From 4877ac756403712e9ca0aaf0ae815d592d8d3507 Mon Sep 17 00:00:00 2001
From: AndreasK79 <andreask@online.no>
Date: Mon, 13 Apr 2020 16:57:58 +0200
Subject: [PATCH] Moved DXCC/CQ to general. Fixed IOTA-populating. Fixed so
 that map location does not change if locator is filled.

---
 application/views/interface_assets/footer.php | 13 ++---
 application/views/qso/index.php               | 50 +++++++++----------
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index 1b51519b..7c194028 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -426,12 +426,13 @@ $(document).on('keypress',function(e) {
                 $('#callsign_info').attr('title', '');
                 $('#callsign_info').text(convert_case(result.dxcc.name));
 
-                // Set Map to Lat/Long
-                markers.clearLayers();
-                var marker = L.marker([result.dxcc.lat, result.dxcc.long]);
-                mymap.panTo([result.dxcc.lat, result.dxcc.long], 8);
-
-                markers.addLayer(marker).addTo(mymap);
+                // Set Map to Lat/Long it locator is not empty
+                if($('#locator').val() == "") {
+                    markers.clearLayers();
+                    var marker = L.marker([result.dxcc.lat, result.dxcc.long]);
+                    mymap.panTo([result.dxcc.lat, result.dxcc.long], 8);
+                    markers.addLayer(marker).addTo(mymap);
+                }
             }
         });
     });
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index c908ccf6..11f6fb0a 100755
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -153,31 +153,6 @@
                 </div>
               </div>
 
-              <div class="form-group">
-                  <label for="dxcc_id">DXCC</label>
-                  <select class="custom-select" id="dxcc_id" name="dxcc_id" required>
-
-                      <?php
-                      foreach($dxcc as $d){
-                          echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . $d->name . '</option>';
-                      }
-                      ?>
-
-                  </select>
-              </div>
-              <div class="form-row">
-                  <div class="form-group col-md-6">
-                      <label for="cqz">CQ Zone</label>
-                      <select class="custom-select" id="cqz" name="cqz" required>
-                          <?php
-                          for ($i = 1; $i<=40; $i++) {
-                              echo '<option value="'. $i . '">'. $i .'</option>';
-                          }
-                          ?>
-                      </select>
-                  </div>
-
-              </div>
           </div>
 
           <!-- Station Panel Data -->
@@ -214,6 +189,29 @@
 
           <!-- General Items -->
           <div class="tab-pane fade" id="general" role="tabpanel" aria-labelledby="general-tab">
+              <div class="form-group">
+                  <label for="dxcc_id">DXCC</label>
+                  <select class="custom-select" id="dxcc_id" name="dxcc_id" required>
+
+                      <?php
+                      foreach($dxcc as $d){
+                          echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . $d->name . '</option>';
+                      }
+                      ?>
+
+                  </select>
+              </div>
+              <div class="form-group">
+                  <label for="cqz">CQ Zone</label>
+                  <select class="custom-select" id="cqz" name="cqz" required>
+                      <?php
+                      for ($i = 1; $i<=40; $i++) {
+                          echo '<option value="'. $i . '">'. $i .'</option>';
+                      }
+                      ?>
+                  </select>
+              </div>
+
             <div class="form-group">
               <label for="selectPropagation">Propagation Mode</label>
               <select class="custom-select" id="selectPropagation" name="prop_mode">
@@ -298,7 +296,7 @@
 
             <div class="form-group">
               <label for="iota_ref">IOTA Reference</label>
-                    <select class="custom-select" id="iota_Ref" name="iota_ref">
+                    <select class="custom-select" id="iota_ref" name="iota_ref">
                         <option value =""></option>
 
                         <?php