goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

Add new Filter

浏览代码
这个提交包含在：
HB9HIL 2023-10-04 09:27:28 +02:00 提交者 GitHub
父节点 7a4836291d
当前提交 fa3d024720
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 18 个文件被更改，包括 54 次插入 和 26 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

6
application/controllers/Logbookadvanced.php
查看文件

@ -105,7 +105,8 @@ class Logbookadvanced extends CI_Controller {
'band' => xss_clean($this->input->post('band')),
'qslSent' => xss_clean($this->input->post('qslSent')),
'qslReceived' => xss_clean($this->input->post('qslReceived')),
'qslMethod' => xss_clean($this->input->post('qslMethod')),
'qslSentMethod' => xss_clean($this->input->post('qslSentMethod')),
'qslReceivedMethod' => xss_clean($this->input->post('qslReceivedMethod')),
'iota' => xss_clean($this->input->post('iota')),
'dxcc' => xss_clean($this->input->post('dxcc')),
'propmode' => xss_clean($this->input->post('propmode')),
@ -292,7 +293,8 @@ class Logbookadvanced extends CI_Controller {
'band' => xss_clean($this->input->post('band')),
'qslSent' => xss_clean($this->input->post('qslSent')),
'qslReceived' => xss_clean($this->input->post('qslReceived')),
'qslMethod' => xss_clean($this->input->post('qslMethod')),
'qslSentMethod' => xss_clean($this->input->post('qslSentMethod')),
'qslReceivedMethod' => xss_clean($this->input->post('qslReceivedMethod')),
'iota' => xss_clean($this->input->post('iota')),
'dxcc' => xss_clean($this->input->post('dxcc')),
'propmode' => xss_clean($this->input->post('propmode')),

3
application/language/bulgarian/filter_lang.php
查看文件

@ -46,7 +46,8 @@ ________________________________________________________________________________
$lang['filter_qsl_sent'] = 'QSL sent';
$lang['filter_qsl_recv'] = 'QSL received';
$lang['filter_qsl_method'] = 'QSL Method';
$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
$lang['filter_lotw_sent'] = 'LoTW sent';
$lang['filter_lotw_recv'] = 'LoTW received';
$lang['filter_eqsl_sent'] = 'eQSL sent';

3
application/language/chinese_simplified/filter_lang.php
查看文件

@ -46,7 +46,8 @@ ________________________________________________________________________________
$lang['filter_qsl_sent'] = 'QSL sent';
$lang['filter_qsl_recv'] = 'QSL received';
$lang['filter_qsl_method'] = 'QSL Method';
$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
$lang['filter_lotw_sent'] = 'LoTW sent';
$lang['filter_lotw_recv'] = 'LoTW received';
$lang['filter_eqsl_sent'] = 'eQSL sent';

3
application/language/czech/filter_lang.php
查看文件

@ -46,7 +46,8 @@ ________________________________________________________________________________
$lang['filter_qsl_sent'] = 'QSL sent';
$lang['filter_qsl_recv'] = 'QSL received';
$lang['filter_qsl_method'] = 'QSL Method';
$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
$lang['filter_lotw_sent'] = 'LoTW sent';
$lang['filter_lotw_recv'] = 'LoTW received';
$lang['filter_eqsl_sent'] = 'eQSL sent';

3
application/language/dutch/filter_lang.php
查看文件

@ -46,7 +46,8 @@ ________________________________________________________________________________
$lang['filter_qsl_sent'] = 'QSL sent';
$lang['filter_qsl_recv'] = 'QSL received';
$lang['filter_qsl_method'] = 'QSL Method';
$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
$lang['filter_lotw_sent'] = 'LoTW sent';
$lang['filter_lotw_recv'] = 'LoTW received';
$lang['filter_eqsl_sent'] = 'eQSL sent';

3
application/language/english/filter_lang.php
查看文件

@ -46,7 +46,8 @@ ________________________________________________________________________________
$lang['filter_qsl_sent'] = 'QSL sent';
$lang['filter_qsl_recv'] = 'QSL received';
$lang['filter_qsl_method'] = 'QSL Method';
$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
$lang['filter_lotw_sent'] = 'LoTW sent';
$lang['filter_lotw_recv'] = 'LoTW received';
$lang['filter_eqsl_sent'] = 'eQSL sent';

3
application/language/finnish/filter_lang.php
查看文件

@ -46,7 +46,8 @@ ________________________________________________________________________________
$lang['filter_qsl_sent'] = 'QSL sent';
$lang['filter_qsl_recv'] = 'QSL received';
$lang['filter_qsl_method'] = 'QSL Method';
$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
$lang['filter_lotw_sent'] = 'LoTW sent';
$lang['filter_lotw_recv'] = 'LoTW received';
$lang['filter_eqsl_sent'] = 'eQSL sent';

3
application/language/french/filter_lang.php
查看文件

@ -46,7 +46,8 @@ ________________________________________________________________________________
$lang['filter_qsl_sent'] = 'QSL sent';
$lang['filter_qsl_recv'] = 'QSL received';
$lang['filter_qsl_method'] = 'QSL Method';
$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
$lang['filter_lotw_sent'] = 'LoTW sent';
$lang['filter_lotw_recv'] = 'LoTW received';
$lang['filter_eqsl_sent'] = 'eQSL sent';

3
application/language/german/filter_lang.php
查看文件

@ -46,7 +46,8 @@ ________________________________________________________________________________
$lang['filter_qsl_sent'] = 'QSL gesendet';
$lang['filter_qsl_recv'] = 'QSL erhalten';
$lang['filter_qsl_method'] = 'QSL Methode';
$lang['filter_qsl_sent_method'] = 'QSL-Sende Methode';
$lang['filter_qsl_recv_method'] = 'QSL-Empfangs Methode';
$lang['filter_lotw_sent'] = 'LoTW gesendet';
$lang['filter_lotw_recv'] = 'LoTW erhalten';
$lang['filter_eqsl_sent'] = 'eQSL gesendet';

3
application/language/greek/filter_lang.php
查看文件

@ -46,7 +46,8 @@ ________________________________________________________________________________
$lang['filter_qsl_sent'] = 'QSL sent';
$lang['filter_qsl_recv'] = 'QSL received';
$lang['filter_qsl_method'] = 'QSL Method';
$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
$lang['filter_lotw_sent'] = 'LoTW sent';
$lang['filter_lotw_recv'] = 'LoTW received';
$lang['filter_eqsl_sent'] = 'eQSL sent';

3
application/language/italian/filter_lang.php
查看文件

@ -46,7 +46,8 @@ ________________________________________________________________________________
$lang['filter_qsl_sent'] = 'QSL sent';
$lang['filter_qsl_recv'] = 'QSL received';
$lang['filter_qsl_method'] = 'QSL Method';
$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
$lang['filter_lotw_sent'] = 'LoTW sent';
$lang['filter_lotw_recv'] = 'LoTW received';
$lang['filter_eqsl_sent'] = 'eQSL sent';

3
application/language/polish/filter_lang.php
查看文件

@ -46,7 +46,8 @@ ________________________________________________________________________________
$lang['filter_qsl_sent'] = 'QSL sent';
$lang['filter_qsl_recv'] = 'QSL received';
$lang['filter_qsl_method'] = 'QSL Method';
$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
$lang['filter_lotw_sent'] = 'LoTW sent';
$lang['filter_lotw_recv'] = 'LoTW received';
$lang['filter_eqsl_sent'] = 'eQSL sent';

3
application/language/russian/filter_lang.php
查看文件

@ -46,7 +46,8 @@ ________________________________________________________________________________
$lang['filter_qsl_sent'] = 'QSL sent';
$lang['filter_qsl_recv'] = 'QSL received';
$lang['filter_qsl_method'] = 'QSL Method';
$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
$lang['filter_lotw_sent'] = 'LoTW sent';
$lang['filter_lotw_recv'] = 'LoTW received';
$lang['filter_eqsl_sent'] = 'eQSL sent';

3
application/language/spanish/filter_lang.php
查看文件

@ -46,7 +46,8 @@ ________________________________________________________________________________
$lang['filter_qsl_sent'] = 'QSL sent';
$lang['filter_qsl_recv'] = 'QSL received';
$lang['filter_qsl_method'] = 'QSL Method';
$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
$lang['filter_lotw_sent'] = 'LoTW sent';
$lang['filter_lotw_recv'] = 'LoTW received';
$lang['filter_eqsl_sent'] = 'eQSL sent';

3
application/language/swedish/filter_lang.php
查看文件

@ -46,7 +46,8 @@ ________________________________________________________________________________
$lang['filter_qsl_sent'] = 'QSL sent';
$lang['filter_qsl_recv'] = 'QSL received';
$lang['filter_qsl_method'] = 'QSL Method';
$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
$lang['filter_lotw_sent'] = 'LoTW sent';
$lang['filter_lotw_recv'] = 'LoTW received';
$lang['filter_eqsl_sent'] = 'eQSL sent';

3
application/language/turkish/filter_lang.php
查看文件

@ -46,7 +46,8 @@ ________________________________________________________________________________
$lang['filter_qsl_sent'] = 'QSL sent';
$lang['filter_qsl_recv'] = 'QSL received';
$lang['filter_qsl_method'] = 'QSL Method';
$lang['filter_qsl_sent_method'] = 'QSL Sending Method';
$lang['filter_qsl_recv_method'] = 'QSL Receiving Method';
$lang['filter_lotw_sent'] = 'LoTW sent';
$lang['filter_lotw_recv'] = 'LoTW received';
$lang['filter_eqsl_sent'] = 'eQSL sent';

15
application/models/Logbookadvanced_model.php
查看文件

@ -62,14 +62,15 @@ class Logbookadvanced_model extends CI_Model {
$conditions[] = $condition;
$binding[] = $searchCriteria['qslReceived'];
}
if ($searchCriteria['qslMethod'] !== '') {
$condition = "COL_QSL_RCVD = ?";
if ($searchCriteria['qslMethod'] == 'N') {
$condition = '('.$condition;
$condition .= " OR COL_QSL_RCVD IS NULL OR COL_QSL_RCVD = '')";
}
if ($searchCriteria['qslSentMethod'] !== '') {
$condition = "COL_QSL_SENT_VIA = ?";
$conditions[] = $condition;
$binding[] = $searchCriteria['qslReceived'];
$binding[] = $searchCriteria['qslSentMethod'];
}
if ($searchCriteria['qslReceivedMethod'] !== '') {
$condition = "COL_QSL_RECV_VIA = ?";
$conditions[] = $condition;
$binding[] = $searchCriteria['qslReceivedMethod'];
}
if ($searchCriteria['lotwSent'] !== '') {
$condition = "COL_LOTW_QSL_SENT = ?";

14
application/views/logbookadvanced/index.php
查看文件

@ -235,8 +235,18 @@ $options = json_decode($options);
</select>
</div>
<div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
<label for="qslmethod"><?php echo lang('filter_qsl_method'); ?></label>
<select id="qslmethod" name="qslmethod" class="form-control form-control-sm">
<label for="qslSentMethod"><?php echo lang('filter_qsl_sent_method'); ?></label>
<select id="qslSentMethod" name="qslSentMethod" class="form-control form-control-sm">
<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>
</select>
</div>
<div class="form-group col-lg-2 col-md-2 col-sm-3 col-xl">
<label for="qslReceivedMethod"><?php echo lang('filter_qsl_recv_method'); ?></label>
<select id="qslReceivedMethod" name="qslReceivedMethod" class="form-control form-control-sm">
<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>