From 58a552ce23848dd737d7be2e5299415051ffb29a Mon Sep 17 00:00:00 2001 From: Daniel Clerc Date: Mon, 16 Nov 2020 21:21:59 +0100 Subject: [PATCH 1/6] add SIG and SIG_INFO to view_log --- application/views/view_log/qso.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index 7a98d489..7719f6e2 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -192,6 +192,20 @@ + COL_SIG != null) { ?> + + Sig: + COL_SIG; ?> + + + + COL_SIG_INFO != null) { ?> + + Sig Info: + COL_SIG_INFO; ?> + + + COL_DARC_DOK != null) { ?> DOK: From f8035613763568ffa46ce7fb4a6b2f7d7a6e858a Mon Sep 17 00:00:00 2001 From: Daniel Clerc Date: Mon, 16 Nov 2020 22:08:32 +0100 Subject: [PATCH 2/6] Add SIG and SIG_INFO to logbook model and qso view --- application/models/Logbook_model.php | 2 ++ application/views/qso/index.php | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index b5bd539b..4eaa7800 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -122,6 +122,8 @@ class Logbook_model extends CI_Model { 'COL_CQZ' => $cqz, 'COL_STATE' => trim($this->input->post('usa_state')), 'COL_SOTA_REF' => trim($this->input->post('sota_ref')), + 'COL_SIG' => trim($this->input->post('sig')), + 'COL_SIG_INFO' => trim($this->input->post('sig_info')), 'COL_DARC_DOK' => trim($this->input->post('darc_dok')), 'COL_NOTES' => $this->input->post('notes'), ); diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 1f02128a..312ba52f 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -328,6 +328,18 @@ For example: GM/NS-001 +
+ + + For example: WWFF or POTA +
+ +
+ + + For example: DLFF-0029 +
+
From 8d85ab230a7066b4367a7bdc2e854578d1400734 Mon Sep 17 00:00:00 2001 From: Daniel Clerc Date: Mon, 16 Nov 2020 22:14:10 +0100 Subject: [PATCH 3/6] Add SIG and SIG_INFO to edit qso views --- application/views/qso/edit.php | 12 +++++++++++- application/views/qso/edit_ajax.php | 10 ++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/application/views/qso/edit.php b/application/views/qso/edit.php index 5f881db7..42179dcd 100755 --- a/application/views/qso/edit.php +++ b/application/views/qso/edit.php @@ -334,7 +334,17 @@
-
+
+ +
+ + +
+ +
+ + +
diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php index e0b2add0..ab7e1227 100644 --- a/application/views/qso/edit_ajax.php +++ b/application/views/qso/edit_ajax.php @@ -382,6 +382,16 @@
+
+ + +
+ +
+ + +
+
From 0b3af61fb12c28c858b7f1f16e38b3a8484dcdba Mon Sep 17 00:00:00 2001 From: Daniel Clerc Date: Mon, 16 Nov 2020 22:19:10 +0100 Subject: [PATCH 4/6] Add SIG and SIG_INFO to adif export --- application/views/adif/data/exportall.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/adif/data/exportall.php b/application/views/adif/data/exportall.php index dbe33c27..26991708 100644 --- a/application/views/adif/data/exportall.php +++ b/application/views/adif/data/exportall.php @@ -13,4 +13,4 @@ $CI->load->library('AdifHelper'); foreach ($qsos->result() as $qso) { echo $CI->adifhelper->getAdifLine($qso); -} \ No newline at end of file +} From 98f4d45c605aeb063d98d772356d80f514716336 Mon Sep 17 00:00:00 2001 From: Daniel Clerc Date: Tue, 17 Nov 2020 21:39:05 +0100 Subject: [PATCH 5/6] Add SIG and SIG_INFO to AdifHelper --- application/libraries/AdifHelper.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/application/libraries/AdifHelper.php b/application/libraries/AdifHelper.php index aa8dd45e..2489b9ed 100644 --- a/application/libraries/AdifHelper.php +++ b/application/libraries/AdifHelper.php @@ -114,6 +114,10 @@ class AdifHelper { $line .= $this->getAdifFieldLine("MY_SIG_INFO", $qso->station_sig_info); + $line .= $this->getAdifFieldLine("SIG", $qso->COL_SIG); + + $line .= $this->getAdifFieldLine("SIG_INFO", $qso->COL_SIG_INFO); + $line .= "\r\n"; return $line; From 3a3b53bc5841337c116336597a4f47d39e20c93a Mon Sep 17 00:00:00 2001 From: Daniel Clerc Date: Tue, 17 Nov 2020 22:29:06 +0100 Subject: [PATCH 6/6] Add SIG and SIG_INFO to edit logbook model --- application/models/Logbook_model.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 4eaa7800..ac044936 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -603,6 +603,8 @@ class Logbook_model extends CI_Model { 'COL_LOTW_QSL_RCVD' => $this->input->post('lotw_recv'), 'COL_IOTA' => $this->input->post('iota_ref'), 'COL_SOTA_REF' => $this->input->post('sota_ref'), + 'COL_SIG' => $this->input->post('sig'), + 'COL_SIG_INFO' => $this->input->post('sig_info'), 'COL_DARC_DOK' => $this->input->post('darc_dok'), 'COL_QTH' => $this->input->post('qth'), 'COL_PROP_MODE' => $this->input->post('prop_mode'),