From 4726321b1d3db1c12031b5eec1c803451aba15c0 Mon Sep 17 00:00:00 2001 From: phl0 Date: Thu, 25 Apr 2024 17:32:37 +0200 Subject: [PATCH 1/2] Remove distance/bearing text if grid is cleared And also set distance to 0 --- application/models/Logbook_model.php | 8 +++++++- assets/js/sections/common.js | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 64d3ec235..48db848d5 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -1258,6 +1258,12 @@ class Logbook_model extends CI_Model { $lotwrdate = $qso->COL_LOTW_QSLRDATE; } + if ($this->input->post('distance')) { + $distance = $this->input->post('distance'); + } else { + $distance = null; + } + $data = array( 'COL_TIME_ON' => $this->input->post('time_on'), 'COL_TIME_OFF' => $this->input->post('time_off'), @@ -1271,7 +1277,7 @@ class Logbook_model extends CI_Model { 'COL_RST_SENT' => $this->input->post('rst_sent'), 'COL_GRIDSQUARE' => strtoupper(trim($this->input->post('locator'))), 'COL_VUCC_GRIDS' => strtoupper(preg_replace('/\s+/', '', $this->input->post('vucc_grids'))), - 'COL_DISTANCE' => $this->input->post('distance'), + 'COL_DISTANCE' => $distance, 'COL_COMMENT' => $this->input->post('comment'), 'COL_NAME' => $this->input->post('name'), 'COL_COUNTRY' => $country, diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js index b7434a1b2..1eb9f6d30 100644 --- a/assets/js/sections/common.js +++ b/assets/js/sections/common.js @@ -246,6 +246,9 @@ function qso_edit(id) { document.getElementById("distance").value = null; }, }); + } else if ($(this).val().length == 0) { + $('#locator_info').fadeOut("slow"); + document.getElementById("distance").value = null; } }); From ceb5bd5d37926fec5eba570bb5f12088351138f4 Mon Sep 17 00:00:00 2001 From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com> Date: Thu, 25 Apr 2024 20:16:36 +0200 Subject: [PATCH 2/2] [LBA] Now uses profiles home grid --- application/controllers/Logbookadvanced.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index d8698b3ed..a369bef0c 100644 --- a/application/controllers/Logbookadvanced.php +++ b/application/controllers/Logbookadvanced.php @@ -381,10 +381,10 @@ class Logbookadvanced extends CI_Controller { foreach ($qsos as $qso) { if (!empty($qso['COL_MY_GRIDSQUARE']) || !empty($qso['COL_MY_VUCC_GRIDS'])) { if (!empty($qso['COL_GRIDSQUARE']) || !empty($qso['COL_VUCC_GRIDS'])) { - $mappedcoordinates[] = $this->calculate($qso, ($qso['COL_MY_GRIDSQUARE'] ?? '') == '' ? $qso['COL_MY_VUCC_GRIDS'] : $qso['COL_MY_GRIDSQUARE'], ($qso['COL_GRIDSQUARE'] ?? '') == '' ? $qso['COL_VUCC_GRIDS'] : $qso['COL_GRIDSQUARE'], $measurement_base, $var_dist, $custom_date_format); + $mappedcoordinates[] = $this->calculate($qso, ($qso['station_gridsquare'] ?? ''), ($qso['COL_GRIDSQUARE'] ?? '') == '' ? $qso['COL_VUCC_GRIDS'] : $qso['COL_GRIDSQUARE'], $measurement_base, $var_dist, $custom_date_format); } else { if (!empty($qso['lat']) || !empty($qso['long'])) { - $mappedcoordinates[] = $this->calculateCoordinates($qso, $qso['lat'], $qso['long'], ($qso['COL_MY_GRIDSQUARE'] ?? '') == '' ? $qso['COL_MY_VUCC_GRIDS'] : $qso['COL_MY_GRIDSQUARE'], $measurement_base, $var_dist, $custom_date_format); + $mappedcoordinates[] = $this->calculateCoordinates($qso, $qso['lat'], $qso['long'], ($qso['station_gridsquare'] ?? ''), $measurement_base, $var_dist, $custom_date_format); } } }