From cad024b1fc8505741edc2990fce615955c2f1af3 Mon Sep 17 00:00:00 2001
From: int2001 <joerg@dj7nt.de>
Date: Thu, 22 Aug 2024 05:56:31 +0000
Subject: [PATCH] Working Clublog-Filter. Added prop_modes to view

---
 application/controllers/Timeline.php  |  1 +
 application/models/Timeline_model.php | 12 ++++-----
 application/views/timeline/index.php  | 36 +++++++++++++++++++++++++--
 3 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/application/controllers/Timeline.php b/application/controllers/Timeline.php
index 2cba97287..58c80e7a2 100644
--- a/application/controllers/Timeline.php
+++ b/application/controllers/Timeline.php
@@ -81,6 +81,7 @@ class Timeline extends CI_Controller {
         $data['worked_bands'] = $this->bands->get_worked_bands();
         $data['bandselect'] = $band;
         $data['modeselect'] = $mode;
+	$data['user_default_band'] = $this->session->userdata('user_default_band');
 
         $this->load->view('interface_assets/header', $data);
         $this->load->view('timeline/index');
diff --git a/application/models/Timeline_model.php b/application/models/Timeline_model.php
index 12a9fe3e3..d40a3e78d 100644
--- a/application/models/Timeline_model.php
+++ b/application/models/Timeline_model.php
@@ -48,7 +48,7 @@ class Timeline_model extends CI_Model
 		    $binding[] = $mode;
 	    }
 
-	    $sql .= $this->addQslToQuery($qsl, $lotw, $eqsl);
+	    $sql .= $this->addQslToQuery($qsl, $lotw, $eqsl, $clublog);
 
 	    $sql .= " group by col_dxcc, col_country
 		    order by date desc";
@@ -83,7 +83,7 @@ class Timeline_model extends CI_Model
 
         $sql .= " and COL_DXCC = '339' and trim(coalesce(COL_STATE,'')) != '' ";
 
-        $sql .= $this->addQslToQuery($qsl, $lotw, $eqsl);
+        $sql .= $this->addQslToQuery($qsl, $lotw, $eqsl, $clublog);
 
         $sql .= " group by col_state
                 order by date desc";
@@ -119,7 +119,7 @@ class Timeline_model extends CI_Model
         $sql .= " and COL_DXCC in ('291', '6', '110')";
         $sql .= " and COL_STATE in ('AK','AL','AR','AZ','CA','CO','CT','DE','FL','GA','HI','IA','ID','IL','IN','KS','KY','LA','MA','MD','ME','MI','MN','MO','MS','MT','NC','ND','NE','NH','NJ','NM','NV','NY','OH','OK','OR','PA','RI','SC','SD','TN','TX','UT','VA','VT','WA','WI','WV','WY')";
 
-        $sql .= $this->addQslToQuery($qsl, $lotw, $eqsl);
+        $sql .= $this->addQslToQuery($qsl, $lotw, $eqsl, $clublog);
 
         $sql .= " group by col_state
                 order by date desc";
@@ -153,7 +153,7 @@ class Timeline_model extends CI_Model
 			$binding[] = $mode;
         }
 
-        $sql .= $this->addQslToQuery($qsl, $lotw, $eqsl);
+        $sql .= $this->addQslToQuery($qsl, $lotw, $eqsl, $clublog);
 
         $sql .= " and col_iota <> '' group by col_iota, name, prefix
                 order by date desc";
@@ -186,7 +186,7 @@ class Timeline_model extends CI_Model
 			$binding[] = $mode;
         }
 
-        $sql .= $this->addQslToQuery($qsl, $lotw, $eqsl);
+        $sql .= $this->addQslToQuery($qsl, $lotw, $eqsl, $clublog);
 
         $sql .= " and col_cqz <> '' group by col_cqz
                 order by date desc";
@@ -216,7 +216,7 @@ class Timeline_model extends CI_Model
 		    }
 
 		    if ($clublog ?? 0 == 1) {
-			    $sql .= " col_clublog_qsl_rcvd = 'Y' or";
+			    $sql .= " col_clublog_qso_download_status = 'Y' or";
 		    }
 		   $sql.=' 1=0)';
 	    } 
