From 7892846e8a969c2446e54b9bbf5f1165b966a2cf Mon Sep 17 00:00:00 2001
From: Andreas <andreask@online.no>
Date: Sun, 31 Jan 2021 15:02:23 +0100
Subject: [PATCH 1/2] [QSO Entry] Added county with autocomplete to the form.

---
 application/controllers/Qso.php               | 35 +++++++++++++++
 .../language/english/general_words_lang.php   |  1 +
 application/views/interface_assets/footer.php | 43 +++++++++++++++++++
 application/views/qso/index.php               |  5 +++
 4 files changed, 84 insertions(+)

diff --git a/application/controllers/Qso.php b/application/controllers/Qso.php
index b8376d4ef..f1e7b1b0d 100755
--- a/application/controllers/Qso.php
+++ b/application/controllers/Qso.php
@@ -317,4 +317,39 @@ public function get_dok() {
         header('Content-Type: application/json');
         echo json_encode($json);
     }
+
+    /*
+	 * Function is used for autocompletion of Counties in the station profile form
+	 */
+    public function get_county() {
+        $json = [];
+
+        if(!empty($this->input->get("query"))) {
+            //$query = isset($_GET['query']) ? $_GET['query'] : FALSE;
+            $county = $this->input->get("state");
+            $cleanedcounty = explode('(', $county);
+            $cleanedcounty = trim($cleanedcounty[0]);
+
+            $file = 'assets/json/US_counties.csv';
+
+            if (is_readable($file)) {
+                $lines = file($file, FILE_IGNORE_NEW_LINES);
+                $input = preg_quote($cleanedcounty, '~');
+                $reg = '~^'. $input .'(.*)$~';
+                $result = preg_grep($reg, $lines);
+                $json = [];
+                $i = 0;
+                foreach ($result as &$value) {
+                    $county = explode(',', $value);
+                    // Limit to 100 as to not slowdown browser too much
+                    if (count($json) <= 100) {
+                        $json[] = ["name"=>$county[1]];
+                    }
+                }
+            }
+        }
+
+        header('Content-Type: application/json');
+        echo json_encode($json);
+    }
 }
diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php
index dc0c1406c..7f12badd3 100644
--- a/application/language/english/general_words_lang.php
+++ b/application/language/english/general_words_lang.php
@@ -83,6 +83,7 @@
 $lang['gen_hamradio_cq_zone'] = 'CQ Zone';
 $lang['gen_hamradio_dxcc'] = 'DXCC';
 $lang['gen_hamradio_usa_state'] = 'USA State';
