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

Se valida sch_end_date que acepte valor nulo en CASE SCHEDULER

Browse Source
This commit is contained in:
Daniel Rojas
2014-08-28 12:35:17 -04:00
parent 6e7eec7528
commit 4f852ab4e5
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -283,11 +283,6 @@ class CaseScheduler
if (!preg_match($patternDate, $caseSchedulerData['SCH_START_DATE'])) {
throw new \Exception(\G::LoadTranslation("ID_INVALID_SCH_START_DATE"));
}
if (!isset($caseSchedulerData['SCH_END_DATE'])) {
if (!preg_match($patternDate, $caseSchedulerData['SCH_END_DATE'])) {
throw new \Exception(\G::LoadTranslation("ID_INVALID_SCH_END_DATE"));
}
}
if ($caseSchedulerData['SCH_START_DATE'] == "") {
throw new \Exception(\G::LoadTranslation("ID_CAN_NOT_BE_NULL", array('sch_start_date')));
}
@@ -486,8 +481,10 @@ class CaseScheduler
$caseSchedulerData['SCH_TIME_NEXT_RUN'] = $date;
}
}
if (trim( $caseSchedulerData['SCH_END_DATE'] ) != '') {
$caseSchedulerData['SCH_END_DATE'] = $caseSchedulerData['SCH_END_DATE'];
if (! empty( $caseSchedulerData['SCH_REPEAT_TASK_CHK'] )) {
if (trim( $caseSchedulerData['SCH_END_DATE'] ) != '') {
$caseSchedulerData['SCH_END_DATE'] = $caseSchedulerData['SCH_END_DATE'];
}
}
if (! empty( $caseSchedulerData['SCH_REPEAT_TASK_CHK'] )) {
$nOptEvery = $caseSchedulerData['SCH_REPEAT_EVERY_OPT'];
@@ -569,11 +566,6 @@ class CaseScheduler
if (!preg_match($patternDate, $caseSchedulerData['SCH_START_DATE'])) {
throw new \Exception(\G::LoadTranslation("ID_INVALID_SCH_START_DATE"));
}
if (isset($caseSchedulerData['SCH_END_DATE'])) {
if (!preg_match($patternDate, $caseSchedulerData['SCH_END_DATE'])) {
throw new \Exception(\G::LoadTranslation("ID_INVALID_SCH_END_DATE"));
}
}
if ($caseSchedulerData['SCH_START_DATE'] == "") {
throw new \Exception(\G::LoadTranslation("ID_CAN_NOT_BE_NULL", array('sch_start_date')));
}
@@ -780,8 +772,10 @@ class CaseScheduler
$caseSchedulerData['SCH_TIME_NEXT_RUN'] = $date;
}
}
if (trim( $caseSchedulerData['SCH_END_DATE'] ) != '') {
$caseSchedulerData['SCH_END_DATE'] = $caseSchedulerData['SCH_END_DATE'];
if (! empty( $caseSchedulerData['SCH_REPEAT_TASK_CHK'] )) {
if (trim( $caseSchedulerData['SCH_END_DATE'] ) != '') {
$caseSchedulerData['SCH_END_DATE'] = $caseSchedulerData['SCH_END_DATE'];
}
}
if (! empty( $caseSchedulerData['SCH_REPEAT_TASK_CHK'] )) {
$nOptEvery = $caseSchedulerData['SCH_REPEAT_EVERY_OPT'];