Merge branch 'dev' of https://github.com/magicbug/Cloudlog into dev

application/controllers/Activated_grids.php

@@ -88,19 +88,17 @@ class Activated_grids extends CI_Controller {
 						}
 
 						// Check if 2 Char is in array
-						if(!in_array($grid_two, $array_grid_2char)){
+						if(!in_array($grid_two, $array_confirmed_grid_2char)){
-							array_push($array_grid_2char, $grid_two);	
+							array_push($array_confirmed_grid_2char, $grid_two);
 						}
 
-		
+						if(!in_array($grid_four, $array_confirmed_grid_4char)){
-						if(!in_array($grid_four, $array_grid_4char)){
+							array_push($array_confirmed_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)){
+							if(!in_array($grid_six, $array_confirmed_grid_6char)){
-								array_push($array_grid_6char, $grid_six);	
+								array_push($array_confirmed_grid_6char, $grid_six);
 							}
 						}
 					}
@@ -118,12 +116,10 @@ class Activated_grids extends CI_Controller {
 						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);
 					}
 
-	
 					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);
@@ -159,12 +155,10 @@ class Activated_grids extends CI_Controller {
 							array_push($array_grid_2char, $grid_two);
 						}
 
-		
 						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);
@@ -185,12 +179,10 @@ class Activated_grids extends CI_Controller {
 						array_push($array_grid_2char, $grid_two);
 					}
 
-	
 					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);
@@ -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);
@@ -229,7 +220,6 @@ class Activated_grids extends CI_Controller {
 		$this->load->view('interface_assets/footer');
 	}
 
-
 	public function band($band)
 	{
 		$this->load->model('activated_grids_model');

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';
 

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';
 

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");';

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);
         }
     }
 }

application/views/activated_grids/index.php

@@ -25,13 +25,13 @@
 <div class="container">
 	<?php if ($this->uri->segment(2) == "satellites") { ?>
 		<div class="alert alert-success" role="alert">
-			<?php echo lang('gridsquares_confirmed_is_green'); ?> <span id="confirmed_grids"></span>| <?php echo lang('gridsquares_worked_but_not_confirmed_is_red'); ?> <span id="worked_grids"></span>|<span id="sum_grids"></span><br>
+			<?php echo lang('gridsquares_confirmed_is_green'); ?> <span id="confirmed_grids"></span>| <?php echo lang('gridsquares_activated_but_not_confirmed_is_red'); ?> <span id="activated_grids"></span>|<span id="sum_grids"></span><br>
 		</div>
 	<?php } ?>
 
 	<?php if ($this->uri->segment(2) == "band") { ?>
 		<div class="alert alert-success" role="alert">
-			<?php echo lang('gridsquares_confirmed_is_green'); ?> <span id="confirmed_grids"></span>| <?php echo lang('gridsquares_worked_but_not_confirmed_is_red'); ?> <span id="worked_grids"></span>|<span id="sum_grids"></span><br>
+			<?php echo lang('gridsquares_confirmed_is_green'); ?> <span id="confirmed_grids"></span>| <?php echo lang('gridsquares_activated_but_not_confirmed_is_red'); ?> <span id="activated_grids"></span>|<span id="sum_grids"></span><br>
 			[<?php echo lang('gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos'); ?>]
 		</div>
 	<?php } ?>

application/views/interface_assets/footer.php

@@ -1189,6 +1189,8 @@ $(document).on('keypress',function(e) {
 
 <?php } ?>
 <?php if ( $this->uri->segment(1) == "qso" || ($this->uri->segment(1) == "contesting" && $this->uri->segment(2) != "add")) { ?>
+    <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/moment.min.js"></script>
+    <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/datetime-moment.js"></script>
     <script>
     function setRst(mode) {
         if(mode == 'JT65' || mode == 'JT65B' || mode == 'JT6C' || mode == 'JTMS' || mode == 'ISCAT' || mode == 'MSK144' || mode == 'JTMSK' || mode == 'QRA64' || mode == 'FT8' || mode == 'FT4' || mode == 'JS8' || mode == 'JT9' || mode == 'JT9-1' || mode == 'ROS'){

application/views/view_log/index.php

@@ -2,7 +2,7 @@
 
 	<h2><?php echo lang('gen_hamradio_logbook'); ?></h2>
 	<?php if ($results) { ?>
-		<h6><?php echo lang('gen_hamradio_logbook').": <span class='station_logbook_decoration'>".$this->logbooks_model->find_name($this->session->userdata('active_station_logbook')); ?></span> <?php echo lang('general_word_location').": <span class='station_location_decoration'>".$this->stations->find_name(); ?></span></h6>
+		<h6><?php echo lang('gen_hamradio_logbook').": ".$this->logbooks_model->find_name($this->session->userdata('active_station_logbook')); ?> <?php echo lang('general_word_location').": ".$this->stations->find_name(); ?></h6>
 	<?php } ?>
 
 

assets/css/general.css

@@ -437,14 +437,3 @@ div#station_logbooks_linked_table_paginate {
     max-height: calc(100vh - 270px);
 	overflow-y: auto;
 }
-
-
-.station_logbook_decoration{
-    font-weight: bold;
-    font-size: larger;
-}
-
-.station_location_decoration{
-    font-weight: bold;
-    font-size: larger;
-}

assets/js/sections/contesting.js

@@ -426,8 +426,7 @@ function logQso() {
 			vuccr,
 		]];
 
-		table.rows.add(data);
+		table.rows.add(data).draw();
-		table.draw();
 		
 		var formdata = new FormData(document.getElementById("qso_input"));
 		$.ajax({
@@ -520,6 +519,7 @@ function restoreContestSession(data) {
 							'</tr>');
 					});
 					if (!$.fn.DataTable.isDataTable('.qsotable')) {
+						$.fn.dataTable.moment('DD-MM-YYYY HH:mm:ss');
 						$('.qsotable').DataTable({
 							"stateSave": true,
 							"pageLength": 25,
@@ -528,7 +528,6 @@ function restoreContestSession(data) {
 							"scrollCollapse": true,
 							"paging": false,
 							"scrollX": true,
-							columnDefs: [ { type: 'date', 'targets': [0] } ],
 							order: [0, 'desc']
 						});
 					}