composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-20 07:42:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Advanced Search: 'between' for numeric criteria

Browse Source 
SVN:b1162[5487]
This commit is contained in:
Eric Espié
2018-03-21 13:12:13 +00:00
parent 114a340527
commit b05b41c7cc
4 changed files with 127 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
sources/application/search/criterionconversion/criteriontooql.class.inc.php
View File

@@ -25,6 +25,7 @@ namespace Combodo\iTop\Application\Search\CriterionConversion;
use AttributeDateTime;
use AttributeDefinition;
use Combodo\iTop\Application\Search\AjaxSearchException;
use Combodo\iTop\Application\Search\CriterionConversionAbstract;
use Combodo\iTop\Application\Search\SearchForm;
use DateInterval;
@@ -56,6 +57,7 @@ class CriterionToOQL extends CriterionConversionAbstract
self::OP_NOT_EMPTY => 'NotEmptyToOql',
self::OP_BETWEEN_DAYS => 'BetweenDaysToOql',
self::OP_BETWEEN_HOURS => 'BetweenHoursToOql',
self::OP_BETWEEN => 'BetweenToOql',
self::OP_IN => 'InToOql',
self::OP_ALL => 'AllToOql',
);
@@ -126,6 +128,7 @@ class CriterionToOQL extends CriterionConversionAbstract
{
return "ISNULL({$sRef})";
}
return "({$sRef} = '')";
}
@@ -165,15 +168,18 @@ class CriterionToOQL extends CriterionConversionAbstract
return "1";
}
// more selected values than remaining so use NOT IN
else if (count($aValues) > (count($aAllowedValues) / 2))
else
{
foreach($aValues as $aValue)
if (count($aValues) > (count($aAllowedValues) / 2))
{
unset($aAllowedValues[$aValue['value']]);
}
$sInList = implode("','", array_keys($aAllowedValues));
foreach($aValues as $aValue)
{
unset($aAllowedValues[$aValue['value']]);
}
$sInList = implode("','", array_keys($aAllowedValues));
return "({$sRef} NOT IN ('$sInList'))";
return "({$sRef} NOT IN ('$sInList'))";
}
}
}
}
@@ -283,6 +289,65 @@ class CriterionToOQL extends CriterionConversionAbstract
return $sOQL;
}
/**
* @param $sRef
* @param $aCriteria
*
* @return string
* @throws \Combodo\iTop\Application\Search\AjaxSearchException
*/
protected static function BetweenToOql($sRef, $aCriteria)
{
$aOQL = array();
$aValues = self::GetValues($aCriteria);
if (count($aValues) != 2)
{
return "1";
}
if (isset($aValues[0]['value']))
{
$sStartNum = trim($aValues[0]['value']);
if (is_numeric($sStartNum))
{
$aOQL[] = "({$sRef} >= '$sStartNum')";
}
else
{
if (!empty($sStartNum))
{
throw new AjaxSearchException("'$sStartNum' is not a numeric value", 400);
}
}
}
if (isset($aValues[1]['value']))
{
$sEndNum = trim($aValues[1]['value']);
if (is_numeric($sEndNum))
{
$aOQL[] = "({$sRef} <= '$sEndNum')";
}
else
{
if (!empty($sEndNum))
{
throw new AjaxSearchException("'$sEndNum' is not a numeric value", 400);
}
}
}
$sOQL = implode(' AND ', $aOQL);
if (empty($sOQL))
{
$sOQL = "1";
}
return $sOQL;
}
protected static function AllToOql($sRef, $aCriteria)
{