AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support strtotime strings for date search

This commit is contained in:
Frederic Guillot 2016-05-25 21:00:01 -04:00
parent 774734a820
commit 74a84a28e3
4 changed files with 112 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -11,6 +11,7 @@ New features:
Improvements:
* Support strtotime strings for date search
* Reset failed login counter and unlock user when changing password
* Task do not open anymore in a new window on the Gantt chart
* Do not display task progress for tasks with no start/end date

11
app/Core/Filter/Lexer.php
View File

@ -26,9 +26,10 @@ class Lexer
*/
private $tokenMap = array(
"/^(\s+)/" => 'T_WHITESPACE',
'/^([<=>]{0,2}[0-9]{4}-[0-9]{2}-[0-9]{2})/' => 'T_DATE',
'/^(yesterday|tomorrow|today)/' => 'T_DATE',
'/^("(.*?)")/' => 'T_STRING',
'/^([<=>]{0,2}[0-9]{4}-[0-9]{2}-[0-9]{2})/' => 'T_STRING',
'/^([<=>]{1,2}\w+)/' => 'T_STRING',
'/^([<=>]{1,2}".+")/' => 'T_STRING',
'/^("(.+)")/' => 'T_STRING',
"/^(\w+)/" => 'T_STRING',
"/^(#\d+)/" => 'T_STRING',
);
@ -107,7 +108,7 @@ class Lexer
$this->offset += strlen($matches[1]);
return array(
'match' => trim($matches[1], '"'),
'match' => str_replace('"', '', $matches[1]),
'token' => $name,
);
}
@ -134,7 +135,7 @@ class Lexer
} else {
$next = next($tokens);
if ($next !== false && in_array($next['token'], array('T_STRING', 'T_DATE'))) {
if ($next !== false && $next['token'] === 'T_STRING') {
$map[$token['token']][] = $next['match'];
}
}

89
tests/units/Core/Filter/LexerTest.php
View File

@ -77,22 +77,103 @@ class LexerTest extends Base
public function testTokenizeWithStringDate()
{
$lexer = new Lexer();
$lexer->addToken("/^(date:)/", 'T_DATE');
$lexer->addToken("/^(date:)/", 'T_MY_DATE');
$expected = array(
'T_DATE' => array('today'),
'T_MY_DATE' => array('today'),
);
$this->assertSame($expected, $lexer->tokenize('date:today something else'));
}
public function testTokenizeWithStringDateWithSpaces()
{
$lexer = new Lexer();
$lexer->addToken("/^(date:)/", 'T_MY_DATE');
$expected = array(
'T_MY_DATE' => array('last month'),
);
$this->assertSame($expected, $lexer->tokenize('date:"last month" something else'));
}
public function testTokenizeWithStringDateWithSpacesAndOperator()
{
$lexer = new Lexer();
$lexer->addToken("/^(date:)/", 'T_MY_DATE');
$expected = array(
'T_MY_DATE' => array('<=last month'),
);
$this->assertSame($expected, $lexer->tokenize('date:<="last month" something else'));
$lexer = new Lexer();
$lexer->addToken("/^(date:)/", 'T_MY_DATE');
$expected = array(
'T_MY_DATE' => array('>=next month'),
);
$this->assertSame($expected, $lexer->tokenize('date:>="next month" something else'));
$lexer = new Lexer();
$lexer->addToken("/^(date:)/", 'T_MY_DATE');
$expected = array(
'T_MY_DATE' => array('<+2 days'),
);
$this->assertSame($expected, $lexer->tokenize('date:<"+2 days" something else'));
$lexer = new Lexer();
$lexer->addToken("/^(date:)/", 'T_MY_DATE');
$expected = array(
'T_MY_DATE' => array('<-1 hour'),
);
$this->assertSame($expected, $lexer->tokenize('date:<"-1 hour" something else'));
}
public function testTokenizeWithStringDateAndOperator()
{
$lexer = new Lexer();
$lexer->addToken("/^(date:)/", 'T_MY_DATE');
$expected = array(
'T_MY_DATE' => array('<=today'),
);
$this->assertSame($expected, $lexer->tokenize('date:<=today something else'));
$lexer = new Lexer();
$lexer->addToken("/^(date:)/", 'T_MY_DATE');
$expected = array(
'T_MY_DATE' => array('>now'),
);
$this->assertSame($expected, $lexer->tokenize('date:>now something else'));
$lexer = new Lexer();
$lexer->addToken("/^(date:)/", 'T_MY_DATE');
$expected = array(
'T_MY_DATE' => array('>=now'),
);
$this->assertSame($expected, $lexer->tokenize('date:>=now something else'));
}
public function testTokenizeWithIsoDate()
{
$lexer = new Lexer();
$lexer->addToken("/^(date:)/", 'T_DATE');
$lexer->addToken("/^(date:)/", 'T_MY_DATE');
$expected = array(
'T_DATE' => array('<=2016-01-01'),
'T_MY_DATE' => array('<=2016-01-01'),
);
$this->assertSame($expected, $lexer->tokenize('date:<=2016-01-01 something else'));

20
tests/units/Filter/ProjectActivityCreationDateFilterTest.php
View File

@ -51,6 +51,26 @@ class ProjectActivityCreationDateFilterTest extends Base
$this->assertCount(0, $events);
}
public function testWithStrtotimeString()
{
$taskFinder = new TaskFinder($this->container);
$taskCreation = new TaskCreation($this->container);
$projectModel = new Project($this->container);
$projectActivityModel = new ProjectActivity($this->container);
$this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
$this->assertEquals(1, $taskCreation->create(array('title' => 'Test', 'project_id' => 1)));
$this->assertNotFalse($projectActivityModel->createEvent(1, 1, 1, Task::EVENT_CREATE, array('task' => $taskFinder->getById(1))));
$query = $projectActivityModel->getQuery();
$filter = new ProjectActivityCreationDateFilter('<=last week');
$filter->setDateParser($this->container['dateParser']);
$filter->withQuery($query)->apply();
$events = $query->findAll();
$this->assertCount(0, $events);
}
public function testWithIsoDate()
{
$taskFinder = new TaskFinder($this->container);