From 9357af16fe3e894329fab5f36da80c633f3a36d3 Mon Sep 17 00:00:00 2001 From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com> Date: Sat, 30 Nov 2024 20:13:35 +0100 Subject: [PATCH] [Gridmap] Added fields to the legend --- application/controllers/Gridmap.php | 5 +++++ application/views/gridmap/index.php | 8 ++++++-- assets/js/sections/gridmap.js | 4 ++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/application/controllers/Gridmap.php b/application/controllers/Gridmap.php index 07c50bfd9..4343b87b2 100644 --- a/application/controllers/Gridmap.php +++ b/application/controllers/Gridmap.php @@ -33,6 +33,11 @@ class Gridmap extends CI_Controller { $data['gridsquares_gridsquares_not_confirmed'] = __("Gridsquares not confirmed"); $data['gridsquares_gridsquares_total_worked'] = __("Total gridsquares worked"); + $data['gridsquares_fields'] = __("Fields"); + $data['gridsquares_fields_confirmed'] = __("Fields confirmed"); + $data['gridsquares_fields_not_confirmed'] = __("Fields not confirmed"); + $data['gridsquares_fields_total_worked'] = __("Total fields worked"); + $footerData = []; $footerData['scripts'] = [ 'assets/js/leaflet/geocoding.js', diff --git a/application/views/gridmap/index.php b/application/views/gridmap/index.php index c2bba6095..eaaefef65 100644 --- a/application/views/gridmap/index.php +++ b/application/views/gridmap/index.php @@ -61,7 +61,7 @@ - +
@@ -129,7 +129,7 @@
- + @@ -175,5 +175,9 @@ echo "var gridsquares_gridsquares_confirmed = \"" . $gridsquares_gridsquares_confirmed . "\";\n"; echo "var gridsquares_gridsquares_not_confirmed = \"" . $gridsquares_gridsquares_not_confirmed . "\";\n"; echo "var gridsquares_gridsquares_total_worked = \"" . $gridsquares_gridsquares_total_worked . "\";\n"; + echo "var gridsquares_fields = \"" . $gridsquares_fields . "\";\n"; + echo "var gridsquares_fields_confirmed = \"" . $gridsquares_fields_confirmed . "\";\n"; + echo "var gridsquares_fields_not_confirmed = \"" . $gridsquares_fields_not_confirmed . "\";\n"; + echo "var gridsquares_fields_total_worked = \"" . $gridsquares_fields_total_worked . "\";\n"; ?> diff --git a/assets/js/sections/gridmap.js b/assets/js/sections/gridmap.js index d54e264e3..d9f4bf7ba 100644 --- a/assets/js/sections/gridmap.js +++ b/assets/js/sections/gridmap.js @@ -131,6 +131,10 @@ function plot(visitor, grid_two, grid_four, grid_six, grid_two_confirmed, grid_f div.innerHTML += '' + gridsquares_gridsquares_confirmed + ' ('+grid_four_confirmed.length+')
'; div.innerHTML += '' + gridsquares_gridsquares_not_confirmed + ' ('+(grid_four.length - grid_four_confirmed.length)+')
'; div.innerHTML += '' + gridsquares_gridsquares_total_worked + ' ('+grid_four.length+')
'; + div.innerHTML += "

" + gridsquares_fields + "

"; + div.innerHTML += '' + gridsquares_fields_confirmed + ' ('+grid_two_confirmed.length+')
'; + div.innerHTML += '' + gridsquares_fields_not_confirmed + ' ('+(grid_two.length - grid_two_confirmed.length)+')
'; + div.innerHTML += '' + gridsquares_fields_total_worked + ' ('+grid_two.length+')
'; return div; };