From c6d9cb61f9e6be50c28e39f4cae8e5cbe30eb7d4 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Mon, 23 Mar 2015 21:14:47 -0400
Subject: [PATCH] PM-1834 "0016158: The routing condition with..." SOLVED

> Code Issue:
  0016158: The routing condition with currency doesn't work
> Solution:
  El Supervisor de Procesos podra cargar una nueva version de un "Input Document".
---
 workflow/engine/methods/cases/cases_Ajax.php  |  8 +++++--
 .../cases/cases_SupervisorSaveDocument.php    | 24 ++++++++++++++-----
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/workflow/engine/methods/cases/cases_Ajax.php b/workflow/engine/methods/cases/cases_Ajax.php
index 57a5fbb7e..00f663f04 100755
--- a/workflow/engine/methods/cases/cases_Ajax.php
+++ b/workflow/engine/methods/cases/cases_Ajax.php
@@ -953,7 +953,11 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
         $Fields['DOC_UID'] = $_POST['docID'];
         $Fields['APP_DOC_UID'] = $_POST['appDocId'];
         $Fields['actionType'] = $_POST['actionType'];
-        $Fields['docVersion'] = $_POST['docVersion'];
+        $Fields["docVersion"] = (int)($_POST["docVersion"]);
+
+        $appDocument = new AppDocument();
+        $arrayAppDocumentData = $appDocument->load($_POST["appDocId"]);
+
         $oInputDocument = new InputDocument();
         $InpDocData = $oInputDocument->load( $Fields['DOC_UID'] );
 
@@ -966,7 +970,7 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
         $Fields["INP_DOC_MAX_FILESIZE_LABEL"] = ($inpDocMaxFilesize > 0)? "[" . $InpDocData["INP_DOC_MAX_FILESIZE"] . " " . $InpDocData["INP_DOC_MAX_FILESIZE_UNIT"] . "]" : "";
         $Fields['fileTypes'] = $InpDocData['INP_DOC_TYPE_FILE'];
 
-        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_AttachInputDocumentGeneral', '', $Fields, 'cases_SupervisorSaveDocument?UID=' . $_POST['docID'] . '&APP_UID=' . $_POST['appDocId'] );
+        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_AttachInputDocumentGeneral', '', $Fields, 'cases_SupervisorSaveDocument?APP_DOC_UID=' . $_POST['appDocId'] . "&DOC_VERSION=" . ($Fields['docVersion'] + 1) . '&APP_UID=' . $arrayAppDocumentData["APP_UID"] . '&UID=' . $_POST['docID']);
         G::RenderPage( 'publish', 'raw' );
         break;
     case "inputDocumentVersionHistory":
diff --git a/workflow/engine/methods/cases/cases_SupervisorSaveDocument.php b/workflow/engine/methods/cases/cases_SupervisorSaveDocument.php
index a7f35ff06..b87896f1d 100755
--- a/workflow/engine/methods/cases/cases_SupervisorSaveDocument.php
+++ b/workflow/engine/methods/cases/cases_SupervisorSaveDocument.php
@@ -26,10 +26,22 @@ try {
     //save info
     G::LoadClass( 'case' );
     G::LoadClass( 'tasks' );
-            
+
     $oAppDocument = new AppDocument();
-    $aFields = array ('APP_UID' => $_GET['APP_UID'],'DEL_INDEX' => 100000,'USR_UID' => $_SESSION['USER_LOGGED'],'DOC_UID' => $_GET['UID'],'APP_DOC_TYPE' => $_POST['form']['APP_DOC_TYPE'],'APP_DOC_CREATE_DATE' => date( 'Y-m-d H:i:s' ),'APP_DOC_COMMENT' => isset( $_POST['form']['APP_DOC_COMMENT'] ) ? $_POST['form']['APP_DOC_COMMENT'] : '','APP_DOC_TITLE' => '','APP_DOC_FILENAME' => isset( $_FILES['form']['name']['APP_DOC_FILENAME'] ) ? $_FILES['form']['name']['APP_DOC_FILENAME'] : ''
+    $aFields = array (
+        "APP_UID" => $_GET["APP_UID"],
+        "DEL_INDEX" => 100000,
+        "USR_UID" => $_SESSION["USER_LOGGED"],
+        "DOC_UID" => $_GET["UID"],
+        "APP_DOC_TYPE" => $_POST["form"]["APP_DOC_TYPE"],
+        "APP_DOC_CREATE_DATE" => date( "Y-m-d H:i:s" ),
+        "APP_DOC_COMMENT" => isset( $_POST["form"]["APP_DOC_COMMENT"] ) ? $_POST["form"]["APP_DOC_COMMENT"] : "",
+        "APP_DOC_TITLE" => "",
+        "APP_DOC_FILENAME" => isset( $_FILES["form"]["name"]["APP_DOC_FILENAME"] ) ? $_FILES["form"]["name"]["APP_DOC_FILENAME"] : "",
+        "APP_DOC_UID" => $_GET["APP_DOC_UID"],
+        "DOC_VERSION" => $_GET["DOC_VERSION"]
     );
+
     $oAppDocument->create( $aFields );
     $sAppDocUid = $oAppDocument->getAppDocUid();
     $info = pathinfo( $oAppDocument->getAppDocFilename() );
@@ -51,7 +63,7 @@ try {
                 unlink( $sPathName . $sFileName );
             }
             //end plugin
-            
+
             //update AppData with the current file uploaded
             $oCase = new Cases();
             $aAppDataFields = $oCase->loadCase( $_GET['APP_UID'] );
@@ -62,7 +74,7 @@ try {
             $oCriteria->addAscendingOrderByColumn(AppDelegationPeer::DEL_INDEX);
             $oDataset = AppDelegationPeer::doSelectRS($oCriteria);
             $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-            
+
             $oDataset->next();
             $oTask = new Tasks();
 
@@ -85,12 +97,12 @@ try {
                             $aDynaforms[] = $aRows['STEP_UID_OBJ'];
                         }
                     }
-                    unset($value);    
+                    unset($value);
                 }
                 $oDataset->next();
             }
 
-            
+
             if (count($aDynaforms) > 0) {
                 require_once ("classes/model/Dynaform.php");
                 $dynInstance = new Dynaform();