Webgui improve filter functions
This commit is contained in:
1 parent
b3825cb1b3
commit
9d09b1e120
17 files changed
+435
-458
No files matched your search
+21
-8
@@ -53,8 +53,9 @@ switch ($submit = form_get_action()) {
|
||||
|
||||
case 'filter':
|
||||
$flt = array();
|
||||
$flt['precision'] = gpc_get_string($_POST, 'flt_precision');
|
||||
$flt['txt'] = gpc_get_string($_POST, 'flt_txt');
|
||||
$flt['cat'] = gpc_get_string($_POST, 'flt_cat');
|
||||
$flt['acc'] = gpc_get_string($_POST, 'flt_acc');
|
||||
db_save_filter($flt, 207);
|
||||
$action = ACT_DEFAULT;
|
||||
break;
|
||||
@@ -145,7 +146,7 @@ if ($action == ACT_DEFAULT):
|
||||
page_caption_search($pagetitle);
|
||||
|
||||
// load filter from db
|
||||
$flt = db_get_filter($user->id, 207, ['txt']);
|
||||
$flt = db_get_filter($user->id, 207, ['txt', 'cat', 'acc']);
|
||||
|
||||
$w = array('(vid=:vid OR vid IS NULL)');
|
||||
$p = array(':vid' => $user->vid);
|
||||
@@ -153,9 +154,20 @@ $p = array(':vid' => $user->vid);
|
||||
// TODO precision additionally as filter
|
||||
|
||||
if (strlen($flt->txt) > 1) {
|
||||
$w[] = 'mname LIKE :txt';
|
||||
$w[] = 'mname LIKE :txt OR note LIKE :txt';
|
||||
$p[':txt'] = '%'.$flt->txt.'%';
|
||||
}
|
||||
if ($flt->cat > 0) {
|
||||
$w[] = 'mcat=:mcat';
|
||||
$p[':mcat'] = $flt->cat;
|
||||
} elseif ($flt->mcat == -1) {
|
||||
$w[] = 'mcat IS NULL';
|
||||
}
|
||||
if ($flt->acc > 0) {
|
||||
$w[] = 'accuracy=:accuracy';
|
||||
$p[':accuracy'] = $flt->acc;
|
||||
}
|
||||
|
||||
$where = join(' AND ', $w);
|
||||
$order = ' ORDER BY mname';
|
||||
|
||||
@@ -180,14 +192,15 @@ $opt_special = array(
|
||||
-1 => _('― none ―')
|
||||
);
|
||||
?>
|
||||
<form method="post" action="<?=$g_scriptname?>">
|
||||
<form id="filterform" method="post" action="<?=$g_scriptname?>">
|
||||
<div id="filter" class="card">
|
||||
<div class="card-header"><i class="bi bi-funnel me-2"></i>Filter</div>
|
||||
<div class="card-body d-flex flex-wrap gap-3">
|
||||
<div class="d-flex flex-nowrap gap-2">
|
||||
<label for="flt_txt">Text</label>
|
||||
<input type="text" class="form-control" name="flt_txt" size="15" maxlength="30" value="<?=$flt->txt ?>">
|
||||
</div>
|
||||
<?php
|
||||
filter_create_text('flt_txt', _('Text'), $flt->txt, 30, 45);
|
||||
filter_create_select('flt_cat', _('Category'), $g_opt_all + $g_opt_none + $opt_category, $flt->cat);
|
||||
filter_create_select('flt_acc', _('Accuracy'), $g_opt_all + $opt_accuracy, $flt->acc);
|
||||
?>
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
<button name="submit[filter]" class="btn btn-sm btn-primary" title="<?=_('Apply')?>"><?=_('Go')?></button>
|
||||
|
||||
Reference in new issue
Block a user