From 1f9a2378040cfa50e85105fc237f3a48e2efbfff Mon Sep 17 00:00:00 2001
From: HB9HIL <fabian.berg@hb9hil.org>
Date: Fri, 5 Jul 2024 10:10:47 +0200
Subject: [PATCH] fill fields only if empty and data is not empty

---
 application/views/qso/edit_ajax.php |  2 +-
 assets/js/sections/common.js        | 36 ++++++++++++++++++-----------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php
index be11c9dd1..f9dd804dd 100644
--- a/application/views/qso/edit_ajax.php
+++ b/application/views/qso/edit_ajax.php
@@ -589,7 +589,7 @@
                         <div class="actions">
                             <a class="btn btn-danger" href="javascript:qso_delete(<?php echo $qso->COL_PRIMARY_KEY; ?>, '<?php echo $qso->COL_CALL; ?>')"><i class="fas fa-trash-alt"></i> <?= __("Delete QSO"); ?></a>
                             <div class="float-end">
-                                <button id="update_from_callbook" type="button" class="btn btn-warning" onclick="callbook_update('<?php echo $qso->COL_CALL; ?>');"><i class="fas fa-book"></i> <?= __("Update from Callbook"); ?></button>
+                                <button id="update_from_callbook" type="button" class="btn btn-warning" onclick="single_callbook_update('<?php echo $qso->COL_CALL; ?>');"><i class="fas fa-book"></i> <?= __("Update from Callbook"); ?></button>
                                 <button id="show" type="button" name="download" class="btn btn-primary" onclick="qso_save();"><i class="fas fa-save"></i> <?= __("Save changes"); ?></button>
                             </div>
                         </div>
diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js
index af1be8ad7..bfb86ef4a 100644
--- a/assets/js/sections/common.js
+++ b/assets/js/sections/common.js
@@ -152,10 +152,10 @@ function displayQso(id) {
     });
 }
 
-// used in edit_ajax.php
-function callbook_update(callsign) {
+// used in edit_ajax.php to update the currently editing QSO
+function single_callbook_update(callsign) {
 
-    var border_color = '2px solid green';
+   
 
     $.ajax({
         url: site_url + '/qso/get_callbook_data',
@@ -165,22 +165,30 @@ function callbook_update(callsign) {
         },
         dataType: 'json',
         success: function (data) {
-            console.log(data);
-            $('#qth').val(data.city).css('border', border_color);
-            $('#dxcc_id').val(data.dxcc).css('border', border_color);
-            $('#locator').val(data.gridsquare).css('border', border_color);
-            // $('#image').val(data.image).css('border', border_color);  Not in use yet, but may in future
-            $('#iota_ref').val(data.iota).css('border', border_color);
-            $('#name').val(data.name).css('border', border_color);
-            $('#qsl-via').val(data.qslmgr).css('border', border_color);
-            $('#state').val(data.state).css('border', border_color);
-            $('#stationCntyInputEdit').val(data.us_county).css('border', border_color);
+            // console.log(data);
+            fill_if_empty('#qth', data.city);
+            fill_if_empty('#dxcc_id', data.dxcc);
+            fill_if_empty('#locator', data.gridsquare);
+            // fill_if_empty('#image', data.image);  Not in use yet, but may in future
+            fill_if_empty('#iota_ref', data.iota);
+            fill_if_empty('#name', data.name);
+            fill_if_empty('#qsl-via', data.qslmgr);
+            fill_if_empty('#state', data.state);
+            fill_if_empty('#stationCntyInputEdit', data.us_county);
         },
         error: function () {
-            console.log("Sorry, something is wrong here");
+            console.error("Sorry, something went wrong to get the callbook data.");
         },
     });
 }
+// used with single_callbook_update() to only fill fields which are empty
+function fill_if_empty(field, data) {
+    var border_color = '2px solid green';
+
+    if ($(field).val() == '' && data != '') {
+        $(field).val(data).css('border', border_color);
+    }
+}
 
 function qso_delete(id, call) {
     BootstrapDialog.confirm({