From 72d69f6d885d6040b7b9458fe44dcd18926c40ad Mon Sep 17 00:00:00 2001 From: int2001 Date: Thu, 14 Dec 2023 07:10:24 +0000 Subject: [PATCH 1/5] Fixed "mark as sent" to not overwrite the method (only if empty) --- application/models/Logbook_model.php | 34 +++++++++++++++---------- application/views/qslprint/qslprint.php | 2 +- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index a58d3111..a9adb4db 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -1483,22 +1483,28 @@ class Logbook_model extends CI_Model { // Set Paper to sent - function paperqsl_update_sent($qso_id, $method) { - if ($this->logbook_model->check_qso_is_accessible($qso_id)) { + function paperqsl_update_sent($qso_id, $method) { + if ($this->logbook_model->check_qso_is_accessible($qso_id)) { + if ($method != '') { + $data = array( + 'COL_QSLSDATE' => date('Y-m-d H:i:s'), + 'COL_QSL_SENT' => 'Y', + 'COL_QSL_SENT_VIA' => $method + ); + } else { + $data = array( + 'COL_QSLSDATE' => date('Y-m-d H:i:s'), + 'COL_QSL_SENT' => 'Y' + ); + } - $data = array( - 'COL_QSLSDATE' => date('Y-m-d H:i:s'), - 'COL_QSL_SENT' => 'Y', - 'COL_QSL_SENT_VIA' => $method - ); + $this->db->where('COL_PRIMARY_KEY', $qso_id); - $this->db->where('COL_PRIMARY_KEY', $qso_id); - - $this->db->update($this->config->item('table_name'), $data); - } else { - return; - } - } + $this->db->update($this->config->item('table_name'), $data); + } else { + return; + } + } // Set Paper to requested diff --git a/application/views/qslprint/qslprint.php b/application/views/qslprint/qslprint.php index 4ed37517..e4dd681a 100644 --- a/application/views/qslprint/qslprint.php +++ b/application/views/qslprint/qslprint.php @@ -56,7 +56,7 @@ if ($qsos->result() != NULL) { echo '' . $qsl->COL_QSL_VIA . ''; echo '' . $qsl->station_callsign . ''; echo ''; echo_qsl_sent_via($qsl->COL_QSL_SENT_VIA); echo ''; - echo ''; + echo ''; echo ''; echo ''; echo ''; From a5617d28768b18a4b349660ceeaa1e5639d22da9 Mon Sep 17 00:00:00 2001 From: int2001 Date: Thu, 14 Dec 2023 07:10:53 +0000 Subject: [PATCH 2/5] Fixed JS-Part of marking as sent/printed --- assets/js/sections/qslprint.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/sections/qslprint.js b/assets/js/sections/qslprint.js index 7a2c2059..3a131072 100644 --- a/assets/js/sections/qslprint.js +++ b/assets/js/sections/qslprint.js @@ -114,7 +114,7 @@ function mark_qsl_sent(id, method) { url: base_url + 'index.php/qso/qsl_sent_ajax', type: 'post', data: {'id': id, - 'method': method + 'method': 'B' }, success: function(data) { if (data.message == 'OK') { From 6af065185ed3d002afd922cb5964291c94c19a7d Mon Sep 17 00:00:00 2001 From: int2001 Date: Thu, 14 Dec 2023 07:44:36 +0000 Subject: [PATCH 3/5] Also do not overwrite VIA when clicking green Button --- application/models/Logbookadvanced_model.php | 37 ++++++++++++-------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index bb2f5b70..3e7775d8 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -335,23 +335,30 @@ class Logbookadvanced_model extends CI_Model { } } - public function updateQsl($ids, $user_id, $method, $sent) { - $this->load->model('user_model'); + public function updateQsl($ids, $user_id, $method, $sent) { + $this->load->model('user_model'); - if(!$this->user_model->authorize(2)) { - return array('message' => 'Error'); - } else { - $data = array( - 'COL_QSLSDATE' => date('Y-m-d H:i:s'), - 'COL_QSL_SENT' => $sent, - 'COL_QSL_SENT_VIA' => $method - ); - $this->db->where_in('COL_PRIMARY_KEY', json_decode($ids, true)); - $this->db->update($this->config->item('table_name'), $data); + if(!$this->user_model->authorize(2)) { + return array('message' => 'Error'); + } else { + if ($method != '') { + $data = array( + 'COL_QSLSDATE' => date('Y-m-d H:i:s'), + 'COL_QSL_SENT' => $sent, + 'COL_QSL_SENT_VIA' => $method + ); + } else { + $data = array( + 'COL_QSLSDATE' => date('Y-m-d H:i:s'), + 'COL_QSL_SENT' => $sent, + ); + } + $this->db->where_in('COL_PRIMARY_KEY', json_decode($ids, true)); + $this->db->update($this->config->item('table_name'), $data); - return array('message' => 'OK'); - } - } + return array('message' => 'OK'); + } + } public function updateQslReceived($ids, $user_id, $method, $sent) { $this->load->model('user_model'); From 65b280b92512bf0bdd77a303bb57b6df34eff726 Mon Sep 17 00:00:00 2001 From: int2001 Date: Thu, 14 Dec 2023 07:44:58 +0000 Subject: [PATCH 4/5] Green Button JS-Part --- assets/js/sections/qslprint.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/sections/qslprint.js b/assets/js/sections/qslprint.js index 3a131072..c6a9955a 100644 --- a/assets/js/sections/qslprint.js +++ b/assets/js/sections/qslprint.js @@ -168,7 +168,7 @@ function markSelectedQsos() { type: 'post', data: {'id': JSON.stringify(id_list, null, 2), 'sent' : 'Y', - 'method' : 'B' + 'method' : '' }, success: function(data) { if (data !== []) { From 654651671d1cd758cda09beadb1a2d2db419db18 Mon Sep 17 00:00:00 2001 From: int2001 Date: Thu, 14 Dec 2023 08:05:16 +0000 Subject: [PATCH 5/5] Minor typo --- assets/js/sections/qslprint.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/sections/qslprint.js b/assets/js/sections/qslprint.js index c6a9955a..e54e2682 100644 --- a/assets/js/sections/qslprint.js +++ b/assets/js/sections/qslprint.js @@ -114,7 +114,7 @@ function mark_qsl_sent(id, method) { url: base_url + 'index.php/qso/qsl_sent_ajax', type: 'post', data: {'id': id, - 'method': 'B' + 'method': method }, success: function(data) { if (data.message == 'OK') {