From d440c8f41c0e6f56c27603d1995d7e5e183d8326 Mon Sep 17 00:00:00 2001 From: Emiliano Macedonio Date: Thu, 27 Jun 2024 12:34:13 +0200 Subject: [PATCH 1/8] Fix Context menu only shown partially #3158 --- assets/css/general.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/general.css b/assets/css/general.css index b33f89d7..c3ef0a85 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -796,7 +796,7 @@ label { } .table-responsive>table .dropdown{position:static;} -.table-responsive>table .dropdown>.dropdown-menu{left:auto !important;top:auto !important;} +.table-responsive>table .dropdown>.dropdown-menu{left: 75%;top:auto !important;} tr.htmx-swapping td { opacity: 0; From b03ecd2bb9d2dfe675dd62ee1eb89cdb855b564a Mon Sep 17 00:00:00 2001 From: PA8S Date: Thu, 27 Jun 2024 21:57:24 +0200 Subject: [PATCH 2/8] Added states/provinces of The Netherlands --- application/views/station_profile/edit.php | 20 ++++++++++++++++++++ assets/js/sections/station_locations.js | 5 +++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index 48223a04..9ca115be 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -760,6 +760,26 @@ +
+ + + +
+
diff --git a/assets/js/sections/station_locations.js b/assets/js/sections/station_locations.js index ba2061a5..cec9f41a 100644 --- a/assets/js/sections/station_locations.js +++ b/assets/js/sections/station_locations.js @@ -40,11 +40,12 @@ $(document).ready( function () { '170': 'nz_state', '209': 'belgium_state', '248': 'italy_state', + '263': 'netherlands_state', '6': 'us_state' // Alaska }; // Hide all states initially - $("#canada_state, #aland_state, #asiatic_russia_state, #belarus_state, #mexico_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #us_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state, #belgium_state, #italy_state"").hide(); + $("#canada_state, #aland_state, #asiatic_russia_state, #belarus_state, #mexico_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #us_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state, #belgium_state, #italy_state, #netherlands_state"").hide(); /** * Gets the selected DXCC ID and shows the corresponding state. */ @@ -68,7 +69,7 @@ $(document).ready( function () { var stateToShow = stateMap[selectedValue] || stateMap['default']; // Hide all states - $("#mexico_state, #belarus_state, #asiatic_russia_state, #aland_state, #canada_state, #us_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state, #belgium_state, #italy_state"").hide(); + $("#mexico_state, #belarus_state, #asiatic_russia_state, #aland_state, #canada_state, #us_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state, #belgium_state, #italy_state, #netherlands_state"").hide(); // Show the selected state $("#" + stateToShow).show(); From 17f5c9482978a95cc0dab0bf2898291148f8d953 Mon Sep 17 00:00:00 2001 From: PA8S Date: Thu, 27 Jun 2024 23:31:57 +0200 Subject: [PATCH 3/8] Removed duplicate quotation mark --- assets/js/sections/station_locations.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/js/sections/station_locations.js b/assets/js/sections/station_locations.js index cec9f41a..5b13bda2 100644 --- a/assets/js/sections/station_locations.js +++ b/assets/js/sections/station_locations.js @@ -45,7 +45,7 @@ $(document).ready( function () { }; // Hide all states initially - $("#canada_state, #aland_state, #asiatic_russia_state, #belarus_state, #mexico_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #us_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state, #belgium_state, #italy_state, #netherlands_state"").hide(); + $("#canada_state, #aland_state, #asiatic_russia_state, #belarus_state, #mexico_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #us_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state, #belgium_state, #italy_state, #netherlands_state").hide(); /** * Gets the selected DXCC ID and shows the corresponding state. */ @@ -69,7 +69,7 @@ $(document).ready( function () { var stateToShow = stateMap[selectedValue] || stateMap['default']; // Hide all states - $("#mexico_state, #belarus_state, #asiatic_russia_state, #aland_state, #canada_state, #us_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state, #belgium_state, #italy_state, #netherlands_state"").hide(); + $("#mexico_state, #belarus_state, #asiatic_russia_state, #aland_state, #canada_state, #us_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state, #belgium_state, #italy_state, #netherlands_state").hide(); // Show the selected state $("#" + stateToShow).show(); From ae914485e3ab87a4c4f7cf5a5ea81af7d448c7ca Mon Sep 17 00:00:00 2001 From: Emiliano Date: Wed, 3 Jul 2024 18:09:12 +0200 Subject: [PATCH 4/8] Complete CSS Fix for #3158 the last commit was not enough to fix the bug --- assets/css/general.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/assets/css/general.css b/assets/css/general.css index 309d435e..e3f2a813 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -346,6 +346,10 @@ TD.lotw { position: absolute !important; } +.dropdown-menu.menuOnResultTab { + left: -200px; +} + .was-map-dialog .modal-dialog { width: 100%; } @@ -805,4 +809,4 @@ tr.htmx-swapping td { .error-red-border { border-color: red; -} \ No newline at end of file +} From c4bd9c45d9acc839fa9f002a938417fbcd1c83eb Mon Sep 17 00:00:00 2001 From: thecocohead Date: Wed, 10 Jul 2024 23:18:38 -0600 Subject: [PATCH 5/8] Adds station flag to map --- application/models/Stations.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/application/models/Stations.php b/application/models/Stations.php index 7cc0c85d..f99269fb 100644 --- a/application/models/Stations.php +++ b/application/models/Stations.php @@ -522,8 +522,16 @@ class Stations extends CI_Model { $_jsonresult = array(); list($station_lat, $station_lng) = array(0,0); $station_active = $this->profile($this->find_active())->row(); - if (!empty($station_active)) { list($station_lat, $station_lng) = $this->qra->qra2latlong($station_active->station_gridsquare); } - if (($station_lat!=0)&&($station_lng!=0)) { $_jsonresult = array('lat'=>$station_lat,'lng'=>$station_lng,'html'=>$station_active->station_gridsquare,'label'=>$station_active->station_profile_name,'icon'=>'stationIcon'); } + + $CI = &get_instance(); + $CI->load->library('DxccFlag'); + $flag = ""; + if (!empty($station_active)) { + $flag = strtolower($CI->dxccflag->getISO($station_active->station_dxcc)); + $flag = ''; + list($station_lat, $station_lng) = $this->qra->qra2latlong($station_active->station_gridsquare); + } + if (($station_lat!=0)&&($station_lng!=0)) { $_jsonresult = array('lat'=>$station_lat,'lng'=>$station_lng,'html'=>$station_active->station_gridsquare,'label'=>$station_active->station_profile_name,'icon'=>'stationIcon','flag'=>$flag); } return (count($_jsonresult)>0)?(array('station'=>$_jsonresult)):array(); } } From 94fd2d28f274aa169beee4d4b73dd814779b0d28 Mon Sep 17 00:00:00 2001 From: thecocohead Date: Wed, 10 Jul 2024 23:27:26 -0600 Subject: [PATCH 6/8] whoops, forgot the space --- application/models/Stations.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/models/Stations.php b/application/models/Stations.php index f99269fb..39c3d7e2 100644 --- a/application/models/Stations.php +++ b/application/models/Stations.php @@ -528,7 +528,7 @@ class Stations extends CI_Model { $flag = ""; if (!empty($station_active)) { $flag = strtolower($CI->dxccflag->getISO($station_active->station_dxcc)); - $flag = ''; + $flag = ' '; list($station_lat, $station_lng) = $this->qra->qra2latlong($station_active->station_gridsquare); } if (($station_lat!=0)&&($station_lng!=0)) { $_jsonresult = array('lat'=>$station_lat,'lng'=>$station_lng,'html'=>$station_active->station_gridsquare,'label'=>$station_active->station_profile_name,'icon'=>'stationIcon','flag'=>$flag); } From 4a0ac53278070ce6ae64941123f86837c235318a Mon Sep 17 00:00:00 2001 From: phl0 Date: Thu, 11 Jul 2024 21:52:34 +0200 Subject: [PATCH 7/8] Prevent also RPT QSOs from being uploaded to LoTW --- application/models/Logbook_model.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index b365038b..a7057aa3 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -4687,6 +4687,9 @@ class Logbook_model extends CI_Model function get_lotw_qsos_to_upload($station_id, $start_date, $end_date) { + // Missing in tqsl 2.7.3 config.xml + $lotw_unsupported_modes = array('INTERNET', 'RPT'); + $this->db->select('COL_PRIMARY_KEY,COL_CALL, COL_BAND, COL_BAND_RX, COL_TIME_ON, COL_RST_RCVD, COL_RST_SENT, COL_MODE, COL_SUBMODE, COL_FREQ, COL_FREQ_RX, COL_GRIDSQUARE, COL_SAT_NAME, COL_PROP_MODE, COL_LOTW_QSL_SENT, station_id'); $this->db->where("station_id", $station_id); @@ -4694,7 +4697,7 @@ class Logbook_model extends CI_Model $this->db->where('COL_LOTW_QSL_SENT', NULL); $this->db->or_where('COL_LOTW_QSL_SENT !=', "Y"); $this->db->group_end(); - $this->db->where('COL_PROP_MODE !=', "INTERNET"); + $this->db->where_not_in('COL_PROP_MODE', $lotw_unsupported_modes); $this->db->where('COL_TIME_ON >=', $start_date); $this->db->where('COL_TIME_ON <=', $end_date); $this->db->order_by("COL_TIME_ON", "desc"); From 14ff6fff1b2afb0eeb905150cd23cd544afc2f7f Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Tue, 13 Aug 2024 15:06:16 +0100 Subject: [PATCH 8/8] [LoTW] fixed issue where freq zero is sometimes added --- application/views/lotw_views/adif_views/adif_export.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/lotw_views/adif_views/adif_export.php b/application/views/lotw_views/adif_views/adif_export.php index 39b9e0cf..1dd7ed54 100644 --- a/application/views/lotw_views/adif_views/adif_export.php +++ b/application/views/lotw_views/adif_views/adif_export.php @@ -44,9 +44,9 @@ $cert2 = str_replace("-----END CERTIFICATE-----", "", $cert1); mode_map($qso->COL_MODE, $qso->COL_SUBMODE)); ?>>mode_map(($qso->COL_MODE == null ? '' : strtoupper($qso->COL_MODE)), ($qso->COL_SUBMODE == null ? '' : strtoupper($qso->COL_SUBMODE)))); ?> -COL_FREQ != "" || $qso->COL_FREQ != "0") { ?>COL_FREQ / 1000000; ?>> +COL_FREQ != "" && $qso->COL_FREQ != "0") { ?>COL_FREQ / 1000000; ?>> -COL_FREQ_RX != "" || $qso->COL_FREQ_RX != "0") { ?>COL_FREQ_RX / 1000000; ?>> +COL_FREQ_RX != "" && $qso->COL_FREQ_RX != "0") { ?>COL_FREQ_RX / 1000000; ?>> COL_PROP_MODE) { ?>COL_PROP_MODE); ?>>COL_PROP_MODE); ?>