composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-26 12:08:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Advanced Search: Dates between

Browse Source 
SVN:b1162[5432]
This commit is contained in:
Eric Espié
2018-03-15 13:35:35 +00:00
parent 6ef31b7983
commit e48e4e7139
6 changed files with 360 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
test/application/search/CriterionConversionTest.php
View File

@@ -30,6 +30,7 @@ namespace Combodo\iTop\Test\UnitTest\Application\Search;
use Combodo\iTop\Application\Search\CriterionConversion\CriterionToOQL;
use Combodo\iTop\Application\Search\CriterionConversion\CriterionToSearchForm;
use Combodo\iTop\Application\Search\CriterionParser;
use Combodo\iTop\Application\Search\SearchForm;
use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
@@ -293,4 +294,62 @@ class CriterionConversionTest extends ItopDataTestCase
),
);
}
/**
* @dataProvider OqlProvider
* @throws \OQLException
*/
function testOqlToForlSearchToOql($sOQL)
{
$oSearchForm = new SearchForm();
$oSearch = \DBSearch::FromOQL($sOQL);
$aFields = $oSearchForm->GetFields(new \DBObjectSet($oSearch));
$aCriterion = $oSearchForm->GetCriterion($oSearch, $aFields);
$this->debug($sOQL);
$aAndCriterion = $aCriterion['or'][0]['and'];
$aNewCriterion = array();
foreach($aAndCriterion as $aCriteria)
{
if (($aCriteria['widget'] == \AttributeDefinition::SEARCH_WIDGET_TYPE_STRING)
|| ($aCriteria['widget'] == \AttributeDefinition::SEARCH_WIDGET_TYPE_DATE_TIME)
|| ($aCriteria['widget'] == \AttributeDefinition::SEARCH_WIDGET_TYPE_ENUM))
{
unset($aCriteria['oql']);
$aField = $aFields['zlist'][$aCriteria['ref']];
$aCriteria['code'] = $aField['code'];
$aCriteria['class'] = $aField['class'];
}
$aNewCriterion[] = $aCriteria;
}
$this->debug($aNewCriterion);
$aCriterion['or'][0]['and'] = $aNewCriterion;
$oSearch->ResetCondition();
$oFilter = CriterionParser::Parse($oSearch->ToOQL(), $aCriterion);
$this->debug($oFilter->ToOQL());
$this->assertTrue(true);
}
function OqlProvider()
{
return array(
array('OQL' => "SELECT Contact WHERE status = 'active'"),
array('OQL' => "SELECT Contact WHERE status = 'active' AND name LIKE 'toto%'"),
array('OQL' => "SELECT Contact WHERE status = 'active' AND org_id = 3"),
array('OQL' => "SELECT Contact WHERE status IN ('active', 'inactive')"),
array('OQL' => "SELECT Contact WHERE status NOT IN ('active')"),
array('OQL' => "SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) < start_date"),
array('OQL' => "SELECT UserRequest WHERE start_date > '2017-01-01 00:00:00' AND '2018-01-01 00:00:00' >= start_date"),
array('OQL' => "SELECT UserRequest WHERE start_date > '2017-01-01 00:00:00' AND status = 'active' AND org_id = 3 AND '2018-01-01 00:00:00' >= start_date"),
array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-01 00:00:00' >= start_date"),
array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-01 01:00:00' > start_date"),
array('OQL' => "SELECT UserRequest WHERE start_date >= '2017-01-01 00:00:00' AND '2017-01-02 00:00:00' > start_date"),
);
}
}