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

Simplify dashboard to use new tasks list view

Browse Source
This commit is contained in:
Frederic Guillot
2017-03-12 21:36:52 -04:00
parent f6b42eb802
commit 9b34631135
31 changed files with 380 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tests/units/Model/SubtaskModelTest.php
View File

@@ -172,4 +172,33 @@ class SubtaskModelTest extends Base
$this->assertEquals(1, $subtaskModel->getProjectId(1));
$this->assertEquals(0, $subtaskModel->getProjectId(2));
}
public function testGetAllByTaskIds()
{
$taskCreationModel = new TaskCreationModel($this->container);
$subtaskModel = new SubtaskModel($this->container);
$projectModel = new ProjectModel($this->container);
$this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1)));
$this->assertEquals(1, $subtaskModel->create(array('title' => 'subtask #1', 'task_id' => 1)));
$this->assertCount(0, $subtaskModel->getAllByTaskIds(array()));
$this->assertCount(1, $subtaskModel->getAllByTaskIds(array(1)));
}
public function testGetAllByTaskIdsAndAssignee()
{
$taskCreationModel = new TaskCreationModel($this->container);
$subtaskModel = new SubtaskModel($this->container);
$projectModel = new ProjectModel($this->container);
$this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1)));
$this->assertEquals(1, $subtaskModel->create(array('title' => 'subtask #1', 'task_id' => 1, 'user_id' => 1)));
$this->assertCount(0, $subtaskModel->getAllByTaskIdsAndAssignee(array(), 1));
$this->assertCount(0, $subtaskModel->getAllByTaskIdsAndAssignee(array(1), 2));
$this->assertCount(1, $subtaskModel->getAllByTaskIdsAndAssignee(array(1), 1));
}
}

121
tests/units/Pagination/DashboardPaginationTest.php Normal file
View File

@@ -0,0 +1,121 @@
<?php
use Kanboard\Core\Security\Role;
use Kanboard\Model\ColumnModel;
use Kanboard\Model\ProjectModel;
use Kanboard\Model\ProjectUserRoleModel;
use Kanboard\Model\SubtaskModel;
use Kanboard\Model\TaskCreationModel;
use Kanboard\Model\UserModel;
use Kanboard\Pagination\DashboardPagination;
require_once __DIR__.'/../Base.php';
class DashboardPaginationTest extends Base
{
public function testDashboardPagination()
{
$projectModel = new ProjectModel($this->container);
$projectUserRoleModel = new ProjectUserRoleModel($this->container);
$taskCreationModel = new TaskCreationModel($this->container);
$subtaskModel = new SubtaskModel($this->container);
$dashboardPagination = new DashboardPagination($this->container);
$this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
$this->assertEquals(2, $projectModel->create(array('name' => 'Project #2')));
$this->assertTrue($projectUserRoleModel->addUser(1, 1, Role::PROJECT_MEMBER));
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 2)));
$this->assertEquals(2, $taskCreationModel->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 2, 'owner_id' => 1)));
$this->assertEquals(1, $subtaskModel->create(array('task_id' => 1, 'title' => 'subtask A', 'user_id' => 1)));
$this->assertEquals(2, $subtaskModel->create(array('task_id' => 2, 'title' => 'subtask B', 'user_id' => 1)));
$this->assertEquals(3, $subtaskModel->create(array('task_id' => 2, 'title' => 'subtask C')));
$dashboard = $dashboardPagination->getOverview(1);
$this->assertCount(1, $dashboard);
$this->assertEquals(1, $dashboard[0]['project_id']);
$this->assertEquals('Project #1', $dashboard[0]['project_name']);
$this->assertEquals(1, $dashboard[0]['paginator']->getTotal());
$tasks = $dashboard[0]['paginator']->getCollection();
$this->assertCount(1, $tasks);
$this->assertCount(1, $tasks[0]['subtasks']);
$this->assertEquals('subtask B', $tasks[0]['subtasks'][0]['title']);
}
public function testWhenUserIsNotAssignedToTask()
{
$userModel = new UserModel($this->container);
$projectModel = new ProjectModel($this->container);
$projectUserRoleModel = new ProjectUserRoleModel($this->container);
$taskCreationModel = new TaskCreationModel($this->container);
$subtaskModel = new SubtaskModel($this->container);
$dashboardPagination = new DashboardPagination($this->container);
$this->assertEquals(2, $userModel->create(array('username' => 'user1')));
$this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
$this->assertEquals(2, $projectModel->create(array('name' => 'Project #2')));
$this->assertTrue($projectUserRoleModel->addUser(1, 1, Role::PROJECT_MEMBER));
$this->assertTrue($projectUserRoleModel->addUser(1, 2, Role::PROJECT_MEMBER));
$this->assertTrue($projectUserRoleModel->addUser(2, 2, Role::PROJECT_MEMBER));
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 2)));
$this->assertEquals(2, $taskCreationModel->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 2, 'owner_id' => 2)));
$this->assertEquals(3, $taskCreationModel->create(array('title' => 'Task #3', 'project_id' => 2, 'owner_id' => 2)));
$this->assertEquals(1, $subtaskModel->create(array('task_id' => 1, 'title' => 'subtask A', 'user_id' => 2)));
$this->assertEquals(2, $subtaskModel->create(array('task_id' => 2, 'title' => 'subtask B', 'user_id' => 1)));
$this->assertEquals(3, $subtaskModel->create(array('task_id' => 2, 'title' => 'subtask C')));
$dashboard = $dashboardPagination->getOverview(1);
$this->assertCount(1, $dashboard);
$this->assertEquals(1, $dashboard[0]['project_id']);
$this->assertEquals('Project #1', $dashboard[0]['project_name']);
$this->assertEquals(1, $dashboard[0]['paginator']->getTotal());
$tasks = $dashboard[0]['paginator']->getCollection();
$this->assertCount(1, $tasks);
$this->assertCount(1, $tasks[0]['subtasks']);
$this->assertEquals('subtask B', $tasks[0]['subtasks'][0]['title']);
$dashboard = $dashboardPagination->getOverview(2);
$this->assertCount(2, $dashboard);
$this->assertEquals('Project #1', $dashboard[0]['project_name']);
$this->assertEquals('Project #2', $dashboard[1]['project_name']);
$this->assertEquals(1, $dashboard[0]['paginator']->getTotal());
$tasks = $dashboard[0]['paginator']->getCollection();
$this->assertCount(1, $tasks);
$this->assertCount(0, $tasks[0]['subtasks']);
$tasks = $dashboard[1]['paginator']->getCollection();
$this->assertCount(2, $tasks);
$this->assertCount(1, $tasks[0]['subtasks']);
$this->assertEquals('subtask A', $tasks[0]['subtasks'][0]['title']);
}
public function testWhenColumnIsHidden()
{
$projectModel = new ProjectModel($this->container);
$projectUserRoleModel = new ProjectUserRoleModel($this->container);
$columnModel = new ColumnModel($this->container);
$taskCreationModel = new TaskCreationModel($this->container);
$subtaskModel = new SubtaskModel($this->container);
$dashboardPagination = new DashboardPagination($this->container);
$this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
$this->assertTrue($projectUserRoleModel->addUser(1, 1, Role::PROJECT_MEMBER));
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
$this->assertEquals(1, $subtaskModel->create(array('task_id' => 1, 'title' => 'subtask #1', 'user_id' => 1)));
$this->assertCount(1, $dashboardPagination->getOverview(1));
$this->assertTrue($columnModel->update(1, 'test', 0, '', 1));
$this->assertCount(0, $dashboardPagination->getOverview(1));
}
}

