From 5b577a432a1b082b4beb49eec513f21c7b9f0d94 Mon Sep 17 00:00:00 2001 From: phl0 Date: Mon, 4 Dec 2023 14:43:07 +0100 Subject: [PATCH 1/4] PoC for subdivision naming --- application/controllers/Logbook.php | 2 ++ application/libraries/Subdivisions.php | 22 ++++++++++++++++++++++ application/views/view_log/qso.php | 2 +- 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 application/libraries/Subdivisions.php diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index 9cf88fbe..4a06fe90 100644 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -670,6 +670,7 @@ function worked_grid_before($gridsquare, $type, $band, $mode) if(!$this->user_model->authorize($this->config->item('auth_mode'))) { return; } $this->load->library('qra'); + $this->load->library('subdivisions'); $this->load->model('logbook_model'); $data['query'] = $this->logbook_model->get_qso($id); @@ -683,6 +684,7 @@ function worked_grid_before($gridsquare, $type, $band, $mode) $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['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 new file mode 100644 index 00000000..1d3fe430 --- /dev/null +++ b/application/libraries/Subdivisions.php @@ -0,0 +1,22 @@ +COL_STATE != null) { ?> - USA State: + : COL_STATE; ?> From 3fed1d33fd20eb78ae0c3e5a6d848a60d344bae0 Mon Sep 17 00:00:00 2001 From: phl0 Date: Mon, 4 Dec 2023 16:02:38 +0100 Subject: [PATCH 2/4] More subdivision names --- application/libraries/Subdivisions.php | 35 ++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/application/libraries/Subdivisions.php b/application/libraries/Subdivisions.php index 1d3fe430..0a5b227e 100644 --- a/application/libraries/Subdivisions.php +++ b/application/libraries/Subdivisions.php @@ -10,9 +10,44 @@ class Subdivisions { public function get_primary_subdivision_name($dxcc) { switch($dxcc) { case '1': + case '29': + case '32': + case '100': + case '137': + case '163': + case '206': + case '209': + case '212': + case '225': + case '248': + case '263': + case '269': return 'Province'; + case '27': + case '15': + case '54': + case '61': + case '126': + case '151': + return 'Oblast'; + case '112': + return 'Region'; + case '132': + case '144': + case '227': + return 'Department'; + case '170': + return 'Region'; + case '224': + return 'Municipality'; + case '230': + return 'Federal State'; + case '239': + case '245': + return 'County'; case '291': return 'US State'; + case '318': case '339': return 'Prefecture'; } From 0fe31f2c231372db492c69e459fdde1232ba5a84 Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 12 Dec 2023 08:49:52 +0100 Subject: [PATCH 3/4] Complete list of prim. subdivisions --- application/libraries/Subdivisions.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/application/libraries/Subdivisions.php b/application/libraries/Subdivisions.php index 0a5b227e..a94b9d19 100644 --- a/application/libraries/Subdivisions.php +++ b/application/libraries/Subdivisions.php @@ -22,6 +22,11 @@ class Subdivisions { case '248': case '263': case '269': + case '281': + case '284': + case '318': + case '375': + case '386': return 'Province'; case '27': case '15': @@ -29,6 +34,7 @@ class Subdivisions { case '61': case '126': case '151': + case '288': return 'Oblast'; case '112': return 'Region'; @@ -44,7 +50,15 @@ class Subdivisions { return 'Federal State'; case '239': case '245': + case '275': + case '497': return 'County'; + case '272': + case '503': + case '504': + return 'District'; + case '287': + return 'Canton'; case '291': return 'US State'; case '318': From 6d647fe7368883de08bb60a8a51477ce2afec19a Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 12 Dec 2023 14:31:39 +0100 Subject: [PATCH 4/4] 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 @@ COL_CNTY != null && $row->COL_CNTY != ",") { ?> - - USA County: - COL_CNTY; ?> - + + : + COL_CNTY; ?> + COL_NAME != null) { ?>