From c131c59d0449e1b81407f9d6a0a1daa5d5205671 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 16 Mar 2022 18:02:31 +0100 Subject: [PATCH 1/4] Add basic QSL message text box --- application/language/english/qso_lang.php | 1 + application/views/qso/index.php | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index 2fda9909..944f0d2a 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -18,6 +18,7 @@ $lang['qso_sig_info_helptext'] = 'For example: DLFF-0029'; $lang['qso_dok_helptext'] = 'For example: Q03'; $lang['qso_notes_helptext'] = 'Note content is used within Cloudlog only and is not exported to other services.'; +$lang['qsl_notes_helptext'] = 'This note content is exported to QSL services like eqsl.cc.'; // Button Text on /qso Display diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 47d63432..17accbf7 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -472,6 +472,13 @@ + +
+ + +
From 8c9e98888c9b7bda034719657b7de56db2ccbf78 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 16 Mar 2022 18:21:46 +0100 Subject: [PATCH 2/4] Save QSLMSG to database --- application/models/Logbook_model.php | 1 + application/views/qso/index.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 1aa0a144..1290d5c7 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -146,6 +146,7 @@ class Logbook_model extends CI_Model { 'COL_QSL_SENT_VIA' => $this->input->post('qsl_sent_method'), 'COL_QSL_RCVD_VIA' => $this->input->post('qsl_recv_method'), 'COL_QSL_VIA' => $this->input->post('qsl_via'), + 'COL_QSLMSG' => $this->input->post('qslmsg'), 'COL_OPERATOR' => $this->session->userdata('user_callsign'), 'COL_QTH' => $this->input->post('qth'), 'COL_PROP_MODE' => $prop_mode, diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 17accbf7..ef1d7ead 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -476,8 +476,8 @@ lang->line('general_word_info'); ?> lang->line('qsl_notes_helptext'); ?>
- - + +
From b9de48d7d202d066eac1057fda460eae8b6374ea Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 16 Mar 2022 20:22:40 +0100 Subject: [PATCH 3/4] Transfer QSLMSG to eqsl.cc during upload --- application/controllers/Eqsl.php | 11 +++++++++++ application/models/Logbook_model.php | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/application/controllers/Eqsl.php b/application/controllers/Eqsl.php index 56219f83..160b7175 100644 --- a/application/controllers/Eqsl.php +++ b/application/controllers/Eqsl.php @@ -430,6 +430,17 @@ class eqsl extends CI_Controller { $adif .= "%20"; } + // adding qslmsg if it isn't blank + if ($qsl['COL_QSLMSG'] != ''){ + $adif .= "%3C"; + $adif .= "QSLMSG"; + $adif .= "%3A"; + $adif .= strlen($qsl['COL_QSLMSG']); + $adif .= "%3E"; + $adif .= $qsl['COL_QSLMSG']; + $adif .= "%20"; + } + if ($qsl['eqslqthnickname'] != ''){ $adif .= "%3C"; $adif .= "APP%5FEQSL%5FQTH%5FNICKNAME"; diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 1290d5c7..bfb3d684 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -2084,7 +2084,7 @@ class Logbook_model extends CI_Model { // Show all QSOs we need to send to eQSL function eqsl_not_yet_sent() { - $this->db->select('station_profile.*, '.$this->config->item('table_name').'.COL_PRIMARY_KEY, '.$this->config->item('table_name').'.COL_TIME_ON, '.$this->config->item('table_name').'.COL_CALL, '.$this->config->item('table_name').'.COL_MODE, '.$this->config->item('table_name').'.COL_SUBMODE, '.$this->config->item('table_name').'.COL_BAND, '.$this->config->item('table_name').'.COL_COMMENT, '.$this->config->item('table_name').'.COL_RST_SENT, '.$this->config->item('table_name').'.COL_PROP_MODE, '.$this->config->item('table_name').'.COL_SAT_NAME, '.$this->config->item('table_name').'.COL_SAT_MODE'); + $this->db->select('station_profile.*, '.$this->config->item('table_name').'.COL_PRIMARY_KEY, '.$this->config->item('table_name').'.COL_TIME_ON, '.$this->config->item('table_name').'.COL_CALL, '.$this->config->item('table_name').'.COL_MODE, '.$this->config->item('table_name').'.COL_SUBMODE, '.$this->config->item('table_name').'.COL_BAND, '.$this->config->item('table_name').'.COL_COMMENT, '.$this->config->item('table_name').'.COL_RST_SENT, '.$this->config->item('table_name').'.COL_PROP_MODE, '.$this->config->item('table_name').'.COL_SAT_NAME, '.$this->config->item('table_name').'.COL_SAT_MODE, '.$this->config->item('table_name').'.COL_QSLMSG'); $this->db->from('station_profile'); $this->db->join($this->config->item('table_name'),'station_profile.station_id = '.$this->config->item('table_name').'.station_id AND station_profile.eqslqthnickname != ""','left'); $this->db->where($this->config->item('table_name').'.COL_CALL !=', ''); From 3be65ae548bfa1b9a72338b004093671bb178086 Mon Sep 17 00:00:00 2001 From: phl0 Date: Thu, 17 Mar 2022 10:48:01 +0100 Subject: [PATCH 4/4] Allow for editing QSL MSG comment --- application/models/Logbook_model.php | 7 ++++--- application/views/qso/edit_ajax.php | 12 ++++++++++++ application/views/qso/index.php | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index bfb3d684..fbad52ef 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -617,6 +617,7 @@ class Logbook_model extends CI_Model { 'COL_QSL_RCVD_VIA' => $this->input->post('qsl_recv_method'), 'COL_EQSL_QSL_SENT' => $this->input->post('eqsl_sent'), 'COL_EQSL_QSL_RCVD' => $this->input->post('eqsl_recv'), + 'COL_QSLMSG' => $this->input->post('qslmsg'), 'COL_LOTW_QSL_SENT' => $this->input->post('lotw_sent'), 'COL_LOTW_QSL_RCVD' => $this->input->post('lotw_recv'), 'COL_IOTA' => $this->input->post('iota_ref'), @@ -630,9 +631,9 @@ class Logbook_model extends CI_Model { 'COL_FREQ_RX' => $this->parse_frequency($this->input->post('freq_display_rx')), 'COL_STX_STRING' => $this->input->post('stx_string'), 'COL_SRX_STRING' => $this->input->post('srx_string'), - 'COL_STX' => $stx_string, - 'COL_SRX' => $srx_string, - 'COL_CONTEST_ID' => $this->input->post('contest_name'), + 'COL_STX' => $stx_string, + 'COL_SRX' => $srx_string, + 'COL_CONTEST_ID' => $this->input->post('contest_name'), 'COL_QSL_VIA' => $this->input->post('qsl_via_callsign'), 'station_id' => $stationId, 'COL_OPERATOR' => $this->input->post('operator_callsign'), diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php index 5e377816..206c9f17 100644 --- a/application/views/qso/edit_ajax.php +++ b/application/views/qso/edit_ajax.php @@ -518,6 +518,18 @@ +
+
+ + +
+
+ +
+
+
diff --git a/application/views/qso/index.php b/application/views/qso/index.php index ef1d7ead..63a3b5c5 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -477,7 +477,7 @@
- +