35
tests/units/Pagination/ProjectPaginationTest.php
View File

@@ -1,35 +0,0 @@
<?php
use Kanboard\Core\Security\Role;
use Kanboard\Model\ProjectModel;
use Kanboard\Model\ProjectUserRoleModel;
use Kanboard\Model\UserModel;
use Kanboard\Pagination\ProjectPagination;
require_once __DIR__.'/../Base.php';
class ProjectPaginationTest extends Base
{
public function testDashboardPagination()
{
$projectModel = new ProjectModel($this->container);
$projectUserRoleModel = new ProjectUserRoleModel($this->container);
$userModel = new UserModel($this->container);
$projectPagination = new ProjectPagination($this->container);
$this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
$this->assertEquals(2, $projectModel->create(array('name' => 'Project #2', 'is_private' => 1)));
$this->assertEquals(3, $projectModel->create(array('name' => 'Project #3')));
$this->assertEquals(4, $projectModel->create(array('name' => 'Project #4', 'is_private' => 1)));
$this->assertEquals(2, $userModel->create(array('username' => 'test')));
$this->assertTrue($projectUserRoleModel->addUser(1, 2, Role::PROJECT_MANAGER));
$this->assertTrue($projectUserRoleModel->addUser(2, 2, Role::PROJECT_MANAGER));
$this->assertCount(2, $projectPagination->getDashboardPaginator(2, 'projects', 5)->getCollection());
$this->assertCount(0, $projectPagination->getDashboardPaginator(3, 'projects', 5)->getCollection());
$this->assertCount(2, $projectPagination->getDashboardPaginator(2, 'projects', 5)->setOrder(ProjectModel::TABLE.'.id')->getCollection());
$this->assertCount(2, $projectPagination->getDashboardPaginator(2, 'projects', 5)->setOrder(ProjectModel::TABLE.'.is_private')->getCollection());
$this->assertCount(2, $projectPagination->getDashboardPaginator(2, 'projects', 5)->setOrder(ProjectModel::TABLE.'.name')->getCollection());
}
}

