diff --git a/workflow/engine/bin/cron_single.php b/workflow/engine/bin/cron_single.php index 8ddd7cd10..eea55933b 100755 --- a/workflow/engine/bin/cron_single.php +++ b/workflow/engine/bin/cron_single.php @@ -839,6 +839,10 @@ function executeCaseSelfService() $appFields["APP_DATA"] = array_merge($appFields["APP_DATA"], $oPMScript->aFields); + unset($appFields['APP_STATUS']); + unset($appFields['APP_PROC_STATUS']); + unset($appFields['APP_PROC_CODE']); + unset($appFields['APP_PIN']); $case->updateCase($appFields["APP_UID"], $appFields); saveLog("unassignedCase", "action", "OK Executed tigger to the case $appcacheAppNumber"); diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php index 02d494bb5..cca004d72 100755 --- a/workflow/engine/classes/class.case.php +++ b/workflow/engine/classes/class.case.php @@ -5950,7 +5950,7 @@ class Cases //save data $aData = array(); $aData['APP_NUMBER'] = $Fields['APP_NUMBER']; - $aData['APP_PROC_STATUS'] = $Fields['APP_PROC_STATUS']; + //$aData['APP_PROC_STATUS'] = $Fields['APP_PROC_STATUS']; $aData['APP_DATA'] = $Fields['APP_DATA']; $aData['DEL_INDEX'] = $iIndex; $aData['TAS_UID'] = $sTask; @@ -6544,6 +6544,10 @@ class Cases $oPMScript->setScript($webBotTrigger); $oPMScript->execute(); $aFields['APP_DATA'] = array_merge($aFields['APP_DATA'], $oPMScript->aFields); + unset($aFields['APP_STATUS']); + unset($aFields['APP_PROC_STATUS']); + unset($aFields['APP_PROC_CODE']); + unset($aFields['APP_PIN']); $this->updateCase($aFields['APP_UID'], $aFields); return true; } diff --git a/workflow/engine/classes/class.pmFunctions.php b/workflow/engine/classes/class.pmFunctions.php index fe5d9dc39..6dd0c079e 100755 --- a/workflow/engine/classes/class.pmFunctions.php +++ b/workflow/engine/classes/class.pmFunctions.php @@ -2380,6 +2380,10 @@ function PMFRedirectToStep ($sApplicationUID, $iDelegation, $sStepType, $sStepUi // save data if (! is_null( $oPMScript )) { $aFields['APP_DATA'] = $oPMScript->aFields; + unset($aFields['APP_STATUS']); + unset($aFields['APP_PROC_STATUS']); + unset($aFields['APP_PROC_CODE']); + unset($aFields['APP_PIN']); $oCase->updateCase( $sApplicationUID, $aFields ); } diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php index 88b0be202..737072fba 100755 --- a/workflow/engine/classes/class.wsBase.php +++ b/workflow/engine/classes/class.wsBase.php @@ -1813,6 +1813,10 @@ class wsBase $arrayField["APP_DATA"] = $oCase->executeTriggers($taskId, $step["STEP_TYPE_OBJ"], $step["STEP_UID_OBJ"], "BEFORE", $arrayField["APP_DATA"]); $arrayField["APP_DATA"] = $oCase->executeTriggers($taskId, $step["STEP_TYPE_OBJ"], $step["STEP_UID_OBJ"], "AFTER", $arrayField["APP_DATA"]); + unset($arrayField['APP_STATUS']); + unset($arrayField['APP_PROC_STATUS']); + unset($arrayField['APP_PROC_CODE']); + unset($arrayField['APP_PIN']); $arrayField = $oCase->updateCase($caseId, $arrayField); } } @@ -2067,6 +2071,10 @@ class wsBase //$appFields = $oCase->loadCase( $caseId ); $appFields['APP_DATA'] = $oPMScript->aFields; + unset($appFields['APP_STATUS']); + unset($appFields['APP_PROC_STATUS']); + unset($appFields['APP_PROC_CODE']); + unset($appFields['APP_PIN']); $oCase->updateCase( $caseId, $appFields ); } } @@ -2114,6 +2122,10 @@ class wsBase $varTriggers .= " - " . nl2br( htmlentities( $oTrigger->getTriTitle(), ENT_QUOTES ) ) . "
"; //$appFields = $oCase->loadCase( $caseId ); $appFields['APP_DATA'] = $oPMScript->aFields; + unset($appFields['APP_STATUS']); + unset($appFields['APP_PROC_STATUS']); + unset($appFields['APP_PROC_CODE']); + unset($appFields['APP_PIN']); //$appFields['APP_DATA']['APPLICATION'] = $caseId; $oCase->updateCase( $caseId, $appFields ); } @@ -2240,6 +2252,10 @@ class wsBase $appFields['APP_DATA'] = $oPMScript->aFields; //$appFields['APP_DATA']['APPLICATION'] = $caseId; //$appFields = $oCase->loadCase($caseId); + unset($aFields['APP_STATUS']); + unset($aFields['APP_PROC_STATUS']); + unset($aFields['APP_PROC_CODE']); + unset($aFields['APP_PIN']); $oCase->updateCase( $caseId, $appFields ); } } @@ -2440,6 +2456,10 @@ class wsBase //Save data - Start $appFields['APP_DATA'] = $oPMScript->aFields; + unset($appFields['APP_STATUS']); + unset($appFields['APP_PROC_STATUS']); + unset($appFields['APP_PROC_CODE']); + unset($appFields['APP_PIN']); //$appFields = $oCase->loadCase($caseId); $oCase->updateCase( $caseId, $appFields ); //Save data - End diff --git a/workflow/engine/methods/cases/cases_Derivate.php b/workflow/engine/methods/cases/cases_Derivate.php index 2d8a6ea2c..869059cb2 100755 --- a/workflow/engine/methods/cases/cases_Derivate.php +++ b/workflow/engine/methods/cases/cases_Derivate.php @@ -78,6 +78,10 @@ try { $appFields['DEL_INDEX'] = $_SESSION['INDEX']; $appFields['TAS_UID'] = $_SESSION['TASK']; + unset($appFields['APP_STATUS']); + unset($appFields['APP_PROC_STATUS']); + unset($appFields['APP_PROC_CODE']); + unset($appFields['APP_PIN']); $oCase->updateCase( $_SESSION['APPLICATION'], $appFields ); //Save data @@ -99,6 +103,10 @@ try { $_SESSION['TRIGGER_DEBUG']['info'][1]['TRIGGERS_NAMES'] = $oCase->getTriggerNames( $triggers ); $_SESSION['TRIGGER_DEBUG']['info'][1]['TRIGGERS_VALUES'] = $triggers; } + unset($appFields['APP_STATUS']); + unset($appFields['APP_PROC_STATUS']); + unset($appFields['APP_PROC_CODE']); + unset($appFields['APP_PIN']); $oCase->updateCase( $_SESSION['APPLICATION'], $appFields ); // Send notifications - Start diff --git a/workflow/engine/methods/cases/cases_SaveData.php b/workflow/engine/methods/cases/cases_SaveData.php index f5e8ab378..298296309 100755 --- a/workflow/engine/methods/cases/cases_SaveData.php +++ b/workflow/engine/methods/cases/cases_SaveData.php @@ -143,13 +143,13 @@ try { //save data $aData = array (); $aData['APP_NUMBER'] = $Fields['APP_NUMBER']; - $aData['APP_PROC_STATUS'] = $Fields['APP_PROC_STATUS']; + //$aData['APP_PROC_STATUS'] = $Fields['APP_PROC_STATUS']; $aData['APP_DATA'] = $Fields['APP_DATA']; $aData['DEL_INDEX'] = $_SESSION['INDEX']; $aData['TAS_UID'] = $_SESSION['TASK']; $aData['CURRENT_DYNAFORM'] = $_GET['UID']; $aData['USER_UID'] = $_SESSION['USER_LOGGED']; - $aData['APP_STATUS'] = $Fields['APP_STATUS']; + //$aData['APP_STATUS'] = $Fields['APP_STATUS']; $aData['PRO_UID'] = $_SESSION['PROCESS']; $oCase->updateCase( $_SESSION['APPLICATION'], $aData ); diff --git a/workflow/engine/methods/cases/cases_SaveDocument.php b/workflow/engine/methods/cases/cases_SaveDocument.php index 5e37770ea..8e7c8dc61 100755 --- a/workflow/engine/methods/cases/cases_SaveDocument.php +++ b/workflow/engine/methods/cases/cases_SaveDocument.php @@ -108,7 +108,7 @@ if ($_SESSION["TRIGGER_DEBUG"]["NUM_TRIGGERS"] > 0) { //Save data $arrayData = array(); $arrayData["APP_NUMBER"] = $arrayField["APP_NUMBER"]; -$arrayData["APP_PROC_STATUS"] = $arrayField["APP_PROC_STATUS"]; +//$arrayData["APP_PROC_STATUS"] = $arrayField["APP_PROC_STATUS"]; $arrayData["APP_DATA"] = $arrayField["APP_DATA"]; $arrayData["DEL_INDEX"] = $_SESSION["INDEX"]; $arrayData["TAS_UID"] = $_SESSION["TASK"]; diff --git a/workflow/engine/methods/cases/cases_Step.php b/workflow/engine/methods/cases/cases_Step.php index cce1e8e2b..b76bc3829 100755 --- a/workflow/engine/methods/cases/cases_Step.php +++ b/workflow/engine/methods/cases/cases_Step.php @@ -170,6 +170,10 @@ if (isset( $_GET['breakpoint'] )) { //Save data - Start +unset($Fields['APP_STATUS']); +unset($Fields['APP_PROC_STATUS']); +unset($Fields['APP_PROC_CODE']); +unset($Fields['APP_PIN']); $oCase->updateCase( $_SESSION['APPLICATION'], $Fields ); //Save data - End @@ -527,6 +531,10 @@ try { //Execute after triggers - End //Save data - Start + unset($Fields['APP_STATUS']); + unset($Fields['APP_PROC_STATUS']); + unset($Fields['APP_PROC_CODE']); + unset($Fields['APP_PIN']); $oCase->updateCase( $_SESSION['APPLICATION'], $Fields ); //Save data - End