From 32ea0f55f1ca3be0ef7a3b9e66048736b59015d9 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Sat, 26 Dec 2020 14:07:00 +0000
Subject: [PATCH] [QSO][Radio] Added Band RX to station which is populated
 based on CAT RX Freq

If the radio interface supplies a freq RX then the javascript will populate RX Band.
---
 application/models/Logbook_model.php          |  2 +-
 application/views/interface_assets/footer.php |  3 ++
 application/views/qso/index.php               | 39 +++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index e6df4a4a..ddebb53f 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -104,6 +104,7 @@ class Logbook_model extends CI_Model {
             'COL_TIME_OFF' => $datetime,
             'COL_CALL' => strtoupper(trim($this->input->post('callsign'))),
             'COL_BAND' => $this->input->post('band'),
+            'COL_BAND_RX' => $this->input->post('band_rx'),
             'COL_FREQ' => $this->parse_frequency($this->input->post('freq_display')),
             'COL_MODE' => $mode,
             'COL_SUBMODE' => $submode,
@@ -127,7 +128,6 @@ class Logbook_model extends CI_Model {
             'COL_IOTA' => trim($this->input->post('iota_ref')),
             'COL_DISTANCE' => "0",
             'COL_FREQ_RX' => $this->parse_frequency($this->input->post('freq_display_rx')),
-            'COL_BAND_RX' => null,
             'COL_ANT_AZ' => null,
             'COL_ANT_EL' => null,
             'COL_A_INDEX' => null,
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index 63f3b3bc..251db397 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -398,6 +398,7 @@ $(document).on('change', 'input', function(){
                       $("#mode").val(val2[0].Uplink_Mode);  
                     }
                     $("#band").val(frequencyToBand(val2[0].Uplink_Freq));
+                    $("#band_rx").val(frequencyToBand(val2[0].Downlink_Freq));
                     $("#frequency").val(val2[0].Uplink_Freq);  
                     $("#frequency_rx").val(val2[0].Downlink_Freq); 
                     $("#selectPropagation").val('SAT');
@@ -1045,6 +1046,7 @@ $(document).on('change', 'input', function(){
           if (data.downlink_freq != "")
           {
             $('#frequency_rx').val(data.downlink_freq);
+            $("#band_rx").val(frequencyToBand(data.downlink_freq));
           }
 
           old_mode = $(".mode").val();
@@ -1091,6 +1093,7 @@ $(document).on('change', 'input', function(){
         $("#sat_mode").val("");
         $("#frequency").val("");
         $("#frequency_rx").val("");
+        $("#band_rx").val("");
         $("#selectPropagation").val($("#selectPropagation option:first").val());
       }
 
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index f6a9fb16..bbddbeeb 100755
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -194,6 +194,45 @@
               <input type="text" class="form-control" id="frequency_rx" name="freq_display_rx" value="<?php echo $this->session->userdata('freq_rx'); ?>" />
             </div>
 
+            <div class="form-group">
+                  <label for="band">RX Band</label>
+
+                  <select id="band_rx" class="form-control" name="band_rx">
+                    <option value="" <?php if($this->session->userdata('band_rx') == "") { echo "selected=\"selected\""; } ?>></option>           
+                    
+                    <optgroup label="HF">
+                      <option value="160m" <?php if($this->session->userdata('band_rx') == "160m") { echo "selected=\"selected\""; } ?>>160m</option>
+                      <option value="80m" <?php if($this->session->userdata('band_rx') == "80m") { echo "selected=\"selected\""; } ?>>80m</option>
+                      <option value="60m" <?php if($this->session->userdata('band_rx') == "60m") { echo "selected=\"selected\""; } ?>>60m</option>
+                      <option value="40m" <?php if($this->session->userdata('band_rx') == "40m") { echo "selected=\"selected\""; } ?>>40m</option>
+                      <option value="30m" <?php if($this->session->userdata('band_rx') == "30m") { echo "selected=\"selected\""; } ?>>30m</option>
+                      <option value="20m" <?php if($this->session->userdata('band_rx') == "20m") { echo "selected=\"selected\""; } ?>>20m</option>
+                      <option value="17m" <?php if($this->session->userdata('band_rx') == "17m") { echo "selected=\"selected\""; } ?>>17m</option>
+                      <option value="15m" <?php if($this->session->userdata('band_rx') == "15m") { echo "selected=\"selected\""; } ?>>15m</option>
+                      <option value="12m" <?php if($this->session->userdata('band_rx') == "12m") { echo "selected=\"selected\""; } ?>>12m</option>
+                      <option value="10m" <?php if($this->session->userdata('band_rx') == "10m") { echo "selected=\"selected\""; } ?>>10m</option>
+                    </optgroup>
+
+                    <optgroup label="VHF">
+                      <option value="6m" <?php if($this->session->userdata('band_rx') == "6m") { echo "selected=\"selected\""; } ?>>6m</option>
+                      <option value="4m" <?php if($this->session->userdata('band_rx') == "4m") { echo "selected=\"selected\""; } ?>>4m</option>
+                      <option value="2m" <?php if($this->session->userdata('band_rx') == "2m") { echo "selected=\"selected\""; } ?>>2m</option>
+                    </optgroup>
+
+                    <optgroup label="UHF">
+                      <option value="70cm" <?php if($this->session->userdata('band_rx') == "70cm") { echo "selected=\"selected\""; } ?>>70cm</option>
+                      <option value="23cm" <?php if($this->session->userdata('band_rx') == "23cm") { echo "selected=\"selected\""; } ?>>23cm</option>
+                      <option value="13cm" <?php if($this->session->userdata('band_rx') == "13cm") { echo "selected=\"selected\""; } ?>>13cm</option>
+                      <option value="9cm" <?php if($this->session->userdata('band_rx') == "9cm") { echo "selected=\"selected\""; } ?>>9cm</option>
+                    </optgroup>
+
+                    <optgroup label="Microwave">
+                      <option value="6cm" <?php if($this->session->userdata('band_rx') == "6cm") { echo "selected=\"selected\""; } ?>>6cm</option>
+                      <option value="3cm" <?php if($this->session->userdata('band_rx') == "3cm") { echo "selected=\"selected\""; } ?>>3cm</option>
+                    </optgroup>
+                  </select>
+            </div>
+
             <div class="form-group">
               <label for="transmit_power">Transmit Power (W)</label>
               <input type="number" step="0.001" class="form-control" id="transmit_power" name="transmit_power" value="<?php echo $this->session->userdata('transmit_power'); ?>" />