Merge pull request #2085 from phl0/deletedDxccHint

Show badge and hints about deleted DXCCs

application/language/english/general_words_lang.php

@@ -94,6 +94,7 @@ $lang['gen_hamradio_logbook'] = 'Logbook';
 
 $lang['gen_hamradio_cq_zone'] = 'CQ Zone';
 $lang['gen_hamradio_dxcc'] = 'DXCC';
+$lang['gen_hamradio_deleted_dxcc'] = 'Deleted DXCC';
 $lang['gen_hamradio_continent'] = 'Continent';
 $lang['gen_hamradio_usa_state'] = 'USA State';
 $lang['gen_hamradio_county_reference'] = 'USA County';

application/language/german/general_words_lang.php

@@ -94,6 +94,7 @@ $lang['gen_hamradio_logbook'] = 'Logbuch';
 
 $lang['gen_hamradio_cq_zone'] = 'CQ Zone';
 $lang['gen_hamradio_dxcc'] = 'DXCC';
+$lang['gen_hamradio_deleted_dxcc'] = 'Gelöschtes DXCC';
 $lang['gen_hamradio_continent'] = 'Kontinent';
 $lang['gen_hamradio_usa_state'] = 'USA-Staat';
 $lang['gen_hamradio_county_reference'] = 'USA County';

application/language/swedish/general_words_lang.php

@@ -94,6 +94,7 @@ $lang['gen_hamradio_logbook'] = 'Loggbok';
 
 $lang['gen_hamradio_cq_zone'] = 'CQ Zone';
 $lang['gen_hamradio_dxcc'] = 'DXCC';
+$lang['gen_hamradio_deleted_dxcc'] = 'Struket DXCC';
 $lang['gen_hamradio_usa_state'] = 'USA State';
 $lang['gen_hamradio_county_reference'] = 'USA County';
 $lang['gen_hamradio_iota_reference'] = 'IOTA Reference';

application/models/Logbook_model.php