53
tests/units/Pagination/SubtaskPaginationTest.php
View File

@@ -1,53 +0,0 @@
<?php
use Kanboard\Model\ColumnModel;
use Kanboard\Model\ProjectModel;
use Kanboard\Model\SubtaskModel;
use Kanboard\Model\TaskCreationModel;
use Kanboard\Model\TaskModel;
use Kanboard\Pagination\SubtaskPagination;
require_once __DIR__.'/../Base.php';
class SubtaskPaginationTest extends Base
{
public function testDashboardPagination()
{
$taskCreationModel = new TaskCreationModel($this->container);
$projectModel = new ProjectModel($this->container);
$subtaskModel = new SubtaskModel($this->container);
$subtaskPagination = new SubtaskPagination($this->container);
$this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 1)));
$this->assertEquals(2, $taskCreationModel->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 2, 'owner_id' => 1)));
$this->assertEquals(1, $subtaskModel->create(array('task_id' => 1, 'title' => 'subtask #1', 'user_id' => 1)));
$this->assertEquals(2, $subtaskModel->create(array('task_id' => 2, 'title' => 'subtask #1', 'user_id' => 1)));
$this->assertEquals(3, $subtaskModel->create(array('task_id' => 1, 'title' => 'subtask #1', 'user_id' => 1)));
$this->assertEquals(4, $subtaskModel->create(array('task_id' => 2, 'title' => 'subtask #1')));
$this->assertEquals(5, $subtaskModel->create(array('task_id' => 1, 'title' => 'subtask #1')));
$this->assertCount(3, $subtaskPagination->getDashboardPaginator(1, 'subtasks', 5)->getCollection());
$this->assertCount(0, $subtaskPagination->getDashboardPaginator(2, 'subtasks', 5)->getCollection());
$this->assertCount(3, $subtaskPagination->getDashboardPaginator(1, 'subtasks', 5)->setOrder(TaskModel::TABLE.'.id')->getCollection());
$this->assertCount(3, $subtaskPagination->getDashboardPaginator(1, 'subtasks', 5)->setOrder('project_name')->getCollection());
$this->assertCount(3, $subtaskPagination->getDashboardPaginator(1, 'subtasks', 5)->setOrder('task_name')->getCollection());
$this->assertCount(3, $subtaskPagination->getDashboardPaginator(1, 'subtasks', 5)->setOrder(SubtaskModel::TABLE.'.title')->getCollection());
}
public function testWhenColumnIsHidden()
{
$columnModel = new ColumnModel($this->container);
$taskCreationModel = new TaskCreationModel($this->container);
$projectModel = new ProjectModel($this->container);
$subtaskModel = new SubtaskModel($this->container);
$subtaskPagination = new SubtaskPagination($this->container);
$this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
$this->assertTrue($columnModel->update(1, 'test', 0, '', 1));
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
$this->assertEquals(1, $subtaskModel->create(array('task_id' => 1, 'title' => 'subtask #1', 'user_id' => 1)));
$this->assertCount(0, $subtaskPagination->getDashboardPaginator(1, 'subtasks', 5)->getCollection());
}
}

30
tests/units/Pagination/TaskPaginationTest.php
View File

@@ -1,30 +0,0 @@
<?php
use Kanboard\Model\ProjectModel;
use Kanboard\Model\TaskCreationModel;
use Kanboard\Model\TaskModel;
use Kanboard\Pagination\TaskPagination;
require_once __DIR__.'/../Base.php';
class TaskPaginationTest extends Base
{
public function testDashboardPagination()
{
$taskCreationModel = new TaskCreationModel($this->container);
$projectModel = new ProjectModel($this->container);
$taskPagination = new TaskPagination($this->container);
$this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 1)));
$this->assertEquals(2, $taskCreationModel->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 2, 'owner_id' => 1)));
$this->assertCount(1, $taskPagination->getDashboardPaginator(1, 'tasks', 5)->getCollection());
$this->assertCount(0, $taskPagination->getDashboardPaginator(2, 'tasks', 5)->getCollection());
$this->assertCount(1, $taskPagination->getDashboardPaginator(1, 'tasks', 5)->setOrder(TaskModel::TABLE.'.id')->getCollection());
$this->assertCount(1, $taskPagination->getDashboardPaginator(1, 'tasks', 5)->setOrder('project_name')->getCollection());
$this->assertCount(1, $taskPagination->getDashboardPaginator(1, 'tasks', 5)->setOrder(TaskModel::TABLE.'.title')->getCollection());
$this->assertCount(1, $taskPagination->getDashboardPaginator(1, 'tasks', 5)->setOrder(TaskModel::TABLE.'.priority')->getCollection());
$this->assertCount(1, $taskPagination->getDashboardPaginator(1, 'tasks', 5)->setOrder(TaskModel::TABLE.'.date_due')->getCollection());
}
}