From 79764997a7bbb41eb44eb23845536d150fc2611c Mon Sep 17 00:00:00 2001
From: HB9HIL <fabian.berg@hb9hil.org>
Date: Fri, 8 Nov 2024 14:52:21 +0100
Subject: [PATCH] show the DXCC in search results as badge

---
 application/controllers/Logbook.php |  4 ++++
 application/views/search/result.php | 18 +++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php
index b57157a36..d4467ecda 100644
--- a/application/controllers/Logbook.php
+++ b/application/controllers/Logbook.php
@@ -948,6 +948,8 @@ class Logbook extends CI_Controller {
 						if (isset($data['callsign']['dxcc'])) {
 							$entity = $this->logbook_model->get_entity($data['callsign']['dxcc']);
 							$data['callsign']['dxcc_name'] = $entity['name'];
+							$data['dxcc_worked'] = $this->logbook_model->check_if_dxcc_worked_in_logbook($data['callsign']['dxcc']);
+							$data['dxcc_confirmed'] = $this->logbook_model->check_if_dxcc_cnfmd_in_logbook($data['callsign']['dxcc']);
 						}
 						if (isset($data['callsign']['error'])) {
 							$data['error'] = $data['callsign']['error'];
@@ -975,6 +977,8 @@ class Logbook extends CI_Controller {
 						if (isset($data['callsign']['dxcc'])) {
 							$entity = $this->logbook_model->get_entity($data['callsign']['dxcc']);
 							$data['callsign']['dxcc_name'] = $entity['name'];
+							$data['dxcc_worked'] = $this->logbook_model->check_if_dxcc_worked_in_logbook($data['callsign']['dxcc']);
+							$data['dxcc_confirmed'] = $this->logbook_model->check_if_dxcc_cnfmd_in_logbook($data['callsign']['dxcc']);
 						}
 						if (isset($data['callsign']['error'])) {
 							$data['error'] = $data['callsign']['error'];
diff --git a/application/views/search/result.php b/application/views/search/result.php
index f0540c8a8..14135b628 100644
--- a/application/views/search/result.php
+++ b/application/views/search/result.php
@@ -25,7 +25,23 @@
 <?php if(isset($callsign['dxcc_name'])) { ?>
 <tr>
 	<td style="padding: 0 0.3em 0 0;" align="left"><?= __("DXCC"); ?></td>
-	<td style="padding: 0.3em 0 0.3em 0.5em;" align="left"><?php echo $callsign['dxcc_name']; ?></td>
+	<td style="padding: 0.3em 0 0.3em 0.5em;" align="left">
+	<?php 
+	 	if ($dxcc_worked != 0) {
+			if ($dxcc_confirmed != 0) {
+				$title_text = __("Confirmed");
+				$badge_class = "badge text-bg-success";
+			} else {
+				$title_text = __("Worked");
+				$badge_class = "badge text-bg-warning";
+			}
+		} else {
+			$title_text = __("Not Worked");
+			$badge_class = "badge text-bg-danger";
+		}
+		echo ' <span data-bs-toggle=\"tooltip" title="' . $title_text . '" class="' . $badge_class . '" style="padding-left: 0.2em; padding-right: 0.2em;">'.strtoupper($callsign['dxcc_name']).'</span>';
+	?>
+	</td>
 </tr>
 <?php } ?>