From bf4c3772106fc95dff5b4e915cbdf1c7d519976c Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 3 Aug 2024 15:00:35 +0200 Subject: [PATCH] add QSLMSG to batchedit --- application/models/Logbookadvanced_model.php | 9 +++++++++ application/views/logbookadvanced/edit.php | 1 + assets/js/sections/logbookadvanced_edit.js | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index cf7e6952f..013fa62d9 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -528,6 +528,7 @@ class Logbookadvanced_model extends CI_Model { case "contest": $column = 'COL_CONTEST_ID'; break; case "lotwsent": $column = 'COL_LOTW_QSL_SENT'; break; case "lotwreceived": $column = 'COL_LOTW_QSL_RCVD'; break; + case "qslmsg": $column = 'COL_QSLMSG'; break; default: return; } @@ -652,6 +653,14 @@ class Logbookadvanced_model extends CI_Model { " SET " . $this->config->item('table_name').".COL_LOTW_QSL_RCVD = ?, " . $this->config->item('table_name').".COL_LOTW_QSLRDATE = now()" . " WHERE " . $this->config->item('table_name').".col_primary_key in ? and station_profile.user_id = ?"; + $query = $this->db->query($sql, array($value, json_decode($ids, true), $this->session->userdata('user_id'))); + + } else if ($column == 'COL_QSLMSG') { + + $sql = "UPDATE ".$this->config->item('table_name')." JOIN station_profile ON ". $this->config->item('table_name').".station_id = station_profile.station_id" . + " SET " . $this->config->item('table_name').".COL_QSLMSG = ? " . + " WHERE " . $this->config->item('table_name').".col_primary_key in ? and station_profile.user_id = ?"; + $query = $this->db->query($sql, array($value, json_decode($ids, true), $this->session->userdata('user_id'))); } else { diff --git a/application/views/logbookadvanced/edit.php b/application/views/logbookadvanced/edit.php index 7b03c81e5..daa90a08a 100644 --- a/application/views/logbookadvanced/edit.php +++ b/application/views/logbookadvanced/edit.php @@ -13,6 +13,7 @@ + diff --git a/assets/js/sections/logbookadvanced_edit.js b/assets/js/sections/logbookadvanced_edit.js index 1baa86099..f4a310e2a 100644 --- a/assets/js/sections/logbookadvanced_edit.js +++ b/assets/js/sections/logbookadvanced_edit.js @@ -183,7 +183,7 @@ function saveBatchEditQsos(id_list) { if (column == 'lotwsent' || column == 'lotwreceived') { value = $("#editLoTW").val(); } - if (column == 'sota' || column == 'pota' || column == 'wwff' || column == 'gridsquare' || column == 'comment' || column == 'operator' || column == 'qslvia' || column == 'contest') { + if (column == 'sota' || column == 'pota' || column == 'wwff' || column == 'gridsquare' || column == 'comment' || column == 'operator' || column == 'qslvia' || column == 'contest' || column == 'qslmsg') { value = $("#editTextInput").val(); } @@ -262,7 +262,7 @@ function changeEditType(type) { $('#editContest').show(); } else if (type == "lotwsent" || type == "lotwreceived") { $('#editLoTW').show(); - } else if (type == "gridsquare" || type == "sota" || type == "wwff" || type == "operator" || type == "pota" || type == "comment" || type == "qslvia" || type == "contest") { + } else if (type == "gridsquare" || type == "sota" || type == "wwff" || type == "operator" || type == "pota" || type == "comment" || type == "qslvia" || type == "contest" || type == "qslmsg") { $('#editTextInput').show(); } }