Add unit test for transition model
This commit is contained in:
@@ -21,7 +21,7 @@ class TransitionExport extends Base
|
|||||||
|
|
||||||
protected function execute(InputInterface $input, OutputInterface $output)
|
protected function execute(InputInterface $input, OutputInterface $output)
|
||||||
{
|
{
|
||||||
$data = $this->transition->export(
|
$data = $this->transitionExport->export(
|
||||||
$input->getArgument('project_id'),
|
$input->getArgument('project_id'),
|
||||||
$input->getArgument('start_date'),
|
$input->getArgument('start_date'),
|
||||||
$input->getArgument('end_date')
|
$input->getArgument('end_date')
|
||||||
|
|||||||
@@ -2,6 +2,8 @@
|
|||||||
|
|
||||||
namespace Kanboard\Controller;
|
namespace Kanboard\Controller;
|
||||||
|
|
||||||
|
use Kanboard\Core\DateParser;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Task controller
|
* Task controller
|
||||||
*
|
*
|
||||||
@@ -62,7 +64,7 @@ class Task extends Base
|
|||||||
'time_spent' => $task['time_spent'] ?: '',
|
'time_spent' => $task['time_spent'] ?: '',
|
||||||
);
|
);
|
||||||
|
|
||||||
$values = $this->dateParser->format($values, array('date_started'), $this->config->get('application_datetime_format', 'm/d/Y H:i'));
|
$values = $this->dateParser->format($values, array('date_started'), $this->config->get('application_datetime_format', DateParser::DATE_TIME_FORMAT));
|
||||||
|
|
||||||
$this->response->html($this->helper->layout->task('task/show', array(
|
$this->response->html($this->helper->layout->task('task/show', array(
|
||||||
'project' => $this->project->getById($task['project_id']),
|
'project' => $this->project->getById($task['project_id']),
|
||||||
|
|||||||
@@ -2,6 +2,8 @@
|
|||||||
|
|
||||||
namespace Kanboard\Controller;
|
namespace Kanboard\Controller;
|
||||||
|
|
||||||
|
use Kanboard\Core\DateParser;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Task Modification controller
|
* Task Modification controller
|
||||||
*
|
*
|
||||||
@@ -83,8 +85,8 @@ class Taskmodification extends Base
|
|||||||
$values = $this->hook->merge('controller:task-modification:form:default', $values, array('default_values' => $values));
|
$values = $this->hook->merge('controller:task-modification:form:default', $values, array('default_values' => $values));
|
||||||
}
|
}
|
||||||
|
|
||||||
$values = $this->dateParser->format($values, array('date_due'), $this->config->get('application_date_format', 'm/d/Y'));
|
$values = $this->dateParser->format($values, array('date_due'), $this->config->get('application_date_format', DateParser::DATE_FORMAT));
|
||||||
$values = $this->dateParser->format($values, array('date_started'), $this->config->get('application_datetime_format', 'm/d/Y H:i'));
|
$values = $this->dateParser->format($values, array('date_started'), $this->config->get('application_datetime_format', DateParser::DATE_TIME_FORMAT));
|
||||||
|
|
||||||
$this->response->html($this->helper->layout->task('task_modification/edit_task', array(
|
$this->response->html($this->helper->layout->task('task_modification/edit_task', array(
|
||||||
'project' => $project,
|
'project' => $project,
|
||||||
|
|||||||
@@ -111,6 +111,7 @@ use Pimple\Container;
|
|||||||
* @property \Kanboard\Model\TaskStatus $taskStatus
|
* @property \Kanboard\Model\TaskStatus $taskStatus
|
||||||
* @property \Kanboard\Model\TaskMetadata $taskMetadata
|
* @property \Kanboard\Model\TaskMetadata $taskMetadata
|
||||||
* @property \Kanboard\Model\Transition $transition
|
* @property \Kanboard\Model\Transition $transition
|
||||||
|
* @property \Kanboard\Model\TransitionExport $transitionExport
|
||||||
* @property \Kanboard\Model\User $user
|
* @property \Kanboard\Model\User $user
|
||||||
* @property \Kanboard\Model\UserImport $userImport
|
* @property \Kanboard\Model\UserImport $userImport
|
||||||
* @property \Kanboard\Model\UserLocking $userLocking
|
* @property \Kanboard\Model\UserLocking $userLocking
|
||||||
|
|||||||
@@ -12,6 +12,9 @@ use DateTime;
|
|||||||
*/
|
*/
|
||||||
class DateParser extends Base
|
class DateParser extends Base
|
||||||
{
|
{
|
||||||
|
const DATE_FORMAT = 'm/d/Y';
|
||||||
|
const DATE_TIME_FORMAT = 'm/d/Y H:i';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* List of time formats
|
* List of time formats
|
||||||
*
|
*
|
||||||
@@ -201,7 +204,7 @@ class DateParser extends Base
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get a timetstamp from an ISO date format
|
* Get a timestamp from an ISO date format
|
||||||
*
|
*
|
||||||
* @access public
|
* @access public
|
||||||
* @param string $value
|
* @param string $value
|
||||||
|
|||||||
@@ -30,6 +30,11 @@ class Request extends Base
|
|||||||
*
|
*
|
||||||
* @access public
|
* @access public
|
||||||
* @param \Pimple\Container $container
|
* @param \Pimple\Container $container
|
||||||
|
* @param array $server
|
||||||
|
* @param array $get
|
||||||
|
* @param array $post
|
||||||
|
* @param array $files
|
||||||
|
* @param array $cookies
|
||||||
*/
|
*/
|
||||||
public function __construct(Container $container, array $server = array(), array $get = array(), array $post = array(), array $files = array(), array $cookies = array())
|
public function __construct(Container $container, array $server = array(), array $get = array(), array $post = array(), array $files = array(), array $cookies = array())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace Kanboard\Model;
|
namespace Kanboard\Model;
|
||||||
|
|
||||||
|
use Kanboard\Core\DateParser;
|
||||||
use PDO;
|
use PDO;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -106,7 +107,7 @@ class TaskExport extends Base
|
|||||||
$task['score'] = $task['score'] ?: 0;
|
$task['score'] = $task['score'] ?: 0;
|
||||||
$task['swimlane_id'] = isset($swimlanes[$task['swimlane_id']]) ? $swimlanes[$task['swimlane_id']] : '?';
|
$task['swimlane_id'] = isset($swimlanes[$task['swimlane_id']]) ? $swimlanes[$task['swimlane_id']] : '?';
|
||||||
|
|
||||||
$task = $this->dateParser->format($task, array('date_due', 'date_modification', 'date_creation', 'date_started', 'date_completed'), 'Y-m-d');
|
$task = $this->dateParser->format($task, array('date_due', 'date_modification', 'date_creation', 'date_started', 'date_completed'), DateParser::DATE_FORMAT);
|
||||||
|
|
||||||
return $task;
|
return $task;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
namespace Kanboard\Model;
|
namespace Kanboard\Model;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Transition model
|
* Transition
|
||||||
*
|
*
|
||||||
* @package model
|
* @package model
|
||||||
* @author Frederic Guillot
|
* @author Frederic Guillot
|
||||||
@@ -22,19 +22,21 @@ class Transition extends Base
|
|||||||
*
|
*
|
||||||
* @access public
|
* @access public
|
||||||
* @param integer $user_id
|
* @param integer $user_id
|
||||||
* @param array $task
|
* @param array $task_event
|
||||||
* @return boolean
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function save($user_id, array $task)
|
public function save($user_id, array $task_event)
|
||||||
{
|
{
|
||||||
|
$time = time();
|
||||||
|
|
||||||
return $this->db->table(self::TABLE)->insert(array(
|
return $this->db->table(self::TABLE)->insert(array(
|
||||||
'user_id' => $user_id,
|
'user_id' => $user_id,
|
||||||
'project_id' => $task['project_id'],
|
'project_id' => $task_event['project_id'],
|
||||||
'task_id' => $task['task_id'],
|
'task_id' => $task_event['task_id'],
|
||||||
'src_column_id' => $task['src_column_id'],
|
'src_column_id' => $task_event['src_column_id'],
|
||||||
'dst_column_id' => $task['dst_column_id'],
|
'dst_column_id' => $task_event['dst_column_id'],
|
||||||
'date' => time(),
|
'date' => $time,
|
||||||
'time_spent' => time() - $task['date_moved']
|
'time_spent' => $time - $task_event['date_moved']
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -116,71 +118,11 @@ class Transition extends Base
|
|||||||
->lte('date', $to)
|
->lte('date', $to)
|
||||||
->eq(self::TABLE.'.project_id', $project_id)
|
->eq(self::TABLE.'.project_id', $project_id)
|
||||||
->desc('date')
|
->desc('date')
|
||||||
|
->desc(self::TABLE.'.id')
|
||||||
->join(Task::TABLE, 'id', 'task_id')
|
->join(Task::TABLE, 'id', 'task_id')
|
||||||
->join(User::TABLE, 'id', 'user_id')
|
->join(User::TABLE, 'id', 'user_id')
|
||||||
->join(Column::TABLE.' as src', 'id', 'src_column_id', self::TABLE, 'src')
|
->join(Column::TABLE.' as src', 'id', 'src_column_id', self::TABLE, 'src')
|
||||||
->join(Column::TABLE.' as dst', 'id', 'dst_column_id', self::TABLE, 'dst')
|
->join(Column::TABLE.' as dst', 'id', 'dst_column_id', self::TABLE, 'dst')
|
||||||
->findAll();
|
->findAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Get project export
|
|
||||||
*
|
|
||||||
* @access public
|
|
||||||
* @param integer $project_id Project id
|
|
||||||
* @param mixed $from Start date (timestamp or user formatted date)
|
|
||||||
* @param mixed $to End date (timestamp or user formatted date)
|
|
||||||
* @return array
|
|
||||||
*/
|
|
||||||
public function export($project_id, $from, $to)
|
|
||||||
{
|
|
||||||
$results = array($this->getColumns());
|
|
||||||
$transitions = $this->getAllByProjectAndDate($project_id, $from, $to);
|
|
||||||
|
|
||||||
foreach ($transitions as $transition) {
|
|
||||||
$results[] = $this->format($transition);
|
|
||||||
}
|
|
||||||
|
|
||||||
return $results;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get column titles
|
|
||||||
*
|
|
||||||
* @access public
|
|
||||||
* @return string[]
|
|
||||||
*/
|
|
||||||
public function getColumns()
|
|
||||||
{
|
|
||||||
return array(
|
|
||||||
e('Id'),
|
|
||||||
e('Task Title'),
|
|
||||||
e('Source column'),
|
|
||||||
e('Destination column'),
|
|
||||||
e('Executer'),
|
|
||||||
e('Date'),
|
|
||||||
e('Time spent'),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Format the output of a transition array
|
|
||||||
*
|
|
||||||
* @access public
|
|
||||||
* @param array $transition
|
|
||||||
* @return array
|
|
||||||
*/
|
|
||||||
public function format(array $transition)
|
|
||||||
{
|
|
||||||
$values = array();
|
|
||||||
$values[] = $transition['id'];
|
|
||||||
$values[] = $transition['title'];
|
|
||||||
$values[] = $transition['src_column'];
|
|
||||||
$values[] = $transition['dst_column'];
|
|
||||||
$values[] = $transition['name'] ?: $transition['username'];
|
|
||||||
$values[] = date('Y-m-d H:i', $transition['date']);
|
|
||||||
$values[] = round($transition['time_spent'] / 3600, 2);
|
|
||||||
|
|
||||||
return $values;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
76
app/Model/TransitionExport.php
Normal file
76
app/Model/TransitionExport.php
Normal file
@@ -0,0 +1,76 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Kanboard\Model;
|
||||||
|
|
||||||
|
use Kanboard\Core\DateParser;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Transition Export
|
||||||
|
*
|
||||||
|
* @package model
|
||||||
|
* @author Frederic Guillot
|
||||||
|
*/
|
||||||
|
class TransitionExport extends Base
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Get project export
|
||||||
|
*
|
||||||
|
* @access public
|
||||||
|
* @param integer $project_id Project id
|
||||||
|
* @param mixed $from Start date (timestamp or user formatted date)
|
||||||
|
* @param mixed $to End date (timestamp or user formatted date)
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
public function export($project_id, $from, $to)
|
||||||
|
{
|
||||||
|
$results = array($this->getColumns());
|
||||||
|
$transitions = $this->transition->getAllByProjectAndDate($project_id, $from, $to);
|
||||||
|
|
||||||
|
foreach ($transitions as $transition) {
|
||||||
|
$results[] = $this->format($transition);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $results;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get column titles
|
||||||
|
*
|
||||||
|
* @access protected
|
||||||
|
* @return string[]
|
||||||
|
*/
|
||||||
|
protected function getColumns()
|
||||||
|
{
|
||||||
|
return array(
|
||||||
|
e('Id'),
|
||||||
|
e('Task Title'),
|
||||||
|
e('Source column'),
|
||||||
|
e('Destination column'),
|
||||||
|
e('Executer'),
|
||||||
|
e('Date'),
|
||||||
|
e('Time spent'),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Format the output of a transition array
|
||||||
|
*
|
||||||
|
* @access protected
|
||||||
|
* @param array $transition
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
protected function format(array $transition)
|
||||||
|
{
|
||||||
|
$values = array(
|
||||||
|
(int) $transition['id'],
|
||||||
|
$transition['title'],
|
||||||
|
$transition['src_column'],
|
||||||
|
$transition['dst_column'],
|
||||||
|
$transition['name'] ?: $transition['username'],
|
||||||
|
date($this->config->get('application_datetime_format', DateParser::DATE_TIME_FORMAT), $transition['date']),
|
||||||
|
round($transition['time_spent'] / 3600, 2)
|
||||||
|
);
|
||||||
|
|
||||||
|
return $values;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -74,6 +74,7 @@ class ClassProvider implements ServiceProviderInterface
|
|||||||
'TaskImport',
|
'TaskImport',
|
||||||
'TaskMetadata',
|
'TaskMetadata',
|
||||||
'Transition',
|
'Transition',
|
||||||
|
'TransitionExport',
|
||||||
'User',
|
'User',
|
||||||
'UserImport',
|
'UserImport',
|
||||||
'UserLocking',
|
'UserLocking',
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ require_once __DIR__.'/../Base.php';
|
|||||||
|
|
||||||
use Kanboard\Core\Session\FlashMessage;
|
use Kanboard\Core\Session\FlashMessage;
|
||||||
use Kanboard\Helper\App;
|
use Kanboard\Helper\App;
|
||||||
use Kanboard\Model\Config;
|
|
||||||
|
|
||||||
class AppHelperTest extends Base
|
class AppHelperTest extends Base
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2,12 +2,10 @@
|
|||||||
|
|
||||||
require_once __DIR__.'/../Base.php';
|
require_once __DIR__.'/../Base.php';
|
||||||
|
|
||||||
use Kanboard\Model\Task;
|
|
||||||
use Kanboard\Model\TaskCreation;
|
use Kanboard\Model\TaskCreation;
|
||||||
use Kanboard\Model\TaskFinder;
|
use Kanboard\Model\TaskFinder;
|
||||||
use Kanboard\Model\Project;
|
use Kanboard\Model\Project;
|
||||||
use Kanboard\Model\Category;
|
use Kanboard\Model\Category;
|
||||||
use Kanboard\Model\User;
|
|
||||||
|
|
||||||
class CategoryTest extends Base
|
class CategoryTest extends Base
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
require_once __DIR__.'/../Base.php';
|
require_once __DIR__.'/../Base.php';
|
||||||
|
|
||||||
use Kanboard\Model\Task;
|
|
||||||
use Kanboard\Model\TaskCreation;
|
use Kanboard\Model\TaskCreation;
|
||||||
use Kanboard\Model\Project;
|
use Kanboard\Model\Project;
|
||||||
use Kanboard\Model\Comment;
|
use Kanboard\Model\Comment;
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
require_once __DIR__.'/../Base.php';
|
require_once __DIR__.'/../Base.php';
|
||||||
|
|
||||||
use Kanboard\Model\Config;
|
use Kanboard\Model\Config;
|
||||||
use Kanboard\Core\Session\SessionManager;
|
|
||||||
|
|
||||||
class ConfigTest extends Base
|
class ConfigTest extends Base
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ use Kanboard\Model\TaskFinder;
|
|||||||
use Kanboard\Model\TaskCreation;
|
use Kanboard\Model\TaskCreation;
|
||||||
use Kanboard\Model\Subtask;
|
use Kanboard\Model\Subtask;
|
||||||
use Kanboard\Model\Comment;
|
use Kanboard\Model\Comment;
|
||||||
use Kanboard\Model\User;
|
|
||||||
use Kanboard\Model\TaskFile;
|
use Kanboard\Model\TaskFile;
|
||||||
use Kanboard\Model\Task;
|
use Kanboard\Model\Task;
|
||||||
use Kanboard\Model\Project;
|
use Kanboard\Model\Project;
|
||||||
|
|||||||
@@ -7,8 +7,6 @@ use Kanboard\Model\TaskFinder;
|
|||||||
use Kanboard\Model\TaskCreation;
|
use Kanboard\Model\TaskCreation;
|
||||||
use Kanboard\Model\ProjectActivity;
|
use Kanboard\Model\ProjectActivity;
|
||||||
use Kanboard\Model\Project;
|
use Kanboard\Model\Project;
|
||||||
use Kanboard\Model\Subtask;
|
|
||||||
use Kanboard\Model\Comment;
|
|
||||||
|
|
||||||
class ProjectActivityTest extends Base
|
class ProjectActivityTest extends Base
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ use Kanboard\Model\ProjectDailyColumnStats;
|
|||||||
use Kanboard\Model\Config;
|
use Kanboard\Model\Config;
|
||||||
use Kanboard\Model\Task;
|
use Kanboard\Model\Task;
|
||||||
use Kanboard\Model\TaskCreation;
|
use Kanboard\Model\TaskCreation;
|
||||||
use Kanboard\Model\TaskStatus;
|
|
||||||
|
|
||||||
class ProjectDailyColumnStatsTest extends Base
|
class ProjectDailyColumnStatsTest extends Base
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ require_once __DIR__.'/../Base.php';
|
|||||||
|
|
||||||
use Kanboard\Model\Project;
|
use Kanboard\Model\Project;
|
||||||
use Kanboard\Model\ProjectDailyStats;
|
use Kanboard\Model\ProjectDailyStats;
|
||||||
use Kanboard\Model\Task;
|
|
||||||
use Kanboard\Model\TaskCreation;
|
use Kanboard\Model\TaskCreation;
|
||||||
use Kanboard\Model\TaskStatus;
|
use Kanboard\Model\TaskStatus;
|
||||||
|
|
||||||
|
|||||||
@@ -2,12 +2,9 @@
|
|||||||
|
|
||||||
require_once __DIR__.'/../Base.php';
|
require_once __DIR__.'/../Base.php';
|
||||||
|
|
||||||
use Kanboard\Model\Task;
|
|
||||||
use Kanboard\Model\TaskCreation;
|
use Kanboard\Model\TaskCreation;
|
||||||
use Kanboard\Model\Subtask;
|
use Kanboard\Model\Subtask;
|
||||||
use Kanboard\Model\Project;
|
use Kanboard\Model\Project;
|
||||||
use Kanboard\Model\Category;
|
|
||||||
use Kanboard\Model\User;
|
|
||||||
use Kanboard\Core\User\UserSession;
|
use Kanboard\Core\User\UserSession;
|
||||||
|
|
||||||
class SubtaskTest extends Base
|
class SubtaskTest extends Base
|
||||||
|
|||||||
@@ -7,8 +7,6 @@ use Kanboard\Model\TaskCreation;
|
|||||||
use Kanboard\Model\Subtask;
|
use Kanboard\Model\Subtask;
|
||||||
use Kanboard\Model\SubtaskTimeTracking;
|
use Kanboard\Model\SubtaskTimeTracking;
|
||||||
use Kanboard\Model\Project;
|
use Kanboard\Model\Project;
|
||||||
use Kanboard\Model\Category;
|
|
||||||
use Kanboard\Model\User;
|
|
||||||
|
|
||||||
class SubtaskTimeTrackingTest extends Base
|
class SubtaskTimeTrackingTest extends Base
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
require_once __DIR__.'/../Base.php';
|
require_once __DIR__.'/../Base.php';
|
||||||
|
|
||||||
use Kanboard\Model\Project;
|
use Kanboard\Model\Project;
|
||||||
use Kanboard\Model\Task;
|
|
||||||
use Kanboard\Model\TaskCreation;
|
use Kanboard\Model\TaskCreation;
|
||||||
use Kanboard\Model\TaskFinder;
|
use Kanboard\Model\TaskFinder;
|
||||||
use Kanboard\Model\Swimlane;
|
use Kanboard\Model\Swimlane;
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ use Kanboard\Model\Config;
|
|||||||
use Kanboard\Model\Task;
|
use Kanboard\Model\Task;
|
||||||
use Kanboard\Model\TaskCreation;
|
use Kanboard\Model\TaskCreation;
|
||||||
use Kanboard\Model\TaskFinder;
|
use Kanboard\Model\TaskFinder;
|
||||||
use Kanboard\Model\TaskStatus;
|
|
||||||
use Kanboard\Model\Project;
|
use Kanboard\Model\Project;
|
||||||
|
|
||||||
class TaskCreationTest extends Base
|
class TaskCreationTest extends Base
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ use Kanboard\Model\Task;
|
|||||||
use Kanboard\Model\TaskCreation;
|
use Kanboard\Model\TaskCreation;
|
||||||
use Kanboard\Model\TaskDuplication;
|
use Kanboard\Model\TaskDuplication;
|
||||||
use Kanboard\Model\TaskFinder;
|
use Kanboard\Model\TaskFinder;
|
||||||
use Kanboard\Model\TaskStatus;
|
|
||||||
use Kanboard\Model\Project;
|
use Kanboard\Model\Project;
|
||||||
use Kanboard\Model\ProjectUserRole;
|
use Kanboard\Model\ProjectUserRole;
|
||||||
use Kanboard\Model\Category;
|
use Kanboard\Model\Category;
|
||||||
|
|||||||
@@ -2,12 +2,10 @@
|
|||||||
|
|
||||||
require_once __DIR__.'/../Base.php';
|
require_once __DIR__.'/../Base.php';
|
||||||
|
|
||||||
use Kanboard\Model\Task;
|
|
||||||
use Kanboard\Model\TaskCreation;
|
use Kanboard\Model\TaskCreation;
|
||||||
use Kanboard\Model\TaskExport;
|
use Kanboard\Model\TaskExport;
|
||||||
use Kanboard\Model\Project;
|
use Kanboard\Model\Project;
|
||||||
use Kanboard\Model\Category;
|
use Kanboard\Model\Category;
|
||||||
use Kanboard\Model\User;
|
|
||||||
use Kanboard\Model\Swimlane;
|
use Kanboard\Model\Swimlane;
|
||||||
|
|
||||||
class TaskExportTest extends Base
|
class TaskExportTest extends Base
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
require_once __DIR__.'/../Base.php';
|
require_once __DIR__.'/../Base.php';
|
||||||
|
|
||||||
use Kanboard\Model\Task;
|
|
||||||
use Kanboard\Model\TaskFile;
|
use Kanboard\Model\TaskFile;
|
||||||
use Kanboard\Model\TaskCreation;
|
use Kanboard\Model\TaskCreation;
|
||||||
use Kanboard\Model\Project;
|
use Kanboard\Model\Project;
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ use Kanboard\Model\TaskLink;
|
|||||||
use Kanboard\Core\DateParser;
|
use Kanboard\Core\DateParser;
|
||||||
use Kanboard\Model\Category;
|
use Kanboard\Model\Category;
|
||||||
use Kanboard\Model\Subtask;
|
use Kanboard\Model\Subtask;
|
||||||
use Kanboard\Model\Config;
|
|
||||||
use Kanboard\Model\Swimlane;
|
use Kanboard\Model\Swimlane;
|
||||||
|
|
||||||
class TaskFilterTest extends Base
|
class TaskFilterTest extends Base
|
||||||
|
|||||||
@@ -2,12 +2,9 @@
|
|||||||
|
|
||||||
require_once __DIR__.'/../Base.php';
|
require_once __DIR__.'/../Base.php';
|
||||||
|
|
||||||
use Kanboard\Model\Task;
|
|
||||||
use Kanboard\Model\TaskCreation;
|
use Kanboard\Model\TaskCreation;
|
||||||
use Kanboard\Model\TaskFinder;
|
use Kanboard\Model\TaskFinder;
|
||||||
use Kanboard\Model\Project;
|
use Kanboard\Model\Project;
|
||||||
use Kanboard\Model\Category;
|
|
||||||
use Kanboard\Model\User;
|
|
||||||
|
|
||||||
class TaskFinderTest extends Base
|
class TaskFinderTest extends Base
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
require_once __DIR__.'/../Base.php';
|
require_once __DIR__.'/../Base.php';
|
||||||
|
|
||||||
use Kanboard\Model\Link;
|
|
||||||
use Kanboard\Model\TaskFinder;
|
use Kanboard\Model\TaskFinder;
|
||||||
use Kanboard\Model\TaskLink;
|
use Kanboard\Model\TaskLink;
|
||||||
use Kanboard\Model\TaskCreation;
|
use Kanboard\Model\TaskCreation;
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ use Kanboard\Model\Task;
|
|||||||
use Kanboard\Model\TaskCreation;
|
use Kanboard\Model\TaskCreation;
|
||||||
use Kanboard\Model\TaskModification;
|
use Kanboard\Model\TaskModification;
|
||||||
use Kanboard\Model\TaskFinder;
|
use Kanboard\Model\TaskFinder;
|
||||||
use Kanboard\Model\TaskStatus;
|
|
||||||
use Kanboard\Model\Project;
|
use Kanboard\Model\Project;
|
||||||
|
|
||||||
class TaskModificationTest extends Base
|
class TaskModificationTest extends Base
|
||||||
|
|||||||
@@ -2,12 +2,10 @@
|
|||||||
|
|
||||||
require_once __DIR__.'/../Base.php';
|
require_once __DIR__.'/../Base.php';
|
||||||
|
|
||||||
use Kanboard\Model\Task;
|
|
||||||
use Kanboard\Model\TaskCreation;
|
use Kanboard\Model\TaskCreation;
|
||||||
use Kanboard\Model\TaskFinder;
|
use Kanboard\Model\TaskFinder;
|
||||||
use Kanboard\Model\TaskPermission;
|
use Kanboard\Model\TaskPermission;
|
||||||
use Kanboard\Model\Project;
|
use Kanboard\Model\Project;
|
||||||
use Kanboard\Model\Category;
|
|
||||||
use Kanboard\Model\User;
|
use Kanboard\Model\User;
|
||||||
use Kanboard\Core\User\UserSession;
|
use Kanboard\Core\User\UserSession;
|
||||||
|
|
||||||
|
|||||||
45
tests/units/Model/TransitionExportTest.php
Normal file
45
tests/units/Model/TransitionExportTest.php
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
require_once __DIR__.'/../Base.php';
|
||||||
|
|
||||||
|
use Kanboard\Model\TaskCreation;
|
||||||
|
use Kanboard\Model\Transition;
|
||||||
|
use Kanboard\Model\TransitionExport;
|
||||||
|
use Kanboard\Model\Project;
|
||||||
|
|
||||||
|
class TransitionExportTest extends Base
|
||||||
|
{
|
||||||
|
public function testExport()
|
||||||
|
{
|
||||||
|
$projectModel = new Project($this->container);
|
||||||
|
$taskCreationModel = new TaskCreation($this->container);
|
||||||
|
$transitionModel = new Transition($this->container);
|
||||||
|
$transitionExportModel = new TransitionExport($this->container);
|
||||||
|
|
||||||
|
$this->assertEquals(1, $projectModel->create(array('name' => 'test')));
|
||||||
|
$this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
|
||||||
|
|
||||||
|
$task_event = array(
|
||||||
|
'project_id' => 1,
|
||||||
|
'task_id' => 1,
|
||||||
|
'src_column_id' => 1,
|
||||||
|
'dst_column_id' => 2,
|
||||||
|
'date_moved' => time() - 3600
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->assertTrue($transitionModel->save(1, $task_event));
|
||||||
|
|
||||||
|
$export = $transitionExportModel->export(1, date('Y-m-d'), date('Y-m-d'));
|
||||||
|
$this->assertCount(2, $export);
|
||||||
|
|
||||||
|
$this->assertEquals(
|
||||||
|
array('Id', 'Task Title', 'Source column', 'Destination column', 'Executer', 'Date', 'Time spent'),
|
||||||
|
$export[0]
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->assertEquals(
|
||||||
|
array(1, 'test', 'Backlog', 'Ready', 'admin', date('m/d/Y H:i', time()), 1.0),
|
||||||
|
$export[1]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
141
tests/units/Model/TransitionTest.php
Normal file
141
tests/units/Model/TransitionTest.php
Normal file
@@ -0,0 +1,141 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
require_once __DIR__.'/../Base.php';
|
||||||
|
|
||||||
|
use Kanboard\Model\TaskCreation;
|
||||||
|
use Kanboard\Model\Transition;
|
||||||
|
use Kanboard\Model\Project;
|
||||||
|
|
||||||
|
class TransitionTest extends Base
|
||||||
|
{
|
||||||
|
public function testSave()
|
||||||
|
{
|
||||||
|
$projectModel = new Project($this->container);
|
||||||
|
$taskCreationModel = new TaskCreation($this->container);
|
||||||
|
$transitionModel = new Transition($this->container);
|
||||||
|
|
||||||
|
$this->assertEquals(1, $projectModel->create(array('name' => 'test')));
|
||||||
|
$this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
|
||||||
|
|
||||||
|
$task_event = array(
|
||||||
|
'project_id' => 1,
|
||||||
|
'task_id' => 1,
|
||||||
|
'src_column_id' => 1,
|
||||||
|
'dst_column_id' => 2,
|
||||||
|
'date_moved' => time() - 3600
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->assertTrue($transitionModel->save(1, $task_event));
|
||||||
|
|
||||||
|
$transitions = $transitionModel->getAllByTask(1);
|
||||||
|
$this->assertCount(1, $transitions);
|
||||||
|
$this->assertEquals('Backlog', $transitions[0]['src_column']);
|
||||||
|
$this->assertEquals('Ready', $transitions[0]['dst_column']);
|
||||||
|
$this->assertEquals('', $transitions[0]['name']);
|
||||||
|
$this->assertEquals('admin', $transitions[0]['username']);
|
||||||
|
$this->assertEquals(1, $transitions[0]['user_id']);
|
||||||
|
$this->assertEquals(time(), $transitions[0]['date'], '', 3);
|
||||||
|
$this->assertEquals(3600, $transitions[0]['time_spent']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testGetTimeSpentByTask()
|
||||||
|
{
|
||||||
|
$projectModel = new Project($this->container);
|
||||||
|
$taskCreationModel = new TaskCreation($this->container);
|
||||||
|
$transitionModel = new Transition($this->container);
|
||||||
|
|
||||||
|
$this->assertEquals(1, $projectModel->create(array('name' => 'test')));
|
||||||
|
$this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
|
||||||
|
|
||||||
|
$task_event = array(
|
||||||
|
'project_id' => 1,
|
||||||
|
'task_id' => 1,
|
||||||
|
'src_column_id' => 1,
|
||||||
|
'dst_column_id' => 2,
|
||||||
|
'date_moved' => time() - 3600
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->assertTrue($transitionModel->save(1, $task_event));
|
||||||
|
|
||||||
|
$task_event = array(
|
||||||
|
'project_id' => 1,
|
||||||
|
'task_id' => 1,
|
||||||
|
'src_column_id' => 2,
|
||||||
|
'dst_column_id' => 3,
|
||||||
|
'date_moved' => time() - 1200
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->assertTrue($transitionModel->save(1, $task_event));
|
||||||
|
|
||||||
|
$expected = array(
|
||||||
|
'1' => 3600,
|
||||||
|
'2' => 1200,
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->assertEquals($expected, $transitionModel->getTimeSpentByTask(1));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testGetAllByProject()
|
||||||
|
{
|
||||||
|
$projectModel = new Project($this->container);
|
||||||
|
$taskCreationModel = new TaskCreation($this->container);
|
||||||
|
$transitionModel = new Transition($this->container);
|
||||||
|
|
||||||
|
$this->assertEquals(1, $projectModel->create(array('name' => 'test')));
|
||||||
|
$this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test1')));
|
||||||
|
$this->assertEquals(2, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test2')));
|
||||||
|
|
||||||
|
$task_event = array(
|
||||||
|
'project_id' => 1,
|
||||||
|
'src_column_id' => 1,
|
||||||
|
'dst_column_id' => 2,
|
||||||
|
'date_moved' => time() - 3600
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->assertTrue($transitionModel->save(1, array('task_id' => 1) + $task_event));
|
||||||
|
$this->assertTrue($transitionModel->save(1, array('task_id' => 2) + $task_event));
|
||||||
|
|
||||||
|
$task_event = array(
|
||||||
|
'project_id' => 1,
|
||||||
|
'src_column_id' => 2,
|
||||||
|
'dst_column_id' => 3,
|
||||||
|
'date_moved' => time() - 1200
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->assertTrue($transitionModel->save(1, array('task_id' => 1) + $task_event));
|
||||||
|
$this->assertTrue($transitionModel->save(1, array('task_id' => 2) + $task_event));
|
||||||
|
|
||||||
|
$transitions = $transitionModel->getAllByProjectAndDate(1, date('Y-m-d'), date('Y-m-d'));
|
||||||
|
$this->assertCount(4, $transitions);
|
||||||
|
|
||||||
|
$this->assertEquals(2, $transitions[0]['id']);
|
||||||
|
$this->assertEquals(1, $transitions[1]['id']);
|
||||||
|
$this->assertEquals(2, $transitions[2]['id']);
|
||||||
|
$this->assertEquals(1, $transitions[3]['id']);
|
||||||
|
|
||||||
|
$this->assertEquals('test2', $transitions[0]['title']);
|
||||||
|
$this->assertEquals('test1', $transitions[1]['title']);
|
||||||
|
$this->assertEquals('test2', $transitions[2]['title']);
|
||||||
|
$this->assertEquals('test1', $transitions[3]['title']);
|
||||||
|
|
||||||
|
$this->assertEquals('Ready', $transitions[0]['src_column']);
|
||||||
|
$this->assertEquals('Ready', $transitions[1]['src_column']);
|
||||||
|
$this->assertEquals('Backlog', $transitions[2]['src_column']);
|
||||||
|
$this->assertEquals('Backlog', $transitions[3]['src_column']);
|
||||||
|
|
||||||
|
$this->assertEquals('Work in progress', $transitions[0]['dst_column']);
|
||||||
|
$this->assertEquals('Work in progress', $transitions[1]['dst_column']);
|
||||||
|
$this->assertEquals('Ready', $transitions[2]['dst_column']);
|
||||||
|
$this->assertEquals('Ready', $transitions[3]['dst_column']);
|
||||||
|
|
||||||
|
$this->assertEquals('admin', $transitions[0]['username']);
|
||||||
|
$this->assertEquals('admin', $transitions[1]['username']);
|
||||||
|
$this->assertEquals('admin', $transitions[2]['username']);
|
||||||
|
$this->assertEquals('admin', $transitions[3]['username']);
|
||||||
|
|
||||||
|
$this->assertEquals(1200, $transitions[0]['time_spent']);
|
||||||
|
$this->assertEquals(1200, $transitions[1]['time_spent']);
|
||||||
|
$this->assertEquals(3600, $transitions[2]['time_spent']);
|
||||||
|
$this->assertEquals(3600, $transitions[3]['time_spent']);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,8 +4,6 @@ require_once __DIR__.'/../Base.php';
|
|||||||
|
|
||||||
use Kanboard\Model\TaskFinder;
|
use Kanboard\Model\TaskFinder;
|
||||||
use Kanboard\Model\TaskCreation;
|
use Kanboard\Model\TaskCreation;
|
||||||
use Kanboard\Model\Subtask;
|
|
||||||
use Kanboard\Model\Comment;
|
|
||||||
use Kanboard\Model\User;
|
use Kanboard\Model\User;
|
||||||
use Kanboard\Model\Group;
|
use Kanboard\Model\Group;
|
||||||
use Kanboard\Model\GroupMember;
|
use Kanboard\Model\GroupMember;
|
||||||
@@ -16,7 +14,6 @@ use Kanboard\Model\ProjectUserRole;
|
|||||||
use Kanboard\Model\ProjectGroupRole;
|
use Kanboard\Model\ProjectGroupRole;
|
||||||
use Kanboard\Model\UserNotification;
|
use Kanboard\Model\UserNotification;
|
||||||
use Kanboard\Model\UserNotificationFilter;
|
use Kanboard\Model\UserNotificationFilter;
|
||||||
use Kanboard\Model\UserNotificationType;
|
|
||||||
use Kanboard\Subscriber\UserNotificationSubscriber;
|
use Kanboard\Subscriber\UserNotificationSubscriber;
|
||||||
use Kanboard\Core\Security\Role;
|
use Kanboard\Core\Security\Role;
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ require_once __DIR__.'/../Base.php';
|
|||||||
use Kanboard\Model\User;
|
use Kanboard\Model\User;
|
||||||
use Kanboard\Model\Subtask;
|
use Kanboard\Model\Subtask;
|
||||||
use Kanboard\Model\Comment;
|
use Kanboard\Model\Comment;
|
||||||
use Kanboard\Model\Task;
|
|
||||||
use Kanboard\Model\TaskCreation;
|
use Kanboard\Model\TaskCreation;
|
||||||
use Kanboard\Model\TaskFinder;
|
use Kanboard\Model\TaskFinder;
|
||||||
use Kanboard\Model\Project;
|
use Kanboard\Model\Project;
|
||||||
|
|||||||
@@ -4,8 +4,6 @@ require_once __DIR__.'/../Base.php';
|
|||||||
|
|
||||||
use Kanboard\Model\TaskFinder;
|
use Kanboard\Model\TaskFinder;
|
||||||
use Kanboard\Model\TaskCreation;
|
use Kanboard\Model\TaskCreation;
|
||||||
use Kanboard\Model\Subtask;
|
|
||||||
use Kanboard\Model\Comment;
|
|
||||||
use Kanboard\Model\User;
|
use Kanboard\Model\User;
|
||||||
use Kanboard\Model\Task;
|
use Kanboard\Model\Task;
|
||||||
use Kanboard\Model\Project;
|
use Kanboard\Model\Project;
|
||||||
|
|||||||
Reference in New Issue
Block a user