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

Merged in victorsl/processmaker/HOR-931-31 (pull request #4448)

Browse Source 
HOR-931
This commit is contained in:
Julio Cesar Laura Avendaño
2016-07-01 11:58:55 -04:00
parent 7dabb98200 b0a502d40f
commit a33e68bb0a
1 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
workflow/engine/src/ProcessMaker/BusinessModel/TimerEvent.php
View File

@@ -1270,6 +1270,40 @@ class TimerEvent
}
if ($flagCase) {
//Update Timer-Event
$arrayData = [];
switch ($arrayTimerEventData['TMREVN_OPTION']) {
case 'HOURLY':
case 'DAILY':
case 'MONTHLY':
case 'EVERY':
if ($timerEventNextRunDateNew == '') {
$timerEventNextRunDateNew = $this->getNextRunDateByDataAndDatetime(
$arrayTimerEventData, $timerEventNextRunDate, false
);
}
if ($arrayTimerEventData['TMREVN_OPTION'] != 'EVERY' &&
$arrayTimerEventData['TMREVN_END_DATE'] . '' != '' &&
strtotime($timerEventNextRunDateNew) > strtotime($arrayTimerEventData['TMREVN_END_DATE'] . ' 23:59:59')
) {
$arrayData['TMREVN_STATUS'] = 'PROCESSED';
} else {
$arrayData['TMREVN_NEXT_RUN_DATE'] = $timerEventNextRunDateNew;
}
break;
case 'ONE-DATE-TIME':
$arrayData['TMREVN_STATUS'] = 'PROCESSED';
break;
}
$arrayData['TMREVN_LAST_RUN_DATE'] = $timerEventNextRunDate;
$arrayData['TMREVN_LAST_EXECUTION_DATE'] = date('Y-m-d H:i:s');
$result = $this->singleUpdate($arrayTimerEventData['TMREVN_UID'], $arrayData);
//Show info in terminal
if ($flagRecord) {
$common->frontEndShow("TEXT", "");
}
@@ -1314,36 +1348,6 @@ class TimerEvent
$this->log("CREATED-NEW-CASE", "Failed: " . $arrayResult["message"] . ", PRO_UID: " . $arrayTimerEventData["PRJ_UID"]);
}
//Update Timer-Event
$arrayData = array();
switch ($arrayTimerEventData["TMREVN_OPTION"]) {
case "HOURLY":
case "DAILY":
case "MONTHLY":
case "EVERY":
if ($timerEventNextRunDateNew == "") {
$timerEventNextRunDateNew = $this->getNextRunDateByDataAndDatetime($arrayTimerEventData, $timerEventNextRunDate, false);
}
if ($arrayTimerEventData["TMREVN_OPTION"] != "EVERY" &&
$arrayTimerEventData["TMREVN_END_DATE"] . "" != "" && strtotime($timerEventNextRunDateNew) > strtotime($arrayTimerEventData["TMREVN_END_DATE"] . " 23:59:59")
) {
$arrayData["TMREVN_STATUS"] = "PROCESSED";
} else {
$arrayData["TMREVN_NEXT_RUN_DATE"] = $timerEventNextRunDateNew;
}
break;
case "ONE-DATE-TIME":
$arrayData["TMREVN_STATUS"] = "PROCESSED";
break;
}
$arrayData["TMREVN_LAST_RUN_DATE"] = $timerEventNextRunDate;
$arrayData["TMREVN_LAST_EXECUTION_DATE"] = date("Y-m-d H:i:s");
$result = $this->singleUpdate($arrayTimerEventData["TMREVN_UID"], $arrayData);
$flagRecord = true;
}
}
@@ -1513,6 +1517,7 @@ class TimerEvent
}
if ($flagCase) {
//Show info in terminal
if ($flagRecord) {
$common->frontEndShow("TEXT", "");
}