From 86355781208489a4a92327b955b2bf47bcdf9f96 Mon Sep 17 00:00:00 2001
From: Paula Quispe <paula.quispe@processmaker.com>
Date: Tue, 20 Apr 2021 16:38:45 -0400
Subject: [PATCH] PMCORE-2940

---
 workflow/engine/classes/WorkspaceTools.php   | 15 +++++++++++++++
 workflow/engine/methods/cases/cases_Step.php |  6 ++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/workflow/engine/classes/WorkspaceTools.php b/workflow/engine/classes/WorkspaceTools.php
index f5a2f0d87..8df7e0778 100644
--- a/workflow/engine/classes/WorkspaceTools.php
+++ b/workflow/engine/classes/WorkspaceTools.php
@@ -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();
diff --git a/workflow/engine/methods/cases/cases_Step.php b/workflow/engine/methods/cases/cases_Step.php
index 7584b1c62..7eea9bd41 100644
--- a/workflow/engine/methods/cases/cases_Step.php
+++ b/workflow/engine/methods/cases/cases_Step.php
@@ -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 {