Merge branch 'dev' into Add-Netherlands-states/provinces

.github/workflows/cypress-tests.yml

@@ -1,5 +1,5 @@
 name: Cypress Tests
-on: [pull_request]
+on: [pull_request, workflow_dispatch]
 jobs:
   cypress-e2e-tests:
     runs-on: ubuntu-latest

application/config/migration.php

@@ -22,7 +22,7 @@
 |
 */
 
-$config['migration_version'] = 185;
+$config['migration_version'] = 186;
 
 /*
 |--------------------------------------------------------------------------

application/controllers/Gridmap.php

@@ -76,9 +76,7 @@ public function getGridsjs() {
 			foreach ($query->result() as $row) 	{
 				$grid_2char_confirmed = strtoupper(substr($row->GRID_SQUARES,0,2));
 				$grid_4char_confirmed = strtoupper(substr($row->GRID_SQUARES,0,4));
-				if ($this->config->item('map_6digit_grids')) {
-					$grid_6char_confirmed = strtoupper(substr($row->GRID_SQUARES,0,6));
-				}
+				$grid_6char_confirmed = strtoupper(substr($row->GRID_SQUARES,0,6));
 
 				// Check if 2 Char is in array
 				if(!in_array($grid_2char_confirmed, $array_grid_2char_confirmed)){
@@ -89,10 +87,8 @@ public function getGridsjs() {
 					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)){
+				if(!in_array($grid_6char_confirmed, $array_grid_6char_confirmed)){
 						array_push($array_grid_6char_confirmed, $grid_6char_confirmed);	
-					}
 				}
 			}
 		}
@@ -104,9 +100,7 @@ public function getGridsjs() {
 
 				$grid_two = strtoupper(substr($row->GRID_SQUARES,0,2));
 				$grid_four = strtoupper(substr($row->GRID_SQUARES,0,4));
-				if ($this->config->item('map_6digit_grids')) {
-					$grid_six = strtoupper(substr($row->GRID_SQUARES,0,6));
-				}
+				$grid_six = strtoupper(substr($row->GRID_SQUARES,0,6));
 
 				// Check if 2 Char is in array
 				if(!in_array($grid_two, $array_grid_2char)){
@@ -116,12 +110,11 @@ public function getGridsjs() {
 				if(!in_array($grid_four, $array_grid_4char)){
 					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);	
-					}
+
+				if(!in_array($grid_six, $array_grid_6char)){
+					array_push($array_grid_6char, $grid_six);	
 				}
+
 			}
 		}
 		$query_vucc = $this->gridmap_model->get_band_worked_vucc_squares($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat);

application/controllers/Information.php

@@ -32,6 +32,8 @@ public function welcome()
 
         // Check country files are present
 
+        // Information about Cloudlog Aurora
+
         // If all is present welcome the user and redirect to the dashboard
     }
 }

application/controllers/Map.php

@@ -80,13 +80,23 @@ public function map_plot_json() {
 			$offset = (intval($this->input->post('offset'))>0)?xss_clean($this->input->post('offset')):null;
 			$qsos = $this->logbook_model->get_qsos($nb_qso, $offset);
 		}
-		// [PLOT] ADD plot //
-		$plot_array = $this->logbook_model->get_plot_array_for_map($qsos->result());
-		// [MAP Custom] ADD Station //
-		$station_array = $this->Stations->get_station_array_for_map();
 
-		header('Content-Type: application/json; charset=utf-8');
-		echo json_encode(array_merge($plot_array, $station_array));
-	}
+		if(empty($qsos)) {
+			// Handle the case where $qsos is empty
 
-}
+			// return json with error "No QSOs found"
+			header('Content-Type: application/json; charset=utf-8');
+			echo json_encode(array('error' => 'No QSOs found'));
+		} else {
+			// Handle the case where $qsos is not empty
+			// [PLOT] ADD plot //
+			$plot_array = $this->logbook_model->get_plot_array_for_map($qsos->result());
+			// [MAP Custom] ADD Station //
+			$station_array = $this->Stations->get_station_array_for_map();
+
+			header('Content-Type: application/json; charset=utf-8');
+			echo json_encode(array_merge($plot_array, $station_array));
+		}
+
+	}
+}

application/language/bulgarian/awards_lang.php

@@ -196,10 +196,10 @@
 
 /*
 ___________________________________________________________________________________________
-WAB -- Use all 3 Lines of Text
+WAB -- Use all 4 Lines of Text
 ___________________________________________________________________________________________
 */
