Merge branch 'dev' of https://github.com/magicbug/Cloudlog into dev

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));

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');