fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in paulis/processmaker/PM-2780-PM (pull request #2308)

Browse Source 
PM-2780:Add an option to select minutes to task timing control
This commit is contained in:
Julio Cesar Laura Avendaño
2015-06-08 13:37:45 -04:00
parent 0dc542bef2 0db77754aa
commit 7b8f7b3792
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/class.calendar.php
View File

@@ -806,7 +806,9 @@ class calendar extends CalendarDefinition
if ( G::toUpper($formatDuration) == 'DAYS' ) { if ( G::toUpper($formatDuration) == 'DAYS' ) {
$duration = $duration*$calendarData['HOURS_FOR_DAY']; $duration = $duration*$calendarData['HOURS_FOR_DAY'];
} }
if ( G::toUpper($formatDuration) == 'MINUTES' ) {
$duration = $duration/60;
}
$hoursDuration = (float)$duration; $hoursDuration = (float)$duration;
$newDate = $iniDate; $newDate = $iniDate;

4
workflow/engine/methods/cases/cases_Step.php
View File

@@ -904,12 +904,16 @@ try {
if ($aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TIMEUNIT'] == 'HOURS') { if ($aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TIMEUNIT'] == 'HOURS') {
$hoursSelected = "selected = 'selected'"; $hoursSelected = "selected = 'selected'";
} else { } else {
if ($aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TIMEUNIT'] == 'MINUTES') {
$minSelected = "selected = 'selected'";
}
$daysSelected = "selected = 'selected'"; $daysSelected = "selected = 'selected'";
} }
$sAux = '<select name=' . $hiddenName . '[NEXT_TASK][TAS_TIMEUNIT] id= ' . $hiddenName . '[NEXT_TASK][TAS_TIMEUNIT] >'; $sAux = '<select name=' . $hiddenName . '[NEXT_TASK][TAS_TIMEUNIT] id= ' . $hiddenName . '[NEXT_TASK][TAS_TIMEUNIT] >';
$sAux .= "<option " . $hoursSelected . " value='HOURS'>Hours</option> "; $sAux .= "<option " . $hoursSelected . " value='HOURS'>Hours</option> ";
$sAux .= "<option " . $daysSelected . " value='DAYS'>Days</option> "; $sAux .= "<option " . $daysSelected . " value='DAYS'>Days</option> ";
$sAux .= "<option " . $minSelected . " value='MINUTES'>Minutes</option> ";
$sAux .= '</select>'; $sAux .= '</select>';
$aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TIMEUNIT'] = $sAux; $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TIMEUNIT'] = $sAux;

2
workflow/engine/src/ProcessMaker/BusinessModel/Task.php
View File

@@ -325,7 +325,7 @@ class Task
if (!isset($arrayProperty["TAS_DURATION"])) { if (!isset($arrayProperty["TAS_DURATION"])) {
throw (new \Exception("Invalid value specified for 'tas_duration'")); throw (new \Exception("Invalid value specified for 'tas_duration'"));
} }
$valuesTimeUnit = array('DAYS','HOURS'); $valuesTimeUnit = array('DAYS','HOURS','MINUTES');
if ((!isset($arrayProperty["TAS_TIMEUNIT"])) || if ((!isset($arrayProperty["TAS_TIMEUNIT"])) ||
(!in_array($arrayProperty["TAS_TIMEUNIT"], $valuesTimeUnit))) { (!in_array($arrayProperty["TAS_TIMEUNIT"], $valuesTimeUnit))) {
throw (new \Exception("Invalid value specified for 'tas_timeunit'")); throw (new \Exception("Invalid value specified for 'tas_timeunit'"));

2
workflow/engine/xmlform/tasks/tasks_TimingControl.xml
View File

@@ -10,7 +10,7 @@
<en><![CDATA[Task duration]]></en> <en><![CDATA[Task duration]]></en>
</TAS_DURATION> </TAS_DURATION>
<TAS_TIMEUNIT type="dropdown" defaultvalue="DAYS" group="1"> <TAS_TIMEUNIT type="dropdown" defaultvalue="DAYS" group="1">
<en><![CDATA[Time unit]]><option name="HOURS"><![CDATA[Hours]]></option><option name="DAYS"><![CDATA[Days]]></option></en> <en><![CDATA[Time unit]]><option name="HOURS"><![CDATA[Hours]]></option><option name="DAYS"><![CDATA[Days]]></option><option name="MINUTES"><![CDATA[Minutes]]></option></en>
</TAS_TIMEUNIT> </TAS_TIMEUNIT>
<TAS_TYPE_DAY type="dropdown" defaultvalue="1" group="1"> <TAS_TYPE_DAY type="dropdown" defaultvalue="1" group="1">
<en><![CDATA[Count days by]]><option name="1"><![CDATA[Work Days]]></option><option name="2"><![CDATA[Calendar Days]]></option></en> <en><![CDATA[Count days by]]><option name="1"><![CDATA[Work Days]]></option><option name="2"><![CDATA[Calendar Days]]></option></en>