mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Added Operator to Table/Quicksearch/Search

pull/2770/head
int2001 2023-12-04 13:21:59 +00:00
rodzic a85dc88159
commit 03c92a9683
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: DFB1C13CD2DB037B
18 zmienionych plików z 40 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
application/controllers/Logbookadvanced.php
Wyświetl plik

@ -124,6 +124,7 @@ class Logbookadvanced extends CI_Controller {
'wwff' => xss_clean($this->input->post('wwff')),
'qslimages' => xss_clean($this->input->post('qslimages')),
'dupes' => xss_clean($this->input->post('dupes')),
'operator' => xss_clean($this->input->post('operator')),
);
$qsos = [];
@ -286,6 +287,7 @@ class Logbookadvanced extends CI_Controller {
'pota' => '',
'wwff' => '',
'qslimages' => '',
'operator' => '',
'ids' => xss_clean($this->input->post('ids'))
);
@ -324,6 +326,7 @@ class Logbookadvanced extends CI_Controller {
'sota' => xss_clean($this->input->post('sota')),
'pota' => xss_clean($this->input->post('pota')),
'wwff' => xss_clean($this->input->post('wwff')),
'operator' => xss_clean($this->input->post('operator')),
'qslimages' => xss_clean($this->input->post('qslimages')),
);
@ -460,8 +463,11 @@ class Logbookadvanced extends CI_Controller {
$json_string['state']['show'] = $this->input->post('state');
$json_string['cqzone']['show'] = $this->input->post('cqzone');
$json_string['iota']['show'] = $this->input->post('iota');
$json_string['pota']['show'] = $this->input->post('pota');
$json_string['operator']['show'] = $this->input->post('operator');
$obj['column_settings']= json_encode($json_string);
log_message("Error",json_encode($json_string));
$this->load->model('user_options_model');
$this->user_options_model->set_option('LogbookAdvanced', 'LogbookAdvanced', $obj);

1
application/language/bulgarian/filter_lang.php
Wyświetl plik

@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show';
// $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php
// $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php
// $lang['options_save'] --> application/language/english/options_lang.php
$lang['filter_search_operator']='Search Operator';
$lang['filter_options_close'] = 'Close';

1
application/language/chinese_simplified/filter_lang.php
Wyświetl plik

@ -156,4 +156,5 @@ $lang['filter_options_show'] = '显示';
// $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php
// $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php
// $lang['options_save'] --> application/language/english/options_lang.php
$lang['filter_search_operator']='Search Operator';
$lang['filter_options_close'] = '关闭';

1
application/language/czech/filter_lang.php
Wyświetl plik

@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show';
// $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php
// $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php
// $lang['options_save'] --> application/language/english/options_lang.php
$lang['filter_search_operator']='Search Operator';
$lang['filter_options_close'] = 'Close';

1
application/language/dutch/filter_lang.php
Wyświetl plik

@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show';
// $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php
// $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php
// $lang['options_save'] --> application/language/english/options_lang.php
$lang['filter_search_operator']='Search Operator';
$lang['filter_options_close'] = 'Close';

1
application/language/english/filter_lang.php
Wyświetl plik

@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show';
// $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php
// $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php
// $lang['options_save'] --> application/language/english/options_lang.php
$lang['filter_search_operator']='Search Operator';
$lang['filter_options_close'] = 'Close';

1
application/language/finnish/filter_lang.php
Wyświetl plik

@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show';
// $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php
// $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php
// $lang['options_save'] --> application/language/english/options_lang.php
$lang['filter_search_operator']='Search Operator';
$lang['filter_options_close'] = 'Close';

1
application/language/french/filter_lang.php
Wyświetl plik

@ -156,4 +156,5 @@ $lang['filter_options_show'] = "Afficher";
// $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php
// $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php
// $lang['options_save'] --> application/language/english/options_lang.php
$lang['filter_search_operator']='Search Operator';
$lang['filter_options_close'] = "Fermer";

1
application/language/german/filter_lang.php
Wyświetl plik

@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Anzeigen';
// $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php
// $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php
// $lang['options_save'] --> application/language/english/options_lang.php
$lang['filter_search_operator']='Search Operator';
$lang['filter_options_close'] = 'Schliessen';

1
application/language/greek/filter_lang.php
Wyświetl plik

@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show';
// $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php
// $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php
// $lang['options_save'] --> application/language/english/options_lang.php
$lang['filter_search_operator']='Search Operator';
$lang['filter_options_close'] = 'Close';

1
application/language/italian/filter_lang.php
Wyświetl plik

@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show';
// $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php
// $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php
// $lang['options_save'] --> application/language/english/options_lang.php
$lang['filter_search_operator']='Search Operator';
$lang['filter_options_close'] = 'Close';

1
application/language/polish/filter_lang.php
Wyświetl plik

@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show';
// $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php
// $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php
// $lang['options_save'] --> application/language/english/options_lang.php
$lang['filter_search_operator']='Search Operator';
$lang['filter_options_close'] = 'Close';

1
application/language/spanish/filter_lang.php
Wyświetl plik

@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show';
// $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php
// $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php
// $lang['options_save'] --> application/language/english/options_lang.php
$lang['filter_search_operator']='Search Operator';
$lang['filter_options_close'] = 'Close';

1
application/language/swedish/filter_lang.php
Wyświetl plik

@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show';
// $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php
// $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php
// $lang['options_save'] --> application/language/english/options_lang.php
$lang['filter_search_operator']='Search Operator';
$lang['filter_options_close'] = 'Close';

1
application/language/turkish/filter_lang.php
Wyświetl plik

@ -156,4 +156,5 @@ $lang['filter_options_show'] = 'Show';
// $lang['gen_hamradio_wwff'] --> application/language/english/general_words_lang.php
// $lang['gen_hamradio_pota'] --> application/language/english/general_words_lang.php
// $lang['options_save'] --> application/language/english/options_lang.php
$lang['filter_search_operator']='Search Operator';
$lang['filter_options_close'] = 'Close';

5
application/models/Logbookadvanced_model.php
Wyświetl plik

@ -168,6 +168,11 @@ class Logbookadvanced_model extends CI_Model {
$binding[] = $searchCriteria['wwff'].'%';
}
if ($searchCriteria['operator'] !== '') {
$conditions[] = "COL_OPERATOR like ?";
$binding[] = $searchCriteria['operator'].'%';
}
if ($searchCriteria['gridsquare'] !== '') {
$conditions[] = "(COL_GRIDSQUARE like ? or COL_VUCC_GRIDS like ?)";
$binding[] = '%' . $searchCriteria['gridsquare'] . '%';

12
application/views/logbookadvanced/index.php
Wyświetl plik

@ -7,7 +7,7 @@
var custom_date_format = "<?php echo $custom_date_format ?>";
<?php
if (!isset($options)) {
$options = "{\"datetime\":{\"show\":\"true\"},\"de\":{\"show\":\"true\"},\"dx\":{\"show\":\"true\"},\"mode\":{\"show\":\"true\"},\"rstr\":{\"show\":\"true\"},\"rsts\":{\"show\":\"true\"},\"band\":{\"show\":\"true\"},\"myrefs\":{\"show\":\"true\"},\"refs\":{\"show\":\"true\"},\"name\":{\"show\":\"true\"},\"qslvia\":{\"show\":\"true\"},\"qsl\":{\"show\":\"true\"},\"lotw\":{\"show\":\"true\"},\"eqsl\":{\"show\":\"true\"},\"qslmsg\":{\"show\":\"true\"},\"dxcc\":{\"show\":\"true\"},\"state\":{\"show\":\"true\"},\"cqzone\":{\"show\":\"true\"},\"iota\":{\"show\":\"true\"}}";
$options = "{\"datetime\":{\"show\":\"true\"},\"de\":{\"show\":\"true\"},\"dx\":{\"show\":\"true\"},\"mode\":{\"show\":\"true\"},\"rstr\":{\"show\":\"true\"},\"rsts\":{\"show\":\"true\"},\"band\":{\"show\":\"true\"},\"myrefs\":{\"show\":\"true\"},\"refs\":{\"show\":\"true\"},\"name\":{\"show\":\"true\"},\"qslvia\":{\"show\":\"true\"},\"qsl\":{\"show\":\"true\"},\"lotw\":{\"show\":\"true\"},\"eqsl\":{\"show\":\"true\"},\"qslmsg\":{\"show\":\"true\"},\"dxcc\":{\"show\":\"true\"},\"state\":{\"show\":\"true\"},\"cqzone\":{\"show\":\"true\"},\"iota\":{\"show\":\"true\"},\"pota\":{\"show\":\"true\"},\"operator\":{\"show\":\"true\"}}";
}
echo "var user_options = $options;";
?>
@ -200,6 +200,10 @@ $options = json_decode($options);
<label class="form-label" for="pota"><?php echo lang('gen_hamradio_pota'); ?></label>
<input type="text" name="pota" id="pota" class="form-control form-control-sm" value="">
</div>
<div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
<label class="form-label" for="operator"><?php echo lang('gen_hamradio_operator'); ?></label>
<input type="text" name="operator" id="operator" class="form-control form-control-sm" value="">
</div>
</div>
</div>
</div>
@ -366,6 +370,9 @@ $options = json_decode($options);
<?php if (($options->refs->show ?? "true") == "true") { ?>
<button type="button" class="btn btn-sm btn-primary me-1" id="searchWwff"><?php echo lang('filter_search_wwff'); ?></button><?php
} ?>
<?php if (($options->operator->show ?? "true") == "true") { ?>
<button type="button" class="btn btn-sm btn-primary me-1" id="searchOperator"><?php echo lang('filter_search_operator'); ?></button><?php
} ?>
</div>
</div>
<div class="row pt-2">
@ -457,6 +464,9 @@ $options = json_decode($options);
<?php if (($options->iota->show ?? "true") == "true") {
echo '<th>' . lang('gen_hamradio_iota') . '</th>';
} ?>
<?php if (($options->operator->show ?? "true") == "true") {
echo '<th>' . lang('gen_hamradio_operator') . '</th>';
} ?>
</tr>
</thead>
<tbody>

4
application/views/logbookadvanced/useroptions.php
Wyświetl plik

@ -90,5 +90,9 @@
<td><?php echo lang('gen_hamradio_pota'); ?></td>
<td><div class="form-check"><input class="form-check-input" name="pota" type="checkbox" <?php if (($options->pota->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
</tr>
<tr>
<td><?php echo lang('gen_hamradio_operator'); ?></td>
<td><div class="form-check"><input class="form-check-input" name="operator" type="checkbox" <?php if (($options->operator->show ?? "true") == "true") { echo 'checked'; } ?>></div></td>
</tr>
</tbody>
</table>