fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PM-2780:Add an option to select minutes to task timing control

Browse Source
This commit is contained in:
Paula V. Quispe
2015-06-08 08:11:27 -04:00
parent bf387ea1f9
commit 19f772d496
2 changed files with 4 additions and 2 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;

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>