Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust colors in gridmaster and FFMA maps

Browse Source
This commit is contained in:
phl0
2025-11-25 13:02:37 +01:00
parent 2383110034
commit 22faf5a5be
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/controllers/Awards.php
View File

@@ -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);

4
assets/js/leaflet/L.MaidenheadColouredGridmasterMap.js
View File

@@ -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

6
assets/js/sections/ffma.js
View File

@@ -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 += "<h4>" + gridsquares_gridsquares + "</h4>";
html = "<table border=\"0\">";
html += '<tr><td><i style="background: ' + confirmedColor + '"></i><span>' + gridsquares_gridsquares_lotw + ':</span></td><td style=\"padding-left: 1em; text-align: right;\"><span>'+grid_four_lotw.length+' / '+grid_max+'</span></td></tr>';
html += '<tr><td><i style="background: ' + workedColor + '"></i><span>' + gridsquares_gridsquares_paper + ':</span></td><td style=\"padding-left: 1em; text-align: right;\"><span>'+paper_count+' / '+grid_max+'</span></td></tr>';
html += '<tr><td><i style="background: ' + unworkedColor +'"></i><span>' + gridsquares_gridsquares_worked +'</span></td><td style=\"padding-left: 1em; text-align: right;\"><span> '+worked_count+' / '+grid_max+'</span></td></tr>';
html += '<tr><td><i style="background: ' + paperColor + '"></i><span>' + gridsquares_gridsquares_paper + ':</span></td><td style=\"padding-left: 1em; text-align: right;\"><span>'+paper_count+' / '+grid_max+'</span></td></tr>';
html += '<tr><td><i style="background: ' + workedColor +'"></i><span>' + gridsquares_gridsquares_worked +'</span></td><td style=\"padding-left: 1em; text-align: right;\"><span> '+worked_count+' / '+grid_max+'</span></td></tr>';
html += '<tr><td><i></i><span>' + gridsquares_gridsquares_worked + ' ('+(Math.round((grid_four.length / grid_max) * 10000) / 100)+'%):</span></td><td style=\"padding-left: 1em; text-align: right;\"><span>'+(grid_four.length)+' / '+grid_max+'</span></td></tr>';
html += "</table>";
div.innerHTML = html;

6
assets/js/sections/gridmaster.js
View File

@@ -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 = "<table border=\"0\">";
html += '<tr><td><i style="background: '+ confirmedColor +'"></i><span>' + gridsquares_gridsquares_lotw + ':</span></td><td style=\"padding-left: 1em; text-align: right;\"><span>'+grid_four_lotw.length+' / '+grid_max+'</span></td></tr>';
html += '<tr><td><i style="background: '+ workedColor +'"></i><span>' + gridsquares_gridsquares_paper + ':</span></td><td style=\"padding-left: 1em; text-align: right;\"><span>'+paper_count+' / '+grid_max+'</span></td></tr>';
html += '<tr><td><i style="background: '+ unworkedColor +'"></i><span>' + gridsquares_gridsquares_worked +'</span></td><td style=\"padding-left: 1em; text-align: right;\"><span> '+worked_count+' / '+grid_max+'</span></td></tr>';
html += '<tr><td><i style="background: '+paperColor+'"></i><span>' + gridsquares_gridsquares_paper + ':</span></td><td style=\"padding-left: 1em; text-align: right;\"><span>'+paper_count+' / '+grid_max+'</span></td></tr>';
html += '<tr><td><i style="background: '+ workedColor +'"></i><span>' + gridsquares_gridsquares_worked +'</span></td><td style=\"padding-left: 1em; text-align: right;\"><span> '+worked_count+' / '+grid_max+'</span></td></tr>';
html += '<tr><td><i></i><span>' + gridsquares_gridsquares_worked + ' ('+(Math.round((grid_four.length / grid_max) * 10000) / 100)+'%):</span></td><td style=\"padding-left: 1em; text-align: right;\"><span>'+(grid_four.length)+' / '+grid_max+'</span></td></tr>';
html += "</table>";
div.innerHTML = html;