From a54b6a92bfb115887578ec4cce77b66ce2e9e451 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 16 Feb 2024 13:34:44 +0100 Subject: [PATCH 01/21] state list from dxcc --- application/libraries/Subdivisions.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/application/libraries/Subdivisions.php b/application/libraries/Subdivisions.php index b4fc343a9..5ed40a1bf 100644 --- a/application/libraries/Subdivisions.php +++ b/application/libraries/Subdivisions.php @@ -93,4 +93,13 @@ class Subdivisions { } return 'County'; } + + public function get_state_list($dxcc) { + $CI =& get_instance(); + $CI->load->model('logbook_model'); + + $states = $CI->logbook_model->get_states_by_dxcc($dxcc); + + return $states; + } } From 324fd127083bd2bd94f51c6506d0e0ba61e89509 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 16 Feb 2024 13:35:32 +0100 Subject: [PATCH 02/21] state list from db --- application/views/qso/edit_ajax.php | 78 +++++++++-------------------- 1 file changed, 23 insertions(+), 55 deletions(-) diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php index 737d40e86..6073953e7 100644 --- a/application/views/qso/edit_ajax.php +++ b/application/views/qso/edit_ajax.php @@ -284,67 +284,35 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + result() as $state) { + $selected = ($qso->COL_STATE == $state->state) ? 'selected="selected"' : ''; + ?> + +
- + + COL_DXCC == '291' || $qso->COL_DXCC == '110' || $qso->COL_DXCC == '006') { ?>
- +
+
From a1035ca8a2784f9b29eecd6a50dfb1c2b6a8485e Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 16 Feb 2024 13:36:06 +0100 Subject: [PATCH 03/21] adjustment for state list input --- application/models/Logbook_model.php | 19 ++++++++++++------- application/views/interface_assets/footer.php | 4 ++-- application/views/qso/index.php | 2 +- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 2ca067999..ea5df6549 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -145,8 +145,8 @@ class Logbook_model extends CI_Model { $submode = $this->input->post('mode'); } - if($this->input->post('county') && $this->input->post('usa_state')) { - $clean_county_input = trim($this->input->post('usa_state')) . "," . trim($this->input->post('county')); + if($this->input->post('county') && $this->input->post('input_state_edit')) { + $clean_county_input = trim($this->input->post('input_state_edit')) . "," . trim($this->input->post('county')); } else { $clean_county_input = null; } @@ -234,7 +234,7 @@ class Logbook_model extends CI_Model { 'COL_LON' => null, 'COL_DXCC' => $dxcc_id, 'COL_CQZ' => $cqz, - 'COL_STATE' => $this->input->post('usa_state') == null ? '' : trim($this->input->post('usa_state')), + 'COL_STATE' => $this->input->post('input_state_edit') == null ? '' : trim($this->input->post('input_state_edit')), 'COL_CNTY' => $clean_county_input, 'COL_SOTA_REF' => $this->input->post('sota_ref') == null ? '' : trim($this->input->post('sota_ref')), 'COL_WWFF_REF' => $this->input->post('wwff_ref') == null ? '' : trim($this->input->post('wwff_ref')), @@ -1079,8 +1079,8 @@ class Logbook_model extends CI_Model { if (stristr($this->input->post('usa_county') ?? '', ',')) { // Already comma-seperated Conuty? $uscounty = $this->input->post('usa_county'); - } elseif ($this->input->post('usa_county') && $this->input->post('usa_state')) { // Both filled (and no comma - because that fits one above) - $uscounty = trim($this->input->post('usa_state') . "," . $this->input->post('usa_county')); + } elseif ($this->input->post('usa_county') && $this->input->post('input_state_edit')) { // Both filled (and no comma - because that fits one above) + $uscounty = trim($this->input->post('input_state_edit') . "," . $this->input->post('usa_county')); } else { // nothing from above? $uscounty = null; } @@ -1227,7 +1227,7 @@ class Logbook_model extends CI_Model { 'station_id' => $stationId, 'COL_STATION_CALLSIGN' => $stationCallsign, 'COL_OPERATOR' => $this->input->post('operator_callsign'), - 'COL_STATE' =>$this->input->post('usa_state'), + 'COL_STATE' =>$this->input->post('input_state_edit'), 'COL_CNTY' => $uscounty, 'COL_MY_IOTA' => $iotaRef, 'COL_MY_SOTA_REF' => $sotaRef, @@ -4665,7 +4665,7 @@ function lotw_last_qsl_date($user_id) { $logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); $this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id'); - $this->db->join('lotw_users', 'lotw_users.callsign = '.$this->config->item('table_name').'.col_call', 'left outer'); + $this->db->join('lotw_users', 'lotw_users.callsign = '.$this->config->item('table_name').'.col_call', 'left outer'); $this->db->where_in($this->config->item('table_name').'.station_id', $logbooks_locations_array); $this->db->where('COL_STATE', $state); $this->db->where('COL_CNTY', $county); @@ -4747,6 +4747,11 @@ function lotw_last_qsl_date($user_id) { } return $json; } + + public function get_states_by_dxcc($dxcc) { + $this->db->where('adif', $dxcc); + return $this->db->get('primary_subdivisions'); + } } function validateADIFDate($date, $format = 'Ymd') diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 188ecb113..603ce9212 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -2094,7 +2094,7 @@ $(document).ready(function(){ function selectize_usa_county() { var baseURL= ""; $('#stationCntyInputEdit').selectize({ - delimiter: ';', + delimiter: ';', maxItems: 1, closeAfterSelect: true, loadThrottle: 250, @@ -2104,7 +2104,7 @@ $(document).ready(function(){ options: [], create: false, load: function(query, callback) { - var state = $("#input_usa_state_edit option:selected").text(); + var state = $("#input_state_edit").val(); if (!query || state == "") return callback(); $.ajax({ diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 251be9f18..f06aea1b1 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -346,7 +346,7 @@
- From 36e4fdebf710980e947b567bf731c1a4bbf22597 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 16 Feb 2024 18:21:06 +0100 Subject: [PATCH 04/21] fix state value --- application/views/qso/edit_ajax.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php index 6073953e7..36cd52219 100644 --- a/application/views/qso/edit_ajax.php +++ b/application/views/qso/edit_ajax.php @@ -300,7 +300,7 @@ result() as $state) { $selected = ($qso->COL_STATE == $state->state) ? 'selected="selected"' : ''; ?> - From 44b75a5a606fcd759a101217c6f60405a0394e19 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 16 Feb 2024 18:21:30 +0100 Subject: [PATCH 05/21] selectize state var --- application/views/interface_assets/footer.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 603ce9212..672939a2b 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -2104,7 +2104,8 @@ $(document).ready(function(){ options: [], create: false, load: function(query, callback) { - var state = $("#input_state_edit").val(); + var state = $("#input_state_edit option:selected").text(); + console.log = (state); if (!query || state == "") return callback(); $.ajax({ From 9f5236cb330bf75c1104b8952f9385ee71ffcd94 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 16 Feb 2024 18:24:43 +0100 Subject: [PATCH 06/21] fix selectize --- assets/js/sections/common.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js index c1b88ac62..425b755e6 100644 --- a/assets/js/sections/common.js +++ b/assets/js/sections/common.js @@ -133,14 +133,14 @@ function qso_edit(id) { nl2br: false, message: html, onshown: function(dialog) { - var state = $("#input_usa_state_edit option:selected").text(); + var state = $("#input_state_edit option:selected").text(); if (state != "") { $("#stationCntyInputEdit").prop('disabled', false); selectize_usa_county(); } - $('#input_usa_state_edit').change(function(){ - var state = $("#input_usa_state_edit option:selected").text(); + $('#input_state_edit').change(function(){ + var state = $("#input_state_edit option:selected").text(); if (state != "") { $("#stationCntyInputEdit").prop('disabled', false); From 03f10c0fda1475a5c836d6dcb41343f1984d7626 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 16 Feb 2024 19:11:30 +0100 Subject: [PATCH 07/21] get us states from db in quick lookup --- application/views/lookup/index.php | 65 ++++++------------------------ 1 file changed, 13 insertions(+), 52 deletions(-) diff --git a/application/views/lookup/index.php b/application/views/lookup/index.php index 927172fa7..d1572cf5d 100644 --- a/application/views/lookup/index.php +++ b/application/views/lookup/index.php @@ -19,7 +19,7 @@ } ?> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + result() as $state) { + $selected = ($qso->COL_STATE == $state->state) ? 'selected="selected"' : ''; + ?> + +
-
- - -
+
+ + +
From 3972ac3e0ad60e64f53166943a1b63ab57b7f122 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 16 Feb 2024 19:14:17 +0100 Subject: [PATCH 09/21] all dxcc available states in station location --- application/views/station_profile/edit.php | 64 +++++----------------- 1 file changed, 13 insertions(+), 51 deletions(-) diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index b3a7ce254..04f6464cc 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -97,58 +97,20 @@
From c53e86ef80e5cd36fd82623e240020e5084845d5 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Fri, 16 Feb 2024 19:18:07 +0100 Subject: [PATCH 10/21] removed console.log --- application/views/interface_assets/footer.php | 1 - 1 file changed, 1 deletion(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 672939a2b..2961af0ee 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -2105,7 +2105,6 @@ $(document).ready(function(){ create: false, load: function(query, callback) { var state = $("#input_state_edit option:selected").text(); - console.log = (state); if (!query || state == "") return callback(); $.ajax({ From fb5dcc149828668299c07c1f4148f284fd72578d Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 17 Feb 2024 15:41:35 +0100 Subject: [PATCH 11/21] form-select disabled style --- assets/css/cyborg/overrides.css | 8 +++++++- assets/css/cyborg_wide/overrides.css | 6 ++++++ assets/css/darkly/overrides.css | 4 ++++ assets/css/darkly_wide/overrides.css | 4 ++++ assets/css/superhero/overrides.css | 5 +++++ assets/css/superhero_wide/overrides.css | 5 +++++ 6 files changed, 31 insertions(+), 1 deletion(-) diff --git a/assets/css/cyborg/overrides.css b/assets/css/cyborg/overrides.css index 9cec76a56..c12430c90 100644 --- a/assets/css/cyborg/overrides.css +++ b/assets/css/cyborg/overrides.css @@ -20,7 +20,13 @@ .border-top { --bs-border-color: #282828; } -/* + +.form-select:disabled { + color: #7f7f7f; + background-color: #151515; +} + +/* * Dark Maps */ diff --git a/assets/css/cyborg_wide/overrides.css b/assets/css/cyborg_wide/overrides.css index 4bae67ba2..2c4d4266c 100644 --- a/assets/css/cyborg_wide/overrides.css +++ b/assets/css/cyborg_wide/overrides.css @@ -20,6 +20,12 @@ .border-top { --bs-border-color: #282828; } + +.form-select:disabled { + color: #7f7f7f; + background-color: #151515; +} + /* * Dark Maps */ diff --git a/assets/css/darkly/overrides.css b/assets/css/darkly/overrides.css index 3e7aad461..bfe4b2a2b 100644 --- a/assets/css/darkly/overrides.css +++ b/assets/css/darkly/overrides.css @@ -39,6 +39,10 @@ color: white; } +.form-select:disabled { + background-color: #222222; +} + /* * Dark Maps */ diff --git a/assets/css/darkly_wide/overrides.css b/assets/css/darkly_wide/overrides.css index 61193b761..da852084b 100644 --- a/assets/css/darkly_wide/overrides.css +++ b/assets/css/darkly_wide/overrides.css @@ -39,6 +39,10 @@ color: white; } +.form-select:disabled { + background-color: #222222; +} + /* * Dark Maps */ diff --git a/assets/css/superhero/overrides.css b/assets/css/superhero/overrides.css index 44c1ece81..692b3ea5b 100644 --- a/assets/css/superhero/overrides.css +++ b/assets/css/superhero/overrides.css @@ -28,6 +28,11 @@ body { --bs-border-color: #253544; } +.form-select:disabled { + color: #7f7f7f; + background-color: #2b3e50; +} + /* * Maps */ diff --git a/assets/css/superhero_wide/overrides.css b/assets/css/superhero_wide/overrides.css index 09ae1c3cf..f4a74c8c5 100644 --- a/assets/css/superhero_wide/overrides.css +++ b/assets/css/superhero_wide/overrides.css @@ -39,6 +39,11 @@ body { overflow-y: auto; } +.form-select:disabled { + color: #7f7f7f; + background-color: #2b3e50; +} + /* * Maps */ From 044e1b2da4b50149f713f740bc609e131fe8b11e Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 17 Feb 2024 15:42:00 +0100 Subject: [PATCH 12/21] get state list in lookup --- application/controllers/Lookup.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/application/controllers/Lookup.php b/application/controllers/Lookup.php index 933fa4ff7..d92be2bb7 100644 --- a/application/controllers/Lookup.php +++ b/application/controllers/Lookup.php @@ -129,4 +129,26 @@ class Lookup extends CI_Controller { } } + public function get_state_list() { + $this->load->library('subdivisions'); + + $dxcc = $this->input->post('dxcc'); + $states_result = $this->subdivisions->get_state_list($dxcc); + $subdivision_name = $this->subdivisions->get_primary_subdivision_name($dxcc); + + if ($states_result->num_rows() > 0) { + $states_array = $states_result->result_array(); + $result = array( + 'status' => 'ok', + 'subdivision_name' => $subdivision_name, + 'data' => $states_array + ); + header('Content-Type: application/json'); + echo json_encode($result); + } else { + header('Content-Type: application/json'); + echo json_encode(array('status' => 'No States for this DXCC in Database')); + } + } + } From efe8a2eab04d8299a4ca24906cac8fbafd0b435d Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sat, 17 Feb 2024 15:42:27 +0100 Subject: [PATCH 13/21] state list by ajax in station edit --- application/views/station_profile/edit.php | 66 ++++++---------------- assets/js/sections/common.js | 28 +++++++++ assets/js/sections/station_locations.js | 65 ++++++++++++--------- 3 files changed, 84 insertions(+), 75 deletions(-) diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index 04f6464cc..8a325c3c4 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -93,56 +93,24 @@
- -
- - + + + +
- $state_list = $CI->subdivisions->get_state_list($my_station_profile->station_dxcc); - ?> - - result() as $state) { - $selected = ($my_station_profile->state == $state->state) ? 'selected="selected"' : ''; - ?> - - - - -
- - -
- - - -
- - -
- - station_cnty; } ?>"> - -
+ +
+ + station_cnty; } ?>"> + +
diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js index 425b755e6..7773e69e9 100644 --- a/assets/js/sections/common.js +++ b/assets/js/sections/common.js @@ -627,6 +627,7 @@ function showQsoActionsMenu(_this) { } }); } + if ($('.table-responsive .dropdown-toggle').length>0) { $('.table-responsive .dropdown-toggle').off('mouseenter').on('mouseenter', function () { showQsoActionsMenu($(this).closest('.dropdown')); @@ -637,6 +638,33 @@ function getDataTablesLanguageUrl() { return "../assets/json/datatables_languages/" + lang_datatables_language + ".json"; } +function statesDropdown(states, set_state = null) { + var dropdown = $('#stateDropdown'); + dropdown.empty(); + dropdown.append($(''; + } + ?> + + ".lang("gen_find_zone_part2")." ".lang("gen_find_zone_part3"); ?> + +
diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js index 7773e69e9..475c6e2cf 100644 --- a/assets/js/sections/common.js +++ b/assets/js/sections/common.js @@ -638,11 +638,12 @@ function getDataTablesLanguageUrl() { return "../assets/json/datatables_languages/" + lang_datatables_language + ".json"; } +var set_state; function statesDropdown(states, set_state = null) { var dropdown = $('#stateDropdown'); dropdown.empty(); dropdown.append($('