diff --git a/application/controllers/Awards.php b/application/controllers/Awards.php index a2a254e8b..59ff6dd8e 100644 --- a/application/controllers/Awards.php +++ b/application/controllers/Awards.php @@ -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(); diff --git a/application/views/awards/ffma/index.php b/application/views/awards/ffma/index.php index c5855d917..de4167791 100644 --- a/application/views/awards/ffma/index.php +++ b/application/views/awards/ffma/index.php @@ -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 . '";'; ?> diff --git a/application/views/awards/gridmaster/index.php b/application/views/awards/gridmaster/index.php index 6ab6d678f..3242ba539 100644 --- a/application/views/awards/gridmaster/index.php +++ b/application/views/awards/gridmaster/index.php @@ -70,5 +70,6 @@ var 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 . '";'; ?> diff --git a/assets/js/sections/ffma.js b/assets/js/sections/ffma.js index b333f9823..4c4c82b40 100644 --- a/assets/js/sections/ffma.js +++ b/assets/js/sections/ffma.js @@ -85,8 +85,8 @@ function gridPlot(form) { 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_worked + ' ('+(Math.round((grid_four.length / grid_max) * 10000) / 100)+'%):'+(grid_four.length)+' / '+grid_max+'
' + gridsquares_gridsquares_worked +' '+worked_count+' / '+grid_max+'
' + gridsquares_total_gridsquares_worked + ' ('+(Math.round((grid_four.length / grid_max) * 10000) / 100)+'%):'+(grid_four.length)+' / '+grid_max+'
"; div.innerHTML = html; return div; diff --git a/assets/js/sections/gridmaster.js b/assets/js/sections/gridmaster.js index 9c77b3ccf..a48a9bfce 100644 --- a/assets/js/sections/gridmaster.js +++ b/assets/js/sections/gridmaster.js @@ -92,7 +92,7 @@ function gridPlot(form, dxcc) { html += '' + gridsquares_gridsquares_lotw + ':'+grid_four_lotw.length+' / '+grid_max+''; html += '' + gridsquares_gridsquares_paper + ':'+paper_count+' / '+grid_max+''; html += '' + gridsquares_gridsquares_worked +' '+worked_count+' / '+grid_max+''; - html += '' + gridsquares_gridsquares_worked + ' ('+(Math.round((grid_four.length / grid_max) * 10000) / 100)+'%):'+(grid_four.length)+' / '+grid_max+''; + html += '' + gridsquares_total_gridsquares_worked + ' ('+(Math.round((grid_four.length / grid_max) * 10000) / 100)+'%):'+(grid_four.length)+' / '+grid_max+''; html += ""; div.innerHTML = html; return div;