-$lang['awards_waja_description_ln1'] = "WAB - Worked All Britain Award";
+$lang['awards_wab_description_ln1'] = "WAB - Worked All Britain Award";
 $lang['awards_wab_description_ln2'] = "The Amateur Radio Worked All Britain (WAB) Award is a prestigious recognition program within the amateur radio community that celebrates communication achievements across the United Kingdom. The WAB Award scheme encourages radio operators to establish contact with stations located in different regions of Britain, fostering camaraderie and promoting radio communication skills. To earn the WAB Award, participants must make successful radio contacts with stations located in specific WAB areas, which are defined by Ordnance Survey grid squares. These grid squares cover the entirety of Great Britain, including England, Scotland, Wales, and some offshore islands.";
 $lang['awards_wab_description_ln3'] = "Participants in the WAB Award program exchange information such as their location, signal strength, and WAB square reference during radio contacts. Points are awarded based on the location of the contacted station, with different point values assigned to contacts made within different WAB areas. By accumulating points from successful contacts, radio operators can progress through various award levels, each representing a significant milestone in their amateur radio journey. The WAB Award not only recognizes the dedication and skill of radio operators but also promotes geographic diversity and encourages exploration of the rich tapestry of locations across Britain through the medium of amateur radio.";
-$lang['awards_waja_description_ln4'] = "For more information, please visit: <a href='https://wab.intermip.net/default.php' target='_blank'>https://wab.intermip.net/default.php</a>.";
+$lang['awards_wab_description_ln4'] = "For more information, please visit: <a href='https://wab.intermip.net/default.php' target='_blank'>https://wab.intermip.net/default.php</a>.";

application/language/bulgarian/statistics_lang.php

@@ -25,10 +25,12 @@
 *
 */
 
+$lang['statistics_distances_bands_all'] = "All";
 $lang['statistics_distances_worked'] = "Distances Worked";
 $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.<br /> Your furthest contact was with";
 $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare";
-$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was";
+$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "The distance was";
+$lang['statistics_distances_part4_contacts_were_plotted_furthest'] = "The average distance is";
 $lang['statistics_distances_number_of_qsos'] = "Number of QSOs";
 $lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)";
 $lang['statistics_distances_qsos_with'] = "QSOs with";

application/language/chinese_simplified/awards_lang.php

@@ -196,10 +196,10 @@
 
 /*
 ___________________________________________________________________________________________
-WAB -- Use all 3 Lines of Text
+WAB -- Use all 4 Lines of Text
 ___________________________________________________________________________________________
 */
-$lang['awards_waja_description_ln1'] = "WAB - Worked All Britain Award";
+$lang['awards_wab_description_ln1'] = "WAB - Worked All Britain Award";
 $lang['awards_wab_description_ln2'] = "The Amateur Radio Worked All Britain (WAB) Award is a prestigious recognition program within the amateur radio community that celebrates communication achievements across the United Kingdom. The WAB Award scheme encourages radio operators to establish contact with stations located in different regions of Britain, fostering camaraderie and promoting radio communication skills. To earn the WAB Award, participants must make successful radio contacts with stations located in specific WAB areas, which are defined by Ordnance Survey grid squares. These grid squares cover the entirety of Great Britain, including England, Scotland, Wales, and some offshore islands.";
 $lang['awards_wab_description_ln3'] = "Participants in the WAB Award program exchange information such as their location, signal strength, and WAB square reference during radio contacts. Points are awarded based on the location of the contacted station, with different point values assigned to contacts made within different WAB areas. By accumulating points from successful contacts, radio operators can progress through various award levels, each representing a significant milestone in their amateur radio journey. The WAB Award not only recognizes the dedication and skill of radio operators but also promotes geographic diversity and encourages exploration of the rich tapestry of locations across Britain through the medium of amateur radio.";
-$lang['awards_waja_description_ln4'] = "For more information, please visit: <a href='https://wab.intermip.net/default.php' target='_blank'>https://wab.intermip.net/default.php</a>.";
+$lang['awards_wab_description_ln4'] = "For more information, please visit: <a href='https://wab.intermip.net/default.php' target='_blank'>https://wab.intermip.net/default.php</a>.";