@@ -313,6 +313,7 @@ class Logbook_model extends CI_Model {
 		$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
 
 		$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
+		$this->db->join('dxcc_entities', 'dxcc_entities.adif = '.$this->config->item('table_name').'.COL_DXCC', 'left outer');
 		switch ($type) {
 			case 'DXCC':
 				$this->db->where('COL_COUNTRY', $searchphrase);
@@ -389,8 +390,9 @@ class Logbook_model extends CI_Model {
 		$sql =  'SELECT COL_FREQ, COL_SOTA_REF, COL_OPERATOR, COL_IOTA, COL_VUCC_GRIDS, COL_STATE, COL_GRIDSQUARE, COL_PRIMARY_KEY, COL_CALL, COL_TIME_ON, COL_BAND, COL_SAT_NAME, COL_MODE, COL_SUBMODE, COL_RST_SENT, ';
 		$sql .= 'COL_RST_RCVD, COL_STX, COL_SRX, COL_STX_STRING, COL_SRX_STRING, COL_COUNTRY, COL_QSL_SENT, COL_QSL_SENT_VIA, ';
 		$sql .= 'COL_QSLSDATE, COL_QSL_RCVD, COL_QSL_RCVD_VIA, COL_QSLRDATE, COL_EQSL_QSL_SENT, COL_EQSL_QSLSDATE, COL_EQSL_QSLRDATE, ';
-		$sql .= 'COL_EQSL_QSL_RCVD, COL_LOTW_QSL_SENT, COL_LOTW_QSLSDATE, COL_LOTW_QSL_RCVD, COL_LOTW_QSLRDATE, COL_CONTEST_ID, station_gridsquare ';
+		$sql .= 'COL_EQSL_QSL_RCVD, COL_LOTW_QSL_SENT, COL_LOTW_QSLSDATE, COL_LOTW_QSL_RCVD, COL_LOTW_QSLRDATE, COL_CONTEST_ID, station_gridsquare, dxcc_entities.name as name, dxcc_entities.end as end ';
 		$sql .= 'FROM '.$this->config->item('table_name').' JOIN `station_profile` ON station_profile.station_id = '.$this->config->item('table_name').'.station_id ';
+      $sql .= 'LEFT OUTER JOIN `dxcc_entities` ON dxcc_entities.adif = '.$this->config->item('table_name').'.COL_DXCC ';
 		$sql .= 'WHERE '.$this->config->item('table_name').'.station_id IN (SELECT station_id from station_profile ';
 		$sql .= 'WHERE station_gridsquare LIKE "%'.$searchphrase.'%") ';
 
@@ -441,6 +443,7 @@ class Logbook_model extends CI_Model {
 		$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
 
       $this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
+      $this->db->join('dxcc_entities', 'dxcc_entities.adif = '.$this->config->item('table_name').'.COL_DXCC', 'left outer');
         $this->db->where('COL_CALL', $call);
         if ($band != 'All') {
             if ($band == 'SAT') {
@@ -458,6 +461,7 @@ class Logbook_model extends CI_Model {
         }
 
         $this->db->where_in('station_profile.station_id', $logbooks_locations_array);
+        $this->db->order_by('COL_TIME_ON', 'DESC');
 
         return $this->db->get($this->config->item('table_name'));
     }
@@ -1275,9 +1279,11 @@ class Logbook_model extends CI_Model {
       return array();
     }
 
+    $this->db->select($this->config->item('table_name').'.*, station_profile.*, dxcc_entities.*');
     $this->db->from($this->config->item('table_name'));
 
     $this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
+    $this->db->join('dxcc_entities', $this->config->item('table_name').'.col_dxcc = dxcc_entities.adif', 'left');
     $this->db->where_in('station_profile.station_id', $logbooks_locations_array);
     $this->db->order_by(''.$this->config->item('table_name').'.COL_TIME_ON', "desc");
     $this->db->order_by(''.$this->config->item('table_name').'.COL_PRIMARY_KEY', "desc");
@@ -1289,7 +1295,7 @@ class Logbook_model extends CI_Model {
   }
 
   function get_qso($id) {
-    $this->db->select($this->config->item('table_name').'.*, station_profile.*, dxcc_entities.*, dxcc_entities_2.name as station_country');
+    $this->db->select($this->config->item('table_name').'.*, station_profile.*, dxcc_entities.*, dxcc_entities_2.name as station_country, dxcc_entities_2.end as station_end');
     $this->db->from($this->config->item('table_name'));
     $this->db->join('dxcc_entities', $this->config->item('table_name').'.col_dxcc = dxcc_entities.adif', 'left');
     $this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id', 'left');

application/models/Logbooks_model.php

@@ -262,9 +262,9 @@ class Logbooks_model extends CI_Model {
 				array_push($relationships_array, $row->station_location_id);
 			}
 
-			$this->db->select('station_profile.*, dxcc_entities.name as station_country');
+			$this->db->select('station_profile.*, dxcc_entities.name as station_country, dxcc_entities.end as end');
 			$this->db->where_in('station_id', $relationships_array);
-			$this->db->join('dxcc_entities','station_profile.station_dxcc = dxcc_entities.adif','left');
+			$this->db->join('dxcc_entities','station_profile.station_dxcc = dxcc_entities.adif','left outer');
 			$query = $this->db->get('station_profile');
 			
 			return $query;

application/models/LotwCert.php

@@ -12,7 +12,7 @@ class LotwCert extends CI_Model {
 	*/
 	function lotw_certs($user_id) {
 
-		$this->db->select('lotw_certs.lotw_cert_id as lotw_cert_id, lotw_certs.callsign as callsign, dxcc_entities.name as cert_dxcc, lotw_certs.qso_start_date as qso_start_date, lotw_certs.qso_end_date as qso_end_date, lotw_certs.date_created as date_created, lotw_certs.date_expires as date_expires, lotw_certs.last_upload as last_upload');
+		$this->db->select('lotw_certs.lotw_cert_id as lotw_cert_id, lotw_certs.callsign as callsign, dxcc_entities.name as cert_dxcc, dxcc_entities.end as cert_dxcc_end, lotw_certs.qso_start_date as qso_start_date, lotw_certs.qso_end_date as qso_end_date, lotw_certs.date_created as date_created, lotw_certs.date_expires as date_expires, lotw_certs.last_upload as last_upload');
 		$this->db->where('user_id', $user_id);
 		$this->db->join('dxcc_entities','lotw_certs.cert_dxcc_id = dxcc_entities.adif','left');
 		$this->db->order_by('cert_dxcc', 'ASC');

application/models/Stations.php

@@ -4,7 +4,7 @@ class Stations extends CI_Model {
 
     function all_with_count() {
 
-		$this->db->select('station_profile.*, dxcc_entities.name as station_country, count('.$this->config->item('table_name').'.station_id) as qso_total');
+		$this->db->select('station_profile.*, dxcc_entities.name as station_country, dxcc_entities.end as dxcc_end, count('.$this->config->item('table_name').'.station_id) as qso_total');
         $this->db->from('station_profile');
         $this->db->join($this->config->item('table_name'),'station_profile.station_id = '.$this->config->item('table_name').'.station_id','left');
         $this->db->join('dxcc_entities','station_profile.station_dxcc = dxcc_entities.adif','left');
@@ -24,7 +24,7 @@ class Stations extends CI_Model {
 	}
 
 	function all_of_user() {
-		$this->db->select('station_profile.*, dxcc_entities.name as station_country');
+		$this->db->select('station_profile.*, dxcc_entities.name as station_country, dxcc_entities.end as dxcc_end');
 		$this->db->where('user_id', $this->session->userdata('user_id'));
 		$this->db->join('dxcc_entities','station_profile.station_dxcc = dxcc_entities.adif','left');
 		return $this->db->get('station_profile');

application/models/Timeline_model.php

@@ -217,6 +217,7 @@ class Timeline_model extends CI_Model
 		$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
 
 		$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
+		$this->db->join('dxcc_entities', 'dxcc_entities.adif = '.$this->config->item('table_name').'.COL_DXCC');
 
         if ($band != 'All') {
             if ($band == 'SAT') {
@@ -240,6 +241,7 @@ class Timeline_model extends CI_Model
             case 'waz':  $this->db->where('COL_CQZ', $querystring); break;
             case 'vucc':  $this->db->group_start(); $this->db->like('COL_GRIDSQUARE', $querystring);  $this->db->or_like('COL_VUCC_GRIDS',$querystring); $this->db->group_end();break;
         }
+        $this->db->order_by('COL_TIME_ON', 'DEsC');
 
         return $this->db->get($this->config->item('table_name'));
     }

application/views/dashboard/index.php

@@ -23,7 +23,7 @@ function echo_table_col($row, $name) {
 		case 'Mode':    echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE . '</td>'; break;
       case 'RSTS':    echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_SENT; if ($row->COL_STX) { echo '<span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo '<span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_STX_STRING . '</span>';} echo '</td>'; break;
       case 'RSTR':    echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '<span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo '<span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';} echo '</td>'; break;
-		case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY))) . '</td>'; break;
+		case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY))); if ($row->end != NULL) echo ' <span class="badge badge-danger">'.$ci->lang->line('gen_hamradio_deleted_dxcc').'</span>'  . '</td>'; break;
 		case 'IOTA':    echo '<td>' . ($row->COL_IOTA) . '</td>'; break;
 		case 'SOTA':    echo '<td>' . ($row->COL_SOTA_REF) . '</td>'; break;
 		case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF) . '</td>'; break;

application/views/dxatlas/index.php

@@ -62,7 +62,7 @@
 						foreach($dxcc as $d){
 							echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower($d->name), "- (/");
 							if ($d->Enddate != null) {
-								echo ' (deleted dxcc)';
+								echo ' ('.$this->lang->line('gen_hamradio_deleted_dxcc').')';
 							}
 							echo '</option>';
 						}

application/views/kml/index.php

@@ -35,7 +35,7 @@
                             foreach($dxcc as $d){
                                 echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower($d->name), "- (/");
                                 if ($d->Enddate != null) {
-                                    echo ' (deleted dxcc)';
+                                    echo ' ('.$this->lang->line('gen_hamradio_deleted_dxcc').')';
                                 }
                                 echo '</option>';
                             }

application/views/logbooks/edit.php

@@ -95,7 +95,7 @@
 						<select name="SelectedStationLocation" class="form-control" id="StationLocationSelect" aria-describedby="StationLocationSelectHelp">
 							<?php foreach ($station_locations_list->result() as $row) {
 								if (!in_array($row->station_id, $linked_stations)) { ?>
-								<option value="<?php echo $row->station_id;?>"><?php echo $row->station_profile_name;?> (Callsign: <?php echo $row->station_callsign;?> DXCC: <?php echo $row->station_country;?>)</option>
+								<option value="<?php echo $row->station_id;?>"><?php echo $row->station_profile_name;?> (Callsign: <?php echo $row->station_callsign;?> DXCC: <?php echo $row->station_country; if ($row->dxcc_end != NULL) { echo ' ('.$this->lang->line('gen_hamradio_deleted_dxcc').')'; } ?>)</option>
 								<?php } ?>
 							<?php } ?>
 						</select>
@@ -129,7 +129,7 @@
 							foreach ($station_locations_linked->result() as $row) {
 					?>
 					<tr>
-						<td><?php echo $row->station_profile_name;?> (Callsign: <?php echo $row->station_callsign;?> DXCC: <?php echo $row->station_country;?>)</td>
+						<td><?php echo $row->station_profile_name;?> (Callsign: <?php echo $row->station_callsign;?> DXCC: <?php echo $row->station_country; if ($row->end != NULL) { echo ' <span class="badge badge-danger">'.$this->lang->line('gen_hamradio_deleted_dxcc').'</span>'; } ?>)</td>
 						<td><a href="<?php echo site_url('logbooks/delete_relationship/'); ?><?php echo $station_logbook_details->logbook_id; ?>/<?php echo $row->station_id;?>" class="btn btn-danger"><i class="fas fa-trash-alt"></i></a></td>
 					</tr>
 					<?php

application/views/lookup/index.php

@@ -16,7 +16,7 @@
 			foreach($dxcc as $d){
 				echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower($d->name), "- (/");
 				if ($d->Enddate != null) {
-					echo ' (deleted dxcc)';
+					echo ' ('.$this->lang->line('gen_hamradio_deleted_dxcc').')';
 				}
 				echo '</option>';
 			}

application/views/lotw_views/index.php

@@ -44,7 +44,7 @@
 						<?php foreach ($lotw_cert_results->result() as $row) { ?>
 							<tr>
 					      		<td><?php echo $row->callsign; ?></td>
-					      		<td><?php echo $row->cert_dxcc == '' ? '- NONE -' : ucfirst($row->cert_dxcc); ?></td>
+                           <td><?php echo $row->cert_dxcc == '' ? '- NONE -' : ucfirst($row->cert_dxcc); if ($row->cert_dxcc_end != NULL) { echo ' <span class="badge badge-danger">'.$this->lang->line('gen_hamradio_deleted_dxcc').'</span>'; } ?></td>
 								<td><?php
 									if (isset($row->qso_start_date)) {
 										$valid_qso_start = strtotime( $row->qso_start_date );

application/views/qso/edit_ajax.php

@@ -227,7 +227,11 @@
                                                 if ($qso->COL_DXCC == $d->adif) {
                                                     echo " selected=\"selected\"";
                                                 }
-                                                echo '>' . $d->prefix . ' - ' . $d->name . '</option>';
+                                                echo '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name)));
+                                                if ($d->Enddate != null) {
+                                                    echo ' ('.$this->lang->line('gen_hamradio_deleted_dxcc').')';
+                                                }
+                                                echo '</option>';
                                             }
                                             ?>
 

application/views/qso/index.php

@@ -216,7 +216,11 @@
                       <option value="0">None</option>
                       <?php
                       foreach($dxcc as $d){
-                          echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))) . '</option>';
+                          echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name)));
+                          if ($d->Enddate != null) {
+                              echo ' ('.$this->lang->line('gen_hamradio_deleted_dxcc').')';
+                          }
+                          echo '</option>';
                       }
                       ?>
 

