From ca611dee737ad10d1b63ed60ec56cf6d2b71b6f5 Mon Sep 17 00:00:00 2001
From: phl0
Date: Thu, 29 Jun 2023 09:46:01 +0200
Subject: [PATCH 1/5] Add option to mark QSL RX from pic upload window
---
.../language/english/general_words_lang.php | 3 +-
.../language/german/general_words_lang.php | 1 +
application/views/view_log/qso.php | 42 ++++++++++++-------
3 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php
index 6dc3b456..2b15e688 100644
--- a/application/language/english/general_words_lang.php
+++ b/application/language/english/general_words_lang.php
@@ -55,6 +55,7 @@ $lang['general_word_lotw'] = 'Logbook of the World';
$lang['general_edit_qso'] = 'Edit QSO';
$lang['general_mark_qsl_rx_bureau'] = 'Mark QSL Received (Bureau)';
$lang['general_mark_qsl_rx_direct'] = 'Mark QSL Received (Direct)';
+$lang['general_mark_qsl_rx_electronic'] = 'Mark QSL Received (Electronic)';
$lang['general_mark_qsl_tx_bureau'] = 'Mark QSL Sent (Bureau)';
$lang['general_mark_qsl_tx_direct'] = 'Mark QSL Sent (Direct)';
@@ -138,4 +139,4 @@ $lang['northamerica'] = 'North America';
$lang['oceania'] = 'Oceania';
$lang['southamerica'] = 'South America';
-$lang['gen_band_selection'] = 'Band selection';
\ No newline at end of file
+$lang['gen_band_selection'] = 'Band selection';
diff --git a/application/language/german/general_words_lang.php b/application/language/german/general_words_lang.php
index 61865b04..8930dddf 100644
--- a/application/language/german/general_words_lang.php
+++ b/application/language/german/general_words_lang.php
@@ -55,6 +55,7 @@ $lang['general_word_lotw'] = 'Logbook of the World';
$lang['general_edit_qso'] = 'QSO bearbeiten';
$lang['general_mark_qsl_rx_bureau'] = 'Markiere QSL erhalten (Büro)';
$lang['general_mark_qsl_rx_direct'] = 'Markiere QSL erhalten (Direkt)';
+$lang['general_mark_qsl_rx_electronic'] = 'Markiere QSL erhalten (Elektronisch)';
$lang['general_mark_qsl_tx_bureau'] = 'Markiere QSL gesendet (Büro)';
$lang['general_mark_qsl_tx_direct'] = 'Markiere QSL gesendet (Direkt)';
diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php
index 0071fc06..8c61953d 100644
--- a/application/views/view_log/qso.php
+++ b/application/views/view_log/qso.php
@@ -507,25 +507,39 @@
Warning Maximum file upload size is B.
-
diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js
index ceb493e5..e2be8bc2 100644
--- a/assets/js/sections/common.js
+++ b/assets/js/sections/common.js
@@ -1,4 +1,6 @@
function qsl_rcvd(id, method) {
+ $(".ld-ext-right-"+method).addClass('running');
+ $(".ld-ext-right-"+method).prop('disabled', true);
$.ajax({
url: base_url + 'index.php/qso/qsl_rcvd_ajax',
type: 'post',
@@ -6,6 +8,8 @@ function qsl_rcvd(id, method) {
'method': method
},
success: function(data) {
+ $(".ld-ext-right-"+method).removeClass('running');
+ $(".ld-ext-right-"+method).prop('disabled', false);
if (data.message == 'OK') {
$("#qsl_" + id).find("span:eq(1)").attr('class', 'qsl-green'); // Paints arrow green
$(".qsl_rcvd_" + id).remove(); // removes choice from menu
From e82a866611db85b4f274a4066645e69089c22022 Mon Sep 17 00:00:00 2001
From: phl0
Date: Thu, 29 Jun 2023 14:57:19 +0200
Subject: [PATCH 4/5] Brush up layout
---
application/views/view_log/qso.php | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php
index 458a95c4..a918a3ef 100644
--- a/application/views/view_log/qso.php
+++ b/application/views/view_log/qso.php
@@ -517,26 +517,30 @@
+
+
+
+
+
+
+
+
From 7e836149ff55fe6d0db8c6526688c37cc9e1671d Mon Sep 17 00:00:00 2001
From: phl0
Date: Thu, 29 Jun 2023 17:53:18 +0200
Subject: [PATCH 5/5] Add buttons for outgoing QSL
---
application/views/view_log/qso.php | 16 +++++++++++++---
assets/js/sections/common.js | 16 ++++++++++++----
2 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php
index a918a3ef..3807efe8 100644
--- a/application/views/view_log/qso.php
+++ b/application/views/view_log/qso.php
@@ -534,13 +534,23 @@
+
+
+
+
+
+
+
+
+
diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js
index e2be8bc2..2464589c 100644
--- a/assets/js/sections/common.js
+++ b/assets/js/sections/common.js
@@ -1,6 +1,6 @@
function qsl_rcvd(id, method) {
- $(".ld-ext-right-"+method).addClass('running');
- $(".ld-ext-right-"+method).prop('disabled', true);
+ $(".ld-ext-right-r-"+method).addClass('running');
+ $(".ld-ext-right-r-"+method).prop('disabled', true);
$.ajax({
url: base_url + 'index.php/qso/qsl_rcvd_ajax',
type: 'post',
@@ -8,8 +8,8 @@ function qsl_rcvd(id, method) {
'method': method
},
success: function(data) {
- $(".ld-ext-right-"+method).removeClass('running');
- $(".ld-ext-right-"+method).prop('disabled', false);
+ $(".ld-ext-right-r-"+method).removeClass('running');
+ $(".ld-ext-right-r-"+method).prop('disabled', false);
if (data.message == 'OK') {
$("#qsl_" + id).find("span:eq(1)").attr('class', 'qsl-green'); // Paints arrow green
$(".qsl_rcvd_" + id).remove(); // removes choice from menu
@@ -43,6 +43,8 @@ function qsl_sent(id, method) {
// Function: qsl_requested
// Marks QSL card requested against the QSO.
function qsl_requested(id, method) {
+ $(".ld-ext-right-t-"+method).addClass('running');
+ $(".ld-ext-right-t-"+method).prop('disabled', true);
$.ajax({
url: base_url + 'index.php/qso/qsl_requested_ajax',
type: 'post',
@@ -50,6 +52,8 @@ function qsl_requested(id, method) {
'method': method
},
success: function(data) {
+ $(".ld-ext-right-t-"+method).removeClass('running');
+ $(".ld-ext-right-t-"+method).prop('disabled', false);
if (data.message == 'OK') {
$("#qsl_" + id).find("span:eq(0)").attr('class', 'qsl-yellow'); // Paints arrow yellow
}
@@ -63,6 +67,8 @@ function qsl_requested(id, method) {
// Function: qsl_ignore
// Marks QSL card ignore against the QSO.
function qsl_ignore(id, method) {
+ $(".ld-ext-right-ignore").addClass('running');
+ $(".ld-ext-right-ignore").prop('disabled', true);
$.ajax({
url: base_url + 'index.php/qso/qsl_ignore_ajax',
type: 'post',
@@ -70,6 +76,8 @@ function qsl_ignore(id, method) {
'method': method
},
success: function(data) {
+ $(".ld-ext-right-ignore").removeClass('running');
+ $(".ld-ext-right-ignore").prop('disabled', false);
if (data.message == 'OK') {
$("#qsl_" + id).find("span:eq(0)").attr('class', 'qsl-grey'); // Paints arrow grey
}