From c6716ab57af95d3f2ca8058701028b4d0663c0f6 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Tue, 14 May 2024 15:25:10 +0100 Subject: [PATCH] [WAB] Added ability to store WAB reference in Station Locations Added ability to store WAB reference in Station Locations and also its exported in ADIF with the custom tag of "APP_CLOUDLOG_MY_WAB" --- application/config/migration.php | 2 +- application/libraries/AdifHelper.php | 2 +- .../migrations/183_add_wab_to_location.php | 29 + application/models/Stations.php | 2 + application/views/interface_assets/footer.php | 85 ++- application/views/station_profile/create.php | 694 +++++++++--------- application/views/station_profile/edit.php | 13 + 7 files changed, 449 insertions(+), 378 deletions(-) create mode 100644 application/migrations/183_add_wab_to_location.php diff --git a/application/config/migration.php b/application/config/migration.php index 1d9283c0..a4c1cf7f 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE; | */ -$config['migration_version'] = 182; +$config['migration_version'] = 183; /* |-------------------------------------------------------------------------- diff --git a/application/libraries/AdifHelper.php b/application/libraries/AdifHelper.php index 22a9d02c..3c63280d 100644 --- a/application/libraries/AdifHelper.php +++ b/application/libraries/AdifHelper.php @@ -209,7 +209,7 @@ class AdifHelper { $line .= $this->getAdifFieldLine("MY_POTA_REF", $qso->station_pota); $line .= $this->getAdifFieldLine("MY_CQ_ZONE", $qso->station_cq); - + $line .= $this->getAdifFieldLine("APP_CLOUDLOG_MY_WAB", $qso->station_wab); $line .= $this->getAdifFieldLine("MY_ITU_ZONE", $qso->station_itu); if($qso->state) { diff --git a/application/migrations/183_add_wab_to_location.php b/application/migrations/183_add_wab_to_location.php new file mode 100644 index 00000000..5bb57420 --- /dev/null +++ b/application/migrations/183_add_wab_to_location.php @@ -0,0 +1,29 @@ +db->field_exists('station_wab', 'station_profile')) { + // Add WAB Ref to station profile + $fields = array( + 'station_wab varchar(10) DEFAULT NULL', + ); + $this->dbforge->add_column('station_profile', $fields); + } + } + + public function down() + { + if ($this->db->field_exists('station_wab', 'station_profile')) { + $this->dbforge->drop_column('station_profile', 'station_wab'); + } + } +} diff --git a/application/models/Stations.php b/application/models/Stations.php index 4c78ec37..7cc0c85d 100644 --- a/application/models/Stations.php +++ b/application/models/Stations.php @@ -91,6 +91,7 @@ class Stations extends CI_Model { 'station_sota' => xss_clean(strtoupper($this->input->post('sota', true))), 'station_wwff' => xss_clean(strtoupper($this->input->post('wwff', true))), 'station_pota' => xss_clean(strtoupper($this->input->post('pota', true))), + 'station_wab' => xss_clean(strtoupper($this->input->post('wab', 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)), @@ -141,6 +142,7 @@ class Stations extends CI_Model { 'station_sota' => xss_clean($this->input->post('sota', true)), 'station_wwff' => xss_clean($this->input->post('wwff', true)), 'station_pota' => xss_clean($this->input->post('pota', true)), + 'station_wab' => xss_clean($this->input->post('wab', 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)), diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index b07eb718..a0b693ba 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -1602,43 +1602,45 @@ if ($this->session->userdata('user_id') != null) { // Load the external GeoJSON file $.when(wab_squares).done(function() { - var layer = L.tileLayer('optionslib->get_option('option_map_tile_server'); ?>', { - maxZoom: 18, - attribution: 'optionslib->get_option('option_map_tile_server_copyright'); ?>', - id: 'mapbox.streets' - }); + var layer = L.tileLayer('optionslib->get_option('option_map_tile_server'); ?>', { + maxZoom: 18, + attribution: 'optionslib->get_option('option_map_tile_server_copyright'); ?>', + id: 'mapbox.streets' + }); - var map = L.map('map', { - layers: [layer], - center: [54.970901, -2.457140], - zoom: 8, - minZoom: 8, - fullscreenControl: true, - fullscreenControlOptions: { - position: 'topleft' - }, - }); + var map = L.map('map', { + layers: [layer], + center: [54.970901, -2.457140], + zoom: 8, + minZoom: 8, + fullscreenControl: true, + fullscreenControlOptions: { + position: 'topleft' + }, + }); - var printer = L.easyPrint({ - tileLayer: layer, - sizeModes: ['Current'], - filename: 'myMap', - exportOnly: true, - hideControlContainer: true - }).addTo(map); + var printer = L.easyPrint({ + tileLayer: layer, + sizeModes: ['Current'], + filename: 'myMap', + exportOnly: true, + hideControlContainer: true + }).addTo(map); - /*Legend specific*/ - var legend = L.control({ position: "topright" }); + /*Legend specific*/ + var legend = L.control({ + position: "topright" + }); -legend.onAdd = function(map) { - var div = L.DomUtil.create("div", "legend"); - div.innerHTML += "

" + lang_general_word_colors + "

"; - div.innerHTML += " Confirmed Square
"; - div.innerHTML += " Unconfirmed Square
"; - return div; -}; + legend.onAdd = function(map) { + var div = L.DomUtil.create("div", "legend"); + div.innerHTML += "

" + lang_general_word_colors + "

"; + div.innerHTML += " Confirmed Square
"; + div.innerHTML += " Unconfirmed Square
"; + return div; + }; -legend.addTo(map); + legend.addTo(map); //console.log(wab_squares.responseJSON); // Add requested external GeoJSON to map @@ -3109,6 +3111,25 @@ legend.addTo(map); - - - -
- - - -
-
- - num_rows() > 0) { ?> - - - - -
- -
- - - -
- -
-
- - - -
- -
- - - -
- -
- - - -
-
- -
-
- - - ".lang("gen_find_zone_part2")." ".lang("gen_find_zone_part3"); ?> -
- -
- - - ".lang("gen_find_zone_part2")." ".lang("gen_find_zone_part3"); ?> -
-
- -
- - -
- -
- -
-
- - - -
- -
- - - - -
- -
- - - -
- -
- - - -
- -
- - - -
- -
- - - -
- -
- - - -
- -
- - - -
- -
- - - - -
- -
- - -
- -
-
- - - -
-
- - - -
-
- - -
-
- - - -
-
- - - -
-
- - -
-
- -
-
- - - + session->flashdata('notice')) { ?> +
+ session->flashdata('notice'); ?>
-
- - + +
+ +
+ + + + + + +
+ +
+ + + +
+
+ + num_rows() > 0) { ?> + + + + +
+ +
+ + + +
+ +
+
+ + + +
+ +
+ + + +
+ +
+ + + +
+
+ +
+
+ + + " . lang("gen_find_zone_part2") . " " . lang("gen_find_zone_part3"); ?> +
+ +
+ + + " . lang("gen_find_zone_part2") . " " . lang("gen_find_zone_part3"); ?> +
+
+ +
+ + +
+ +
+ +
+
+ + + +
+ +
+ + + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + Enter your WAB Square, if you dont know it use WhatsMyLocator +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + + +
+ +
+ +
-
-
- - -
-
- - + +
+
+ + + +
+
+ + +
+
+ + + +
+
+ + + +
+
+ + +
+
+ +
+
+ + + +
+
+ + +
+
+ +
+ + - -
-
- - - -
+ + +
+ + + +
+
+ + + +
- + - - - + + + -
+
- + \ No newline at end of file diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index b3a7ce25..fb4311ad 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -319,6 +319,19 @@ + +
+
+
Worked All Britain Reference
+
+
+ + station_wab; } ?>"> + Enter your WAB Square, if you dont know it use WhatsMyLocator +
+
+
+