diff --git a/application/controllers/Activated_grids.php b/application/controllers/Activated_grids.php index b536b9ad..3800fe20 100644 --- a/application/controllers/Activated_grids.php +++ b/application/controllers/Activated_grids.php @@ -1,9 +1,9 @@ config->item('map_6digit_grids')) { $grid_six = strtoupper(substr($subsquare,0,6)); } - + // Check if 2 Char is in array - if(!in_array($grid_two, $array_grid_2char)){ - array_push($array_grid_2char, $grid_two); + if(!in_array($grid_two, $array_confirmed_grid_2char)){ + array_push($array_confirmed_grid_2char, $grid_two); } - - - if(!in_array($grid_four, $array_grid_4char)){ - array_push($array_grid_4char, $grid_four); + + if(!in_array($grid_four, $array_confirmed_grid_4char)){ + array_push($array_confirmed_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_confirmed_grid_6char)){ + array_push($array_confirmed_grid_6char, $grid_six); } } } @@ -112,21 +110,19 @@ class Activated_grids extends CI_Controller { if ($this->config->item('map_6digit_grids')) { $grid_6char_confirmed = strtoupper(substr($row->SAT_SQUARE,0,6)); } - + // Check if 2 Char is in array if(!in_array($grid_2char_confirmed, $array_confirmed_grid_2char)){ - array_push($array_confirmed_grid_2char, $grid_2char_confirmed); + array_push($array_confirmed_grid_2char, $grid_2char_confirmed); } - - + if(!in_array($grid_4char_confirmed, $array_confirmed_grid_4char)){ - array_push($array_confirmed_grid_4char, $grid_4char_confirmed); + array_push($array_confirmed_grid_4char, $grid_4char_confirmed); } - - + if ($this->config->item('map_6digit_grids')) { if(!in_array($grid_6char_confirmed, $array_confirmed_grid_6char)){ - array_push($array_confirmed_grid_6char, $grid_6char_confirmed); + array_push($array_confirmed_grid_6char, $grid_6char_confirmed); } } @@ -153,21 +149,19 @@ class Activated_grids extends CI_Controller { if ($this->config->item('map_6digit_grids')) { $grid_six = strtoupper(substr($subsquare,0,6)); } - + // 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); } } } @@ -179,21 +173,19 @@ class Activated_grids extends CI_Controller { if ($this->config->item('map_6digit_grids')) { $grid_six = strtoupper(substr($row->SAT_SQUARE,0,6)); } - + // 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); } } @@ -214,7 +206,6 @@ class Activated_grids extends CI_Controller { return '[' . implode(',', $temp) . ']'; } - $data['grid_2char_confirmed'] = js_array($array_confirmed_grid_2char); $data['grid_4char_confirmed'] = js_array($array_confirmed_grid_4char); $data['grid_6char_confirmed'] = js_array($array_confirmed_grid_6char); @@ -228,7 +219,6 @@ class Activated_grids extends CI_Controller { $this->load->view('activated_grids/index.php'); $this->load->view('interface_assets/footer'); } - public function band($band) { @@ -266,16 +256,16 @@ class Activated_grids 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); } } } @@ -296,18 +286,18 @@ class Activated_grids 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); } } diff --git a/application/language/english/gridsquares_lang.php b/application/language/english/gridsquares_lang.php index b1977cf7..8600088b 100644 --- a/application/language/english/gridsquares_lang.php +++ b/application/language/english/gridsquares_lang.php @@ -7,7 +7,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $lang['gridsquares_gridsquare_map'] = 'Gridsquare map'; $lang['gridsquares_confirmed_is_green'] = 'Confirmed is Green'; -$lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Worked but not confirmes is Red'; +$lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Worked but not confirmed is Red'; +$lang['gridsquares_activated_but_not_confirmed_is_red'] = 'Activated but not confirmed is Red'; $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos'] = 'This map does not include satellite, internet or repeater QSOs'; diff --git a/application/language/german/gridsquares_lang.php b/application/language/german/gridsquares_lang.php index 7933234f..24b40d2d 100644 --- a/application/language/german/gridsquares_lang.php +++ b/application/language/german/gridsquares_lang.php @@ -6,6 +6,7 @@ $lang['gridsquares_gridsquare_map'] = 'Planquadratkarte'; $lang['gridsquares_confirmed_is_green'] = 'Bestätigt ist grün'; $lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Gearbeitet aber nicht bestätigt ist rot'; +$lang['gridsquares_worked_but_not_confirmed_is_red'] = 'Aktiviert aber nicht bestätigt ist rot'; $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos'] = 'Diese Karte beinhaltet keine Satelliten-, Internet- oder Relais-QSOs'; diff --git a/application/models/Activated_grids_model.php b/application/models/Activated_grids_model.php index c07969ca..9cabf1da 100644 --- a/application/models/Activated_grids_model.php +++ b/application/models/Activated_grids_model.php @@ -11,7 +11,7 @@ class Activated_grids_model extends CI_Model { return null; } - $sql = 'SELECT DISTINCT station_gridsquare AS SAT_SQUARE, COL_SAT_NAME FROM ' + $sql = 'SELECT DISTINCT station_gridsquare AS SAT_SQUARE FROM ' . 'station_profile JOIN '.$this->config->item('table_name').' on '.$this->config->item('table_name').'.station_id = station_profile.station_id ' . 'WHERE station_profile.station_gridsquare != "" AND '.$this->config->item('table_name').'.COL_SAT_NAME != ""'; @@ -29,7 +29,7 @@ class Activated_grids_model extends CI_Model { $location_list = "'".implode("','",$logbooks_locations_array)."'"; - $sql = 'SELECT DISTINCT station_gridsquare AS SAT_SQUARE, COL_SAT_NAME FROM ' + $sql = 'SELECT DISTINCT station_gridsquare AS SAT_SQUARE FROM ' . 'station_profile JOIN '.$this->config->item('table_name').' on '.$this->config->item('table_name').'.station_id = station_profile.station_id ' . 'WHERE station_profile.station_gridsquare != "" AND '.$this->config->item('table_name').'.COL_SAT_NAME != "" ' . 'AND (COL_LOTW_QSL_SENT = "Y" OR COL_QSL_SENT = "Y");'; diff --git a/application/models/Distances_model.php b/application/models/Distances_model.php index 642c0d8a..c704eeb7 100644 --- a/application/models/Distances_model.php +++ b/application/models/Distances_model.php @@ -256,13 +256,13 @@ class Distances_model extends CI_Model switch ($measurement_base) { case 'M': - return round(6371*$ca/1.609344); + return ceil(6371*$ca/1.609344); case 'K': - return round(6371*$ca); + return ceil(6371*$ca); case 'N': - return round(6371*$ca/1.852); + return ceil(6371*$ca/1.852); default: - return round(6371*$ca); + return ceil(6371*$ca); } } } diff --git a/application/views/activated_grids/index.php b/application/views/activated_grids/index.php index 0dedbbdb..c099c5b9 100644 --- a/application/views/activated_grids/index.php +++ b/application/views/activated_grids/index.php @@ -25,13 +25,13 @@
uri->segment(2) == "satellites") { ?> uri->segment(2) == "band") { ?> diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index e7936563..4430a9c0 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -1189,6 +1189,8 @@ $(document).on('keypress',function(e) { uri->segment(1) == "qso" || ($this->uri->segment(1) == "contesting" && $this->uri->segment(2) != "add")) { ?> + +