From 54531b08c5d736b6839e5cf0a0b2648a504a6743 Mon Sep 17 00:00:00 2001 From: Daniel Clerc Date: Sun, 8 Nov 2020 10:19:47 +0100 Subject: [PATCH 1/8] Add sig and sig_info fields to model --- application/models/Stations.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/application/models/Stations.php b/application/models/Stations.php index 044e80d6..9131c4b2 100644 --- a/application/models/Stations.php +++ b/application/models/Stations.php @@ -42,6 +42,8 @@ class Stations extends CI_Model { 'station_city' => xss_clean($this->input->post('city', true)), 'station_iota' => xss_clean(strtoupper($this->input->post('iota', true))), 'station_sota' => xss_clean(strtoupper($this->input->post('sota', true))), + 'station_sig' => xss_clean(strtoupper($this->input->post('sig', true))), + 'station_sig_info' => xss_clean(strtoupper($this->input->post('sig_info', true))), 'station_callsign' => xss_clean($this->input->post('station_callsign', true)), 'station_dxcc' => xss_clean($this->input->post('dxcc', true)), 'station_country' => xss_clean($this->input->post('station_country', true)), @@ -64,6 +66,8 @@ class Stations extends CI_Model { 'station_city' => xss_clean($this->input->post('city', true)), 'station_iota' => xss_clean($this->input->post('iota', true)), 'station_sota' => xss_clean($this->input->post('sota', true)), + 'station_sig' => xss_clean($this->input->post('sig', true)), + 'station_sig_info' => xss_clean($this->input->post('sig_info', true)), 'station_callsign' => xss_clean($this->input->post('station_callsign', true)), 'station_dxcc' => xss_clean($this->input->post('dxcc', true)), 'station_country' => xss_clean($this->input->post('station_country', true)), From 8412095d3cd25908462674add7bc303fb36ec7ca Mon Sep 17 00:00:00 2001 From: Daniel Clerc Date: Sun, 8 Nov 2020 14:18:25 +0100 Subject: [PATCH 2/8] Add sig and sig_info fields to edit and create view --- application/views/station_profile/create.php | 12 ++++++++++++ application/views/station_profile/edit.php | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php index 6a9b5207..0f05e4a4 100644 --- a/application/views/station_profile/create.php +++ b/application/views/station_profile/create.php @@ -182,6 +182,18 @@ Station SOTA reference. +
+ + + Station Signature (e.g. WWFF). +
+ +
+ + + Station Signature Info (e.g. DLFF-0029). +
+
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index 1d3311bd..20fdc365 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -204,6 +204,18 @@ Station SOTA reference.
+
+ + station_sig; } ?>"> + Station Signature (e.g. WWFF).. +
+ +
+ + station_sig_info; } ?>"> + Station Signature Info (e.g. DLFF-0029). +
+
eqslqthnickname; } ?>"> From f41af318b9ec1ebc2b53af6509c26c524df9e42b Mon Sep 17 00:00:00 2001 From: Daniel Clerc Date: Sun, 8 Nov 2020 14:23:43 +0100 Subject: [PATCH 3/8] Add migration for sig and sig_info fields --- .../055_add_signature_to_station_profile.php | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 application/migrations/055_add_signature_to_station_profile.php diff --git a/application/migrations/055_add_signature_to_station_profile.php b/application/migrations/055_add_signature_to_station_profile.php new file mode 100644 index 00000000..5bd8b2dd --- /dev/null +++ b/application/migrations/055_add_signature_to_station_profile.php @@ -0,0 +1,22 @@ +dbforge->add_column('station_profile', $fields); + } + + public function down() + { + $this->dbforge->drop_column('station_profile', 'station_sig'); + $this->dbforge->drop_column('station_profile', 'station_sig_info'); + } +} \ No newline at end of file From 27418ea0a5d3604433ddd45f7edbfe67e0620050 Mon Sep 17 00:00:00 2001 From: Daniel Clerc Date: Sun, 8 Nov 2020 21:44:14 +0100 Subject: [PATCH 4/8] Add set migration to 55 in config/migration --- application/config/migration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/config/migration.php b/application/config/migration.php index 2b1e5243..a9dbaec0 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -21,7 +21,7 @@ $config['migration_enabled'] = TRUE; | be upgraded / downgraded to. | */ -$config['migration_version'] = 54; +$config['migration_version'] = 55; /* |-------------------------------------------------------------------------- From 59af8dd7f1eb54bb9ccda8108bd3ef7ee0035f05 Mon Sep 17 00:00:00 2001 From: Daniel Clerc Date: Sun, 8 Nov 2020 21:46:57 +0100 Subject: [PATCH 5/8] Add sig/sig_info to function reassign in Stations model --- application/models/Stations.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/application/models/Stations.php b/application/models/Stations.php index 9131c4b2..47534858 100644 --- a/application/models/Stations.php +++ b/application/models/Stations.php @@ -176,6 +176,14 @@ class Stations extends CI_Model { $this->db->where('COL_MY_SOTA_REF', $row->station_sota); } + if($row->station_sig != "") { + $this->db->where('COL_MY_SIG', $row->station_sig); + } + + if($row->station_sig_info != "") { + $this->db->where('COL_MY_SIG_INFO', $row->station_sig_info); + } + $this->db->where('COL_MY_COUNTRY', $row->station_country); if( strpos($row->station_gridsquare, ',') !== false ) { From 137c4d95ec587b5c3ce7a23650600cbbf2a5bae1 Mon Sep 17 00:00:00 2001 From: Daniel Clerc Date: Sun, 8 Nov 2020 22:01:24 +0100 Subject: [PATCH 6/8] Add sig/sig_info to adif exportall function --- 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 734bb347..20ac07df 100644 --- a/application/views/adif/data/exportall.php +++ b/application/views/adif/data/exportall.php @@ -9,5 +9,5 @@ result() as $qso) { ?> - COL_CALL); ?>>COL_CALL; ?>COL_BAND); ?>>COL_BAND; ?>COL_MODE); ?>>COL_MODE; ?>COL_SUBMODE) { ?>COL_SUBMODE); ?>>COL_SUBMODE; ?>COL_FREQ != "0") { ?>COL_FREQ / 1000000; ?>>COL_FREQ_RX != "0") { ?>COL_FREQ_RX / 1000000; ?>>COL_BAND_RX) { ?>COL_BAND_RX); ?>>COL_BAND_RX; ?>COL_TIME_ON); $new_date = date('Ymd', $date_on); ?>>COL_TIME_ON); $new_on = date('His', $time_on); ?>>COL_TIME_OFF); $new_off = date('His', $time_off); ?>>COL_RST_RCVD); ?>>COL_RST_RCVD; ?>COL_RST_SENT); ?>>COL_RST_SENT; ?>COL_QSL_RCVD); ?>>COL_QSL_RCVD; ?>COL_QSL_SENT); ?>>COL_QSL_SENT; ?>COL_COUNTRY); ?>>COL_COUNTRY; ?>COL_VUCC_GRIDS != "") { ?>COL_VUCC_GRIDS); ?>>COL_VUCC_GRIDS; ?>COL_VUCC_GRIDS == "" && $qso->COL_GRIDSQUARE != "") { ?>COL_GRIDSQUARE); ?>>COL_GRIDSQUARE; ?>COL_SAT_NAME) { ?>COL_SAT_MODE != 0 || $qso->COL_SAT_MODE !="") {?>COL_SAT_MODE); ?>>COL_SAT_MODE; ?>COL_SAT_NAME); ?>>COL_SAT_NAME; ?>COL_PROP_MODE) { ?>COL_PROP_MODE); ?>>COL_PROP_MODE; ?>COL_NAME) { ?>COL_NAME); ?>>COL_NAME; ?>COL_STATE) { ?>COL_STATE); ?>>COL_STATE; ?>COL_SOTA_REF) { ?>COL_SOTA_REF); ?>>COL_SOTA_REF; ?>COL_OPERATOR) { ?>COL_OPERATOR); ?>>COL_OPERATOR; ?>station_callsign) { ?>station_callsign); ?>>station_callsign; ?>station_city) { ?>station_city); ?>>station_city; ?>station_country) { ?>station_country); ?>>station_country; ?>station_dxcc) { ?>station_dxcc); ?>>station_dxcc; ?>station_gridsquare, ',') !== false ) { ?>station_gridsquare); ?>>station_gridsquare; ?>station_gridsquare); ?>>station_gridsquare; ?>station_iota) { ?>station_iota); ?>>station_iota; ?>station_sota) { ?>station_sota); ?>>station_sota; ?>station_cq) { ?>station_cq); ?>>station_cq; ?>station_itu) { ?>station_itu); ?>>station_itu; ?>station_cnty) { ?>station_cnty); ?>>station_cnty; ?>state) { ?>state); ?>>state; ?>COL_STX !="") { ?>COL_STX);?>>COL_STX; ?>COL_STX_STRING !="") { ?>COL_STX_STRING);?>>COL_STX_STRING; ?>COL_SRX !="") { ?>COL_SRX);?>>COL_SRX; ?>COL_SRX_STRING !="") { ?>COL_SRX_STRING);?>>COL_SRX_STRING; ?>COL_TX_PWR !="") { ?>COL_TX_PWR);?>>COL_TX_PWR; ?>COL_COMMENT !="") { ?>COL_COMMENT);?>>COL_COMMENT; ?> + COL_CALL); ?>>COL_CALL; ?>COL_BAND); ?>>COL_BAND; ?>COL_MODE); ?>>COL_MODE; ?>COL_SUBMODE) { ?>COL_SUBMODE); ?>>COL_SUBMODE; ?>COL_FREQ != "0") { ?>COL_FREQ / 1000000; ?>>COL_FREQ_RX != "0") { ?>COL_FREQ_RX / 1000000; ?>>COL_BAND_RX) { ?>COL_BAND_RX); ?>>COL_BAND_RX; ?>COL_TIME_ON); $new_date = date('Ymd', $date_on); ?>>COL_TIME_ON); $new_on = date('His', $time_on); ?>>COL_TIME_OFF); $new_off = date('His', $time_off); ?>>COL_RST_RCVD); ?>>COL_RST_RCVD; ?>COL_RST_SENT); ?>>COL_RST_SENT; ?>COL_QSL_RCVD); ?>>COL_QSL_RCVD; ?>COL_QSL_SENT); ?>>COL_QSL_SENT; ?>COL_COUNTRY); ?>>COL_COUNTRY; ?>COL_VUCC_GRIDS != "") { ?>COL_VUCC_GRIDS); ?>>COL_VUCC_GRIDS; ?>COL_VUCC_GRIDS == "" && $qso->COL_GRIDSQUARE != "") { ?>COL_GRIDSQUARE); ?>>COL_GRIDSQUARE; ?>COL_SAT_NAME) { ?>COL_SAT_MODE != 0 || $qso->COL_SAT_MODE !="") {?>COL_SAT_MODE); ?>>COL_SAT_MODE; ?>COL_SAT_NAME); ?>>COL_SAT_NAME; ?>COL_PROP_MODE) { ?>COL_PROP_MODE); ?>>COL_PROP_MODE; ?>COL_NAME) { ?>COL_NAME); ?>>COL_NAME; ?>COL_STATE) { ?>COL_STATE); ?>>COL_STATE; ?>COL_SOTA_REF) { ?>COL_SOTA_REF); ?>>COL_SOTA_REF; ?>COL_OPERATOR) { ?>COL_OPERATOR); ?>>COL_OPERATOR; ?>station_callsign) { ?>station_callsign); ?>>station_callsign; ?>station_city) { ?>station_city); ?>>station_city; ?>station_country) { ?>station_country); ?>>station_country; ?>station_dxcc) { ?>station_dxcc); ?>>station_dxcc; ?>station_gridsquare, ',') !== false ) { ?>station_gridsquare); ?>>station_gridsquare; ?>station_gridsquare); ?>>station_gridsquare; ?>station_iota) { ?>station_iota); ?>>station_iota; ?>station_sota) { ?>station_sota); ?>>station_sota; ?>station_sota) { ?>station_sig); ?>>station_sig; ?>station_sig) { ?>station_sig_info); ?>>station_sig_info; ?>station_cq) { ?>station_cq); ?>>station_cq; ?>station_itu) { ?>station_itu); ?>>station_itu; ?>station_cnty) { ?>station_cnty); ?>>station_cnty; ?>state) { ?>state); ?>>state; ?>COL_STX !="") { ?>COL_STX);?>>COL_STX; ?>COL_STX_STRING !="") { ?>COL_STX_STRING);?>>COL_STX_STRING; ?>COL_SRX !="") { ?>COL_SRX);?>>COL_SRX; ?>COL_SRX_STRING !="") { ?>COL_SRX_STRING);?>>COL_SRX_STRING; ?> From 4c1088da5e41fd6116a2d27301818f6d70f10f02 Mon Sep 17 00:00:00 2001 From: Daniel Clerc Date: Wed, 11 Nov 2020 18:19:31 +0100 Subject: [PATCH 7/8] Fix form name tag to avoid overwriting sota field --- application/views/station_profile/edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index 20fdc365..5be02219 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -206,7 +206,7 @@
- station_sig; } ?>"> + station_sig; } ?>"> Station Signature (e.g. WWFF)..
From 01578c4f40797f466eb296e7c336d28af637d04b Mon Sep 17 00:00:00 2001 From: Daniel Clerc Date: Wed, 11 Nov 2020 18:38:11 +0100 Subject: [PATCH 8/8] Readds TX_PWR and COMMENT 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 20ac07df..f6ca4990 100644 --- a/application/views/adif/data/exportall.php +++ b/application/views/adif/data/exportall.php @@ -9,5 +9,5 @@ result() as $qso) { ?> - COL_CALL); ?>>COL_CALL; ?>COL_BAND); ?>>COL_BAND; ?>COL_MODE); ?>>COL_MODE; ?>COL_SUBMODE) { ?>COL_SUBMODE); ?>>COL_SUBMODE; ?>COL_FREQ != "0") { ?>COL_FREQ / 1000000; ?>>COL_FREQ_RX != "0") { ?>COL_FREQ_RX / 1000000; ?>>COL_BAND_RX) { ?>COL_BAND_RX); ?>>COL_BAND_RX; ?>COL_TIME_ON); $new_date = date('Ymd', $date_on); ?>>COL_TIME_ON); $new_on = date('His', $time_on); ?>>COL_TIME_OFF); $new_off = date('His', $time_off); ?>>COL_RST_RCVD); ?>>COL_RST_RCVD; ?>COL_RST_SENT); ?>>COL_RST_SENT; ?>COL_QSL_RCVD); ?>>COL_QSL_RCVD; ?>COL_QSL_SENT); ?>>COL_QSL_SENT; ?>COL_COUNTRY); ?>>COL_COUNTRY; ?>COL_VUCC_GRIDS != "") { ?>COL_VUCC_GRIDS); ?>>COL_VUCC_GRIDS; ?>COL_VUCC_GRIDS == "" && $qso->COL_GRIDSQUARE != "") { ?>COL_GRIDSQUARE); ?>>COL_GRIDSQUARE; ?>COL_SAT_NAME) { ?>COL_SAT_MODE != 0 || $qso->COL_SAT_MODE !="") {?>COL_SAT_MODE); ?>>COL_SAT_MODE; ?>COL_SAT_NAME); ?>>COL_SAT_NAME; ?>COL_PROP_MODE) { ?>COL_PROP_MODE); ?>>COL_PROP_MODE; ?>COL_NAME) { ?>COL_NAME); ?>>COL_NAME; ?>COL_STATE) { ?>COL_STATE); ?>>COL_STATE; ?>COL_SOTA_REF) { ?>COL_SOTA_REF); ?>>COL_SOTA_REF; ?>COL_OPERATOR) { ?>COL_OPERATOR); ?>>COL_OPERATOR; ?>station_callsign) { ?>station_callsign); ?>>station_callsign; ?>station_city) { ?>station_city); ?>>station_city; ?>station_country) { ?>station_country); ?>>station_country; ?>station_dxcc) { ?>station_dxcc); ?>>station_dxcc; ?>station_gridsquare, ',') !== false ) { ?>station_gridsquare); ?>>station_gridsquare; ?>station_gridsquare); ?>>station_gridsquare; ?>station_iota) { ?>station_iota); ?>>station_iota; ?>station_sota) { ?>station_sota); ?>>station_sota; ?>station_sota) { ?>station_sig); ?>>station_sig; ?>station_sig) { ?>station_sig_info); ?>>station_sig_info; ?>station_cq) { ?>station_cq); ?>>station_cq; ?>station_itu) { ?>station_itu); ?>>station_itu; ?>station_cnty) { ?>station_cnty); ?>>station_cnty; ?>state) { ?>state); ?>>state; ?>COL_STX !="") { ?>COL_STX);?>>COL_STX; ?>COL_STX_STRING !="") { ?>COL_STX_STRING);?>>COL_STX_STRING; ?>COL_SRX !="") { ?>COL_SRX);?>>COL_SRX; ?>COL_SRX_STRING !="") { ?>COL_SRX_STRING);?>>COL_SRX_STRING; ?> + COL_CALL); ?>>COL_CALL; ?>COL_BAND); ?>>COL_BAND; ?>COL_MODE); ?>>COL_MODE; ?>COL_SUBMODE) { ?>COL_SUBMODE); ?>>COL_SUBMODE; ?>COL_FREQ != "0") { ?>COL_FREQ / 1000000; ?>>COL_FREQ_RX != "0") { ?>COL_FREQ_RX / 1000000; ?>>COL_BAND_RX) { ?>COL_BAND_RX); ?>>COL_BAND_RX; ?>COL_TIME_ON); $new_date = date('Ymd', $date_on); ?>>COL_TIME_ON); $new_on = date('His', $time_on); ?>>COL_TIME_OFF); $new_off = date('His', $time_off); ?>>COL_RST_RCVD); ?>>COL_RST_RCVD; ?>COL_RST_SENT); ?>>COL_RST_SENT; ?>COL_QSL_RCVD); ?>>COL_QSL_RCVD; ?>COL_QSL_SENT); ?>>COL_QSL_SENT; ?>COL_COUNTRY); ?>>COL_COUNTRY; ?>COL_VUCC_GRIDS != "") { ?>COL_VUCC_GRIDS); ?>>COL_VUCC_GRIDS; ?>COL_VUCC_GRIDS == "" && $qso->COL_GRIDSQUARE != "") { ?>COL_GRIDSQUARE); ?>>COL_GRIDSQUARE; ?>COL_SAT_NAME) { ?>COL_SAT_MODE != 0 || $qso->COL_SAT_MODE !="") {?>COL_SAT_MODE); ?>>COL_SAT_MODE; ?>COL_SAT_NAME); ?>>COL_SAT_NAME; ?>COL_PROP_MODE) { ?>COL_PROP_MODE); ?>>COL_PROP_MODE; ?>COL_NAME) { ?>COL_NAME); ?>>COL_NAME; ?>COL_STATE) { ?>COL_STATE); ?>>COL_STATE; ?>COL_SOTA_REF) { ?>COL_SOTA_REF); ?>>COL_SOTA_REF; ?>COL_OPERATOR) { ?>COL_OPERATOR); ?>>COL_OPERATOR; ?>station_callsign) { ?>station_callsign); ?>>station_callsign; ?>station_city) { ?>station_city); ?>>station_city; ?>station_country) { ?>station_country); ?>>station_country; ?>station_dxcc) { ?>station_dxcc); ?>>station_dxcc; ?>station_gridsquare, ',') !== false ) { ?>station_gridsquare); ?>>station_gridsquare; ?>station_gridsquare); ?>>station_gridsquare; ?>station_iota) { ?>station_iota); ?>>station_iota; ?>station_sota) { ?>station_sota); ?>>station_sota; ?>station_sota) { ?>station_sig); ?>>station_sig; ?>station_sig) { ?>station_sig_info); ?>>station_sig_info; ?>station_cq) { ?>station_cq); ?>>station_cq; ?>station_itu) { ?>station_itu); ?>>station_itu; ?>station_cnty) { ?>station_cnty); ?>>station_cnty; ?>state) { ?>state); ?>>state; ?>COL_STX !="") { ?>COL_STX);?>>COL_STX; ?>COL_STX_STRING !="") { ?>COL_STX_STRING);?>>COL_STX_STRING; ?>COL_SRX !="") { ?>COL_SRX);?>>COL_SRX; ?>COL_SRX_STRING !="") { ?>COL_SRX_STRING);?>>COL_SRX_STRING; ?>COL_TX_PWR; ?>COL_COMMENT !="") { ?>COL_COMMENT);?>>COL_COMMENT; ?>