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

Filter refactoring

Browse Source
This commit is contained in:
Frederic Guillot
2016-04-09 22:42:17 -04:00
parent 42813d702d
commit 11858be4e8
101 changed files with 3235 additions and 2841 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/ServiceProvider/ClassProvider.php
View File

@@ -49,9 +49,7 @@ class ClassProvider implements ServiceProviderInterface
'ProjectNotification',
'ProjectMetadata',
'ProjectGroupRole',
'ProjectGroupRoleFilter',
'ProjectUserRole',
'ProjectUserRoleFilter',
'RememberMeSession',
'Subtask',
'SubtaskTimeTracking',
@@ -63,7 +61,6 @@ class ClassProvider implements ServiceProviderInterface
'TaskExternalLink',
'TaskFinder',
'TaskFile',
'TaskFilter',
'TaskLink',
'TaskModification',
'TaskPermission',
@@ -79,15 +76,6 @@ class ClassProvider implements ServiceProviderInterface
'UserUnreadNotification',
'UserMetadata',
),
'Formatter' => array(
'TaskFilterGanttFormatter',
'TaskFilterAutoCompleteFormatter',
'TaskFilterCalendarFormatter',
'TaskFilterICalendarFormatter',
'ProjectGanttFormatter',
'UserFilterAutoCompleteFormatter',
'GroupAutoCompleteFormatter',
),
'Validator' => array(
'ActionValidator',
'AuthValidator',

112
app/ServiceProvider/FilterProvider.php Normal file
View File

@@ -0,0 +1,112 @@
<?php
namespace Kanboard\ServiceProvider;
use Kanboard\Core\Filter\LexerBuilder;
use Kanboard\Core\Filter\QueryBuilder;
use Kanboard\Filter\TaskAssigneeFilter;
use Kanboard\Filter\TaskCategoryFilter;
use Kanboard\Filter\TaskColorFilter;
use Kanboard\Filter\TaskColumnFilter;
use Kanboard\Filter\TaskCreationDateFilter;
use Kanboard\Filter\TaskDescriptionFilter;
use Kanboard\Filter\TaskDueDateFilter;
use Kanboard\Filter\TaskIdFilter;
use Kanboard\Filter\TaskLinkFilter;
use Kanboard\Filter\TaskModificationDateFilter;
use Kanboard\Filter\TaskProjectFilter;
use Kanboard\Filter\TaskReferenceFilter;
use Kanboard\Filter\TaskStatusFilter;
use Kanboard\Filter\TaskSubtaskAssigneeFilter;
use Kanboard\Filter\TaskSwimlaneFilter;
use Kanboard\Filter\TaskTitleFilter;
use Kanboard\Model\Project;
use Kanboard\Model\ProjectGroupRole;
use Kanboard\Model\ProjectUserRole;
use Kanboard\Model\User;
use Pimple\Container;
use Pimple\ServiceProviderInterface;
/**
* Filter Provider
*
* @package serviceProvider
* @author Frederic Guillot
*/
class FilterProvider implements ServiceProviderInterface
{
/**
* Register providers
*
* @access public
* @param \Pimple\Container $container
* @return \Pimple\Container
*/
public function register(Container $container)
{
$container['projectGroupRoleQuery'] = $container->factory(function ($c) {
$builder = new QueryBuilder();
$builder->withQuery($c['db']->table(ProjectGroupRole::TABLE));
return $builder;
});
$container['projectUserRoleQuery'] = $container->factory(function ($c) {
$builder = new QueryBuilder();
$builder->withQuery($c['db']->table(ProjectUserRole::TABLE));
return $builder;
});
$container['userQuery'] = $container->factory(function ($c) {
$builder = new QueryBuilder();
$builder->withQuery($c['db']->table(User::TABLE));
return $builder;
});
$container['projectQuery'] = $container->factory(function ($c) {
$builder = new QueryBuilder();
$builder->withQuery($c['db']->table(Project::TABLE));
return $builder;
});
$container['taskQuery'] = $container->factory(function ($c) {
$builder = new QueryBuilder();
$builder->withQuery($c['taskFinder']->getExtendedQuery());
return $builder;
});
$container['taskLexer'] = $container->factory(function ($c) {
$builder = new LexerBuilder();
$builder
->withQuery($c['taskFinder']->getExtendedQuery())
->withFilter(TaskAssigneeFilter::getInstance()
->setCurrentUserId($c['userSession']->getId())
)
->withFilter(new TaskCategoryFilter())
->withFilter(TaskColorFilter::getInstance()->setColorModel($c['color']))
->withFilter(new TaskColumnFilter())
->withFilter(new TaskCreationDateFilter())
->withFilter(new TaskDescriptionFilter())
->withFilter(new TaskDueDateFilter())
->withFilter(new TaskIdFilter())
->withFilter(TaskLinkFilter::getInstance()
->setDatabase($c['db'])
)
->withFilter(new TaskModificationDateFilter())
->withFilter(new TaskProjectFilter())
->withFilter(new TaskReferenceFilter())
->withFilter(new TaskStatusFilter())
->withFilter(TaskSubtaskAssigneeFilter::getInstance()
->setCurrentUserId($c['userSession']->getId())
->setDatabase($c['db'])
)
->withFilter(new TaskSwimlaneFilter())
->withFilter(new TaskTitleFilter(), true)
;
return $builder;
});
return $container;
}
}

2
app/ServiceProvider/HelperProvider.php
View File

@@ -13,12 +13,14 @@ class HelperProvider implements ServiceProviderInterface
{
$container['helper'] = new Helper($container);
$container['helper']->register('app', '\Kanboard\Helper\AppHelper');
$container['helper']->register('calendar', '\Kanboard\Helper\CalendarHelper');
$container['helper']->register('asset', '\Kanboard\Helper\AssetHelper');
$container['helper']->register('board', '\Kanboard\Helper\BoardHelper');
$container['helper']->register('dt', '\Kanboard\Helper\DateHelper');
$container['helper']->register('file', '\Kanboard\Helper\FileHelper');
$container['helper']->register('form', '\Kanboard\Helper\FormHelper');
$container['helper']->register('hook', '\Kanboard\Helper\HookHelper');
$container['helper']->register('ical', '\Kanboard\Helper\ICalHelper');
$container['helper']->register('layout', '\Kanboard\Helper\LayoutHelper');
$container['helper']->register('model', '\Kanboard\Helper\ModelHelper');
$container['helper']->register('subtask', '\Kanboard\Helper\SubtaskHelper');