application/views/station_profile/create.php

@@ -46,7 +46,8 @@
 				<select class="form-control" id="dxcc_select" name="dxcc" aria-describedby="stationCallsignInputHelp">
 				<option value="0" selected>NONE</option>
 				<?php foreach ($dxcc_list->result() as $dxcc) { ?>
-				<option value="<?php echo $dxcc->adif; ?>"><?php echo $dxcc->name; ?></option>
+				<option value="<?php echo $dxcc->adif; ?>"><?php echo ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix; if ($dxcc->end != NULL) echo ' ('.$this->lang->line('gen_hamradio_deleted_dxcc').')';?>
+				</option>
 				<?php } ?>
 				</select>
 				<?php } ?>

application/views/station_profile/edit.php

@@ -65,7 +65,8 @@
 							<select class="form-control" id="dxcc_select" name="dxcc" aria-describedby="stationCallsignInputHelp">
 							<option value="0" <?php if($my_station_profile->station_dxcc == "0") { ?>selected<?php } ?>>NONE</option>
 							<?php foreach ($dxcc_list->result() as $dxcc) { ?>
-							<option value="<?php echo $dxcc->adif; ?>" <?php if($my_station_profile->station_dxcc == $dxcc->adif) { ?>selected<?php } ?>><?php echo $dxcc->name; ?></option>
+							<option value="<?php echo $dxcc->adif; ?>" <?php if($my_station_profile->station_dxcc == $dxcc->adif) { ?>selected<?php } ?>><?php echo ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix; if ($dxcc->end != NULL) echo ' ('.$this->lang->line('gen_hamradio_deleted_dxcc').')';?>
+							</option>
 							<?php } ?>
 							</select>
 							<?php } ?>