diff --git a/application/views/timeline/index.php b/application/views/timeline/index.php
index 297ed455d..97341fda3 100644
--- a/application/views/timeline/index.php
+++ b/application/views/timeline/index.php
@@ -37,7 +37,7 @@
                     </div>
                 </div>
 
-        <div class="mb-3 row">
+        <div class="mb-4 row">
             <label class="col-md-1 control-label" for="award"><?= __("Award") ?></label>
                 <div class="col-md-3">
                     <select id="award" name="award" class="form-select">
@@ -50,7 +50,7 @@
                     </select>
                 </div>
                 <div class="col-md-1 control-label"><?= __("Confirmation") ?></div>
-                <div class="col-md-3">
+                <div class="col-md-4">
                     <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="qsl" value="1" id="qsl" <?php if ($this->input->post('qsl'))  echo ' checked="checked"'; ?> >
                         <label class="form-check-label" for="qsl"><?= __("QSL") ?></label>
@@ -63,6 +63,38 @@
                         <input class="form-check-input" type="checkbox" name="eqsl" value="1" id="eqsl" <?php if ($this->input->post('eqsl')) echo ' checked="checked"'; ?> >
                         <label class="form-check-label" for="eqsl"><?= __("eQSL") ?></label>
                     </div>
+ 		    <div class="form-check-inline">
+                        <input class="form-check-input" type="checkbox" name="clublog" value="1" id="clublog" <?php if ($this->input->post('clublog')) echo ' checked="checked"'; ?> >
+                        <label class="form-check-label" for="clublog"><?= __("Clublog") ?></label>
+                    </div>
+                </div>
+            </div>
+
+	    <div class="mb-3 row">
+                <label class="col-md-1" for="propagation"><?= __("Propagation"); ?></label>
+                <div class="col-sm-3">
+                    <select class="form-select form-select-sm w-auto" id="propagation" <?php if ($user_default_band == 'SAT') {echo 'disabled';} ?>>
+                        <option value=""><?= __("All"); ?></option>
+                        <option value="None"><?= __("None/Empty"); ?></option>
+                        <option value="AS"><?= _pgettext("Propagation Mode","Aircraft Scatter"); ?></option>
+                        <option value="AUR"><?= _pgettext("Propagation Mode","Aurora"); ?></option>
+                        <option value="AUE"><?= _pgettext("Propagation Mode","Aurora-E"); ?></option>
+                        <option value="BS"><?= _pgettext("Propagation Mode","Back scatter"); ?></option>
+                        <option value="ECH"><?= _pgettext("Propagation Mode","EchoLink"); ?></option>
+                        <option value="EME"><?= _pgettext("Propagation Mode","Earth-Moon-Earth"); ?></option>
+                        <option value="ES"><?= _pgettext("Propagation Mode","Sporadic E"); ?></option>
+                        <option value="FAI"><?= _pgettext("Propagation Mode","Field Aligned Irregularities"); ?></option>
+                        <option value="F2"><?= _pgettext("Propagation Mode","F2 Reflection"); ?></option>
+                        <option value="INTERNET"><?= _pgettext("Propagation Mode","Internet-assisted"); ?></option>
+                        <option value="ION"><?= _pgettext("Propagation Mode","Ionoscatter"); ?></option>
+                        <option value="IRL"><?= _pgettext("Propagation Mode","IRLP"); ?></option>
+                        <option value="MS"><?= _pgettext("Propagation Mode","Meteor scatter"); ?></option>
+                        <option value="RPT"><?= _pgettext("Propagation Mode","Terrestrial or atmospheric repeater or transponder"); ?></option>
+                        <option value="RS"><?= _pgettext("Propagation Mode","Rain scatter"); ?></option>
+                        <option value="SAT" <?php if ($user_default_band == 'SAT') {echo 'selected="selected"';} ?>><?= _pgettext("Propagation Mode","Satellite"); ?></option>
+                        <option value="TEP"><?= _pgettext("Propagation Mode","Trans-equatorial"); ?></option>
+                        <option value="TR"><?= _pgettext("Propagation Mode","Tropospheric ducting"); ?></option>
+                    </select>
                 </div>
             </div>