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

Merge remote-tracking branch 'pm/3.1.1' into HOR-2021

Browse Source
This commit is contained in:
Ronald Q
2016-10-12 08:36:56 -04:00
parent 0b0b005444 aac460328e
commit 3f6b871cfa
2 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
workflow/engine/src/ProcessMaker/BusinessModel/MessageApplication.php
View File

@@ -430,7 +430,7 @@ class MessageApplication
$appNumber = $arrayResult["caseNumber"];
$this->syslog(
200
,'Case created'
,"Case #$appNumber created"
,'CREATED-NEW-CASE'
,''//timeZone
,$messageEventDefinitionUserUid
@@ -445,7 +445,7 @@ class MessageApplication
if ($arrayResult["status_code"] == 0) {
$this->syslog(
200
,'Case routed'
,"Case #$appNumber routed"
,'ROUTED-NEW-CASE'
,''//timeZone
,$messageEventDefinitionUserUid
@@ -458,7 +458,7 @@ class MessageApplication
} else {
$this->syslog(
500
,'Failed case routed '.$arrayResult["message"]
,"Failed case #$appNumber. " . $arrayResult["message"]
,'ROUTED-NEW-CASE'
,''//timeZone
,$messageEventDefinitionUserUid
@@ -476,7 +476,7 @@ class MessageApplication
} else {
$this->syslog(
500
,'Failed case created '.$arrayResult["message"]
,"Failed case #$appNumber. " . $arrayResult["message"]
,'CREATED-NEW-CASE'
,''//timeZone
,$messageEventDefinitionUserUid
@@ -522,7 +522,7 @@ class MessageApplication
if ($arrayResult["status_code"] == 0) {
$this->syslog(
200
,'Case routed'
,"Case #$appNumber routed "
,'ROUTED-NEW-CASE'
,''//timeZone
,$userUid
@@ -535,7 +535,7 @@ class MessageApplication
} else {
$this->syslog(
500
,'Failed case routed'
,"Failed case #$appNumber. " . $arrayResult["message"]
,'ROUTED-NEW-CASE'
,''//timeZone
,$userUid

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

@@ -1399,7 +1399,7 @@ class TimerEvent
$this->log("CREATED-NEW-CASE", "Case #$applicationNumber created, APP_UID: $applicationUid, PRO_UID: " . $arrayTimerEventData["PRJ_UID"]);
$this->syslog(
200
,'Case created'
,"Case #$applicationNumber created"
,'CREATED-NEW-CASE'
,$datetime
,''//UsrUid
@@ -1420,7 +1420,7 @@ class TimerEvent
$this->log("ROUTED-NEW-CASE", "Case #$applicationNumber routed, APP_UID: $applicationUid, PRO_UID: " . $arrayTimerEventData["PRJ_UID"]);
$this->syslog(
200
,'Case routed'
,"Case #$applicationNumber routed"
,'ROUTED-NEW-CASE'
,$datetime
,''//usrUid
@@ -1436,7 +1436,7 @@ class TimerEvent
$this->log("ROUTED-NEW-CASE", "Failed: " . $arrayResult["message"] . ", Case: #$applicationNumber, APP_UID: $applicationUid, PRO_UID: " . $arrayTimerEventData["PRJ_UID"]);
$this->syslog(
500
,'Failed case routed'
,"Failed case #$applicationNumber. " . $arrayResult["message"]
,'ROUTED-NEW-CASE'
,$datetime
,''//usrUid
@@ -1453,7 +1453,7 @@ class TimerEvent
$this->log("CREATED-NEW-CASE", "Failed: " . $arrayResult["message"] . ", PRO_UID: " . $arrayTimerEventData["PRJ_UID"]);
$this->syslog(
500
,'Failed case created '.$arrayResult["message"]
,"Failed case #$applicationNumber. " . $arrayResult["message"]
,'CREATED-NEW-CASE'
,$datetime
,''//usrUid
@@ -1480,14 +1480,6 @@ class TimerEvent
$common->frontEndShow("END");
$this->log("END-NEW-CASES", "Date \"$datetime (UTC +00:00)\": End new cases");
$this->syslog(
200
,'End new cases'
,'END-NEW-CASES'
,$datetime
);
//Intermediate Catch Timer-Event (continue the case) ///////////////////////////////////////////////////////
$this->log("START-CONTINUE-CASES", "Date \"$datetime (UTC +00:00)\": Start continue the cases");
$this->syslog(
@@ -1671,13 +1663,25 @@ class TimerEvent
$common->frontEndShow("TEXT", " - OK");
$this->log("CONTINUED-CASE", "Case #$applicationNumber continued, APP_UID: $applicationUid, PRO_UID: " . $arrayTimerEventData["PRJ_UID"]);
$this->syslog(
200
,"Case #$applicationNumber continued"
,'CONTINUED-CASE'
,$datetime
,''//usrUid
,$arrayTimerEventData["PRJ_UID"]
,$tasUid
,$applicationUid
,$applicationNumber
,$delIndex
);
} else {
$common->frontEndShow("TEXT", " - Failed: " . $arrayResult["message"]);
$this->log("CONTINUED-CASE", "Failed: " . $arrayResult["message"] . ", Case: #$applicationNumber, APP_UID: $applicationUid, PRO_UID: " . $arrayTimerEventData["PRJ_UID"]);
$this->syslog(
500
,'Failed '.$arrayResult["message"]
,"Failed case #$applicationUid. " . $arrayResult["message"]
,'CONTINUED-CASE'
,$datetime
,''//usrUid