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/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'); 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 ''; diff --git a/assets/js/sections/qslprint.js b/assets/js/sections/qslprint.js index 7a2c2059..e54e2682 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 !== []) {