application/language/chinese_simplified/statistics_lang.php

@@ -25,10 +25,12 @@
 *
 */
 
+$lang['statistics_distances_bands_all'] = "全部";
 $lang['statistics_distances_worked'] = "通联距离";
 $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "次通联<br /> 您最远的通联是与";
 $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "在网格";
 $lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "距离是";
+$lang['statistics_distances_part4_contacts_were_plotted_furthest'] = "平均距离是";
 $lang['statistics_distances_number_of_qsos'] = "QSO 数量";
 $lang['statistics_distances_callsigns_worked'] = "通联的呼号（最多显示5个）：";
 $lang['statistics_distances_qsos_with'] = "QSO 与";

application/language/czech/awards_lang.php

@@ -195,10 +195,10 @@
 $lang['awards_waja_description_ln4'] = "For more information, please visit: <a href='https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm' target='_blank'>https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm</a>.";
 /*
 ___________________________________________________________________________________________
-WAB -- Use all 3 Lines of Text
+WAB -- Use all 4 Lines of Text
 ___________________________________________________________________________________________
 */
-$lang['awards_waja_description_ln1'] = "WAB - Worked All Britain Award";
+$lang['awards_wab_description_ln1'] = "WAB - Worked All Britain Award";
 $lang['awards_wab_description_ln2'] = "The Amateur Radio Worked All Britain (WAB) Award is a prestigious recognition program within the amateur radio community that celebrates communication achievements across the United Kingdom. The WAB Award scheme encourages radio operators to establish contact with stations located in different regions of Britain, fostering camaraderie and promoting radio communication skills. To earn the WAB Award, participants must make successful radio contacts with stations located in specific WAB areas, which are defined by Ordnance Survey grid squares. These grid squares cover the entirety of Great Britain, including England, Scotland, Wales, and some offshore islands.";
 $lang['awards_wab_description_ln3'] = "Participants in the WAB Award program exchange information such as their location, signal strength, and WAB square reference during radio contacts. Points are awarded based on the location of the contacted station, with different point values assigned to contacts made within different WAB areas. By accumulating points from successful contacts, radio operators can progress through various award levels, each representing a significant milestone in their amateur radio journey. The WAB Award not only recognizes the dedication and skill of radio operators but also promotes geographic diversity and encourages exploration of the rich tapestry of locations across Britain through the medium of amateur radio.";
-$lang['awards_waja_description_ln4'] = "For more information, please visit: <a href='https://wab.intermip.net/default.php' target='_blank'>https://wab.intermip.net/default.php</a>.";
+$lang['awards_wab_description_ln4'] = "For more information, please visit: <a href='https://wab.intermip.net/default.php' target='_blank'>https://wab.intermip.net/default.php</a>.";

application/language/czech/statistics_lang.php

@@ -25,10 +25,12 @@
 *
 */
 
+$lang['statistics_distances_bands_all'] = "All";
 $lang['statistics_distances_worked'] = "Distances Worked";
 $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.<br /> Your furthest contact was with";
 $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare";
-$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was";
+$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "The distance was";
+$lang['statistics_distances_part4_contacts_were_plotted_furthest'] = "The average distance is";
 $lang['statistics_distances_number_of_qsos'] = "Number of QSOs";
 $lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)";
 $lang['statistics_distances_qsos_with'] = "QSOs with";

application/language/dutch/awards_lang.php

@@ -196,10 +196,10 @@
 
     /*
 ___________________________________________________________________________________________
-WAB -- Use all 3 Lines of Text
+WAB -- Use all 4 Lines of Text
 ___________________________________________________________________________________________
 */
