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

Merged in bugfix/PMCORE-2940 (pull request #7888)

Browse Source 
PMCORE-2940

Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
Paula Quispe
2021-04-22 21:54:22 +00:00
committed by Julio Cesar Laura Avendaño
parent 530b587028 8635578120
commit e1c02ea23a
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
workflow/engine/classes/WorkspaceTools.php
View File

@@ -4167,6 +4167,21 @@ class WorkspaceTools
APP_STATUS_ID = 0");
$con->commit();
// Populating APPLICATION.APP_FINISH_DATE
CLI::logging("-> Populating APPLICATION.APP_FINISH_DATE \n");
$con->begin();
$stmt = $con->createStatement();
$rs = $stmt->executeQuery("UPDATE APPLICATION AS AP
INNER JOIN (
SELECT APP_DELEGATION.APP_NUMBER, APP_DELEGATION.DEL_FINISH_DATE
FROM APP_DELEGATION
ORDER BY DEL_FINISH_DATE DESC
) AS DEL
ON (AP.APP_NUMBER = DEL.APP_NUMBER)
SET AP.APP_FINISH_DATE = DEL.DEL_FINISH_DATE
WHERE AP.APP_FINISH_DATE IS NULL AND AP.APP_STATUS_ID = 3");
$con->commit();
// Populating APP_DELAY.USR_ID
CLI::logging("-> Populating APP_DELAY.USR_ID \n");
$con->begin();

6
workflow/engine/methods/cases/cases_Step.php
View File

@@ -1,5 +1,6 @@
<?php
use ProcessMaker\Model\Application as ModelApplication;
use ProcessMaker\Model\Process as ProcessModel;
use ProcessMaker\Plugins\PluginRegistry;
use ProcessMaker\Util\DateTime;
@@ -233,18 +234,19 @@ if (isset($_GET['breakpoint'])) {
}
#end trigger debug session.......
//Save data - Start
// Save data - Start
unset($Fields['APP_STATUS']);
unset($Fields['APP_PROC_STATUS']);
unset($Fields['APP_PROC_CODE']);
unset($Fields['APP_PIN']);
unset($Fields['APP_FINISH_DATE']);
$Fields["USER_UID"] = $_SESSION["USER_LOGGED"];
$Fields["CURRENT_DYNAFORM"] = $_GET["UID"];
$Fields["OBJECT_TYPE"] = ($_GET["UID"] == "-1") ? "ASSIGN_TASK" : $_GET["TYPE"];
$oCase->updateCase($_SESSION['APPLICATION'], $Fields);
//Save data - End
// Save data - End
//Obtain previous and next step - Start
try {