Handle priority for task and project duplication

This commit is contained in:
Frederic Guillot
2016-07-02 16:36:10 -04:00
parent 8e56148a6d
commit 10d577ad9d
11 changed files with 279 additions and 129 deletions

View File

@@ -81,7 +81,7 @@ class ActionCreationController extends BaseController
'colors_list' => $this->colorModel->getList(),
'categories_list' => $this->categoryModel->getList($project['id']),
'links_list' => $this->linkModel->getList(0, false),
'priorities_list' => $this->projectModel->getPriorities($project),
'priorities_list' => $this->projectTaskPriorityModel->getPriorities($project),
'project' => $project,
'available_actions' => $this->actionManager->getAvailableActions(),
'events' => $this->actionManager->getCompatibleEvents($values['action_name']),

View File

@@ -87,6 +87,7 @@ use Pimple\Container;
* @property \Kanboard\Model\ProjectNotificationModel $projectNotificationModel
* @property \Kanboard\Model\ProjectNotificationTypeModel $projectNotificationTypeModel
* @property \Kanboard\Model\ProjectTaskDuplicationModel $projectTaskDuplicationModel
* @property \Kanboard\Model\ProjectTaskPriorityModel $projectTaskPriorityModel
* @property \Kanboard\Model\RememberMeSessionModel $rememberMeSessionModel
* @property \Kanboard\Model\SubtaskModel $subtaskModel
* @property \Kanboard\Model\SubtaskTimeTrackingModel $subtaskTimeTrackingModel

View File

@@ -146,6 +146,9 @@ class ProjectDuplicationModel extends Base
'is_public' => 0,
'is_private' => $private ? 1 : $is_private,
'owner_id' => $owner_id,
'priority_default' => $project['priority_default'],
'priority_start' => $project['priority_start'],
'priority_end' => $project['priority_end'],
);
if (! $this->db->table(ProjectModel::TABLE)->save($values)) {

View File

@@ -245,19 +245,6 @@ class ProjectModel extends Base
->count();
}
/**
* Get Priority range from a project
*
* @access public
* @param array $project
* @return array
*/
public function getPriorities(array $project)
{
$range = range($project['priority_start'], $project['priority_end']);
return array_combine($range, $range);
}
/**
* Gather some task metrics for a given project
*

View File

@@ -0,0 +1,74 @@
<?php
namespace Kanboard\Model;
use Kanboard\Core\Base;
/**
* Project Task Priority Model
*
* @package Kanboard\Model
* @author Frederic Guillot
*/
class ProjectTaskPriorityModel extends Base
{
/**
* Get Priority range from a project
*
* @access public
* @param array $project
* @return array
*/
public function getPriorities(array $project)
{
$range = range($project['priority_start'], $project['priority_end']);
return array_combine($range, $range);
}
/**
* Get task priority settings
*
* @access public
* @param int $project_id
* @return array|null
*/
public function getPrioritySettings($project_id)
{
return $this->db
->table(ProjectModel::TABLE)
->columns('priority_default', 'priority_start', 'priority_end')
->eq('id', $project_id)
->findOne();
}
/**
* Get default task priority
*
* @access public
* @param int $project_id
* @return int
*/
public function getDefaultPriority($project_id)
{
return $this->db->table(ProjectModel::TABLE)->eq('id', $project_id)->findOneColumn('priority_default') ?: 0;
}
/**
* Get priority for a destination project
*
* @access public
* @param integer $dst_project_id
* @param integer $priority
* @return integer
*/
public function getPriorityForProject($dst_project_id, $priority)
{
$settings = $this->getPrioritySettings($dst_project_id);
if ($priority >= $settings['priority_start'] && $priority <= $settings['priority_end']) {
return $priority;
}
return $settings['priority_default'];
}
}

View File

@@ -18,7 +18,7 @@ class TaskDuplicationModel extends Base
* @access protected
* @var string[]
*/
protected $fields_to_duplicate = array(
protected $fieldsToDuplicate = array(
'title',
'description',
'date_due',
@@ -27,6 +27,7 @@ class TaskDuplicationModel extends Base
'column_id',
'owner_id',
'score',
'priority',
'category_id',
'time_estimated',
'swimlane_id',
@@ -95,6 +96,12 @@ class TaskDuplicationModel extends Base
$values['column_id'] = $values['column_id'] ?: $this->columnModel->getFirstColumnId($values['project_id']);
}
// Check if priority exists for destination project
$values['priority'] = $this->projectTaskPriorityModel->getPriorityForProject(
$values['project_id'],
empty($values['priority']) ? 0 : $values['priority']
);
return $values;
}
@@ -110,7 +117,7 @@ class TaskDuplicationModel extends Base
$task = $this->taskFinderModel->getById($task_id);
$values = array();
foreach ($this->fields_to_duplicate as $field) {
foreach ($this->fieldsToDuplicate as $field) {
$values[$field] = $task[$field];
}

View File

@@ -56,6 +56,7 @@ class ClassProvider implements ServiceProviderInterface
'ProjectMetadataModel',
'ProjectGroupRoleModel',
'ProjectTaskDuplicationModel',
'ProjectTaskPriorityModel',
'ProjectUserRoleModel',
'RememberMeSessionModel',
'SubtaskModel',