-$lang['awards_waja_description_ln1'] = "WAB - Worked All Britain Award";
+$lang['awards_wab_description_ln1'] = "WAB - Worked All Britain Award";
 $lang['awards_wab_description_ln2'] = "The Amateur Radio Worked All Britain (WAB) Award is a prestigious recognition program within the amateur radio community that celebrates communication achievements across the United Kingdom. The WAB Award scheme encourages radio operators to establish contact with stations located in different regions of Britain, fostering camaraderie and promoting radio communication skills. To earn the WAB Award, participants must make successful radio contacts with stations located in specific WAB areas, which are defined by Ordnance Survey grid squares. These grid squares cover the entirety of Great Britain, including England, Scotland, Wales, and some offshore islands.";
 $lang['awards_wab_description_ln3'] = "Participants in the WAB Award program exchange information such as their location, signal strength, and WAB square reference during radio contacts. Points are awarded based on the location of the contacted station, with different point values assigned to contacts made within different WAB areas. By accumulating points from successful contacts, radio operators can progress through various award levels, each representing a significant milestone in their amateur radio journey. The WAB Award not only recognizes the dedication and skill of radio operators but also promotes geographic diversity and encourages exploration of the rich tapestry of locations across Britain through the medium of amateur radio.";
-$lang['awards_waja_description_ln4'] = "For more information, please visit: <a href='https://wab.intermip.net/default.php' target='_blank'>https://wab.intermip.net/default.php</a>.";
+$lang['awards_wab_description_ln4'] = "For more information, please visit: <a href='https://wab.intermip.net/default.php' target='_blank'>https://wab.intermip.net/default.php</a>.";

application/language/dutch/statistics_lang.php

@@ -25,10 +25,12 @@
 *
 */
 
+$lang['statistics_distances_bands_all'] = "All";
 $lang['statistics_distances_worked'] = "Distances Worked";
 $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.<br /> Your furthest contact was with";
 $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare";
-$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was";
+$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "The distance was";
+$lang['statistics_distances_part4_contacts_were_plotted_furthest'] = "The average distance is";
 $lang['statistics_distances_number_of_qsos'] = "Number of QSOs";
 $lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)";
 $lang['statistics_distances_qsos_with'] = "QSOs with";

application/language/english/awards_lang.php

@@ -196,10 +196,10 @@
 
 /*
 ___________________________________________________________________________________________
-WAB -- Use all 3 Lines of Text
+WAB -- Use all 4 Lines of Text
 ___________________________________________________________________________________________
 */
-$lang['awards_waja_description_ln1'] = "WAB - Worked All Britain Award";
+$lang['awards_wab_description_ln1'] = "WAB - Worked All Britain Award";
 $lang['awards_wab_description_ln2'] = "The Amateur Radio Worked All Britain (WAB) Award is a prestigious recognition program within the amateur radio community that celebrates communication achievements across the United Kingdom. The WAB Award scheme encourages radio operators to establish contact with stations located in different regions of Britain, fostering camaraderie and promoting radio communication skills. To earn the WAB Award, participants must make successful radio contacts with stations located in specific WAB areas, which are defined by Ordnance Survey grid squares. These grid squares cover the entirety of Great Britain, including England, Scotland, Wales, and some offshore islands.";
 $lang['awards_wab_description_ln3'] = "Participants in the WAB Award program exchange information such as their location, signal strength, and WAB square reference during radio contacts. Points are awarded based on the location of the contacted station, with different point values assigned to contacts made within different WAB areas. By accumulating points from successful contacts, radio operators can progress through various award levels, each representing a significant milestone in their amateur radio journey. The WAB Award not only recognizes the dedication and skill of radio operators but also promotes geographic diversity and encourages exploration of the rich tapestry of locations across Britain through the medium of amateur radio.";
-$lang['awards_waja_description_ln4'] = "For more information, please visit: <a href='https://wab.intermip.net/default.php' target='_blank'>https://wab.intermip.net/default.php</a>.";
+$lang['awards_wab_description_ln4'] = "For more information, please visit: <a href='https://wab.intermip.net/default.php' target='_blank'>https://wab.intermip.net/default.php</a>.";

application/language/english/statistics_lang.php

@@ -25,10 +25,12 @@
 *
 */
 
+$lang['statistics_distances_bands_all'] = "All";
 $lang['statistics_distances_worked'] = "Distances Worked";
 $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.<br /> Your furthest contact was with";
 $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare";
-$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was";
+$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "The distance was";
+$lang['statistics_distances_part4_contacts_were_plotted_furthest'] = "The average distance is";
 $lang['statistics_distances_number_of_qsos'] = "Number of QSOs";
 $lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)";
 $lang['statistics_distances_qsos_with'] = "QSOs with";