+$lang['gen_hamradio_county_reference'] = 'USA County';
 $lang['gen_hamradio_iota_reference'] = 'IOTA Reference';
 $lang['gen_hamradio_sota_reference'] = 'SOTA Reference';
 $lang['gen_hamradio_dok'] = 'DOK';
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index 390a2228f..f6727945f 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -323,6 +323,49 @@ function searchButtonPress(){
 $( document ).ready(function() {
     var baseURL= "<?php echo base_url();?>";
 
+    $('#input_usa_state').change(function(){
+        var state = $("#input_usa_state option:selected").text();
+        if (state != "") {
+            $("#stationCntyInput").prop('disabled', false);
+
+            $('#stationCntyInput').selectize({
+                maxItems: 1,
+                closeAfterSelect: true,
+                loadThrottle: 250,
+                valueField: 'name',
+                labelField: 'name',
+                searchField: 'name',
+                options: [],
+                create: false,
+                load: function(query, callback) {
+                    var state = $("#input_usa_state option:selected").text();
+
+                    if (!query || state == "") return callback();
+                    $.ajax({
+                        url: baseURL+'index.php/qso/get_county',
+                        type: 'GET',
+                        dataType: 'json',
+                        data: {
+                            query: query,
+                            state: state,
+                        },
+                        error: function() {
+                            callback();
+                        },
+                        success: function(res) {
+                            callback(res);
+                        }
+                    });
+                }
+            });
+
+        } else {
+            $("#stationCntyInput").prop('disabled', true);
+            $('#stationCntyInput')[0].selectize.destroy();
+            $("#stationCntyInput").val("");
+        }
+    });
+
     $('#sota_ref').selectize({
         maxItems: 1,
         closeAfterSelect: true,
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index 5ab674755..ca3b2b37b 100755
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -347,6 +347,11 @@
               </select>
             </div>
 
+              <div class="form-group">
+                  <label for="stationCntyInput"><?php echo $this->lang->line('gen_hamradio_county_reference'); ?></label>
+                  <input disabled="disabled" class="form-control" id="stationCntyInput" type="text" name="county" value="" />
+              </div>
+
             <div class="form-group">
               <label for="iota_ref"><?php echo $this->lang->line('gen_hamradio_iota_reference'); ?></label>
                     <select class="custom-select" id="iota_ref" name="iota_ref">

From 44a1dd569122f47ddc4874c1e472d004ebac807c Mon Sep 17 00:00:00 2001
From: Andreas <andreask@online.no>
Date: Sun, 31 Jan 2021 15:27:56 +0100
Subject: [PATCH 2/2] [QSO Entry] County can now be saved and changed when
 editing a QSO.

---
 application/models/Logbook_model.php          |  4 +-
 application/views/interface_assets/footer.php | 54 +++++++++++++++++++
 application/views/qso/edit_ajax.php           |  5 ++
 application/views/view_log/qso.php            |  6 +++
 4 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index 23e437ee9..aaae4a4d1 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -150,6 +150,7 @@ function create_qso() {
             'COL_DXCC' => $dxcc_id,
             'COL_CQZ' => $cqz,
             'COL_STATE' => trim($this->input->post('usa_state')),
+            'COL_USACA_COUNTIES' => trim($this->input->post('county')),
             'COL_SOTA_REF' => trim($this->input->post('sota_ref')),
             'COL_SIG' => trim($this->input->post('sig')),
             'COL_SIG_INFO' => trim($this->input->post('sig_info')),
@@ -529,7 +530,8 @@ function edit() {
        'COL_QSL_VIA' => $this->input->post('qsl_via_callsign'),
        'station_id' => $this->input->post('station_profile'),
        'COL_OPERATOR' => $this->input->post('operator_callsign'),
-       'COL_STATE' =>$this->input->post('usa_state')
+       'COL_STATE' =>$this->input->post('usa_state'),
+       'COL_USACA_COUNTIES' =>$this->input->post('usa_county'),
     );
 
     if ($this->exists_qrz_api_key($data['station_id'])) {
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index f6727945f..cd2cf1fa7 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -2040,6 +2040,26 @@ function qso_edit(id) {
                         nl2br: false,
                         message: html,
                         onshown: function(dialog) {
+                            var state = $("#input_usa_state option:selected").text();
+                            if (state != "") {
+                                $("#stationCntyInput").prop('disabled', false);
+                                selectize_usa_county();
+                            }
+
+                            $('#input_usa_state').change(function(){
+                                var state = $("#input_usa_state option:selected").text();
+                                if (state != "") {
+                                    $("#stationCntyInput").prop('disabled', false);
+
+                                    selectize_usa_county();
+
+                                } else {
+                                    $("#stationCntyInput").prop('disabled', true);
+                                    $('#stationCntyInput')[0].selectize.destroy();
+                                    $("#stationCntyInput").val("");
+                                }
+                            });
+
                             $('#sota_ref').selectize({
                                 maxItems: 1,
                                 closeAfterSelect: true,
@@ -2101,6 +2121,40 @@ function qso_edit(id) {
             });
         }
 
+        function selectize_usa_county() {
+            var baseURL= "<?php echo base_url();?>";
+            $('#stationCntyInput').selectize({
+                maxItems: 1,
+                closeAfterSelect: true,
+                loadThrottle: 250,
+                valueField: 'name',
+                labelField: 'name',
+                searchField: 'name',
+                options: [],
+                create: false,
+                load: function(query, callback) {
+                    var state = $("#input_usa_state option:selected").text();
+
+                    if (!query || state == "") return callback();
+                    $.ajax({
+                        url: baseURL+'index.php/qso/get_county',
+                        type: 'GET',
+                        dataType: 'json',
+                        data: {
+                            query: query,
+                            state: state,
+                        },
+                        error: function() {
+                            callback();
+                        },
+                        success: function(res) {
+                            callback(res);
+                        }
+                    });
+                }
+            });
+        }
+
         function qso_save() {
             var baseURL= "<?php echo base_url();?>";
             var myform = document.getElementById("qsoform");
diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php
index 44a6e5578..5e07f8672 100644
--- a/application/views/qso/edit_ajax.php
+++ b/application/views/qso/edit_ajax.php
@@ -371,6 +371,11 @@
                                     </select>
                                 </div>
 
+                                <div class="form-group">
+                                    <label for="stationCntyInput">USA County</label>
+                                    <input disabled="disabled" class="form-control" id="stationCntyInput" type="text" name="usa_county" value="<?php echo $qso->COL_USACA_COUNTIES; ?>" />
+                                </div>
+
                                 <div class="form-group">
                                     <label for="iota_ref">IOTA</label>
                                     <select class="custom-select" id="iota_ref" name="iota_ref">
diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php
index c8e435aaf..b68646983 100644
--- a/application/views/view_log/qso.php
+++ b/application/views/view_log/qso.php
@@ -144,6 +144,12 @@
                     </tr>
                     <?php } ?>
 
+                    <?php if($row->COL_USACA_COUNTIES != null) { ?>
+                        <tr>
+                            <td>USA County:</td>
+                            <td><?php echo $row->COL_USACA_COUNTIES; ?></td>
+                        </tr>
+                    <?php } ?>
 
                     <?php if($row->COL_NAME != null) { ?>
                     <tr>