From 22faf5a5be22eb002dc5db6aaab871adeee81d2a Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 25 Nov 2025 13:02:37 +0100 Subject: [PATCH] Adjust colors in gridmaster and FFMA maps --- application/controllers/Awards.php | 4 ++-- assets/js/leaflet/L.MaidenheadColouredGridmasterMap.js | 4 ++-- assets/js/sections/ffma.js | 6 ++++-- assets/js/sections/gridmaster.js | 6 ++++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/application/controllers/Awards.php b/application/controllers/Awards.php index ebf2cb56d..a2a254e8b 100644 --- a/application/controllers/Awards.php +++ b/application/controllers/Awards.php @@ -1085,8 +1085,8 @@ class Awards extends CI_Controller { $footerData = []; $footerData['scripts']= [ 'assets/js/leaflet/geocoding.js', - 'assets/js/leaflet/L.MaidenheadColouredGridmasterMap.js', - 'assets/js/sections/ffma.js' + 'assets/js/sections/ffma.js', + 'assets/js/leaflet/L.MaidenheadColouredGridmasterMap.js' ]; $this->load->view('interface_assets/header',$data); diff --git a/assets/js/leaflet/L.MaidenheadColouredGridmasterMap.js b/assets/js/leaflet/L.MaidenheadColouredGridmasterMap.js index cbc5665a7..4c36fef59 100644 --- a/assets/js/leaflet/L.MaidenheadColouredGridmasterMap.js +++ b/assets/js/leaflet/L.MaidenheadColouredGridmasterMap.js @@ -81,10 +81,10 @@ L.Maidenhead = L.LayerGroup.extend({ var rectConfirmed = L.rectangle(bounds, {className: 'grid-rectangle grid-confirmed', color: this.options.confirmedColor, weight: 1, fillOpacity: 1, fill:true, interactive: false}); this.addLayer(rectConfirmed); } else if (grid_four_paper.includes(locator)) { - var rectPaper = L.rectangle(bounds, {className: 'grid-rectangle grid-confirmed-paper', color: this.options.workedColor, weight: 1, fillOpacity: 1, fill:true, interactive: false}); + var rectPaper = L.rectangle(bounds, {className: 'grid-rectangle grid-confirmed-paper', color: paperColor, weight: 1, fillOpacity: 1, fill:true, interactive: false}); this.addLayer(rectPaper); } else { - var rectWorked = L.rectangle(bounds, {className: 'grid-rectangle grid-unworked', color: this.options.unworkedColor, weight: 1, fillOpacity: 1, fill:true, interactive: false}) + var rectWorked = L.rectangle(bounds, {className: 'grid-rectangle grid-unworked', color: this.options.workedColor, weight: 1, fillOpacity: 1, fill:true, interactive: false}) this.addLayer(rectWorked); } // Controls text on grid on various zoom levels diff --git a/assets/js/sections/ffma.js b/assets/js/sections/ffma.js index 92a1c299b..4a128364e 100644 --- a/assets/js/sections/ffma.js +++ b/assets/js/sections/ffma.js @@ -4,6 +4,8 @@ let grid_four_lotw = ''; let grid_four_paper = ''; let confirmedColor = user_map_custom.qsoconfirm.color; +// Take station color for paper QSLs here +let paperColor = user_map_custom.station.color let workedColor = user_map_custom.qso.color; let unworkedColor = ''; if (typeof(user_map_custom.unworked) !== 'undefined') { @@ -88,8 +90,8 @@ function gridPlot(form) { //div.innerHTML += "

" + gridsquares_gridsquares + "

"; html = ""; html += ''; - html += ''; - html += ''; + html += ''; + html += ''; html += ''; html += "
' + gridsquares_gridsquares_lotw + ':'+grid_four_lotw.length+' / '+grid_max+'
' + gridsquares_gridsquares_paper + ':'+paper_count+' / '+grid_max+'
' + gridsquares_gridsquares_worked +' '+worked_count+' / '+grid_max+'
' + gridsquares_gridsquares_paper + ':'+paper_count+' / '+grid_max+'
' + gridsquares_gridsquares_worked +' '+worked_count+' / '+grid_max+'
' + gridsquares_gridsquares_worked + ' ('+(Math.round((grid_four.length / grid_max) * 10000) / 100)+'%):'+(grid_four.length)+' / '+grid_max+'
"; div.innerHTML = html; diff --git a/assets/js/sections/gridmaster.js b/assets/js/sections/gridmaster.js index daa34e847..318854f67 100644 --- a/assets/js/sections/gridmaster.js +++ b/assets/js/sections/gridmaster.js @@ -4,6 +4,8 @@ let grid_four_lotw = ''; let grid_four_paper = ''; let confirmedColor = user_map_custom.qsoconfirm.color; +// Take station color for paper QSLs here +let paperColor = user_map_custom.station.color let workedColor = user_map_custom.qso.color; let unworkedColor = ''; if (typeof(user_map_custom.unworked) !== 'undefined') { @@ -94,8 +96,8 @@ function gridPlot(form, dxcc) { var div = L.DomUtil.create("div", "legend"); html = ""; html += ''; - html += ''; - html += ''; + html += ''; + html += ''; html += ''; html += "
' + gridsquares_gridsquares_lotw + ':'+grid_four_lotw.length+' / '+grid_max+'
' + gridsquares_gridsquares_paper + ':'+paper_count+' / '+grid_max+'
' + gridsquares_gridsquares_worked +' '+worked_count+' / '+grid_max+'
' + gridsquares_gridsquares_paper + ':'+paper_count+' / '+grid_max+'
' + gridsquares_gridsquares_worked +' '+worked_count+' / '+grid_max+'
' + gridsquares_gridsquares_worked + ' ('+(Math.round((grid_four.length / grid_max) * 10000) / 100)+'%):'+(grid_four.length)+' / '+grid_max+'
"; div.innerHTML = html;