Rename total gridsquares in legend(s)

This commit is contained in:
phl0
2025-11-25 14:02:29 +01:00
parent 13367b4e69
commit 5ffaee5496
5 changed files with 7 additions and 3 deletions

View File

@@ -1044,6 +1044,7 @@ class Awards extends CI_Controller {
$data['gridsquares_gridsquares_worked']= __("Gridsquares worked");
$data['gridsquares_gridsquares_lotw']= __("Gridsquares confirmed on LoTW");
$data['gridsquares_gridsquares_paper']= __("Gridsquares confirmed by paper QSL");
$data['gridsquares_total_gridsquares_worked']= __("Total Gridsquares worked");
$indexData['dxcc'] = $dxcc;
@@ -1079,6 +1080,7 @@ class Awards extends CI_Controller {
$data['gridsquares_gridsquares_worked']= __("Gridsquares worked");
$data['gridsquares_gridsquares_lotw']= __("Gridsquares confirmed on LoTW");
$data['gridsquares_gridsquares_paper']= __("Gridsquares confirmed by paper QSL");
$data['gridsquares_total_gridsquares_worked']= __("Total Gridsquares worked");
$data['grid_count'] = $this->ffma_model->get_grid_count();
$data['grids'] = $this->ffma_model->get_grids();

View File

@@ -53,5 +53,6 @@ var type = "worked";
echo 'var gridsquares_gridsquares_worked = "' . $gridsquares_gridsquares_worked . '";';
echo 'var gridsquares_gridsquares_lotw = "' . $gridsquares_gridsquares_lotw . '";';
echo 'var gridsquares_gridsquares_paper = "' . $gridsquares_gridsquares_paper . '";';
echo 'var gridsquares_total_gridsquares_worked = "' . $gridsquares_total_gridsquares_worked . '";';
?>
</script>

View File

@@ -70,5 +70,6 @@ var dxcc = '<?php echo $dxcc; ?>';
echo 'var gridsquares_gridsquares_worked = "' . $gridsquares_gridsquares_worked . '";';
echo 'var gridsquares_gridsquares_lotw = "' . $gridsquares_gridsquares_lotw . '";';
echo 'var gridsquares_gridsquares_paper = "' . $gridsquares_gridsquares_paper . '";';
echo 'var gridsquares_total_gridsquares_worked = "' . $gridsquares_total_gridsquares_worked . '";';
?>
</script>

View File

@@ -85,8 +85,8 @@ function gridPlot(form) {
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: ' + 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 += '<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_total_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;
return div;

View File

@@ -92,7 +92,7 @@ function gridPlot(form, dxcc) {
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: '+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 += '<tr><td><i></i><span>' + gridsquares_total_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;
return div;