application/views/station_profile/index.php

@@ -59,7 +59,7 @@
 						<?php echo $row->station_profile_name;?><br>
 					</td>
 					<td><?php echo $row->station_callsign;?></td>
-					<td><?php echo $row->station_country == '' ? '- NONE -' : $row->station_country;?></td>
+					<td><?php echo $row->station_country == '' ? '- NONE -' : $row->station_country; if ($row->dxcc_end != NULL) { echo ' <span class="badge badge-danger">'.$this->lang->line('gen_hamradio_deleted_dxcc').'</span>'; } ?></td>
 					<td><?php echo $row->station_gridsquare;?></td>
 					<td style="text-align: center" data-order="<?php echo $row->station_id;?>">
 						<?php if($row->station_active != 1) { ?>

application/views/timeline/index.php

@@ -106,15 +106,16 @@
 <?php
 
 function write_dxcc_timeline($timeline_array, $custom_date_format, $bandselect, $modeselect, $award) {
+    $ci =& get_instance();
     $i = count($timeline_array);
     echo '<table style="width:100%" class="table table-sm timelinetable table-bordered table-hover table-striped table-condensed text-center">
               <thead>
                     <tr>
                         <td>#</td>
-                        <td>Date</td>
+                        <td>'.$ci->lang->line('general_word_date').'</td>
                         <td>Prefix</td>
-                        <td>Country</td>
+                        <td>'.$ci->lang->line('general_word_country').'</td>
-                        <td>Deleted</td>
+                        <td>Status</td>
                         <td>End Date</td>
                         <td>Show QSOs</td>
                     </tr>
@@ -129,7 +130,7 @@ function write_dxcc_timeline($timeline_array, $custom_date_format, $bandselect,
                 <td>' . $line->prefix . '</td>
                 <td>' . $line->col_country . '</td>
                 <td>';
-        if (!empty($line->end)) echo 'Yes';
+        if (!empty($line->end)) echo '<span class="badge badge-danger">'.$ci->lang->line('gen_hamradio_deleted_dxcc').'</span>';
         echo '</td>
                 <td>' . $line->end . '</td>
                 <td><a href=javascript:displayTimelineContacts("' . $line->adif . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>Show</a></td>
@@ -139,13 +140,14 @@ function write_dxcc_timeline($timeline_array, $custom_date_format, $bandselect,
 }
 
 function write_was_timeline($timeline_array, $custom_date_format, $bandselect, $modeselect, $award) {
+    $ci =& get_instance();
     $i = count($timeline_array);
     echo '<table style="width:100%" class="table table-sm timelinetable table-bordered table-hover table-striped table-condensed text-center">
               <thead>
                     <tr>
                         <td>#</td>
-                        <td>Date</td>
+                        <td>'.$ci->lang->line('general_word_date').'</td>
-                        <td>State</td>
+                        <td>'.$ci->lang->line('gen_hamradio_state').'</td>
                         <td>Show QSOs</td>
                     </tr>
                 </thead>
@@ -164,13 +166,14 @@ function write_was_timeline($timeline_array, $custom_date_format, $bandselect, $
 }
 
 function write_iota_timeline($timeline_array, $custom_date_format, $bandselect, $modeselect, $award) {
+    $ci =& get_instance();
     $i = count($timeline_array);
     echo '<table style="width:100%" class="table table-sm timelinetable table-bordered table-hover table-striped table-condensed text-center">
               <thead>
                     <tr>
                         <td>#</td>
-                        <td>Date</td>
+                        <td>'.$ci->lang->line('general_word_date').'</td>
-                        <td>Iota</td>
+                        <td>IOTA</td>
                         <td>Name</td>
                         <td>Prefix</td>
                         <td>Show QSOs</td>
@@ -193,12 +196,13 @@ function write_iota_timeline($timeline_array, $custom_date_format, $bandselect,
 }
 
 function write_waz_timeline($timeline_array, $custom_date_format, $bandselect, $modeselect, $award) {
+    $ci =& get_instance();
     $i = count($timeline_array);
     echo '<table style="width:100%" class="table table-sm timelinetable table-bordered table-hover table-striped table-condensed text-center">
               <thead>
                     <tr>
                         <td>#</td>
-                        <td>Date</td>
+                        <td>'.$ci->lang->line('general_word_date').'</td>
                         <td>CQ Zone</td>
                         <td>Show QSOs</td>
                     </tr>
@@ -218,13 +222,14 @@ function write_waz_timeline($timeline_array, $custom_date_format, $bandselect, $
 }
 
 function write_vucc_timeline($timeline_array, $custom_date_format, $bandselect, $modeselect, $award) {
+    $ci =& get_instance();
     $i = count($timeline_array);
     echo '<table style="width:100%" class="table table-sm timelinetable table-bordered table-hover table-striped table-condensed text-center">
               <thead>
                     <tr>
                         <td>#</td>
-                        <td>Date</td>
+                        <td>'.$ci->lang->line('general_word_date').'</td>
-                        <td>Gridsquare</td>
+                        <td>'.$ci->lang->line('gen_hamradio_gridsquare').'</td>
                         <td>Show QSOs</td>
                     </tr>
                 </thead>

application/views/timeplotter/index.php

@@ -21,9 +21,9 @@
                         <?php
                         if ($dxcc_list->num_rows() > 0) {
                                 foreach ($dxcc_list->result() as $dxcc) {
-                                    echo '<option value=' . $dxcc->adif . '> ' . $dxcc->name . ' - ' . $dxcc->prefix;
+                                    echo '<option value=' . $dxcc->adif . '> ' . ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix;
                                     if ($dxcc->end != null) {
-                                        echo ' (deleted)';
+                                        echo ' ('.$this->lang->line('gen_hamradio_deleted_dxcc').')';
                                     }
                                     echo '</option>';
                                 }
@@ -57,4 +57,4 @@
 
         <div id="timeplotter_div">
         </div>
-</div>
+</div>

application/views/view_log/partial/log_ajax.php

@@ -23,7 +23,7 @@ function echo_table_col($row, $name) {
 		case 'Mode':    echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE . '</td>'; break;
         case 'RSTS':    echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo '<span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo '<span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_STX_STRING . '</span>';} echo '</td>'; break;
         case 'RSTR':    echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '<span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo '<span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';} echo '</td>'; break;
-		case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY))) . '</td>'; break;
+		case 'Country': echo '<td>' . ucwords(strtolower(($row->name))); if ($row->end != null) echo ' <span class="badge badge-danger">'.$ci->lang->line('gen_hamradio_deleted_dxcc').'</span>' . '</td>'; break;
 		case 'IOTA':    echo '<td>' . ($row->COL_IOTA) . '</td>'; break;
 		case 'SOTA':    echo '<td>' . ($row->COL_SOTA_REF) . '</td>'; break;
 		case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF) . '</td>'; break;

application/views/view_log/qso.php

@@ -187,10 +187,10 @@
                         <td><?php echo $row->COL_SAT_MODE; ?></td>
                     </tr>
                     <?php } ?>
-                    <?php if($row->COL_COUNTRY != null) { ?>
+                    <?php if($row->name != null) { ?>
                     <tr>
                         <td><?php echo $this->lang->line('general_word_country'); ?></td>
-                        <td><?php echo ucwords(strtolower(($row->COL_COUNTRY)), "- (/"); ?></td>
+                        <td><?php echo ucwords(strtolower(($row->name)), "- (/"); if ($row->end != null) { echo ' <span class="badge badge-danger">'.$this->lang->line('gen_hamradio_deleted_dxcc').'</span>'; } ?></td>
                     </tr>
                     <?php } ?>
 
@@ -411,7 +411,7 @@
                     <?php if($row->station_country) { ?>
                     <tr>
                         <td>Station Country</td>
-                        <td><?php echo ucwords(strtolower(($row->station_country)), "- (/"); ?></td>
+                        <td><?php echo ucwords(strtolower(($row->station_country)), "- (/"); if ($row->station_end != null) echo ' <span class="badge badge-danger">'.$this->lang->line('gen_hamradio_deleted_dxcc').'</span>'; ?></td>
                     </tr>
                     <?php } ?>