Merged in darojas/processmaker (pull request #409)

Cambio de nombre a la funcion postProjectWsUserCanStartTask, Ajustes en validaciones de Cases Output documents, Fix checkstyle warnings, Arreglo en input documents

workflow/engine/src/ProcessMaker/BusinessModel/CaseScheduler.php

@@ -310,7 +310,6 @@ class CaseScheduler
             $sDaysPerformTask = '';
             $sWeeks = '';
             $sMonths = '';
-            $sMonths = '';
             $sStartDay = '';
             $nSW = 0;
             $aData['SCH_DAYS_PERFORM_TASK'] = '';
@@ -609,7 +608,6 @@ class CaseScheduler
             $sDaysPerformTask = '';
             $sWeeks = '';
             $sMonths = '';
-            $sMonths = '';
             $sStartDay = '';
             $nSW = 0;
             $aData['SCH_DAYS_PERFORM_TASK'] = '';

workflow/engine/src/ProcessMaker/BusinessModel/Cases.php

@@ -305,8 +305,7 @@ class Cases
                             foreach ($indexes as $index) {
                                 $row = $aaappsDBData[$index];
                             }
-                            if(!isset($row))
+                            if (!isset($row)) {
-                            {
                                 continue;
                             }
                             \G::LoadClass('wsBase');

workflow/engine/src/ProcessMaker/BusinessModel/Cases/InputDocument.php

@@ -183,12 +183,14 @@ class InputDocument
             //Triggers
             $arrayTrigger = $case->loadTriggers($taskUid, "INPUT_DOCUMENT", $inputDocumentUid, "AFTER");
             //Add Input Document
-            if (!$_FILES["form"]["error"]) {
+            $_FILES["form"]["name"] = '';
+            $_FILES["form"]["error"] = '';
+            $_FILES["form"]["tmp_name"] = '';
+            if ($_FILES["form"]["error"] == '') {
                 $_FILES["form"]["error"] = 0;
             }
             if (isset($_FILES) && isset($_FILES["form"]) && count($_FILES["form"]) > 0) {
-                $appDocUid = $case->addInputDocument(
+                $appDocUid = $case->addInputDocument($inputDocumentUid,
-                    $inputDocumentUid,
                                                      $appDocUid,
                                                      $docVersion,
                                                      $appDocType,
@@ -201,19 +203,15 @@ class InputDocument
                                                      "xmlform",
                                                      $_FILES["form"]["name"],
                                                      $_FILES["form"]["error"],
-                    $_FILES["form"]["tmp_name"]
+                                                     $_FILES["form"]["tmp_name"]);
-                );
             }
             //Trigger - Execute after - Start
-           $arrayField["APP_DATA"] = $case->executeTriggers(
+            $arrayField["APP_DATA"] = $case->executeTriggers ($taskUid,
-               $taskUid,
                                                               "INPUT_DOCUMENT",
                                                               $inputDocumentUid,
                                                               "AFTER",
-               $arrayField["APP_DATA"]
+                                                              $arrayField["APP_DATA"]);
-           );
             //Trigger - Execute after - End
-
             //Save data
             $arrayData = array();
             $arrayData["APP_NUMBER"] = $arrayField["APP_NUMBER"];

workflow/engine/src/ProcessMaker/BusinessModel/Cases/OutputDocument.php

@@ -56,10 +56,6 @@ class OutputDocument
     public function getCasesOutputDocument($applicationUid, $userUid, $applicationDocumentUid)
     {
         try {
-            $oAppDocument = \AppDocumentPeer::retrieveByPK( $applicationDocumentUid, 1 );
-            if (is_null( $oAppDocument ) || $oAppDocument->getAppDocStatus() == 'DELETED') {
-                throw (new \Exception('This output document with id: '.$applicationDocumentUid.' doesn\'t exist!'));
-            }
             $sApplicationUID = $applicationUid;
             $sUserUID = $userUid;
             \G::LoadClass('case');
@@ -84,6 +80,10 @@ class OutputDocument
                     $docrow['app_doc_index'] = $row['APP_DOC_INDEX'];
                     $docrow['app_doc_link'] = 'cases/' . $row['DOWNLOAD_LINK'];
                     if ($docrow['app_doc_uid'] == $applicationDocumentUid) {
+                        $oAppDocument = \AppDocumentPeer::retrieveByPK( $applicationDocumentUid, $row['DOC_VERSION'] );
+                        if (is_null( $oAppDocument )) {
+                            throw (new \Exception('This output document with id: '.$applicationDocumentUid.' doesn\'t exist!'));
+                        }
                         $result = $docrow;
                     }
                 }
@@ -269,6 +269,11 @@ class OutputDocument
                 }
             }
             $g->sessionVarRestore();
+            $oAppDocument = \AppDocumentPeer::retrieveByPK( $aFields['APP_DOC_UID'], $lastDocVersion);
+            if ($oAppDocument->getAppDocStatus() == 'DELETED') {
+                $oAppDocument->setAppDocStatus('ACTIVE');
+                $oAppDocument->save();
+            }
             $response = $this->getCasesOutputDocument($applicationUid, $userUid, $aFields['APP_DOC_UID']);
             return $response;
         } catch (\Exception $e) {
@@ -628,3 +633,4 @@ class OutputDocument
         }
     }
 }
