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

Recurring tasks (#847): rename class constants

Browse Source
This commit is contained in:
Frederic Guillot
2015-05-10 15:55:57 -04:00
parent bd3c44c3d3
commit a7b77623ce
7 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/Model/Task.php
View File

@@ -46,35 +46,35 @@ class Task extends Base
*
* @var integer
*/
const RECURE_STATUS_NONE = 0;
const RECURE_STATUS_PENDING = 1;
const RECURE_STATUS_PROCESSED = 2;
const RECURRING_STATUS_NONE = 0;
const RECURRING_STATUS_PENDING = 1;
const RECURRING_STATUS_PROCESSED = 2;
/**
* Recurrence: trigger
*
* @var integer
*/
const RECURE_TRIGGER_FIRST = 0;
const RECURE_TRIGGER_LAST = 1;
const RECURE_TRIGGER_CLOSE = 2;
const RECURRING_TRIGGER_FIRST_COLUMN = 0;
const RECURRING_TRIGGER_LAST_COLUMN = 1;
const RECURRING_TRIGGER_CLOSE = 2;
/**
* Recurrence: timeframe
*
* @var integer
*/
const RECURE_DAYS = 0;
const RECURE_MONTHS = 1;
const RECURE_YEARS = 2;
const RECURRING_TIMEFRAME_DAYS = 0;
const RECURRING_TIMEFRAME_MONTHS = 1;
const RECURRING_TIMEFRAME_YEARS = 2;
/**
* Recurrence: base date used to calculate new due date
*
* @var integer
*/
const RECURE_BASEDATE_DUEDATE = 0;
const RECURE_BASEDATE_TRIGGERDATE = 1;
const RECURRING_BASEDATE_DUEDATE = 0;
const RECURRING_BASEDATE_TRIGGERDATE = 1;
/**
* Remove a task
@@ -121,8 +121,8 @@ class Task extends Base
public function getRecurrenceStatusList()
{
return array (
Task::RECURE_STATUS_NONE => t('No'),
Task::RECURE_STATUS_PENDING => t('Yes'),
Task::RECURRING_STATUS_NONE => t('No'),
Task::RECURRING_STATUS_PENDING => t('Yes'),
);
}
@@ -135,9 +135,9 @@ class Task extends Base
public function getRecurrenceTriggerList()
{
return array (
Task::RECURE_TRIGGER_FIRST => t('When task is moved from first column'),
Task::RECURE_TRIGGER_LAST => t('When task is moved to last column'),
Task::RECURE_TRIGGER_CLOSE => t('When task is closed'),
Task::RECURRING_TRIGGER_FIRST_COLUMN => t('When task is moved from first column'),
Task::RECURRING_TRIGGER_LAST_COLUMN => t('When task is moved to last column'),
Task::RECURRING_TRIGGER_CLOSE => t('When task is closed'),
);
}
@@ -150,8 +150,8 @@ class Task extends Base
public function getRecurrenceBasedateList()
{
return array (
Task::RECURE_BASEDATE_DUEDATE => t('Existing due date'),
Task::RECURE_BASEDATE_TRIGGERDATE => t('Action date'),
Task::RECURRING_BASEDATE_DUEDATE => t('Existing due date'),
Task::RECURRING_BASEDATE_TRIGGERDATE => t('Action date'),
);
}
@@ -164,9 +164,9 @@ class Task extends Base
public function getRecurrenceTimeframeList()
{
return array (
Task::RECURE_DAYS => t('Day(s)'),
Task::RECURE_MONTHS => t('Month(s)'),
Task::RECURE_YEARS => t('Year(s)'),
Task::RECURRING_TIMEFRAME_DAYS => t('Day(s)'),
Task::RECURRING_TIMEFRAME_MONTHS => t('Month(s)'),
Task::RECURRING_TIMEFRAME_YEARS => t('Year(s)'),
);
}
}

10
app/Model/TaskDuplication.php
View File

@@ -62,7 +62,7 @@ class TaskDuplication extends Base
{
$values = $this->copyFields($task_id);
if ($values['recurrence_status'] == Task::RECURE_STATUS_PENDING) {
if ($values['recurrence_status'] == Task::RECURRING_STATUS_PENDING) {
$values['recurrence_parent'] = $task_id;
$values['column_id'] = $this->board->getFirstColumn($values['project_id']);
@@ -76,7 +76,7 @@ class TaskDuplication extends Base
->table(Task::TABLE)
->eq('id', $task_id)
->update(array(
'recurrence_status' => Task::RECURE_STATUS_PROCESSED,
'recurrence_status' => Task::RECURRING_STATUS_PROCESSED,
'recurrence_child' => $recurring_task_id,
));
@@ -181,7 +181,7 @@ class TaskDuplication extends Base
{
if (! empty($values['date_due']) && $values['recurrence_factor'] != 0) {
if ($values['recurrence_basedate'] == Task::RECURE_BASEDATE_TRIGGERDATE) {
if ($values['recurrence_basedate'] == Task::RECURRING_BASEDATE_TRIGGERDATE) {
$values['date_due'] = time();
}
@@ -189,10 +189,10 @@ class TaskDuplication extends Base
$subtract = $values['recurrence_factor'] < 0;
switch ($values['recurrence_timeframe']) {
case Task::RECURE_MONTHS:
case Task::RECURRING_TIMEFRAME_MONTHS:
$interval = 'P' . $factor . 'M';
break;
case Task::RECURE_YEARS:
case Task::RECURRING_TIMEFRAME_YEARS:
$interval = 'P' . $factor . 'Y';
break;
default: