mirror of
https://github.com/wavelog/wavelog.git
synced 2026-03-22 18:27:16 +00:00
Add new Filter
This commit is contained in:
@@ -13,7 +13,7 @@ class Logbookadvanced_model extends CI_Model {
|
||||
$conditions[] = "date(COL_TIME_ON) >= ?";
|
||||
$binding[] = $from;
|
||||
}
|
||||
|
||||
|
||||
if ($searchCriteria['dateTo'] !== '') {
|
||||
$to = DateTime::createFromFormat('d/m/Y', $searchCriteria['dateTo']);
|
||||
$to = $to->format('Y-m-d');
|
||||
@@ -72,20 +72,12 @@ class Logbookadvanced_model extends CI_Model {
|
||||
|
||||
if ($searchCriteria['qslSentMethod'] !== '') {
|
||||
$condition = "COL_QSL_SENT_VIA like ?";
|
||||
/*if ($searchCriteria['qslSentMethod'] == 'N') {
|
||||
$condition = '('.$condition;
|
||||
$condition .= " OR COL_QSL_SENT_VIA OR COL_QSL_SENT_VIA = '')";
|
||||
}*/
|
||||
$conditions[] = $condition;
|
||||
$binding[] = $searchCriteria['qslSentMethod'].'%';
|
||||
}
|
||||
|
||||
if ($searchCriteria['qslReceivedMethod'] !== '') {
|
||||
$condition = "COL_QSL_RECV_VIA like ?";
|
||||
/*if ($searchCriteria['qslReceivedMethod'] == 'N') {
|
||||
$condition = '('.$condition;
|
||||
$condition .= " OR COL_QSL_RECV_VIA OR COL_QSL_RECV_VIA = '')";
|
||||
}*/
|
||||
$conditions[] = $condition;
|
||||
$binding[] = $searchCriteria['qslReceivedMethod'].'%';
|
||||
}
|
||||
|
||||
@@ -300,13 +300,6 @@ $options = json_decode($options);
|
||||
</div>
|
||||
<div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
|
||||
<label for="qslvia"><?php echo lang('filter_qsl_via'); ?></label>
|
||||
<datalist id="qslvia" name="qslvia">
|
||||
<option value=""><?php echo lang('general_word_all'); ?></option>
|
||||
<option value="B"><?php echo lang('general_word_qslcard_bureau'); ?></option>
|
||||
<option value="D"><?php echo lang('general_word_qslcard_direct'); ?></option>
|
||||
<option value="E"><?php echo lang('general_word_qslcard_electronic'); ?></option>
|
||||
<option value="M"><?php echo lang('general_word_qslcard_manager'); ?></option>
|
||||
</datalist>
|
||||
<input type="search" list="qslvia" name="qslviainput" class="custom-select custom-select-sm">
|
||||
</div>
|
||||
<div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
|
||||
|
||||
Reference in New Issue
Block a user