blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-16 22:42:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added the operations equal and not equal for strings in the FilterComponent

Browse Source
This commit is contained in:
Paolo
2022-10-10 14:55:49 +02:00
parent ba5fb29d13
commit 08a58b919a
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/FilterCmptLib.php
+20 -4
View File
@@ -768,15 +768,31 @@ class FilterCmptLib
{
// comparison (==)
case self::OP_EQUAL:
if (is_numeric($filterDefinition->condition)) $condition = '= '.$filterDefinition->condition;
// Numeric
if (is_numeric($filterDefinition->condition))
{
$condition = '= '.$filterDefinition->condition;
}
else // string type
{
$condition = '= \''.$this->_ci->FiltersModel->escapeLike($filterDefinition->condition).'\'';
}
break;
// not equal (!=)
case self::OP_NOT_EQUAL:
if (is_numeric($filterDefinition->condition)) $condition = '!= '.$filterDefinition->condition;
// Numeric
if (is_numeric($filterDefinition->condition))
{
$condition = '!= '.$filterDefinition->condition;
}
else // string type
{
$condition = '!= \''.$this->_ci->FiltersModel->escapeLike($filterDefinition->condition).'\'';
}
break;
// greater than (>)
case self::OP_GREATER_THAN:
// It it's a date type
// If it's a date type
if (is_numeric($filterDefinition->condition)
&& isset($filterDefinition->option)
&& ($filterDefinition->option == self::OPT_HOURS
@@ -793,7 +809,7 @@ class FilterCmptLib
break;
// less than (<)
case self::OP_LESS_THAN:
// It it's a date type
// If it's a date type
if (is_numeric($filterDefinition->condition)
&& isset($filterDefinition->option)
&& ($filterDefinition->option == self::OPT_HOURS
public/js/components/filter/Filter.js
+2
View File
@@ -644,6 +644,8 @@ export const CoreFilterCmpt = {
|| filterField.type.toLowerCase().indexOf('bpchar') >= 0">
<div class="col-2">
<select class="form-select" name="operation" v-model="filterField.operation">
<option value="equal">Gleich</option>
<option value="nequal">Nicht gleich</option>
<option value="contains">Enthält</option>
<option value="ncontains">Enthält nicht</option>
</select>