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

Move dashboard pagination into separate classes

Browse Source
This commit is contained in:
Frederic Guillot
2016-07-24 12:09:41 -04:00
parent 506ebf3bac
commit 51b2193fc4
19 changed files with 337 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
app/Model/TaskFinderModel.php
View File

@@ -63,19 +63,19 @@ class TaskFinderModel extends Base
return $this->db
->table(TaskModel::TABLE)
->columns(
'tasks.id',
'tasks.title',
'tasks.date_due',
'tasks.date_creation',
'tasks.project_id',
'tasks.color_id',
'tasks.priority',
'tasks.time_spent',
'tasks.time_estimated',
'tasks.is_active',
'tasks.creator_id',
'projects.name AS project_name',
'columns.title AS column_title'
TaskModel::TABLE.'.id',
TaskModel::TABLE.'.title',
TaskModel::TABLE.'.date_due',
TaskModel::TABLE.'.date_creation',
TaskModel::TABLE.'.project_id',
TaskModel::TABLE.'.color_id',
TaskModel::TABLE.'.priority',
TaskModel::TABLE.'.time_spent',
TaskModel::TABLE.'.time_estimated',
TaskModel::TABLE.'.is_active',
TaskModel::TABLE.'.creator_id',
ProjectModel::TABLE.'.name AS project_name',
ColumnModel::TABLE.'.title AS column_title'
)
->join(ProjectModel::TABLE, 'id', 'project_id')
->join(ColumnModel::TABLE, 'id', 'column_id')
@@ -103,36 +103,36 @@ class TaskFinderModel extends Base
'(SELECT COUNT(*) FROM '.TaskLinkModel::TABLE.' WHERE '.TaskLinkModel::TABLE.'.task_id = tasks.id) AS nb_links',
'(SELECT COUNT(*) FROM '.TaskExternalLinkModel::TABLE.' WHERE '.TaskExternalLinkModel::TABLE.'.task_id = tasks.id) AS nb_external_links',
'(SELECT DISTINCT 1 FROM '.TaskLinkModel::TABLE.' WHERE '.TaskLinkModel::TABLE.'.task_id = tasks.id AND '.TaskLinkModel::TABLE.'.link_id = 9) AS is_milestone',
'tasks.id',
'tasks.reference',
'tasks.title',
'tasks.description',
'tasks.date_creation',
'tasks.date_modification',
'tasks.date_completed',
'tasks.date_started',
'tasks.date_due',
'tasks.color_id',
'tasks.project_id',
'tasks.column_id',
'tasks.swimlane_id',
'tasks.owner_id',
'tasks.creator_id',
'tasks.position',
'tasks.is_active',
'tasks.score',
'tasks.category_id',
'tasks.priority',
'tasks.date_moved',
'tasks.recurrence_status',
'tasks.recurrence_trigger',
'tasks.recurrence_factor',
'tasks.recurrence_timeframe',
'tasks.recurrence_basedate',
'tasks.recurrence_parent',
'tasks.recurrence_child',
'tasks.time_estimated',
'tasks.time_spent',
TaskModel::TABLE.'.id',
TaskModel::TABLE.'.reference',
TaskModel::TABLE.'.title',
TaskModel::TABLE.'.description',
TaskModel::TABLE.'.date_creation',
TaskModel::TABLE.'.date_modification',
TaskModel::TABLE.'.date_completed',
TaskModel::TABLE.'.date_started',
TaskModel::TABLE.'.date_due',
TaskModel::TABLE.'.color_id',
TaskModel::TABLE.'.project_id',
TaskModel::TABLE.'.column_id',
TaskModel::TABLE.'.swimlane_id',
TaskModel::TABLE.'.owner_id',
TaskModel::TABLE.'.creator_id',
TaskModel::TABLE.'.position',
TaskModel::TABLE.'.is_active',
TaskModel::TABLE.'.score',
TaskModel::TABLE.'.category_id',
TaskModel::TABLE.'.priority',
TaskModel::TABLE.'.date_moved',
TaskModel::TABLE.'.recurrence_status',
TaskModel::TABLE.'.recurrence_trigger',
TaskModel::TABLE.'.recurrence_factor',
TaskModel::TABLE.'.recurrence_timeframe',
TaskModel::TABLE.'.recurrence_basedate',
TaskModel::TABLE.'.recurrence_parent',
TaskModel::TABLE.'.recurrence_child',
TaskModel::TABLE.'.time_estimated',
TaskModel::TABLE.'.time_spent',
UserModel::TABLE.'.username AS assignee_username',
UserModel::TABLE.'.name AS assignee_name',
UserModel::TABLE.'.email AS assignee_email',