diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 87044478..2b4197e2 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -784,6 +784,26 @@ if ($this->session->userdata('user_id') != null) { }); // Form "submit" // $('.custom-map-QSOs .btn_submit_map_custom').off('click').on('click', function() { + // Show loading spinner and disable button + const $button = $(this); + const $spinner = $('#load-spinner'); + + $button.prop('disabled', true); + $spinner.removeClass('d-none'); + + // Hide any previous alerts + $('.warningOnSubmit').hide(); + $('#map-success-alert').addClass('d-none'); + + // Failsafe timeout to prevent stuck spinner (35 seconds) + const failsafeTimeout = setTimeout(function() { + console.warn('Map loading timed out - forcing spinner hide'); + $button.prop('disabled', false); + $spinner.addClass('d-none'); + $('.warningOnSubmit .warningOnSubmit_txt').text('Map loading timed out. Please try again.'); + $('.warningOnSubmit').show(); + }, 35000); + var customdata = { 'dataPost': { 'date_from': $('.custom-map-QSOs input[name="from"]').val(), @@ -795,6 +815,49 @@ if ($this->session->userdata('user_id') != null) { }, 'map_id': '#custommap' }; + + // Add success and error callbacks to the customdata + customdata.onSuccess = function(plotjson) { + // Clear the failsafe timeout + clearTimeout(failsafeTimeout); + + try { + // Update statistics + if (typeof updateMapStatistics === 'function') { + updateMapStatistics(plotjson); + } + + // Show success message + const qsoCount = plotjson['markers'] ? plotjson['markers'].length : 0; + $('#qso-count-display').text(`Loaded ${qsoCount} QSOs successfully`); + $('#map-success-alert').removeClass('d-none'); + + setTimeout(() => { + $('#map-success-alert').addClass('d-none'); + }, 3000); + } catch (error) { + console.error('Error in success callback:', error); + $('.warningOnSubmit .warningOnSubmit_txt').text('Map loaded but encountered an error displaying statistics.'); + $('.warningOnSubmit').show(); + } finally { + // Always re-enable button and hide spinner + $button.prop('disabled', false); + $spinner.addClass('d-none'); + } + }; + + customdata.onError = function() { + // Clear the failsafe timeout + clearTimeout(failsafeTimeout); + + $('.warningOnSubmit .warningOnSubmit_txt').text('Failed to load map data. Please try again.'); + $('.warningOnSubmit').show(); + + // Re-enable button and hide spinner + $button.prop('disabled', false); + $spinner.addClass('d-none'); + }; + initplot(qso_loc, customdata); }) }); @@ -806,6 +869,10 @@ if ($this->session->userdata('user_id') != null) { success: function(data) { document.getElementById('from').value = data; document.getElementById('to').value = new Date().toISOString().split('T')[0]; + // Update the date range display + if (typeof updateDateRangeDisplay === 'function') { + updateDateRangeDisplay(); + } }, error: function() {}, }); diff --git a/application/views/map/custom_date.php b/application/views/map/custom_date.php index 58c982c7..b0498b24 100644 --- a/application/views/map/custom_date.php +++ b/application/views/map/custom_date.php @@ -1,107 +1,474 @@ + +

-

QSOs (Custom Dates)

+ + +
+
+
+
+
+
+

+ + QSOs (Custom Dates) +

