From f3e88ffdef97f6caed850c70d7f5647229b3e292 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Thu, 5 Mar 2020 18:27:11 +0000 Subject: [PATCH 01/23] Added USA state to the General tab --- application/models/Logbook_model.php | 1 + application/views/qso/index.php | 58 ++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 0ad10816..4791bc75 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -106,6 +106,7 @@ class Logbook_model extends CI_Model { 'COL_LON' => null, 'COL_DXCC' => $dxcc_id, 'COL_CQZ' => $cqz, + 'COL_STATE' => trim($this->input->post('usa_state')), 'COL_SOTA_REF' => trim($this->input->post('sota_ref')), 'COL_DARC_DOK' => trim($this->input->post('darc_dok')), ); diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 5bbbbc10..81db6cd5 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -215,6 +215,64 @@ +
+ + +
+
e.g: EU-005 From c72c5deea4dc880b4cd0f99ab93900897cd4b8fe Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Thu, 5 Mar 2020 18:29:31 +0000 Subject: [PATCH 02/23] Added USA State to the QSO popup box --- application/views/view_log/qso.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index b073599c..4ed57cfd 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -73,6 +73,13 @@ COL_VUCC_GRIDS; ?> + + COL_STATE != null) { ?> + + USA State: + COL_STATE; ?> + + COL_NAME != null) { ?> From 01cade18feb05fdf8122d58e9becb82d05871dc1 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Thu, 5 Mar 2020 18:31:54 +0000 Subject: [PATCH 03/23] Added USA State to the edit fields list --- application/models/Logbook_model.php | 1 + application/views/qso/edit.php | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 4791bc75..17d2550a 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -282,6 +282,7 @@ class Logbook_model extends CI_Model { 'COL_QSL_VIA' => $this->input->post('qsl_via_callsign'), 'station_id' => $this->input->post('station_profile'), 'COL_OPERATOR' => $this->input->post('operator_callsign'), + 'COL_STATE' =>$this->input->post('usa_state') ); $this->db->where('COL_PRIMARY_KEY', $this->input->post('id')); diff --git a/application/views/qso/edit.php b/application/views/qso/edit.php index 869d9466..83d6680f 100755 --- a/application/views/qso/edit.php +++ b/application/views/qso/edit.php @@ -155,6 +155,11 @@