From 98dc24851db17e96316cb4708abb9ae14256fcda Mon Sep 17 00:00:00 2001 From: phl0 Date: Mon, 8 May 2023 20:12:07 +0200 Subject: [PATCH 1/2] Make SAT filter appear also if propmode SAT is selected --- assets/js/sections/logbookadvanced.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index 304f4e45..910148ee 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -11,6 +11,15 @@ $('#band').change(function () { } }); +$('#selectPropagation').change(function () { + var prop_mode = $("#selectPropagation option:selected").text(); + if (prop_mode != "Satellite") { + $(".sats_dropdown").attr("hidden", true); + } else { + $(".sats_dropdown").removeAttr("hidden"); + } +}); + function updateRow(qso) { let row = $('#qsoID-' + qso.qsoID); let cells = row.find('td'); From f1c6f4e88084f8e4baa350e2564ec913a7595515 Mon Sep 17 00:00:00 2001 From: phl0 Date: Mon, 8 May 2023 20:27:53 +0200 Subject: [PATCH 2/2] Also allow for SAT name filter with propmode SAT --- application/models/Logbookadvanced_model.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index 6918f58e..437f4f7a 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -80,6 +80,12 @@ class Logbookadvanced_model extends CI_Model { if ($searchCriteria['propmode'] !== '') { $conditions[] = "COL_PROP_MODE = ?"; $binding[] = $searchCriteria['propmode']; + if($searchCriteria['propmode'] == "SAT") { + if ($searchCriteria['sats'] !== 'All') { + $conditions[] = "COL_SAT_NAME = ?"; + $binding[] = trim($searchCriteria['sats']); + } + } } $where = trim(implode(" AND ", $conditions));