+
+
+
+
+
+
session->flashdata('notice')) { ?> -
-
-
- - -
- -
- - -
- -
- -
+ +
+
+
+ Filter Controls +
+
+ + + +
+
+
+
+
+ Quick Filters +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+
+
-
-
- - -
+ +
+
+
+
+
+ Date Range +
+
+
+ + +
+
+ + +
+
+
+
+
+
-
- - -
- lang('gen_hamradio_propagation_AS'), - 'AUR' => lang('gen_hamradio_propagation_AUR'), - 'AUE' => lang('gen_hamradio_propagation_AUE'), - 'BS' => lang('gen_hamradio_propagation_BS'), - 'ECH' => lang('gen_hamradio_propagation_ECH'), - 'EME' => lang('gen_hamradio_propagation_EME'), - 'ES' => lang('gen_hamradio_propagation_ES'), - 'FAI' => lang('gen_hamradio_propagation_FAI'), - 'F2' => lang('gen_hamradio_propagation_F2'), - 'INTERNET' => lang('gen_hamradio_propagation_INTERNET'), - 'ION' => lang('gen_hamradio_propagation_ION'), - 'IRL' => lang('gen_hamradio_propagation_IRL'), - 'MS' => lang('gen_hamradio_propagation_MS'), - 'RPT' => lang('gen_hamradio_propagation_RPT'), - 'RS' => lang('gen_hamradio_propagation_RS'), - 'SAT' => lang('gen_hamradio_propagation_SAT'), - 'TEP' => lang('gen_hamradio_propagation_TEP'), - 'TR' => lang('gen_hamradio_propagation_TR')]; - asort($prop_modes); - ?> -
- - -
+ +
+
+
+
+
+ Advanced Filters +
+
+
+ + +
+ +
+ + +
+ + lang('gen_hamradio_propagation_AS'), + 'AUR' => lang('gen_hamradio_propagation_AUR'), + 'AUE' => lang('gen_hamradio_propagation_AUE'), + 'BS' => lang('gen_hamradio_propagation_BS'), + 'ECH' => lang('gen_hamradio_propagation_ECH'), + 'EME' => lang('gen_hamradio_propagation_EME'), + 'ES' => lang('gen_hamradio_propagation_ES'), + 'FAI' => lang('gen_hamradio_propagation_FAI'), + 'F2' => lang('gen_hamradio_propagation_F2'), + 'INTERNET' => lang('gen_hamradio_propagation_INTERNET'), + 'ION' => lang('gen_hamradio_propagation_ION'), + 'IRL' => lang('gen_hamradio_propagation_IRL'), + 'MS' => lang('gen_hamradio_propagation_MS'), + 'RPT' => lang('gen_hamradio_propagation_RPT'), + 'RS' => lang('gen_hamradio_propagation_RS'), + 'SAT' => lang('gen_hamradio_propagation_SAT'), + 'TEP' => lang('gen_hamradio_propagation_TEP'), + 'TR' => lang('gen_hamradio_propagation_TR')]; + asort($prop_modes); + ?> +
+ + +
+
+
+
+
+
+ + +
+
+ + +
+
+ +
+ + Map loaded successfully +
+
+
+
- -
-
- -
-
- -
-
- +
- -
+ +
+
+
+
+
+
+
+
+ QSOs Displayed: + 0 +
- \ No newline at end of file +
+ Map loaded successfully +
+
+
+
+
+ + + +
+
+
+
+
+
+
+ + +
+
+
+ World Map View +
+
+ Showing: +
+
+
+
+
+
+ + +
+
+
+
+
+
+ Legend: + + + QSO + + + + Home Station + +
+
+ + + Click on markers for QSO details + +
+
+
+
+
+
+ + \ No newline at end of file diff --git a/assets/css/map-enhancements.css b/assets/css/map-enhancements.css new file mode 100644 index 00000000..f8a8c67d --- /dev/null +++ b/assets/css/map-enhancements.css @@ -0,0 +1,74 @@ +/* Custom Map Interface Enhancements */ + +/* Ensure grid square labels stay together (fix for separated letters) */ +.leaflet-marker-icon.my-div-icon, +.my-div-icon .grid-text, +.my-div-icon .grid-text font, +span.grid-text, +span.grid-text > font { + letter-spacing: 0 !important; + word-spacing: 0 !important; + white-space: nowrap !important; + font-family: monospace !important; + display: inline-block !important; +} + +/* Map container enhancements */ +#custommap { + border-radius: 0 0 0.375rem 0.375rem; + overflow: hidden; + transition: height 0.3s ease; + width: 100%; + height: 1000px !important; /* Maintain original screenshot-friendly height */ +} + +/* Fullscreen map styling */ +#custommap:fullscreen { + border-radius: 0; +} + +/* Statistics badges */ +.custom-map-QSOs .badge { + font-size: 0.85em; + padding: 0.5em 0.75em; +} + + +/* Legend styling */ +.custom-map-QSOs .fas { + width: 1em; + text-align: center; +} + +/* Responsive improvements */ +@media (max-width: 768px) { + .custom-map-QSOs .card-body { + padding: 1rem 0.5rem; + } + + .custom-map-QSOs .btn-group .btn { + padding: 0.375rem 0.5rem; + font-size: 0.8rem; + } + + /* Keep map height at 1000px even on mobile for screenshots */ + #custommap { + height: 1000px !important; + min-height: 1000px !important; + } +} + +/* Animation for statistics updates */ +.custom-map-QSOs .badge { + transition: all 0.3s ease; +} + +.custom-map-QSOs .badge.updated { + animation: pulse 0.5s ease-in-out; +} + +@keyframes pulse { + 0% { transform: scale(1); } + 50% { transform: scale(1.1); } + 100% { transform: scale(1); } +} \ No newline at end of file diff --git a/assets/js/leaflet/leafembed.js b/assets/js/leaflet/leafembed.js index b2a59bf9..8a459a9e 100644 --- a/assets/js/leaflet/leafembed.js +++ b/assets/js/leaflet/leafembed.js @@ -68,8 +68,18 @@ function askForPlots(_url_qso, options={}) { removeMarkers(); if (typeof options.dataPost !== "undefined") { _dataPost = options.dataPost; } else { _dataPost = {}; } $.ajax({ - url: _url_qso, type: 'POST', dataType: 'json', data: _dataPost, - error: function() { console.log('[ERROR] ajax askForPlots() function return error.'); }, + url: _url_qso, + type: 'POST', + dataType: 'json', + data: _dataPost, + timeout: 30000, // 30 second timeout + error: function(xhr, status, error) { + console.log('[ERROR] ajax askForPlots() function return error:', status, error); + // Call custom error callback if provided + if (typeof options.onError === 'function') { + options.onError(); + } + }, success: function(plotjson) { if ((typeof plotjson['markers'] !== "undefined")&&(plotjson['markers'].length>0)) { for (i=0;i