fernando/luos
1
0
Fork 0
Code Releases Activity

Fix BUG: 15330: Every format in the properties Invalid Start Timer. Case Scheduler - SCH_REPEAT_EVERY

Browse Source
This commit is contained in:
Daniel Rojas
2014-07-07 14:27:00 -04:00
parent 76350ddf1f
commit 6b2b643e79
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/src/ProcessMaker/BusinessModel/CaseScheduler.php
View File

@@ -469,13 +469,12 @@ class CaseScheduler
$sDateTmp = date('Y-m-d'); $sDateTmp = date('Y-m-d');
$caseSchedulerData['SCH_START_DATE'] = $sDateTmp; $caseSchedulerData['SCH_START_DATE'] = $sDateTmp;
} }
$caseSchedulerData['SCH_END_DATE'] = date('Y-m-d', strtotime( $sDateTmp )) . ' ' . date('H:i:s', strtotime( $sTimeTmp ));
$caseSchedulerData['SCH_START_TIME'] = time(); $caseSchedulerData['SCH_START_TIME'] = time();
$caseSchedulerData['SCH_START_DATE'] = $caseSchedulerData['SCH_START_TIME']; $caseSchedulerData['SCH_START_DATE'] = $caseSchedulerData['SCH_START_TIME'];
if ($caseSchedulerData['SCH_REPEAT_EVERY'] == "") { if ($caseSchedulerData['SCH_REPEAT_EVERY'] == "") {
throw new \Exception(\G::LoadTranslation("ID_CAN_NOT_BE_NULL", array('sch_repeat_every'))); throw new \Exception(\G::LoadTranslation("ID_CAN_NOT_BE_NULL", array('sch_repeat_every')));
} }
$patternHour="/^([0-1][0-9]|[2][0-3])[\.]([0-5][0-9])$/"; $patternHour="/^([0-9]|0[0-9]|1[0-9]|2[0-3]).[0-5][0-9]$/";
if (!preg_match($patternHour, $caseSchedulerData['SCH_REPEAT_EVERY'])) { if (!preg_match($patternHour, $caseSchedulerData['SCH_REPEAT_EVERY'])) {
throw new \Exception(\G::LoadTranslation("ID_INVALID_SCH_REPEAT")); throw new \Exception(\G::LoadTranslation("ID_INVALID_SCH_REPEAT"));
} }
@@ -764,13 +763,12 @@ class CaseScheduler
$sDateTmp = date('Y-m-d'); $sDateTmp = date('Y-m-d');
$caseSchedulerData['SCH_START_DATE'] = $sDateTmp; $caseSchedulerData['SCH_START_DATE'] = $sDateTmp;
} }
$caseSchedulerData['SCH_END_DATE'] = date('Y-m-d', strtotime($sDateTmp)) . ' ' . date('H:i:s', strtotime($sTimeTmp));
$caseSchedulerData['SCH_START_TIME'] = time(); $caseSchedulerData['SCH_START_TIME'] = time();
$caseSchedulerData['SCH_START_DATE'] = $caseSchedulerData['SCH_START_TIME']; $caseSchedulerData['SCH_START_DATE'] = $caseSchedulerData['SCH_START_TIME'];
if ($caseSchedulerData['SCH_REPEAT_EVERY'] == "") { if ($caseSchedulerData['SCH_REPEAT_EVERY'] == "") {
throw new \Exception(\G::LoadTranslation("ID_CAN_NOT_BE_NULL", array('sch_repeat_every'))); throw new \Exception(\G::LoadTranslation("ID_CAN_NOT_BE_NULL", array('sch_repeat_every')));
} }
$patternHour="/^([0-1][0-9]|[2][0-3])[\.]([0-5][0-9])$/"; $patternHour="/^([0-9]|0[0-9]|1[0-9]|2[0-3]).[0-5][0-9]$/";
if (!preg_match($patternHour, $caseSchedulerData['SCH_REPEAT_EVERY'])) { if (!preg_match($patternHour, $caseSchedulerData['SCH_REPEAT_EVERY'])) {
throw new \Exception(\G::LoadTranslation("ID_INVALID_SCH_REPEAT")); throw new \Exception(\G::LoadTranslation("ID_INVALID_SCH_REPEAT"));
} }