composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 10:38:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Advanced Search: Dates between

Browse Source 
SVN:b1162[5505]
This commit is contained in:
Eric Espié
2018-03-23 10:41:37 +00:00
parent 956b8958fb
commit 43615450ad
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,7 @@
namespace Combodo\iTop\Application\Search\CriterionConversion;
use AttributeDate;
use AttributeDateTime;
use AttributeDefinition;
use AttributeExternalKey;
@@ -249,13 +250,22 @@ class CriterionToOQL extends CriterionConversionAbstract
return "1";
}
$oFormat = AttributeDateTime::GetFormat();
$sWidget = $aCriteria['widget'];
if ($sWidget == AttributeDefinition::SEARCH_WIDGET_TYPE_DATE_TIME)
{
$sAttributeClass = AttributeDateTime::class;
}
else
{
$sAttributeClass = AttributeDate::class;
}
$oFormat = $sAttributeClass::GetFormat();
$sStartDate = $aValues[0]['value'];
if (!empty($sStartDate))
{
$oDate = $oFormat->parse($sStartDate);
$sStartDate = $oDate->format(AttributeDateTime::GetSQLFormat());
$sStartDate = $oDate->format($sAttributeClass::GetSQLFormat());
$aOQL[] = "({$sRef} >= '$sStartDate')";
}
@@ -264,7 +274,7 @@ class CriterionToOQL extends CriterionConversionAbstract
{
$oDate = $oFormat->parse($sEndDate);
$oDate->add(DateInterval::createFromDateString('1 second'));
$sEndDate = $oDate->format(AttributeDateTime::GetSQLFormat());
$sEndDate = $oDate->format($sAttributeClass::GetSQLFormat());
$aOQL[] = "({$sRef} < '$sEndDate')";
}