fernando/luos
1
0
Fork 0
Code Releases Activity

Fix standard date CASE SCHEDULER

Browse Source
This commit is contained in:
Freddy Daniel Rojas Valda
2014-02-11 17:08:17 -04:00
parent 37e3a6d31d
commit d50ee89cc5
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
workflow/engine/src/BusinessModel/CaseScheduler.php
View File

@@ -461,7 +461,7 @@ class CaseScheduler
if (($sOption != '1') && ($sOption != '4') && ($sOption != '5')) {
$sDateTmp = '';
if ($sStartDay == '') {
$sStartDay = date( 'Y-m-d' );
$sStartDay = date('Y-m-d');
} else {
$aaStartDay = explode( "|", $aData['SCH_START_DAY'] );
$aaStartDay[0] = $aaStartDay[0];
@@ -469,15 +469,15 @@ class CaseScheduler
$aaStartDay[2]= ($aaStartDay[2] == 7 ? 1 : $aaStartDay[2]);
$sStartDay = $aaStartDay[0].'|'.$aaStartDay[1].'|'.$aaStartDay[2];
}
$dCurrentDay = date( "d" );
$dCurrentMonth = date( "m" );
$dCurrentDay = date("d");
$dCurrentMonth = date("m");
$aStartDay = explode( "|", $aData['SCH_START_DAY'] );
if ($sOption == '3' && $aStartDay[0] == '1') {
$monthsArray = explode( "|", $sMonths );
foreach ($monthsArray as $row) {
if ($dCurrentMonth == $row && $dCurrentDay < $aStartDay[1]) {
$startTime = $aData['SCH_START_TIME'] . ":00";
$aData['SCH_TIME_NEXT_RUN'] = date( 'Y' ) . '-' . $row . '-' . $aStartDay[1] . ' ' . $startTime;
$aData['SCH_TIME_NEXT_RUN'] = date('Y') . '-' . $row . '-' . $aStartDay[1] . ' ' . $startTime;
break;
} else {
$aData['SCH_TIME_NEXT_RUN'] = $oCaseScheduler->updateNextRun( $sOption, $sValue, $nActualTime, $sDaysPerformTask, $sWeeks, $sStartDay, $sMonths, $sDateTmp );
@@ -488,8 +488,8 @@ class CaseScheduler
}
} else {
if ($sOption == '4') {
$sDateTmp = date( 'Y-m-d' );
$aData['SCH_START_TIME'] = date( 'Y-m-d', strtotime( $sDateTmp ) ) . ' ' . date( 'H:i:s', strtotime( $sTimeTmp ) );
$sDateTmp = date('Y-m-d');
$aData['SCH_START_TIME'] = date('Y-m-d', strtotime( $sDateTmp )) . ' ' . date('H:i:s', strtotime( $sTimeTmp ));
$aData['SCH_START_DATE'] = $aData['SCH_START_TIME'];
$aData['SCH_END_DATE'] = $aData['SCH_START_TIME'];
}
@@ -498,10 +498,10 @@ class CaseScheduler
if ($aData['SCH_START_DATE'] != '') {
$sDateTmp = $aData['SCH_START_DATE'];
} else {
$sDateTmp = date( 'Y-m-d' );
$sDateTmp = date('Y-m-d');
$aData['SCH_START_DATE'] = $sDateTmp;
}
$aData['SCH_END_DATE'] = date( 'Y-m-d', strtotime( $sDateTmp ) ) . ' ' . date( 'H:i:s', strtotime( $sTimeTmp ) );
$aData['SCH_END_DATE'] = date('Y-m-d', strtotime( $sDateTmp )) . ' ' . date('H:i:s', strtotime( $sTimeTmp ));
$aData['SCH_START_TIME'] = time();
$aData['SCH_START_DATE'] = $aData['SCH_START_TIME'];
if ($aData['SCH_REPEAT_EVERY'] == "") {
@@ -515,7 +515,7 @@ class CaseScheduler
$aData['SCH_REPEAT_EVERY'] = $aData['SCH_REPEAT_EVERY'];
$date = $aData['SCH_START_TIME'];
$date += $nextRun;
$date = date( "Y-m-d H:i", $date );
$date = date("Y-m-d H:i", $date);
$aData['SCH_TIME_NEXT_RUN'] = $date;
}
}
@@ -748,7 +748,7 @@ class CaseScheduler
}
if (($sOption != '1') && ($sOption != '4') && ($sOption != '5')) {
if ($sStartDay == '') {
$sStartDay = date( 'Y-m-d' );
$sStartDay = date('Y-m-d');
} else {
$aaStartDay = explode( "|", $aData['SCH_START_DAY'] );
$aaStartDay[0] = $aaStartDay[0];
@@ -756,8 +756,8 @@ class CaseScheduler
$aaStartDay[2]= ($aaStartDay[2] == 7 ? 1 : $aaStartDay[2]);
$sStartDay = $aaStartDay[0].'|'.$aaStartDay[1].'|'.$aaStartDay[2];
}
$dCurrentDay = date( "d" );
$dCurrentMonth = date( "m" );
$dCurrentDay = date("d");
$dCurrentMonth = date("m");
$aStartDay = explode( "|", $aData['SCH_START_DAY'] );
$sDateTmp = '';
if ($sOption == '3' && $aStartDay[0] == '1') {
@@ -765,7 +765,7 @@ class CaseScheduler
foreach ($monthsArray as $row) {
if ($dCurrentMonth == $row && $dCurrentDay < $aStartDay[1]) {
$startTime = $aData['SCH_START_TIME'] . ":00";
$aData['SCH_TIME_NEXT_RUN'] = date( 'Y' ) . '-' . $row . '-' . $aStartDay[1] . ' ' . $startTime;
$aData['SCH_TIME_NEXT_RUN'] = date('Y') . '-' . $row . '-' . $aStartDay[1] . ' ' . $startTime;
break;
} else {
$aData['SCH_TIME_NEXT_RUN'] = $oCaseScheduler->updateNextRun( $sOption, $sValue, $nActualTime, $sDaysPerformTask, $sWeeks, $sStartDay, $sMonths, $sDateTmp );
@@ -776,8 +776,8 @@ class CaseScheduler
}
} else {
if ($sOption == '4') {
$sDateTmp = date( 'Y-m-d' );
$aData['SCH_START_TIME'] = date( 'Y-m-d', strtotime( $sDateTmp ) ) . ' ' . date( 'H:i:s', strtotime( $sTimeTmp ) );
$sDateTmp = date('Y-m-d');
$aData['SCH_START_TIME'] = date('Y-m-d', strtotime( $sDateTmp )) . ' ' . date('H:i:s', strtotime( $sTimeTmp ));
$aData['SCH_START_DATE'] = $aData['SCH_START_TIME'];
$aData['SCH_END_DATE'] = $aData['SCH_START_TIME'];
}
@@ -786,7 +786,7 @@ class CaseScheduler
if ($aData['SCH_START_DATE'] != '') {
$sDateTmp = $aData['SCH_START_DATE'];
} else {
$sDateTmp = date( 'Y-m-d' );
$sDateTmp = date('Y-m-d');
$aData['SCH_START_DATE'] = $sDateTmp;
}
$aData['SCH_END_DATE'] = date('Y-m-d', strtotime($sDateTmp)) . ' ' . date('H:i:s', strtotime($sTimeTmp));
@@ -803,7 +803,7 @@ class CaseScheduler
$aData['SCH_REPEAT_EVERY'] = $aData['SCH_REPEAT_EVERY'];
$date = $aData['SCH_START_TIME'];
$date += $nextRun;
$date = date( "Y-m-d H:i", $date );
$date = date("Y-m-d H:i", $date);
$aData['SCH_TIME_NEXT_RUN'] = $date;
}
}