From fc12664da858fc2a70c9444291c0488f30836e31 Mon Sep 17 00:00:00 2001
From: phl0 <github@florian-wolters.de>
Date: Thu, 27 Apr 2023 09:47:09 +0200
Subject: [PATCH] Add deleted DXCC badge to linked station profiles

---
 application/models/Logbooks_model.php | 4 ++--
 application/views/logbooks/edit.php   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/models/Logbooks_model.php b/application/models/Logbooks_model.php
index 8cacc5a8..7096ce58 100644
--- a/application/models/Logbooks_model.php
+++ b/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;
diff --git a/application/views/logbooks/edit.php b/application/views/logbooks/edit.php
index 1380b800..1df99f4f 100644
--- a/application/views/logbooks/edit.php
+++ b/application/views/logbooks/edit.php
@@ -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