From 6d647fe7368883de08bb60a8a51477ce2afec19a Mon Sep 17 00:00:00 2001
From: phl0 <github@florian-wolters.de>
Date: Tue, 12 Dec 2023 14:31:39 +0100
Subject: [PATCH] Add functions for secondary subdivisions

---
 application/controllers/Logbook.php    |  1 +
 application/libraries/Subdivisions.php | 25 +++++++++++++++++++++++++
 application/views/view_log/qso.php     |  8 ++++----
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php
index 760fa2b3..d757e3e5 100644
--- a/application/controllers/Logbook.php
+++ b/application/controllers/Logbook.php
@@ -717,6 +717,7 @@ class Logbook extends CI_Controller {
         $this->load->model('Qsl_model');
         $data['qslimages'] = $this->Qsl_model->getQslForQsoId($id);
         $data['primary_subdivision'] = $this->subdivisions->get_primary_subdivision_name($data['query']->result()[0]->COL_DXCC);
+        $data['secondary_subdivision'] = $this->subdivisions->get_secondary_subdivision_name($data['query']->result()[0]->COL_DXCC);
 		$data['max_upload'] = ini_get('upload_max_filesize');
 		$this->load->view('interface_assets/mini_header', $data);
 		$this->load->view('view_log/qso');
diff --git a/application/libraries/Subdivisions.php b/application/libraries/Subdivisions.php
index a94b9d19..b4fc343a 100644
--- a/application/libraries/Subdivisions.php
+++ b/application/libraries/Subdivisions.php
@@ -8,6 +8,7 @@
 class Subdivisions {
 
 	public function get_primary_subdivision_name($dxcc) {
+		// ref. http://adif.org.uk/314/ADIF_314_annotated.htm#Primary_Administrative_Subdivision
 		switch($dxcc) {
 			case '1':
 			case '29':
@@ -68,4 +69,28 @@ class Subdivisions {
 		return 'State';
 	}
 	
+	public function get_secondary_subdivision_name($dxcc) {
+		// ref. http://adif.org.uk/314/ADIF_314_annotated.htm#Secondary_Administrative_Subdivision
+		switch($dxcc) {
+			case '6':
+			case '110':
+			case '291':
+				return 'US County';
+			case '15':
+			case '54':
+			case '61':
+			case '126':
+			case '151':
+			case '288':
+				return 'District';
+			case '21':
+			case '29':
+			case '32':
+			case '281':
+				return 'DME';
+			case '339':
+				return 'City / Ku / Gun';
+		}
+		return 'County';
+	}
 }
diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php
index f3db7333..d6250730 100644
--- a/application/views/view_log/qso.php
+++ b/application/views/view_log/qso.php
@@ -167,10 +167,10 @@
                     <?php } ?>
 
                     <?php if($row->COL_CNTY != null && $row->COL_CNTY != ",") { ?>
-                        <tr>
-                            <td>USA County:</td>
-                            <td><?php echo $row->COL_CNTY; ?></td>
-                        </tr>
+                    <tr>
+                        <td><?php echo $secondary_subdivision ?>:</td>
+                        <td><?php echo $row->COL_CNTY; ?></td>
+                    </tr>
                     <?php } ?>
 
                     <?php if($row->COL_NAME != null) { ?>