+

workflow/engine/src/ProcessMaker/BusinessModel/OutputDocument.php

@@ -267,7 +267,7 @@ class OutputDocument
                 $aData['out_doc_pdf_security_open_password'] = \G::encrypt( $aData['out_doc_pdf_security_open_password'], $outDocUid );
                 $aData['out_doc_pdf_security_owner_password'] = \G::encrypt( $aData['out_doc_pdf_security_owner_password'], $outDocUid );
             }
-            $this->updateOutputDocument($sProcessUID, $aData, $outDocUid, 1);
+            $this->updateOutputDocument($sProcessUID, $aData, 1, $outDocUid);
             //Return
             unset($aData["PRO_UID"]);
             $aData = array_change_key_case($aData, CASE_LOWER);
@@ -287,7 +287,7 @@ class OutputDocument
      *
      * @access public
      */
-    public function updateOutputDocument($sProcessUID, $aData, $sOutputDocumentUID = '', $sFlag)
+    public function updateOutputDocument($sProcessUID, $aData, $sFlag, $sOutputDocumentUID = '')
     {
         $oConnection = \Propel::getConnection(\OutputDocumentPeer::DATABASE_NAME);
         $pemission = $aData['out_doc_pdf_security_permissions'];

workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php

@@ -1031,3 +1031,4 @@ class ProcessSupervisor
         $oCriteria->save();
     }
 }
+

workflow/engine/src/ProcessMaker/BusinessModel/ProjectUser.php

@@ -209,7 +209,7 @@ class ProjectUser
      *
      * @access public
      */
-    public function postProjectWsUserCanStartTask($sProcessUID, $sActivityUID, $oData)
+    public function projectWsUserCanStartTask($sProcessUID, $sActivityUID, $oData)
     {
         try {
             $oProcess = \ProcessPeer::retrieveByPK( $sProcessUID );

workflow/engine/src/ProcessMaker/BusinessModel/User.php

@@ -207,7 +207,6 @@ class User
     public function create($arrayData)
     {
         try {
-            global $RBAC;
             require_once (PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Users.php");
             $arrayData = array_change_key_case($arrayData, CASE_UPPER);
             $form = $arrayData;

workflow/engine/src/ProcessMaker/Services/Api/Cases/InputDocument.php

@@ -81,3 +81,4 @@ class InputDocument extends Api
         }
     }
 }
+

workflow/engine/src/ProcessMaker/Services/Api/Project/OutputDocuments.php

@@ -86,7 +86,7 @@ class OutputDocuments extends Api
         try {
             $request_data = (array)($request_data);
             $outputDocument = new \ProcessMaker\BusinessModel\OutputDocument();
-            $arrayData = $outputDocument->updateOutputDocument($prjUid, $request_data, $outputDocumentUid, 0);
+            $outputDocument->updateOutputDocument($prjUid, $request_data, 0, $outputDocumentUid);
         } catch (\Exception $e) {
             //Response
             throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());

workflow/engine/src/ProcessMaker/Services/Api/Project/ProjectUsers.php

@@ -81,7 +81,7 @@ class ProjectUsers extends Api
         try {
             $request_data = (array)($request_data);
             $user = new \ProcessMaker\BusinessModel\ProjectUser();
-            $objectData = $user->postProjectWsUserCanStartTask($prj_uid, $act_uid, $request_data);
+            $objectData = $user->projectWsUserCanStartTask($prj_uid, $act_uid, $request_data);
             //Response
             $response = $objectData;
         } catch (\Exception $e) {