{Advanced Logbook] Added sat filter

application/controllers/Logbookadvanced.php

@@ -46,6 +46,7 @@ class Logbookadvanced extends CI_Controller {
 		$pageData['modes'] = $this->logbookadvanced_model->get_modes();
 		$pageData['dxccarray'] = $this->logbook_model->fetchDxcc();
 		$pageData['iotaarray'] = $this->logbook_model->fetchIota();
+		$pageData['sats'] = $this->bands->get_worked_sats();
 		
 		$pageData['bands'] = $this->bands->get_worked_bands();
 		
@@ -80,6 +81,7 @@ class Logbookadvanced extends CI_Controller {
 			'gridsquare' => xss_clean($this->input->post('gridsquare')),
 			'state' => xss_clean($this->input->post('state')),
 			'qsoresults' => xss_clean($this->input->post('qsoresults')),
+			'sats' => xss_clean($this->input->post('sats')),
 		);
 
 		$qsos = [];

application/models/Logbookadvanced_model.php

@@ -41,6 +41,10 @@ class Logbookadvanced_model extends CI_Model {
 				$binding[] = trim($searchCriteria['band']);
 			} else {
 				$conditions[] = "COL_PROP_MODE = 'SAT'";
+				if ($searchCriteria['sats'] !== 'All') {
+					$conditions[] = "COL_SAT_NAME = ?";
+					$binding[] = trim($searchCriteria['sats']);
+				}
 			}
 		}
 		if ($searchCriteria['qslSent'] !== '') {
@@ -77,7 +81,7 @@ class Logbookadvanced_model extends CI_Model {
                 $conditions[] = "COL_PROP_MODE = ?";
                 $binding[] = $searchCriteria['propmode'];
         }
-    
+
 		$where = trim(implode(" AND ", $conditions));
 		if ($where != "") {
 			$where = "AND $where";

application/views/logbookadvanced/index.php

@@ -100,6 +100,15 @@
 					?>
 				</select>
 			</div>
+			<div hidden class="sats_dropdown form-group col-lg-2 col-md-2 col-sm-3 col-xl">
+			<label class="form-label" for="sats">Satellite</label>
+			<select class="form-control form-control-sm"  id="sats">
+				<option value="All">All</option>
+				<?php foreach($sats as $sat) {
+					echo '<option value="' . htmlentities($sat) . '"' . '>' . htmlentities($sat) . '</option>'."\n";
+				} ?>
+			</select>
+			</div>
 			<div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
 				<label class="form-label" for="selectPropagation">Propagation</label>
 				<select id="selectPropagation" name="selectPropagation" class="form-control form-control-sm">

assets/js/sections/logbookadvanced.js

@@ -2,6 +2,15 @@ var callBookProcessingDialog = null;
 var inCallbookProcessing = false;
 var inCallbookItemProcessing = false;
 
+$('#band').change(function () {
+	var band = $("#band option:selected").text();
+	if (band != "SAT") {
+		$(".sats_dropdown").attr("hidden", true);
+	} else {
+		$(".sats_dropdown").removeAttr("hidden");
+	}
+});
+
 function updateRow(qso) {
 	let row = $('#qsoID-' + qso.qsoID);
 	let cells = row.find('td');
@@ -156,7 +165,8 @@ $(document).ready(function () {
 				propmode: this.selectPropagation.value,
 				gridsquare: this.gridsquare.value,
 				state: this.state.value,
-				qsoresults: this.qsoResults.value
+				qsoresults: this.qsoResults.value,
+				sats: this.sats.value
 			},
 			dataType: 'json',
 			success: function (data) {