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

[Activated Gridsquares] Fix after fields was added

Browse Source
This commit is contained in:
Andreas Kristiansen
2024-12-02 13:35:03 +01:00
parent a62136f3a1
commit 6e57903d21
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
application/controllers/Activated_gridmap.php
View File

@@ -33,13 +33,18 @@ class Activated_gridmap extends CI_Controller {
$data['gridsquares_gridsquares_not_confirmed'] = __("Gridsquares not confirmed");
$data['gridsquares_gridsquares_total_activated'] = __("Total gridsquares activated");
$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',
'assets/js/leaflet/L.MaidenheadColouredGridMap.js',
'assets/js/sections/gridmap.js?'
];
$this->load->view('interface_assets/header', $data);
$this->load->view('activated_gridmap/index');
$this->load->view('interface_assets/footer', $footerData);
@@ -87,16 +92,16 @@ class Activated_gridmap extends CI_Controller {
// Check if 2 Char is in array
if(!in_array($grid_2char_confirmed, $array_grid_2char_confirmed)){
array_push($array_grid_2char_confirmed, $grid_2char_confirmed);
array_push($array_grid_2char_confirmed, $grid_2char_confirmed);
}
if(!in_array($grid_4char_confirmed, $array_grid_4char_confirmed)){
array_push($array_grid_4char_confirmed, $grid_4char_confirmed);
array_push($array_grid_4char_confirmed, $grid_4char_confirmed);
}
if ($this->config->item('map_6digit_grids')) {
if(!in_array($grid_6char_confirmed, $array_grid_6char_confirmed)){
array_push($array_grid_6char_confirmed, $grid_6char_confirmed);
array_push($array_grid_6char_confirmed, $grid_6char_confirmed);
}
}
}
@@ -118,16 +123,16 @@ class Activated_gridmap extends CI_Controller {
// Check if 2 Char is in array
if(!in_array($grid_two, $array_grid_2char)){
array_push($array_grid_2char, $grid_two);
array_push($array_grid_2char, $grid_two);
}
if(!in_array($grid_four, $array_grid_4char)){
array_push($array_grid_4char, $grid_four);
array_push($array_grid_4char, $grid_four);
}
if ($this->config->item('map_6digit_grids')) {
if(!in_array($grid_six, $array_grid_6char)){
array_push($array_grid_6char, $grid_six);
array_push($array_grid_6char, $grid_six);
}
}
}
@@ -140,18 +145,18 @@ class Activated_gridmap extends CI_Controller {
$grids = explode(",", $row->COL_VUCC_GRIDS);
foreach($grids as $key) {
foreach($grids as $key) {
$grid_two = strtoupper(substr($key,0,2));
$grid_four = strtoupper(substr($key,0,4));
// Check if 2 Char is in array
if(!in_array($grid_two, $array_grid_2char)){
array_push($array_grid_2char, $grid_two);
array_push($array_grid_2char, $grid_two);
}
if(!in_array($grid_four, $array_grid_4char)){
array_push($array_grid_4char, $grid_four);
array_push($array_grid_4char, $grid_four);
}
}
}
@@ -165,18 +170,18 @@ class Activated_gridmap extends CI_Controller {
$grids = explode(",", $row->COL_VUCC_GRIDS);
foreach($grids as $key) {
foreach($grids as $key) {
$grid_2char_confirmed = strtoupper(substr($key,0,2));
$grid_4char_confirmed = strtoupper(substr($key,0,4));
// Check if 2 Char is in array
if(!in_array($grid_2char_confirmed, $array_grid_2char_confirmed)){
array_push($array_grid_2char_confirmed, $grid_2char_confirmed);
array_push($array_grid_2char_confirmed, $grid_2char_confirmed);
}
if(!in_array($grid_4char_confirmed, $array_grid_4char_confirmed)){
array_push($array_grid_4char_confirmed, $grid_4char_confirmed);
array_push($array_grid_4char_confirmed, $grid_4char_confirmed);
}
}
}

4
application/views/activated_gridmap/index.php
View File

@@ -127,5 +127,9 @@ var visitor = false;
echo 'var gridsquares_gridsquares_confirmed = "' . $gridsquares_gridsquares_confirmed . '";';
echo 'var gridsquares_gridsquares_not_confirmed = "' . $gridsquares_gridsquares_not_confirmed . '";';
echo 'var gridsquares_gridsquares_total_worked = "' . $gridsquares_gridsquares_total_activated . '";';
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";
?>
</script>