From 02adc70cf62c183d44ea901b9b9772e1525015d3 Mon Sep 17 00:00:00 2001 From: Daniel Rojas Date: Tue, 25 Mar 2014 16:43:50 -0400 Subject: [PATCH] Se agrega metodo POST para InputDocuments y se corrigen nombres de variables para InputDocuments y OutputDocuments --- .../src/BusinessModel/Cases/InputDocument.php | 82 ++++++------ .../BusinessModel/Cases/OutputDocument.php | 117 ++---------------- .../Api/ProcessMaker/Cases/InputDocument.php | 33 +++-- .../Api/ProcessMaker/Cases/OutputDocument.php | 30 ++--- 4 files changed, 75 insertions(+), 187 deletions(-) diff --git a/workflow/engine/src/BusinessModel/Cases/InputDocument.php b/workflow/engine/src/BusinessModel/Cases/InputDocument.php index bdbae4943..e4ed6410a 100644 --- a/workflow/engine/src/BusinessModel/Cases/InputDocument.php +++ b/workflow/engine/src/BusinessModel/Cases/InputDocument.php @@ -6,15 +6,15 @@ class InputDocument /** * Get data of Cases InputDocument * - * @param string $caseUid + * @param string $applicationUid * @param string $userUid * * return array Return an array with data of an InputDocument */ - public function getCasesInputDocuments($caseUid, $userUid) + public function getCasesInputDocuments($applicationUid, $userUid) { try { - $sApplicationUID = $caseUid; + $sApplicationUID = $applicationUid; $sUserUID = $userUid; \G::LoadClass('case'); $oCase = new \Cases(); @@ -49,16 +49,16 @@ class InputDocument /** * Get data of Cases InputDocument * - * @param string $caseUid + * @param string $applicationUid * @param string $userUid * @param string $inputDocumentUid * * return array Return an array with data of an InputDocument */ - public function getCasesInputDocument($caseUid, $userUid, $inputDocumentUid) + public function getCasesInputDocument($applicationUid, $userUid, $inputDocumentUid) { try { - $sApplicationUID = $caseUid; + $sApplicationUID = $applicationUid; $sUserUID = $userUid; \G::LoadClass('case'); $oCase = new \Cases(); @@ -117,17 +117,18 @@ class InputDocument /** * Get data of Cases InputDocument * - * @param string $caseUid + * @param string $applicationUid + * @param string $taskUid * @param string $inputDocumentUid * @param string $userUid * * return array Return an array with data of an InputDocument */ - public function addCasesInputDocument($caseUid, $inputDocumentUid, $userUid) + public function addCasesInputDocument($applicationUid, $taskUid, $inputDocumentUid, $userUid) { try { - if ((isset( $_FILES['form'] )) && ($_FILES['form']['error']['APP_DOC_FILENAME'] != 0)) { - $code = $_FILES['form']['error']['APP_DOC_FILENAME']; + if ((isset( $_FILES['form'] )) && ($_FILES['form']['error'] != 0)) { + $code = $_FILES['form']['error']; switch ($code) { case UPLOAD_ERR_INI_SIZE: $message = \G::LoadTranslation( 'ID_UPLOAD_ERR_INI_SIZE' ); @@ -159,31 +160,23 @@ class InputDocument \G::header( "location: " . "/sys" . SYS_SYS . $backUrlObj[1] ); die(); } - \G::LoadClass("case"); - - //$inputDocumentUid = $_GET["UID"]; //$_POST["form"]["DOC_UID"] - $appDocUid = ''; - //$appDocUid = $_POST["form"]["APP_DOC_UID"]; + $appDocUid = \G::generateUniqueID(); $docVersion = ''; - //$docVersion = intval($_POST["form"]["docVersion"]); $appDocType = 'INPUT'; - //$appDocType = $_POST["form"]["APP_DOC_TYPE"]; - $appDocComment = (isset($_POST["form"]["APP_DOC_COMMENT"]))? $_POST["form"]["APP_DOC_COMMENT"] : ""; - $actionType = $_POST["form"]["actionType"]; - + $appDocComment = (isset($_POST["form"]))? $_POST["form"] : ""; $case = new \Cases(); - $case->thisIsTheCurrentUser($_SESSION["APPLICATION"], $_SESSION["INDEX"], $_SESSION["USER_LOGGED"], "REDIRECT", "casesListExtJs"); - + $delIndex = \AppDelegation::getCurrentIndex($applicationUid); + $case->thisIsTheCurrentUser($applicationUid, $delIndex, $userUid, "REDIRECT", "casesListExtJs"); //Load the fields - $arrayField = $case->loadCase($_SESSION["APPLICATION"]); + $arrayField = $case->loadCase($applicationUid); $arrayField["APP_DATA"] = array_merge($arrayField["APP_DATA"], \G::getSystemConstants()); - //Triggers - $arrayTrigger = $case->loadTriggers($_SESSION["TASK"], "INPUT_DOCUMENT", $inputDocumentUid, "AFTER"); - - + $arrayTrigger = $case->loadTriggers($taskUid, "INPUT_DOCUMENT", $inputDocumentUid, "AFTER"); //Add Input Document + if (!$_FILES["form"]["error"]) { + $_FILES["form"]["error"] = 0; + } if (isset($_FILES) && isset($_FILES["form"]) && count($_FILES["form"]) > 0) { $appDocUid = $case->addInputDocument( $inputDocumentUid, @@ -191,44 +184,39 @@ class InputDocument $docVersion, $appDocType, $appDocComment, - $actionType, - $_SESSION["APPLICATION"], - $_SESSION["INDEX"], - $_SESSION["TASK"], - $_SESSION["USER_LOGGED"], + '', + $applicationUid, + $delIndex, + $taskUid, + $userUid, "xmlform", - $_FILES["form"]["name"]["APP_DOC_FILENAME"], - $_FILES["form"]["error"]["APP_DOC_FILENAME"], - $_FILES["form"]["tmp_name"]["APP_DOC_FILENAME"] + $_FILES["form"]["name"], + $_FILES["form"]["error"], + $_FILES["form"]["tmp_name"] ); - } - - if ($_SESSION["TRIGGER_DEBUG"]["NUM_TRIGGERS"] > 0) { + } + if ($_SESSION["TRIGGER_DEBUG"]["NUM_TRIGGERS"] > 0) { //Trigger - Execute after - Start $arrayField["APP_DATA"] = $case->executeTriggers( - $_SESSION["TASK"], + $taskUid, "INPUT_DOCUMENT", $inputDocumentUid, "AFTER", $arrayField["APP_DATA"] ); //Trigger - Execute after - End - } - + } //Save data $arrayData = array(); $arrayData["APP_NUMBER"] = $arrayField["APP_NUMBER"]; //$arrayData["APP_PROC_STATUS"] = $arrayField["APP_PROC_STATUS"]; $arrayData["APP_DATA"] = $arrayField["APP_DATA"]; - $arrayData["DEL_INDEX"] = $_SESSION["INDEX"]; - $arrayData["TAS_UID"] = $_SESSION["TASK"]; - - $case->updateCase($_SESSION["APPLICATION"], $arrayData); - + $arrayData["DEL_INDEX"] = $delIndex; + $arrayData["TAS_UID"] = $taskUid; + $case->updateCase($applicationUid, $arrayData); } catch (\Exception $e) { throw $e; } } - } diff --git a/workflow/engine/src/BusinessModel/Cases/OutputDocument.php b/workflow/engine/src/BusinessModel/Cases/OutputDocument.php index 4653d8d4c..eb129cdea 100644 --- a/workflow/engine/src/BusinessModel/Cases/OutputDocument.php +++ b/workflow/engine/src/BusinessModel/Cases/OutputDocument.php @@ -6,21 +6,21 @@ class OutputDocument /** * Get data of Cases OutputDocument * - * @param string $caseUid + * @param string $applicationUid * @param string $userUid * * return array Return an array with data of an OutputDocument */ - public function getCasesOutputDocuments($caseUid, $userUid) + public function getCasesOutputDocuments($applicationUid, $userUid) { try { \G::LoadClass('case'); $oCase = new \Cases(); - $fields = $oCase->loadCase( $caseUid ); + $fields = $oCase->loadCase( $applicationUid ); $sProcessUID = $fields['PRO_UID']; $sTaskUID = ''; $oCriteria = new \BusinessModel\Cases(); - $oCriteria->getAllGeneratedDocumentsCriteria( $sProcessUID, $caseUid, $sTaskUID, $userUid); + $oCriteria->getAllGeneratedDocumentsCriteria( $sProcessUID, $applicationUid, $sTaskUID, $userUid); $result = array (); global $_DBArray; foreach ($_DBArray['outputDocuments'] as $key => $row) { @@ -47,16 +47,16 @@ class OutputDocument /** * Get data of Cases OutputDocument * - * @param string $caseUid + * @param string $applicationUid * @param string $userUid * @param string $outputDocumentUid * * return array Return an array with data of an OutputDocument */ - public function getCasesOutputDocument($caseUid, $userUid, $outputDocumentUid) + public function getCasesOutputDocument($applicationUid, $userUid, $outputDocumentUid) { try { - $sApplicationUID = $caseUid; + $sApplicationUID = $applicationUid; $sUserUID = $userUid; \G::LoadClass('case'); $oCase = new \Cases(); @@ -115,114 +115,15 @@ class OutputDocument /** * Get data of Cases OutputDocument * - * @param string $caseUid + * @param string $applicationUid * @param string $outputDocumentUid * @param string $userUid * * return array Return an array with data of an OutputDocument */ - public function addCasesOutputDocument($caseUid, $outputDocumentUid, $userUid) + public function addCasesOutputDocument($applicationUid, $outputDocumentUid, $userUid) { try { - if ((isset( $_FILES['form'] )) && ($_FILES['form']['error']['APP_DOC_FILENAME'] != 0)) { - $code = $_FILES['form']['error']['APP_DOC_FILENAME']; - switch ($code) { - case UPLOAD_ERR_INI_SIZE: - $message = \G::LoadTranslation( 'ID_UPLOAD_ERR_INI_SIZE' ); - break; - case UPLOAD_ERR_FORM_SIZE: - $message = \G::LoadTranslation( 'ID_UPLOAD_ERR_FORM_SIZE' ); - break; - case UPLOAD_ERR_PARTIAL: - $message = \G::LoadTranslation( 'ID_UPLOAD_ERR_PARTIAL' ); - break; - case UPLOAD_ERR_NO_FILE: - $message = \G::LoadTranslation( 'ID_UPLOAD_ERR_NO_FILE' ); - break; - case UPLOAD_ERR_NO_TMP_DIR: - $message = \G::LoadTranslation( 'ID_UPLOAD_ERR_NO_TMP_DIR' ); - break; - case UPLOAD_ERR_CANT_WRITE: - $message = \G::LoadTranslation( 'ID_UPLOAD_ERR_CANT_WRITE' ); - break; - case UPLOAD_ERR_EXTENSION: - $message = \G::LoadTranslation( 'ID_UPLOAD_ERR_EXTENSION' ); - break; - default: - $message = \G::LoadTranslation( 'ID_UPLOAD_ERR_UNKNOWN' ); - break; - } - \G::SendMessageText( $message, "ERROR" ); - $backUrlObj = explode( "sys" . SYS_SYS, $_SERVER['HTTP_REFERER'] ); - \G::header( "location: " . "/sys" . SYS_SYS . $backUrlObj[1] ); - die(); - } - - \G::LoadClass("case"); - - //$inputDocumentUid = $_GET["UID"]; //$_POST["form"]["DOC_UID"] - $appDocUid = ''; - //$appDocUid = $_POST["form"]["APP_DOC_UID"]; - $docVersion = ''; - //$docVersion = intval($_POST["form"]["docVersion"]); - $appDocType = 'INPUT'; - //$appDocType = $_POST["form"]["APP_DOC_TYPE"]; - $appDocComment = (isset($_POST["form"]["APP_DOC_COMMENT"]))? $_POST["form"]["APP_DOC_COMMENT"] : ""; - $actionType = $_POST["form"]["actionType"]; - - $case = new \Cases(); - $case->thisIsTheCurrentUser($_SESSION["APPLICATION"], $_SESSION["INDEX"], $_SESSION["USER_LOGGED"], "REDIRECT", "casesListExtJs"); - - //Load the fields - $arrayField = $case->loadCase($_SESSION["APPLICATION"]); - $arrayField["APP_DATA"] = array_merge($arrayField["APP_DATA"], \G::getSystemConstants()); - - //Triggers - $arrayTrigger = $case->loadTriggers($_SESSION["TASK"], "INPUT_DOCUMENT", $outputDocumentUid, "AFTER"); - - - //Add Input Document - if (isset($_FILES) && isset($_FILES["form"]) && count($_FILES["form"]) > 0) { - $appDocUid = $case->addInputDocument( - $outputDocumentUid, - $appDocUid, - $docVersion, - $appDocType, - $appDocComment, - $actionType, - $_SESSION["APPLICATION"], - $_SESSION["INDEX"], - $_SESSION["TASK"], - $_SESSION["USER_LOGGED"], - "xmlform", - $_FILES["form"]["name"]["APP_DOC_FILENAME"], - $_FILES["form"]["error"]["APP_DOC_FILENAME"], - $_FILES["form"]["tmp_name"]["APP_DOC_FILENAME"] - ); - } - - if ($_SESSION["TRIGGER_DEBUG"]["NUM_TRIGGERS"] > 0) { - //Trigger - Execute after - Start - $arrayField["APP_DATA"] = $case->executeTriggers( - $_SESSION["TASK"], - "INPUT_DOCUMENT", - $outputDocumentUid, - "AFTER", - $arrayField["APP_DATA"] - ); - //Trigger - Execute after - End - } - - //Save data - $arrayData = array(); - $arrayData["APP_NUMBER"] = $arrayField["APP_NUMBER"]; - //$arrayData["APP_PROC_STATUS"] = $arrayField["APP_PROC_STATUS"]; - $arrayData["APP_DATA"] = $arrayField["APP_DATA"]; - $arrayData["DEL_INDEX"] = $_SESSION["INDEX"]; - $arrayData["TAS_UID"] = $_SESSION["TASK"]; - - $case->updateCase($_SESSION["APPLICATION"], $arrayData); - } catch (\Exception $e) { throw $e; } diff --git a/workflow/engine/src/Services/Api/ProcessMaker/Cases/InputDocument.php b/workflow/engine/src/Services/Api/ProcessMaker/Cases/InputDocument.php index 7a4fc778e..22e3fa180 100644 --- a/workflow/engine/src/Services/Api/ProcessMaker/Cases/InputDocument.php +++ b/workflow/engine/src/Services/Api/ProcessMaker/Cases/InputDocument.php @@ -12,16 +12,16 @@ use \Luracast\Restler\RestException; class InputDocument extends Api { /** - * @url GET /:cas_uid/input-documents + * @url GET /:app_uid/input-documents * - * @param string $cas_uid {@min 32}{@max 32} + * @param string $app_uid {@min 32}{@max 32} */ - public function doGetInputDocuments($cas_uid) + public function doGetInputDocuments($app_uid) { try { $userUid = $this->getUserId(); $inputDocument = new \BusinessModel\Cases\InputDocument(); - $response = $inputDocument->getCasesInputDocuments($cas_uid, $userUid); + $response = $inputDocument->getCasesInputDocuments($app_uid, $userUid); return $response; } catch (\Exception $e) { throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage())); @@ -29,17 +29,17 @@ class InputDocument extends Api } /** - * @url GET /:cas_uid/input-document/:inp_doc_uid + * @url GET /:app_uid/input-document/:inp_doc_uid * - * @param string $cas_uid {@min 32}{@max 32} + * @param string $app_uid {@min 32}{@max 32} * @param string $inp_doc_uid {@min 32}{@max 32} */ - public function doGetInputDocument($cas_uid, $inp_doc_uid) + public function doGetInputDocument($app_uid, $inp_doc_uid) { try { $userUid = $this->getUserId(); $inputDocument = new \BusinessModel\Cases\InputDocument(); - $response = $inputDocument->getCasesInputDocument($cas_uid, $userUid, $inp_doc_uid); + $response = $inputDocument->getCasesInputDocument($app_uid, $userUid, $inp_doc_uid); return $response; } catch (\Exception $e) { throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage())); @@ -47,12 +47,12 @@ class InputDocument extends Api } /** - * @url DELETE /:cas_uid/input-document/:inp_doc_uid + * @url DELETE /:app_uid/input-document/:inp_doc_uid * - * @param string $cas_uid {@min 32}{@max 32} + * @param string $app_uid {@min 32}{@max 32} * @param string $inp_doc_uid {@min 32}{@max 32} */ - public function doDeleteInputDocument($cas_uid, $inp_doc_uid) + public function doDeleteInputDocument($app_uid, $inp_doc_uid) { try { $inputDocument = new \BusinessModel\Cases\InputDocument(); @@ -62,22 +62,21 @@ class InputDocument extends Api } } /** - * @url POST /:cas_uid/input-document + * @url POST /:app_uid/input-document * - * @param string $cas_uid {@min 32}{@max 32} + * @param string $app_uid { @min 32}{@max 32} + * @param string $tas_uid {@min 32}{@max 32} * @param string $inp_doc_uid {@min 32}{@max 32} */ - public function doPostInputDocument($cas_uid, $inp_doc_uid) + public function doPostInputDocument($app_uid, $tas_uid, $inp_doc_uid) { try { $userUid = $this->getUserId(); $inputDocument = new \BusinessModel\Cases\InputDocument(); - $response = $inputDocument->addCasesInputDocument($cas_uid, $inp_doc_uid, $userUid); + $response = $inputDocument->addCasesInputDocument($app_uid, $tas_uid, $inp_doc_uid, $userUid); return $response; } catch (\Exception $e) { throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage())); } } } - - diff --git a/workflow/engine/src/Services/Api/ProcessMaker/Cases/OutputDocument.php b/workflow/engine/src/Services/Api/ProcessMaker/Cases/OutputDocument.php index 1b42e53e8..f151135ab 100644 --- a/workflow/engine/src/Services/Api/ProcessMaker/Cases/OutputDocument.php +++ b/workflow/engine/src/Services/Api/ProcessMaker/Cases/OutputDocument.php @@ -12,16 +12,16 @@ use \Luracast\Restler\RestException; class OutputDocument extends Api { /** - * @url GET /:cas_uid/output-documents + * @url GET /:app_uid/output-documents * - * @param string $cas_uid {@min 32}{@max 32} + * @param string $app_uid {@min 32}{@max 32} */ - public function doGetOutputDocuments($cas_uid) + public function doGetOutputDocuments($app_uid) { try { $userUid = $this->getUserId(); $outputDocument = new \BusinessModel\Cases\OutputDocument(); - $response = $outputDocument->getCasesOutputDocuments($cas_uid, $userUid); + $response = $outputDocument->getCasesOutputDocuments($app_uid, $userUid); return $response; } catch (\Exception $e) { throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage())); @@ -29,17 +29,17 @@ class OutputDocument extends Api } /** - * @url GET /:cas_uid/output-document/:out_doc_uid + * @url GET /:app_uid/output-document/:out_doc_uid * - * @param string $cas_uid {@min 32}{@max 32} + * @param string $app_uid {@min 32}{@max 32} * @param string $out_doc_uid {@min 32}{@max 32} */ - public function doGetOutputDocument($cas_uid, $out_doc_uid) + public function doGetOutputDocument($app_uid, $out_doc_uid) { try { $userUid = $this->getUserId(); $outputDocument = new \BusinessModel\Cases\OutputDocument(); - $response = $outputDocument->getCasesOutputDocument($cas_uid, $userUid, $out_doc_uid); + $response = $outputDocument->getCasesOutputDocument($app_uid, $userUid, $out_doc_uid); return $response; } catch (\Exception $e) { throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage())); @@ -47,12 +47,12 @@ class OutputDocument extends Api } /** - * @url DELETE /:cas_uid/output-document/:out_doc_uid + * @url DELETE /:app_uid/output-document/:out_doc_uid * - * @param string $cas_uid {@min 32}{@max 32} + * @param string $app_uid {@min 32}{@max 32} * @param string $out_doc_uid {@min 32}{@max 32} */ - public function doDeleteOutputDocument($cas_uid, $out_doc_uid) + public function doDeleteOutputDocument($app_uid, $out_doc_uid) { try { $outputDocument = new \BusinessModel\Cases\OutputDocument(); @@ -62,17 +62,17 @@ class OutputDocument extends Api } } /** - * @url POST /:cas_uid/output-document + * @url POST /:app_uid/output-document * - * @param string $cas_uid {@min 32}{@max 32} + * @param string $app_uid {@min 32}{@max 32} * @param string $out_doc_uid {@min 32}{@max 32} */ - public function doPostOutputDocument($cas_uid, $out_doc_uid) + public function doPostOutputDocument($app_uid, $out_doc_uid) { try { $userUid = $this->getUserId(); $outputDocument = new \BusinessModel\Cases\OutputDocument(); - $response = $outputDocument->addCasesOutputDocument($cas_uid, $out_doc_uid, $userUid); + $response = $outputDocument->addCasesOutputDocument($app_uid, $out_doc_uid, $userUid); return $response; } catch (\Exception $e) { throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));