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

HOR-3393

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2017-06-14 11:28:01 -04:00
parent 42ac321495
commit abdb2184a8
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -765,9 +765,19 @@ class TimerEvent
if (isset($arrayData["TMREVN_CONFIGURATION_DATA"])) { if (isset($arrayData["TMREVN_CONFIGURATION_DATA"])) {
$arrayData["TMREVN_CONFIGURATION_DATA"] = serialize($arrayData["TMREVN_CONFIGURATION_DATA"]); $arrayData["TMREVN_CONFIGURATION_DATA"] = serialize($arrayData["TMREVN_CONFIGURATION_DATA"]);
} }
$oldValues = $timerEvent->toArray();
$timerEvent->fromArray($arrayData, \BasePeer::TYPE_FIELDNAME); $timerEvent->fromArray($arrayData, \BasePeer::TYPE_FIELDNAME);
$nowValues = $timerEvent->toArray();
//If the timer event undergoes any editing, the value of the 'TMREVN_STATUS'
//field must be changed to 'ACTIVE', otherwise the 'ONE-DATE-TIME'
//option will prevent execution.
if (!($oldValues == $nowValues)) {
$timerEvent->setTmrevnStatus("ACTIVE");
}
if ($bpmnEvent->getEvnType() == "START") { if ($bpmnEvent->getEvnType() == "START") {
switch ($arrayFinalData["TMREVN_OPTION"]) { switch ($arrayFinalData["TMREVN_OPTION"]) {
case "HOURLY": case "HOURLY":
@@ -1471,11 +1481,11 @@ class TimerEvent
$flagRecord = true; $flagRecord = true;
} }
} }
if (!$flagRecord) { if (!$flagRecord) {
$common->frontEndShow("TEXT", "Not exists any record to start a new case, on date \"$datetime (UTC +00:00)\""); $common->frontEndShow("TEXT", "Not exists any record to start a new case, on date \"$datetime (UTC +00:00)\"");
$action = "NO-RECORDS";
$this->log("NO-RECORDS", "Not exists any record to start a new case"); $this->log($action, "Not exists any record to start a new case");
$aInfo = array( $aInfo = array(
'ip' => \G::getIpAddress() 'ip' => \G::getIpAddress()
,'action' => $action ,'action' => $action
@@ -1493,7 +1503,8 @@ class TimerEvent
$common->frontEndShow("END"); $common->frontEndShow("END");
//Intermediate Catch Timer-Event (continue the case) /////////////////////////////////////////////////////// //Intermediate Catch Timer-Event (continue the case) ///////////////////////////////////////////////////////
$this->log("START-CONTINUE-CASES", "Date \"$datetime (UTC +00:00)\": Start continue the cases"); $action = "START-CONTINUE-CASES";
$this->log($action, "Date \"$datetime (UTC +00:00)\": Start continue the cases");
$aInfo = array( $aInfo = array(
'ip' => \G::getIpAddress() 'ip' => \G::getIpAddress()
,'action' => $action ,'action' => $action