From 9036eecbcbca004df969f57b765db0c754999ef9 Mon Sep 17 00:00:00 2001 From: Wendy Nestor Date: Tue, 6 May 2014 12:05:51 -0400 Subject: [PATCH 1/6] Arregos a los features pm tables y eliminacion del feature remove users en web entry --- .../admin_setup/pm_tables/basic_sequence_pm_tables.feature | 2 +- .../projects/project/main_tests_project_resources.feature | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/features/backend/admin_setup/pm_tables/basic_sequence_pm_tables.feature b/features/backend/admin_setup/pm_tables/basic_sequence_pm_tables.feature index af06bf294..89bf37536 100644 --- a/features/backend/admin_setup/pm_tables/basic_sequence_pm_tables.feature +++ b/features/backend/admin_setup/pm_tables/basic_sequence_pm_tables.feature @@ -195,7 +195,7 @@ Scenario Outline: Delete a pm table of a pmtable Scenario Outline: Delete a data of a pmtable Given that I want to delete a resource with the key "pmt_uid" stored in session array as variable "pmt_uid_" - And I request "pmtable//data/CAMPO1/updatevalor2" + And I request "pmtable//data/CAMPO1/valor1" And the content type is "application/json" Then the response status code should be 200 And the response charset is "UTF-8" diff --git a/features/backend/projects/project/main_tests_project_resources.feature b/features/backend/projects/project/main_tests_project_resources.feature index e4910a29b..774fcf4cf 100644 --- a/features/backend/projects/project/main_tests_project_resources.feature +++ b/features/backend/projects/project/main_tests_project_resources.feature @@ -24,7 +24,7 @@ Scenario: Get definition of a project activity for obtent definition Scenario Outline: Create new Projects - Given POST data from file "" + Given POST data from file "" And I request "projects" Then the response status code should be 201 And the response charset is "UTF-8" From e80226631b3b17ddbf2a4a742eb0c169ad7152a2 Mon Sep 17 00:00:00 2001 From: Victor Saisa Lopez Date: Tue, 6 May 2014 15:38:34 -0400 Subject: [PATCH 2/6] ProcessMaker-BE "BPMN Import (improvement)" - Se ha cambiado el siguiente Endpoint: POST /api/1.0/{workspace}/project/import El nuevo Endpoint es el siguiente POST /api/1.0/{workspace}/project/import?option={option} - Se realizaron los cambios necesarios para el manejo de la variable "option" --- .../src/ProcessMaker/Importer/Importer.php | 55 +++++++++++++------ .../src/ProcessMaker/Services/Api/Project.php | 4 +- 2 files changed, 41 insertions(+), 18 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/Importer/Importer.php b/workflow/engine/src/ProcessMaker/Importer/Importer.php index 2e5482d3c..b390234fc 100644 --- a/workflow/engine/src/ProcessMaker/Importer/Importer.php +++ b/workflow/engine/src/ProcessMaker/Importer/Importer.php @@ -44,8 +44,8 @@ abstract class Importer if ($this->targetExists()) { throw new \Exception(sprintf( "Project already exists, you need set an action to continue. " . - "Available actions: [%s|%s|%s].", self::IMPORT_OPTION_CREATE_NEW, - self::IMPORT_OPTION_OVERWRITE, self::IMPORT_OPTION_DISABLE_AND_CREATE_NEW + "Available actions: [%s|%s|%s|%s].", self::IMPORT_OPTION_CREATE_NEW, + self::IMPORT_OPTION_OVERWRITE, self::IMPORT_OPTION_DISABLE_AND_CREATE_NEW, self::IMPORT_OPTION_KEEP_WITHOUT_CHANGING_AND_CREATE_NEW ), self::IMPORT_STAT_TARGET_ALREADY_EXISTS); } $generateUid = false; @@ -206,7 +206,7 @@ abstract class Importer $data = $_FILES[$varName]; - if ($data["error"] != 0){ + if ($data["error"] != 0) { throw new \Exception("Error while uploading file. Error code: {$data["error"]}"); } @@ -263,7 +263,9 @@ abstract class Importer $basePath = ""; } - if (empty($basePath)) continue; + if (empty($basePath)) { + continue; + } foreach ($files as $file) { $filename = $basePath . $file["file_path"]; @@ -366,6 +368,10 @@ abstract class Importer $result = $workflow->updateTask($arrayTaskData["TAS_UID"], $arrayTaskData); } + unset($arrayWorkflowTables["process"]["PRO_CREATE_USER"]); + unset($arrayWorkflowTables["process"]["PRO_CREATE_DATE"]); + unset($arrayWorkflowTables["process"]["PRO_UPDATE_DATE"]); + $workflow->update($arrayWorkflowTables["process"]); //Return @@ -375,21 +381,21 @@ abstract class Importer /** * Imports a Project sent through the POST method ($_FILES) * - * @param array $arrayData Data - * @param array $arrayFieldName The field's names + * @param array $arrayData Data + * @param string $option Option ("CREATE", "OVERWRITE", "DISABLE", "KEEP") + * @param array $arrayFieldName The field's names * * return array Returns the data sent and the unique id of Project */ - public function importPostFile($arrayData, $arrayFieldName = array()) + public function importPostFile(array $arrayData, $option = "CREATE", array $arrayFieldName = array()) { try { //Set data - $arrayFieldName["projectFile"] = (isset($arrayFieldName["projectFile"]))? $arrayFieldName["projectFile"] : "PRJ_FILE"; + $arrayFieldName["projectFile"] = (isset($arrayFieldName["projectFile"]))? $arrayFieldName["projectFile"] : "PROJECT_FILE"; $arrayFieldName["option"] = (isset($arrayFieldName["option"]))? $arrayFieldName["option"] : "OPTION"; $arrayFieldDefinition = array( - $arrayFieldName["projectFile"] => array("type" => "string", "required" => true, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "projectFile"), - $arrayFieldName["option"] => array("type" => "int", "required" => false, "empty" => false, "defaultValues" => array("CREATE", "OVERWRITE", "DISABLE", "KEEP"), "fieldNameAux" => "option") + $arrayFieldName["projectFile"] => array("type" => "string", "required" => true, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "projectFile") ); $arrayFieldNameForException = $arrayFieldName; @@ -405,6 +411,9 @@ abstract class Importer $arrayData[$arrayFieldName["projectFile"]] = $arrayData[$arrayFieldName["projectFile"]]["name"]; } + $optionCaseUpper = (strtoupper($option) == $option)? true : false; + $option = strtoupper($option); + //Verify data $process = new \ProcessMaker\BusinessModel\Process(); $validator = new \ProcessMaker\BusinessModel\Validator(); @@ -414,6 +423,16 @@ abstract class Importer $process->throwExceptionIfDataNotMetFieldDefinition($arrayData, $arrayFieldDefinition, $arrayFieldNameForException, true); + $arrayOptionDefaultValues = array("CREATE", "OVERWRITE", "DISABLE", "KEEP"); + + if ($option . "" != "") { + if (!in_array($option, $arrayOptionDefaultValues, true)) { + $strdv = implode("|", $arrayOptionDefaultValues); + + throw (new \Exception(str_replace(array("{0}", "{1}"), array($arrayFieldNameForException["option"], ($optionCaseUpper)? $strdv : strtolower($strdv)), "Invalid value for \"{0}\", it only accepts values: \"{1}\"."))); + } + } + if ((isset($_FILES["filepmx"]) && pathinfo($_FILES["filepmx"]["name"], PATHINFO_EXTENSION) != "pmx") || (isset($arrayData[$arrayFieldName["projectFile"]]) && pathinfo($arrayData[$arrayFieldName["projectFile"]], PATHINFO_EXTENSION) != "pmx") ) { @@ -421,20 +440,22 @@ abstract class Importer } //Set variables - $option = self::IMPORT_OPTION_CREATE_NEW; + $opt = self::IMPORT_OPTION_CREATE_NEW; //CREATE - switch ((isset($arrayData[$arrayFieldName["option"]]))? $arrayData[$arrayFieldName["option"]] : "CREATE") { + switch ($option) { case "OVERWRITE": - $option = self::IMPORT_OPTION_OVERWRITE; + $opt = self::IMPORT_OPTION_OVERWRITE; break; case "DISABLE": - $option = self::IMPORT_OPTION_DISABLE_AND_CREATE_NEW; + $opt = self::IMPORT_OPTION_DISABLE_AND_CREATE_NEW; break; case "KEEP": - $option = self::IMPORT_OPTION_KEEP_WITHOUT_CHANGING_AND_CREATE_NEW; + $opt = self::IMPORT_OPTION_KEEP_WITHOUT_CHANGING_AND_CREATE_NEW; break; } + $option = $opt; + if (isset($_FILES["filepmx"])) { $this->setSaveDir(PATH_DOCUMENT . "input"); $this->setSourceFromGlobals("filepmx"); @@ -452,7 +473,9 @@ abstract class Importer $arrayData = array_merge(array("PRJ_UID" => $projectUid), $arrayData); } catch (\Exception $e) { - throw (new \Exception("Project already exists")); + $msg = str_replace(array(self::IMPORT_OPTION_CREATE_NEW, self::IMPORT_OPTION_OVERWRITE, self::IMPORT_OPTION_DISABLE_AND_CREATE_NEW, self::IMPORT_OPTION_KEEP_WITHOUT_CHANGING_AND_CREATE_NEW), $arrayOptionDefaultValues, $e->getMessage()); + + throw (new \Exception($msg)); } //Return diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Project.php b/workflow/engine/src/ProcessMaker/Services/Api/Project.php index b77e43511..ad21dceae 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api/Project.php +++ b/workflow/engine/src/ProcessMaker/Services/Api/Project.php @@ -118,14 +118,14 @@ class Project extends Api * * @status 201 */ - public function doPostImport($request_data) + public function doPostImport(array $request_data, $option = null) { try { $importer = new \ProcessMaker\Importer\XmlImporter(); $importer->setData("usr_uid", $this->getUserId()); - $arrayData = $importer->importPostFile($request_data, array("projectFile" => "prj_file", "option" => "option")); + $arrayData = $importer->importPostFile($request_data, $option, array("projectFile" => "project_file", "option" => "option")); $response = $arrayData; From cc73f8e7efa4ad530f6c3c7ac2ced392b8b6ec0e Mon Sep 17 00:00:00 2001 From: Daniel Rojas Date: Tue, 6 May 2014 16:16:45 -0400 Subject: [PATCH 3/6] Se modifica codigo para ASSIGNEE y ASSIGNEE ADHOC, removiendo codigo innecesario --- .../src/ProcessMaker/BusinessModel/Task.php | 183 +++++------------- 1 file changed, 48 insertions(+), 135 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php index 2cf999702..ef2d4a8ad 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php @@ -704,7 +704,7 @@ class Task } return $arrayData; - } catch (Exception $e) { + } catch (\Exception $e) { throw $e; } @@ -765,15 +765,6 @@ class Task foreach ($aAux as $aGroup) { $aUIDS1[] = $aGroup['GRP_UID']; } - $groups = new \Groupwf(); - $totalCount = 0; - $criteria = new \Criteria( 'workflow' ); - $criteria->addSelectColumn( \GroupwfPeer::GRP_UID ); - $criteria->addJoin( \GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::LEFT_JOIN ); - $criteria->add( \ContentPeer::CON_CATEGORY, 'GRP_TITLE' ); - $criteria->add( \ContentPeer::CON_LANG, SYS_LANG ); - $criteria->addAscendingOrderByColumn( \ContentPeer::CON_VALUE ); - $totalRows = \GroupwfPeer::doCount( $criteria ); $criteria = new \Criteria( 'workflow' ); $criteria->addSelectColumn( \GroupwfPeer::GRP_UID ); $criteria->addSelectColumn( \GroupwfPeer::GRP_STATUS ); @@ -788,14 +779,11 @@ class Task } $oDataset = \GroupwfPeer::doSelectRS( $criteria ); $oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC ); - $processes = Array (); - $uids = array (); $groups = array (); - $aGroups = array (); while ($oDataset->next()) { $groups[] = $oDataset->getRow(); } - $result = array ('rows' => $groups,'totalCount' => $totalRows); + $result = array ('rows' => $groups); foreach ($result['rows'] as $results) { if (in_array($results['GRP_UID'], $aUIDS1)) { $c++; @@ -809,7 +797,7 @@ class Task if ($type == '' || $type == 'group') { $aUsers[] = array('aas_uid' => $results['GRP_UID'], 'aas_name' => (!isset($aRow2['GROUP_INACTIVE']) ? $results['GRP_TITLE'] . - ' (' . $aRow2['MEMBERS_NUMBER'] . ' ' . + ' (' . $aRow2['MEMBERS_NUMBER'] . ' ' . ((int) $aRow2['MEMBERS_NUMBER'] == 1 ? \G::LoadTranslation('ID_USER') : \G::LoadTranslation('ID_USERS')). ')' . '' : $results['GRP_TITLE'] . ' ' . $aRow2['GROUP_INACTIVE']), 'aas_lastname' => "", @@ -867,7 +855,7 @@ class Task } $aUsers = $this->arrayPagination($aUsers, $start, $limit); return $aUsers; - } catch (Exception $e) { + } catch (\Exception $e) { throw $e; } } @@ -901,7 +889,6 @@ class Task throw (new \Exception( 'This id for act_uid: '. $sTaskUID .' does not correspond to a registered activity')); } $iType = 1; - $aUsers = array(); $oTasks = new \Tasks(); $aAux = $oTasks->getGroupsOfTask($sTaskUID, $iType); $aUIDS1 = array(); @@ -914,9 +901,6 @@ class Task $aUIDS2[] = $aUser['USR_UID']; } $aUsers = array(); - $sDelimiter = \DBAdapter::getStringDelimiter(); - $groups = new \Groupwf(); - $result = $groups->getAllGroup($start, $limit, $filter); $c = 0; $oTasks = new \Tasks(); $aAux = $oTasks->getGroupsOfTask($sTaskUID, 1); @@ -924,15 +908,6 @@ class Task foreach ($aAux as $aGroup) { $aUIDS1[] = $aGroup['GRP_UID']; } - $groups = new \Groupwf(); - $totalCount = 0; - $criteria = new \Criteria( 'workflow' ); - $criteria->addSelectColumn( \GroupwfPeer::GRP_UID ); - $criteria->addJoin( \GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::LEFT_JOIN ); - $criteria->add( \ContentPeer::CON_CATEGORY, 'GRP_TITLE' ); - $criteria->add( \ContentPeer::CON_LANG, SYS_LANG ); - $criteria->addAscendingOrderByColumn( \ContentPeer::CON_VALUE ); - $totalRows = \GroupwfPeer::doCount( $criteria ); $criteria = new \Criteria( 'workflow' ); $criteria->addSelectColumn( \GroupwfPeer::GRP_UID ); $criteria->addSelectColumn( \GroupwfPeer::GRP_STATUS ); @@ -947,14 +922,11 @@ class Task } $oDataset = \GroupwfPeer::doSelectRS( $criteria ); $oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC ); - $processes = Array (); - $uids = array (); $groups = array (); - $aGroups = array (); while ($oDataset->next()) { $groups[] = $oDataset->getRow(); } - $result = array ('rows' => $groups,'totalCount' => $totalRows); + $result = array ('rows' => $groups); foreach ($result['rows'] as $results) { if (! in_array($results['GRP_UID'], $aUIDS1)) { $c++; @@ -968,7 +940,7 @@ class Task if ($type == '' || $type == 'group') { $aUsers[] = array('aas_uid' => $results['GRP_UID'], 'aas_name' => (!isset($aRow2['GROUP_INACTIVE']) ? $results['GRP_TITLE'] . - ' (' . $aRow2['MEMBERS_NUMBER'] . ' ' . + ' (' . $aRow2['MEMBERS_NUMBER'] . ' ' . ((int) $aRow2['MEMBERS_NUMBER'] == 1 ? \G::LoadTranslation('ID_USER') : \G::LoadTranslation('ID_USERS')). ')' . '' : $results['GRP_TITLE'] . ' ' . $aRow2['GROUP_INACTIVE']), 'aas_lastname' => "", @@ -977,7 +949,6 @@ class Task } } } - $sDelimiter = \DBAdapter::getStringDelimiter(); $oCriteria = new \Criteria('workflow'); $oCriteria->addSelectColumn(\UsersPeer::USR_UID); $oCriteria->addSelectColumn(\UsersPeer::USR_USERNAME); @@ -1022,7 +993,7 @@ class Task } $aUsers = $this->arrayPagination($aUsers, $start, $limit); return $aUsers; - } catch (Exception $e) { + } catch (\Exception $e) { throw $e; } } @@ -1078,15 +1049,6 @@ class Task foreach ($aAux as $aGroup) { $aUIDS1[] = $aGroup['GRP_UID']; } - $groups = new \Groupwf(); - $totalCount = 0; - $criteria = new \Criteria( 'workflow' ); - $criteria->addSelectColumn( \GroupwfPeer::GRP_UID ); - $criteria->addJoin( \GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::LEFT_JOIN ); - $criteria->add( \ContentPeer::CON_CATEGORY, 'GRP_TITLE' ); - $criteria->add( \ContentPeer::CON_LANG, SYS_LANG ); - $criteria->addAscendingOrderByColumn( \ContentPeer::CON_VALUE ); - $totalRows = \GroupwfPeer::doCount( $criteria ); $criteria = new \Criteria( 'workflow' ); $criteria->addSelectColumn( \GroupwfPeer::GRP_UID ); $criteria->addSelectColumn( \GroupwfPeer::GRP_STATUS ); @@ -1099,14 +1061,11 @@ class Task $criteria->addAscendingOrderByColumn( \ContentPeer::CON_VALUE ); $oDataset = \GroupwfPeer::doSelectRS( $criteria ); $oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC ); - $processes = Array (); - $uids = array (); $groups = array (); - $aGroups = array (); while ($oDataset->next()) { $groups[] = $oDataset->getRow(); } - $result = array ('rows' => $groups,'totalCount' => $totalRows); + $result = array ('rows' => $groups); foreach ($result['rows'] as $results) { if (in_array($results['GRP_UID'], $aUIDS1)) { $c++; @@ -1117,14 +1076,14 @@ class Task $oDataset2->setFetchmode(\ResultSet::FETCHMODE_ASSOC); $oDataset2->next(); $aRow2 = $oDataset2->getRow(); - $aUsers[] = array('aas_uid' => $results['GRP_UID'], - 'aas_name' => (!isset($aRow2['GROUP_INACTIVE']) ? $results['GRP_TITLE'] . - ' (' . $aRow2['MEMBERS_NUMBER'] . ' ' . - ((int) $aRow2['MEMBERS_NUMBER'] == 1 ? \G::LoadTranslation('ID_USER') : \G::LoadTranslation('ID_USERS')). - ')' . '' : $results['GRP_TITLE'] . ' ' . $aRow2['GROUP_INACTIVE']), - 'aas_lastname' => "", - 'aas_username' => "", - 'aas_type' => "group" ); + $aUsers = array('aas_uid' => $results['GRP_UID'], + 'aas_name' => (!isset($aRow2['GROUP_INACTIVE']) ? $results['GRP_TITLE'] . + ' (' . $aRow2['MEMBERS_NUMBER'] . ' ' . + ((int) $aRow2['MEMBERS_NUMBER'] == 1 ? \G::LoadTranslation('ID_USER') : \G::LoadTranslation('ID_USERS')). + ')' . '' : $results['GRP_TITLE'] . ' ' . $aRow2['GROUP_INACTIVE']), + 'aas_lastname' => "", + 'aas_username' => "", + 'aas_type' => "group" ); } } $oCriteria = new \Criteria('workflow'); @@ -1157,7 +1116,7 @@ class Task } else { return $aUsers; } - } catch (Exception $e) { + } catch (\Exception $e) { throw $e; } } @@ -1232,7 +1191,7 @@ class Task 'TU_RELATION' => 2)); } } - } catch ( Exception $e ) { + } catch ( \Exception $e ) { throw $e; } } @@ -1276,7 +1235,7 @@ class Task } else { throw (new \Exception( 'This row does not exist!' )); } - } catch (Exception $e) { + } catch (\Exception $e) { throw $e; } } @@ -1336,15 +1295,6 @@ class Task foreach ($aAux as $aGroup) { $aUIDS1[] = $aGroup['GRP_UID']; } - $groups = new \Groupwf(); - $totalCount = 0; - $criteria = new \Criteria( 'workflow' ); - $criteria->addSelectColumn( \GroupwfPeer::GRP_UID ); - $criteria->addJoin( \GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::LEFT_JOIN ); - $criteria->add( \ContentPeer::CON_CATEGORY, 'GRP_TITLE' ); - $criteria->add( \ContentPeer::CON_LANG, SYS_LANG ); - $criteria->addAscendingOrderByColumn( \ContentPeer::CON_VALUE ); - $totalRows = \GroupwfPeer::doCount( $criteria ); $criteria = new \Criteria( 'workflow' ); $criteria->addSelectColumn( \GroupwfPeer::GRP_UID ); $criteria->addSelectColumn( \GroupwfPeer::GRP_STATUS ); @@ -1359,14 +1309,11 @@ class Task } $oDataset = \GroupwfPeer::doSelectRS( $criteria ); $oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC ); - $processes = Array (); - $uids = array (); $groups = array (); - $aGroups = array (); while ($oDataset->next()) { $groups[] = $oDataset->getRow(); } - $result = array ('rows' => $groups,'totalCount' => $totalRows); + $result = array ('rows' => $groups); foreach ($result['rows'] as $results) { if (in_array($results['GRP_UID'], $aUIDS1)) { $c++; @@ -1380,7 +1327,7 @@ class Task if ($type == '' || $type == 'group') { $aUsers[] = array('ada_uid' => $results['GRP_UID'], 'ada_name' => (!isset($aRow2['GROUP_INACTIVE']) ? $results['GRP_TITLE'] . - ' (' . $aRow2['MEMBERS_NUMBER'] . ' ' . + ' (' . $aRow2['MEMBERS_NUMBER'] . ' ' . ((int) $aRow2['MEMBERS_NUMBER'] == 1 ? \G::LoadTranslation('ID_USER') : \G::LoadTranslation('ID_USERS')). ')' . '' : $results['GRP_TITLE'] . ' ' . $aRow2['GROUP_INACTIVE']), 'ada_lastname' => "", @@ -1438,7 +1385,7 @@ class Task } $aUsers = $this->arrayPagination($aUsers, $start, $limit); return $aUsers; - } catch (Exception $e) { + } catch (\Exception $e) { throw $e; } } @@ -1463,7 +1410,6 @@ class Task require_once (PATH_RBAC_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "RbacUsers.php"); require_once (PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "TaskUser.php"); require_once (PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "GroupUser.php"); - $aUsers = array(); $oProcess = \ProcessPeer::retrieveByPK( $sProcessUID ); if (is_null($oProcess)) { throw (new \Exception( 'This id for prj_uid: '. $sProcessUID .' does not correspond to a registered process')); @@ -1472,7 +1418,6 @@ class Task if (is_null($oActivity)) { throw (new \Exception( 'This id for act_uid: '. $sTaskUID .' does not correspond to a registered activity')); } - $iType = 2; $oTasks = new \Tasks(); $aAux = $oTasks->getGroupsOfTask($sTaskUID, $iType); @@ -1486,9 +1431,6 @@ class Task $aUIDS2[] = $aUser['USR_UID']; } $aUsers = array(); - $sDelimiter = \DBAdapter::getStringDelimiter(); - $groups = new \Groupwf(); - $result = $groups->getAllGroup($start, $limit, $filter); $c = 0; $oTasks = new \Tasks(); $aAux = $oTasks->getGroupsOfTask($sTaskUID, 2); @@ -1496,15 +1438,6 @@ class Task foreach ($aAux as $aGroup) { $aUIDS1[] = $aGroup['GRP_UID']; } - $groups = new \Groupwf(); - $totalCount = 0; - $criteria = new \Criteria( 'workflow' ); - $criteria->addSelectColumn( \GroupwfPeer::GRP_UID ); - $criteria->addJoin( \GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::LEFT_JOIN ); - $criteria->add( \ContentPeer::CON_CATEGORY, 'GRP_TITLE' ); - $criteria->add( \ContentPeer::CON_LANG, SYS_LANG ); - $criteria->addAscendingOrderByColumn( \ContentPeer::CON_VALUE ); - $totalRows = \GroupwfPeer::doCount( $criteria ); $criteria = new \Criteria( 'workflow' ); $criteria->addSelectColumn( \GroupwfPeer::GRP_UID ); $criteria->addSelectColumn( \GroupwfPeer::GRP_STATUS ); @@ -1519,14 +1452,11 @@ class Task } $oDataset = \GroupwfPeer::doSelectRS( $criteria ); $oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC ); - $processes = Array (); - $uids = array (); $groups = array (); - $aGroups = array (); while ($oDataset->next()) { $groups[] = $oDataset->getRow(); } - $result = array ('rows' => $groups,'totalCount' => $totalRows); + $result = array ('rows' => $groups); foreach ($result['rows'] as $results) { if (! in_array($results['GRP_UID'], $aUIDS1)) { $c++; @@ -1540,7 +1470,7 @@ class Task if ($type == '' || $type == 'group') { $aUsers[] = array('ada_uid' => $results['GRP_UID'], 'ada_name' => (!isset($aRow2['GROUP_INACTIVE']) ? $results['GRP_TITLE'] . - ' (' . $aRow2['MEMBERS_NUMBER'] . ' ' . + ' (' . $aRow2['MEMBERS_NUMBER'] . ' ' . ((int) $aRow2['MEMBERS_NUMBER'] == 1 ? \G::LoadTranslation('ID_USER') : \G::LoadTranslation('ID_USERS')). ')' . '' : $results['GRP_TITLE'] . ' ' . $aRow2['GROUP_INACTIVE']), 'ada_lastname' => "", @@ -1549,7 +1479,6 @@ class Task } } } - $sDelimiter = \DBAdapter::getStringDelimiter(); $oCriteria = new \Criteria('workflow'); $oCriteria->addSelectColumn(\UsersPeer::USR_UID); $oCriteria->addSelectColumn(\UsersPeer::USR_USERNAME); @@ -1594,13 +1523,11 @@ class Task } $aUsers = $this->arrayPagination($aUsers, $start, $limit); return $aUsers; - } catch (Exception $e) { + } catch (\Exception $e) { throw $e; } } - - /** * Return a single Adhoc user or group assigned to an activity * @@ -1652,15 +1579,6 @@ class Task foreach ($aAux as $aGroup) { $aUIDS1[] = $aGroup['GRP_UID']; } - $groups = new \Groupwf(); - $totalCount = 0; - $criteria = new \Criteria( 'workflow' ); - $criteria->addSelectColumn( \GroupwfPeer::GRP_UID ); - $criteria->addJoin( \GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::LEFT_JOIN ); - $criteria->add( \ContentPeer::CON_CATEGORY, 'GRP_TITLE' ); - $criteria->add( \ContentPeer::CON_LANG, SYS_LANG ); - $criteria->addAscendingOrderByColumn( \ContentPeer::CON_VALUE ); - $totalRows = \GroupwfPeer::doCount( $criteria ); $criteria = new \Criteria( 'workflow' ); $criteria->addSelectColumn( \GroupwfPeer::GRP_UID ); $criteria->addSelectColumn( \GroupwfPeer::GRP_STATUS ); @@ -1673,14 +1591,11 @@ class Task $criteria->addAscendingOrderByColumn( \ContentPeer::CON_VALUE ); $oDataset = \GroupwfPeer::doSelectRS( $criteria ); $oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC ); - $processes = Array (); - $uids = array (); $groups = array (); - $aGroups = array (); while ($oDataset->next()) { $groups[] = $oDataset->getRow(); } - $result = array ('rows' => $groups,'totalCount' => $totalRows); + $result = array ('rows' => $groups); foreach ($result['rows'] as $results) { if (in_array($results['GRP_UID'], $aUIDS1)) { $c++; @@ -1693,7 +1608,7 @@ class Task $aRow2 = $oDataset2->getRow(); $aUsers[] = array('ada_uid' => $results['GRP_UID'], 'ada_name' => (!isset($aRow2['GROUP_INACTIVE']) ? $results['GRP_TITLE'] . - ' (' . $aRow2['MEMBERS_NUMBER'] . ' ' . + ' (' . $aRow2['MEMBERS_NUMBER'] . ' ' . ((int) $aRow2['MEMBERS_NUMBER'] == 1 ? \G::LoadTranslation('ID_USER') : \G::LoadTranslation('ID_USERS')). ')' . '' : $results['GRP_TITLE'] . ' ' . $aRow2['GROUP_INACTIVE']), 'ada_lastname' => "", @@ -1731,7 +1646,7 @@ class Task } else { return $aUsers; } - } catch (Exception $e) { + } catch (\Exception $e) { throw $e; } } @@ -1806,7 +1721,7 @@ class Task 'TU_RELATION' => 2)); } } - } catch ( Exception $e ) { + } catch ( \Exception $e ) { throw $e; } } @@ -1850,7 +1765,7 @@ class Task } else { throw (new \Exception( 'This row does not exist!' )); } - } catch (Exception $e) { + } catch (\Exception $e) { throw $e; } } @@ -1979,10 +1894,9 @@ class Task $oGroupCriteria->addSelectColumn(\UsersPeer::USR_LASTNAME); $oGroupCriteria->addSelectColumn(\UsersPeer::USR_USERNAME); if ($filter != '') { - $oGroupCriteria->add($oGroupCriteria->getNewCriterion(\UsersPeer::USR_USERNAME, "%$filter%", - \Criteria::LIKE)->addOr($oGroupCriteria->getNewCriterion(\UsersPeer::USR_FIRSTNAME, - "%$filter%", \Criteria::LIKE))->addOr($oGroupCriteria->getNewCriterion(\UsersPeer::USR_LASTNAME, - "%$filter%", \Criteria::LIKE))); + $oGroupCriteria->add($oGroupCriteria->getNewCriterion(\UsersPeer::USR_USERNAME, "%$filter%", \Criteria::LIKE) + ->addOr($oGroupCriteria->getNewCriterion(\UsersPeer::USR_FIRSTNAME, "%$filter%", \Criteria::LIKE)) + ->addOr($oGroupCriteria->getNewCriterion(\UsersPeer::USR_LASTNAME, "%$filter%", \Criteria::LIKE))); } $oGroupCriteria->add(\UsersPeer::USR_UID, $aGroupRow["USR_UID"]); $oUserDataset = \UsersPeer::doSelectRS($oGroupCriteria); @@ -2053,7 +1967,7 @@ class Task } $aUsersGroups = $this->arrayPagination($aUsersGroups, $start, $limit); return $aUsersGroups; - } catch (Exception $e) { + } catch (\Exception $e) { throw $e; } } @@ -2104,10 +2018,9 @@ class Task $oGroupCriteria->addSelectColumn(\UsersPeer::USR_LASTNAME); $oGroupCriteria->addSelectColumn(\UsersPeer::USR_USERNAME); if ($filter != '') { - $oGroupCriteria->add($oGroupCriteria->getNewCriterion(\UsersPeer::USR_USERNAME, "%$filter%", - \Criteria::LIKE)->addOr($oGroupCriteria->getNewCriterion(\UsersPeer::USR_FIRSTNAME, - "%$filter%", \Criteria::LIKE))->addOr($oGroupCriteria->getNewCriterion(\UsersPeer::USR_LASTNAME, - "%$filter%", \Criteria::LIKE))); + $oGroupCriteria->add($oGroupCriteria->getNewCriterion(\UsersPeer::USR_USERNAME, "%$filter%", \Criteria::LIKE) + ->addOr($oGroupCriteria->getNewCriterion(\UsersPeer::USR_FIRSTNAME, "%$filter%", \Criteria::LIKE)) + ->addOr($oGroupCriteria->getNewCriterion(\UsersPeer::USR_LASTNAME, "%$filter%", \Criteria::LIKE))); } $oGroupCriteria->add(\UsersPeer::USR_UID, $aGroupRow["USR_UID"]); $oUserDataset = \UsersPeer::doSelectRS($oGroupCriteria); @@ -2115,10 +2028,10 @@ class Task $oUserDataset->next(); while ($aUserRow = $oUserDataset->getRow()) { $aUsers[] = array('aas_uid' => $aUserRow['USR_UID'], - 'aas_name' => $aUserRow['USR_FIRSTNAME'], - 'aas_lastname' => $aUserRow['USR_LASTNAME'], - 'aas_username' => $aUserRow['USR_USERNAME'], - 'aas_type' => "user" ); + 'aas_name' => $aUserRow['USR_FIRSTNAME'], + 'aas_lastname' => $aUserRow['USR_LASTNAME'], + 'aas_username' => $aUserRow['USR_USERNAME'], + 'aas_type' => "user" ); $oUserDataset->next(); } } @@ -2130,8 +2043,8 @@ class Task $oCriteria->addSelectColumn(\UsersPeer::USR_USERNAME); if ($filter != '') { $oCriteria->add($oCriteria->getNewCriterion(\UsersPeer::USR_USERNAME, "%$filter%", \Criteria::LIKE) - ->addOr($oCriteria->getNewCriterion(\UsersPeer::USR_FIRSTNAME, "%$filter%", \Criteria::LIKE)) - ->addOr($oCriteria->getNewCriterion(\UsersPeer::USR_LASTNAME, "%$filter%", \Criteria::LIKE ))); + ->addOr($oCriteria->getNewCriterion(\UsersPeer::USR_FIRSTNAME, "%$filter%", \Criteria::LIKE)) + ->addOr($oCriteria->getNewCriterion(\UsersPeer::USR_LASTNAME, "%$filter%", \Criteria::LIKE ))); } $oCriteria->addJoin(\TaskUserPeer::USR_UID, \UsersPeer::USR_UID, \Criteria::LEFT_JOIN); $oCriteria->add(\TaskUserPeer::TAS_UID, $sTaskUID); @@ -2143,10 +2056,10 @@ class Task while ($aRow = $oDataset->getRow()) { if ($type == '' || $type == 'user') { $aUsers[] = array('aas_uid' => $aRow['USR_UID'], - 'aas_name' => $aRow['USR_FIRSTNAME'], - 'aas_lastname' => $aRow['USR_LASTNAME'], - 'aas_username' => $aRow['USR_USERNAME'], - 'aas_type' => "user" ); + 'aas_name' => $aRow['USR_FIRSTNAME'], + 'aas_lastname' => $aRow['USR_LASTNAME'], + 'aas_username' => $aRow['USR_USERNAME'], + 'aas_type' => "user" ); } $oDataset->next(); } @@ -2178,7 +2091,7 @@ class Task } $aUsersGroups = $this->arrayPagination($aUsersGroups, $start, $limit); return $aUsersGroups; - } catch (Exception $e) { + } catch (\Exception $e) { throw $e; } } From 7ea88959ae813be8b196f3762c79378c9c279764 Mon Sep 17 00:00:00 2001 From: Wendy Nestor Date: Tue, 6 May 2014 16:55:18 -0400 Subject: [PATCH 4/6] Avance de los features pm table, project --- .../pm_tables/main_tests_pm_tables.feature | 42 +- .../main_tests_project_resources.feature | 14 + .../negative_tests_project_resources.feature | 214 ++ features/json/process_template_complete.json | 2104 +++++++++++++++++ 4 files changed, 2367 insertions(+), 7 deletions(-) create mode 100644 features/json/process_template_complete.json diff --git a/features/backend/admin_setup/pm_tables/main_tests_pm_tables.feature b/features/backend/admin_setup/pm_tables/main_tests_pm_tables.feature index c5bcfac73..61bd92da3 100644 --- a/features/backend/admin_setup/pm_tables/main_tests_pm_tables.feature +++ b/features/backend/admin_setup/pm_tables/main_tests_pm_tables.feature @@ -76,15 +76,43 @@ Scenario Outline: Create news pmtable Examples: | test_description | pmt_uid_number | pmt_tab_name | pmt_tab_dsc | fld_name_1 | fld_label_1 | fld_type_1 | fld_name_2 | fld_label_2 | fld_type_2 | fld_name_3 | fld_label_3 | fld_type_3 | - | Create pmtable with type varchar, bigint and boolean | 1 | PMT_Test_QA1 | pmt table 1 created with script | UNO | UNO | VARCHAR | DOS | DOS | BIGINT | TRES | TRES | BOOLEAN | - | Create pmtable with type varchar, char and date | 2 | PMT_Test_QA2 | pmt table 2 created with script | UNO | UNO | VARCHAR | DOS | DOS | CHAR | TRES | TRES | DATE | - | Create pmtable with type varchar, datetime and decimal | 3 | PMT_Test_QA3 | pmt table 3 created with script | UNO | UNO | VARCHAR | DOS | DOS | DATETIME | TRES | TRES | DECIMAL | - | Create pmtable with type varchar, double and float | 4 | PMT_Test_QA4 | pmt table 4 created with script | UNO | UNO | VARCHAR | DOS | DOS | DOUBLE | TRES | TRES | FLOAT | - | Create pmtable with type varchar, integer and longvarchar | 5 | PMT_Test_QA5 | pmt table 5 created with script | UNO | UNO | VARCHAR | DOS | DOS | INTEGER | TRES | TRES | LONGVARCHAR | - | Create pmtable with type varchar, real and smallint | 6 | PMT_Test_QA6 | pmt table 6 created with script | UNO | UNO | VARCHAR | DOS | DOS | REAL | TRES | TRES | SMALLINT | - | Create pmtable with type varchar, time and tinyint | 7 | PMT_Test_QA7 | pmt table 7 created with script | UNO | UNO | VARCHAR | DOS | DOS | TIME | TRES | TRES | TINYINT | + | Create pmtable with type varchar, bigint and boolean | 1 | PMT_Test_QA1 | pmt table 1 created with script | UNO | UNO | VARCHAR | DOS | DOS | BIGINT | TRES | TRES | BOOLEAN | + | Create pmtable with type varchar, datetime and decimal | 3 | PMT_Test_QA3 | pmt table 3 created with script | UNO | UNO | VARCHAR | DOS | DOS | DATETIME | TRES | TRES | DECIMAL | + | Create pmtable with type varchar, double and float | 4 | PMT_Test_QA4 | pmt table 4 created with script | UNO | UNO | VARCHAR | DOS | DOS | DOUBLE | TRES | TRES | FLOAT | + | Create pmtable with type varchar, integer and longvarchar | 5 | PMT_Test_QA5 | pmt table 5 created with script | UNO | UNO | VARCHAR | DOS | DOS | INTEGER | TRES | TRES | LONGVARCHAR | + | Create pmtable with type varchar, real and smallint | 6 | PMT_Test_QA6 | pmt table 6 created with script | UNO | UNO | VARCHAR | DOS | DOS | REAL | TRES | TRES | SMALLINT | + | Create pmtable with type varchar, time and tinyint | 7 | PMT_Test_QA7 | pmt table 7 created with script | UNO | UNO | VARCHAR | DOS | DOS | TIME | TRES | TRES | TINYINT | +Scenario Outline: Create new pmtable with type date and char + Given POST this data: + """ + { + "pmt_tab_name" : "PMT_Test_QA2", + "pmt_tab_dsc" : "pmt table 2 created with script", + "fields" : [ + { + "fld_key" : 1, + "fld_name" : "EJEMPLO", + "fld_label" : "EJEMPLO", + "fld_type" : "DATE" + } + ] + } + """ + And I request "pmtable" + Then the response status code should be 201 + And the response charset is "UTF-8" + And the content type is "application/json" + And the type is "object" + And store "pmt_uid" in session array as variable "pmt_uid_" + + Examples: + + | test_description | pmt_uid_number | + | Create pmtable with type date | 2 | + + Scenario Outline: Create a new Data of pm table. Given POST this data: """ diff --git a/features/backend/projects/project/main_tests_project_resources.feature b/features/backend/projects/project/main_tests_project_resources.feature index 774fcf4cf..44b1d74e9 100644 --- a/features/backend/projects/project/main_tests_project_resources.feature +++ b/features/backend/projects/project/main_tests_project_resources.feature @@ -45,8 +45,21 @@ Scenario Outline: Create new Projects | Create a new process with parallel by evaluation derivation | 3 | process_template_parallel_por_evaluation.json | | Create a new process with selection derivation | 4 | process_template_selection.json | | Create a new process with sequencial derivation | 5 | process_template_sequencial.json | + | Create a new process Complete | 6 | process_template_complete.json | +Scenario Outline: Create new Projects with same name (negative test) + Given POST data from file "" + And I request "projects" + Then the response status code should be 400 + And the response status message should have the following text "" + + Examples: + + | Description | project_template | + | Create a new process with same name | process_template_evaluation.json | + + Scenario: Get a list of projects Given I request "project" Then the response status code should be 200 @@ -706,6 +719,7 @@ Scenario Outline: Delete a Project activity created previously in this script | 3 | | 4 | | 5 | + | 6 | Scenario: Get a list of projects diff --git a/features/backend/projects/project/negative_tests_project_resources.feature b/features/backend/projects/project/negative_tests_project_resources.feature index e69de29bb..c0afec2b0 100644 --- a/features/backend/projects/project/negative_tests_project_resources.feature +++ b/features/backend/projects/project/negative_tests_project_resources.feature @@ -0,0 +1,214 @@ +@ProcessMakerMichelangelo @RestAPI +Feature: Projects Negative Tests + +Background: + Given that I have a valid access_token + + +Scenario Outline: Create new Projects (Negative Tests) + Given POST this data: + """ + { + "prj_name": "", + "prj_description": "", + "prj_target_namespace": "sample", + "prj_expresion_language": null, + "prj_type_language": null, + "prj_exporter": null, + "prj_exporter_version": null, + "prj_create_date": "2014-04-28 11:01:54", + "prj_update_date": "2014-04-30 08:46:17", + "prj_author": "00000000000000000000000000000001", + "prj_author_version": null, + "prj_original_source": null, + "diagrams": [ + { + "dia_uid": "956446767534fece3179b54016939905", + "prj_uid": "655001588534fece2d46f86033751389", + "dia_name": "Prueba New Project", + "dia_is_closable": 0, + "pro_uid": "736054291534fece3342096012897456", + "activities": [ + { + "act_uid": "569214945534fecfa8f0835033274864", + "act_name": "", + "act_type": "", + "act_is_for_compensation": "0", + "act_start_quantity": "1", + "act_completion_quantity": "0", + "act_task_type": "EMPTY", + "act_implementation": "", + "act_instantiate": "0", + "act_script_type": "", + "act_script": "", + "act_loop_type": "NONE", + "act_test_before": "0", + "act_loop_maximum": "0", + "act_loop_condition": "0", + "act_loop_cardinality": "0", + "act_loop_behavior": "0", + "act_is_adhoc": "0", + "act_is_collapsed": "0", + "act_completion_condition": "0", + "act_ordering": "0", + "act_cancel_remaining_instances": "0", + "act_protocol": "0", + "act_method": "0", + "act_is_global": "0", + "act_referer": "0", + "act_default_flow": "0", + "act_master_diagram": "0", + "bou_x": "486", + "bou_y": "101", + "bou_width": "161", + "bou_height": "42", + "bou_container": "bpmnDiagram" + } + ], + "events": [ + { + "evn_uid": "259220802534fecfad49854013091940", + "evn_name": "", + "evn_type": "", + "evn_marker": "", + "evn_is_interrupting": "1", + "evn_cancel_activity": "0", + "evn_activity_ref": null, + "evn_wait_for_completion": "0", + "evn_error_name": null, + "evn_error_code": null, + "evn_escalation_name": null, + "evn_escalation_code": null, + "evn_message": "LEAD", + "evn_operation_name": null, + "evn_operation_implementation_ref": null, + "evn_time_date": null, + "evn_time_cycle": null, + "evn_time_duration": null, + "evn_behavior": "CATCH", + "bou_x": "517", + "bou_y": "19", + "bou_width": "33", + "bou_height": "33", + "bou_container": "bpmnDiagram" + }, + { + "evn_uid": "856003291534fecfae5dff7085708495", + "evn_name": "End # 1", + "evn_type": "END", + "evn_marker": "EMPTY", + "evn_is_interrupting": "1", + "evn_cancel_activity": "0", + "evn_activity_ref": null, + "evn_wait_for_completion": "0", + "evn_error_name": null, + "evn_error_code": null, + "evn_escalation_name": null, + "evn_escalation_code": null, + "evn_message": "", + "evn_operation_name": null, + "evn_operation_implementation_ref": null, + "evn_time_date": null, + "evn_time_cycle": null, + "evn_time_duration": null, + "evn_behavior": "THROW", + "bou_x": "549", + "bou_y": "181", + "bou_width": "33", + "bou_height": "33", + "bou_container": "bpmnDiagram" + } + ], + "gateways": [], + "flows": [ + { + "flo_uid": "17092374253551306216a72013534569", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "569214945534fecfa8f0835033274864", + "flo_element_origin_type": "bpmnActivity", + "flo_element_dest": "856003291534fecfae5dff7085708495", + "flo_element_dest_type": "bpmnEvent", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "561", + "flo_y1": "193", + "flo_x2": "577", + "flo_y2": "193", + "flo_state": [ + { + "x": 566, + "y": 145 + }, + { + "x": 566, + "y": 171 + }, + { + "x": 602, + "y": 171 + }, + { + "x": 602, + "y": 198 + }, + { + "x": 582, + "y": 198 + } + ] + }, + { + "flo_uid": "304762728534fecfaf3bf88040991913", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "259220802534fecfad49854013091940", + "flo_element_origin_type": "bpmnEvent", + "flo_element_dest": "569214945534fecfa8f0835033274864", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "529", + "flo_y1": "95", + "flo_x2": "556", + "flo_y2": "95", + "flo_state": [ + { + "x": 534, + "y": 52 + }, + { + "x": 534, + "y": 76 + }, + { + "x": 561, + "y": 76 + }, + { + "x": 561, + "y": 100 + } + ] + } + ], + "artifacts": [], + "laneset": [], + "lanes": [] + } + ] + } + """ + And I request "projects" + Then the response status code should be + And the response status message should have the following text "" + + Examples: + + | Description | prj_name | prj_description | act_name | act_type | evn_name | evn_marker | error_code | error_message | + | Field required prj_name | | Prueba | Task # 1 | TASK | End # 1 | EMPTY | 400 | prj_name | + | Field required prj_description | Test negative project 1 | | Task # 1 | TASK | End # 1 | EMPTY | 400 | prj_description | + | Field required act_name | Test negative project 2 | Prueba 1 | | TASK | End # 1 | EMPTY | 400 | act_name | + | Field required act_type | Test negative project 3 | Prueba 2 | Task # 1 | | End # 1 | EMPTY | 400 | act_type | + | Field required evn_name | Test negative project 4 | Prueba 3 | Task # 1 | TASK | | EMPTY | 400 | evn_name | + | Field required evn_marker | Test negative project 5 | Prueba 4 | Task # 1 | TASK | End # 1 | | 400 | evn_marker | \ No newline at end of file diff --git a/features/json/process_template_complete.json b/features/json/process_template_complete.json new file mode 100644 index 000000000..e0c8792a1 --- /dev/null +++ b/features/json/process_template_complete.json @@ -0,0 +1,2104 @@ +{ + "prj_uid": "1455892245368ebeb11c1a5001393784", + "prj_name": "Process Complete BPMN Test", + "prj_description": "", + "prj_target_namespace": "", + "prj_expresion_language": null, + "prj_type_language": null, + "prj_exporter": null, + "prj_exporter_version": null, + "prj_create_date": "2014-05-06 10:04:27", + "prj_update_date": "2014-05-06 10:52:40", + "prj_author": "00000000000000000000000000000001", + "prj_author_version": null, + "prj_original_source": null, + "diagrams": [ + { + "dia_uid": "9354974525368ebeb1ce822029579066", + "prj_uid": "1455892245368ebeb11c1a5001393784", + "dia_name": "Process Complete BPMN", + "dia_is_closable": 0, + "pro_uid": "6011808005368ebeb205d38072672605", + "activities": [ + { + "act_uid": "1160076165368f2cd7416c7095931710", + "act_name": "Grid - Triggers", + "act_type": "TASK", + "act_is_for_compensation": "0", + "act_start_quantity": "1", + "act_completion_quantity": "0", + "act_task_type": "EMPTY", + "act_implementation": "", + "act_instantiate": "0", + "act_script_type": "", + "act_script": "", + "act_loop_type": "NONE", + "act_test_before": "0", + "act_loop_maximum": "0", + "act_loop_condition": "0", + "act_loop_cardinality": "0", + "act_loop_behavior": "0", + "act_is_adhoc": "0", + "act_is_collapsed": "0", + "act_completion_condition": "0", + "act_ordering": "0", + "act_cancel_remaining_instances": "0", + "act_protocol": "0", + "act_method": "0", + "act_is_global": "0", + "act_referer": "0", + "act_default_flow": "0", + "act_master_diagram": "0", + "bou_x": "999", + "bou_y": "357", + "bou_width": "160", + "bou_height": "40", + "bou_container": "bpmnDiagram" + }, + { + "act_uid": "1662057995368f3d166c493099132622", + "act_name": "Prueba Javascript", + "act_type": "TASK", + "act_is_for_compensation": "0", + "act_start_quantity": "1", + "act_completion_quantity": "0", + "act_task_type": "EMPTY", + "act_implementation": "", + "act_instantiate": "0", + "act_script_type": "", + "act_script": "", + "act_loop_type": "NONE", + "act_test_before": "0", + "act_loop_maximum": "0", + "act_loop_condition": "0", + "act_loop_cardinality": "0", + "act_loop_behavior": "0", + "act_is_adhoc": "0", + "act_is_collapsed": "0", + "act_completion_condition": "0", + "act_ordering": "0", + "act_cancel_remaining_instances": "0", + "act_protocol": "0", + "act_method": "0", + "act_is_global": "0", + "act_referer": "0", + "act_default_flow": "0", + "act_master_diagram": "0", + "bou_x": "2091", + "bou_y": "331", + "bou_width": "160", + "bou_height": "40", + "bou_container": "bpmnDiagram" + }, + { + "act_uid": "2072984565368efc137a394001073529", + "act_name": "Dynaform and Grid", + "act_type": "TASK", + "act_is_for_compensation": "0", + "act_start_quantity": "1", + "act_completion_quantity": "0", + "act_task_type": "EMPTY", + "act_implementation": "", + "act_instantiate": "0", + "act_script_type": "", + "act_script": "", + "act_loop_type": "NONE", + "act_test_before": "0", + "act_loop_maximum": "0", + "act_loop_condition": "0", + "act_loop_cardinality": "0", + "act_loop_behavior": "0", + "act_is_adhoc": "0", + "act_is_collapsed": "0", + "act_completion_condition": "0", + "act_ordering": "0", + "act_cancel_remaining_instances": "0", + "act_protocol": "0", + "act_method": "0", + "act_is_global": "0", + "act_referer": "0", + "act_default_flow": "0", + "act_master_diagram": "0", + "bou_x": "196", + "bou_y": "287", + "bou_width": "160", + "bou_height": "40", + "bou_container": "bpmnDiagram" + }, + { + "act_uid": "2202457115368f21965c7f9036908008", + "act_name": "Input Document", + "act_type": "TASK", + "act_is_for_compensation": "0", + "act_start_quantity": "1", + "act_completion_quantity": "0", + "act_task_type": "EMPTY", + "act_implementation": "", + "act_instantiate": "0", + "act_script_type": "", + "act_script": "", + "act_loop_type": "NONE", + "act_test_before": "0", + "act_loop_maximum": "0", + "act_loop_condition": "0", + "act_loop_cardinality": "0", + "act_loop_behavior": "0", + "act_is_adhoc": "0", + "act_is_collapsed": "0", + "act_completion_condition": "0", + "act_ordering": "0", + "act_cancel_remaining_instances": "0", + "act_protocol": "0", + "act_method": "0", + "act_is_global": "0", + "act_referer": "0", + "act_default_flow": "0", + "act_master_diagram": "0", + "bou_x": "1382", + "bou_y": "59", + "bou_width": "160", + "bou_height": "40", + "bou_container": "bpmnDiagram" + }, + { + "act_uid": "2523767555368f22d419373008089487", + "act_name": "Review Input Document", + "act_type": "TASK", + "act_is_for_compensation": "0", + "act_start_quantity": "1", + "act_completion_quantity": "0", + "act_task_type": "EMPTY", + "act_implementation": "", + "act_instantiate": "0", + "act_script_type": "", + "act_script": "", + "act_loop_type": "NONE", + "act_test_before": "0", + "act_loop_maximum": "0", + "act_loop_condition": "0", + "act_loop_cardinality": "0", + "act_loop_behavior": "0", + "act_is_adhoc": "0", + "act_is_collapsed": "0", + "act_completion_condition": "0", + "act_ordering": "0", + "act_cancel_remaining_instances": "0", + "act_protocol": "0", + "act_method": "0", + "act_is_global": "0", + "act_referer": "0", + "act_default_flow": "0", + "act_master_diagram": "0", + "bou_x": "1622", + "bou_y": "59", + "bou_width": "160", + "bou_height": "40", + "bou_container": "bpmnDiagram" + }, + { + "act_uid": "2875638555368f165542516003504891", + "act_name": "Triggers (PMFSendMessage)", + "act_type": "TASK", + "act_is_for_compensation": "0", + "act_start_quantity": "1", + "act_completion_quantity": "0", + "act_task_type": "EMPTY", + "act_implementation": "", + "act_instantiate": "0", + "act_script_type": "", + "act_script": "", + "act_loop_type": "NONE", + "act_test_before": "0", + "act_loop_maximum": "0", + "act_loop_condition": "0", + "act_loop_cardinality": "0", + "act_loop_behavior": "0", + "act_is_adhoc": "0", + "act_is_collapsed": "0", + "act_completion_condition": "0", + "act_ordering": "0", + "act_cancel_remaining_instances": "0", + "act_protocol": "0", + "act_method": "0", + "act_is_global": "0", + "act_referer": "0", + "act_default_flow": "0", + "act_master_diagram": "0", + "bou_x": "694", + "bou_y": "202", + "bou_width": "159", + "bou_height": "40", + "bou_container": "bpmnDiagram" + }, + { + "act_uid": "3038060175368f269739a45028031318", + "act_name": "Output with editor", + "act_type": "TASK", + "act_is_for_compensation": "0", + "act_start_quantity": "1", + "act_completion_quantity": "0", + "act_task_type": "EMPTY", + "act_implementation": "", + "act_instantiate": "0", + "act_script_type": "", + "act_script": "", + "act_loop_type": "NONE", + "act_test_before": "0", + "act_loop_maximum": "0", + "act_loop_condition": "0", + "act_loop_cardinality": "0", + "act_loop_behavior": "0", + "act_is_adhoc": "0", + "act_is_collapsed": "0", + "act_completion_condition": "0", + "act_ordering": "0", + "act_cancel_remaining_instances": "0", + "act_protocol": "0", + "act_method": "0", + "act_is_global": "0", + "act_referer": "0", + "act_default_flow": "0", + "act_master_diagram": "0", + "bou_x": "1616", + "bou_y": "202", + "bou_width": "160", + "bou_height": "40", + "bou_container": "bpmnDiagram" + }, + { + "act_uid": "3109778415368f2f54dcfb6033675546", + "act_name": "Sub Process syncronous", + "act_type": "SUB_PROCESS", + "act_is_for_compensation": "0", + "act_start_quantity": "1", + "act_completion_quantity": "0", + "act_task_type": "EMPTY", + "act_implementation": "", + "act_instantiate": "0", + "act_script_type": "", + "act_script": "", + "act_loop_type": "NONE", + "act_test_before": "0", + "act_loop_maximum": "0", + "act_loop_condition": "0", + "act_loop_cardinality": "0", + "act_loop_behavior": "0", + "act_is_adhoc": "0", + "act_is_collapsed": "0", + "act_completion_condition": "0", + "act_ordering": "0", + "act_cancel_remaining_instances": "0", + "act_protocol": "0", + "act_method": "0", + "act_is_global": "0", + "act_referer": "0", + "act_default_flow": "0", + "act_master_diagram": "0", + "bou_x": "1442", + "bou_y": "287", + "bou_width": "160", + "bou_height": "40", + "bou_container": "bpmnDiagram" + }, + { + "act_uid": "3287598595368f45d714018043209407", + "act_name": "Task # 4", + "act_type": "TASK", + "act_is_for_compensation": "0", + "act_start_quantity": "1", + "act_completion_quantity": "0", + "act_task_type": "EMPTY", + "act_implementation": "", + "act_instantiate": "0", + "act_script_type": "", + "act_script": "", + "act_loop_type": "NONE", + "act_test_before": "0", + "act_loop_maximum": "0", + "act_loop_condition": "0", + "act_loop_cardinality": "0", + "act_loop_behavior": "0", + "act_is_adhoc": "0", + "act_is_collapsed": "0", + "act_completion_condition": "0", + "act_ordering": "0", + "act_cancel_remaining_instances": "0", + "act_protocol": "0", + "act_method": "0", + "act_is_global": "0", + "act_referer": "0", + "act_default_flow": "0", + "act_master_diagram": "0", + "bou_x": "2987", + "bou_y": "282", + "bou_width": "160", + "bou_height": "40", + "bou_container": "bpmnDiagram" + }, + { + "act_uid": "3566890705368f33167fc22032897213", + "act_name": "Dependent Fields", + "act_type": "TASK", + "act_is_for_compensation": "0", + "act_start_quantity": "1", + "act_completion_quantity": "0", + "act_task_type": "EMPTY", + "act_implementation": "", + "act_instantiate": "0", + "act_script_type": "", + "act_script": "", + "act_loop_type": "NONE", + "act_test_before": "0", + "act_loop_maximum": "0", + "act_loop_condition": "0", + "act_loop_cardinality": "0", + "act_loop_behavior": "0", + "act_is_adhoc": "0", + "act_is_collapsed": "0", + "act_completion_condition": "0", + "act_ordering": "0", + "act_cancel_remaining_instances": "0", + "act_protocol": "0", + "act_method": "0", + "act_is_global": "0", + "act_referer": "0", + "act_default_flow": "0", + "act_master_diagram": "0", + "bou_x": "1007", + "bou_y": "513", + "bou_width": "160", + "bou_height": "40", + "bou_container": "bpmnDiagram" + }, + { + "act_uid": "3683085655368f269668a52008262297", + "act_name": "Sub Process Asyncronous", + "act_type": "SUB_PROCESS", + "act_is_for_compensation": "0", + "act_start_quantity": "1", + "act_completion_quantity": "0", + "act_task_type": "EMPTY", + "act_implementation": "", + "act_instantiate": "0", + "act_script_type": "", + "act_script": "", + "act_loop_type": "NONE", + "act_test_before": "0", + "act_loop_maximum": "0", + "act_loop_condition": "0", + "act_loop_cardinality": "0", + "act_loop_behavior": "0", + "act_is_adhoc": "0", + "act_is_collapsed": "0", + "act_completion_condition": "0", + "act_ordering": "0", + "act_cancel_remaining_instances": "0", + "act_protocol": "0", + "act_method": "0", + "act_is_global": "0", + "act_referer": "0", + "act_default_flow": "0", + "act_master_diagram": "0", + "bou_x": "1372", + "bou_y": "202", + "bou_width": "160", + "bou_height": "40", + "bou_container": "bpmnDiagram" + }, + { + "act_uid": "3834232595368f2f55a4787031141076", + "act_name": "Task # 1", + "act_type": "TASK", + "act_is_for_compensation": "0", + "act_start_quantity": "1", + "act_completion_quantity": "0", + "act_task_type": "EMPTY", + "act_implementation": "", + "act_instantiate": "0", + "act_script_type": "", + "act_script": "", + "act_loop_type": "NONE", + "act_test_before": "0", + "act_loop_maximum": "0", + "act_loop_condition": "0", + "act_loop_cardinality": "0", + "act_loop_behavior": "0", + "act_is_adhoc": "0", + "act_is_collapsed": "0", + "act_completion_condition": "0", + "act_ordering": "0", + "act_cancel_remaining_instances": "0", + "act_protocol": "0", + "act_method": "0", + "act_is_global": "0", + "act_referer": "0", + "act_default_flow": "0", + "act_master_diagram": "0", + "bou_x": "1442", + "bou_y": "373", + "bou_width": "160", + "bou_height": "40", + "bou_container": "bpmnDiagram" + }, + { + "act_uid": "4135711835368f381521244073774350", + "act_name": "Datos - Pm Table", + "act_type": "TASK", + "act_is_for_compensation": "0", + "act_start_quantity": "1", + "act_completion_quantity": "0", + "act_task_type": "EMPTY", + "act_implementation": "", + "act_instantiate": "0", + "act_script_type": "", + "act_script": "", + "act_loop_type": "NONE", + "act_test_before": "0", + "act_loop_maximum": "0", + "act_loop_condition": "0", + "act_loop_cardinality": "0", + "act_loop_behavior": "0", + "act_is_adhoc": "0", + "act_is_collapsed": "0", + "act_completion_condition": "0", + "act_ordering": "0", + "act_cancel_remaining_instances": "0", + "act_protocol": "0", + "act_method": "0", + "act_is_global": "0", + "act_referer": "0", + "act_default_flow": "0", + "act_master_diagram": "0", + "bou_x": "1431", + "bou_y": "586", + "bou_width": "160", + "bou_height": "40", + "bou_container": "bpmnDiagram" + }, + { + "act_uid": "4790702485368efad167477011123879", + "act_name": "Grids", + "act_type": "TASK", + "act_is_for_compensation": "0", + "act_start_quantity": "1", + "act_completion_quantity": "0", + "act_task_type": "EMPTY", + "act_implementation": "", + "act_instantiate": "0", + "act_script_type": "", + "act_script": "", + "act_loop_type": "NONE", + "act_test_before": "0", + "act_loop_maximum": "0", + "act_loop_condition": "0", + "act_loop_cardinality": "0", + "act_loop_behavior": "0", + "act_is_adhoc": "0", + "act_is_collapsed": "0", + "act_completion_condition": "0", + "act_ordering": "0", + "act_cancel_remaining_instances": "0", + "act_protocol": "0", + "act_method": "0", + "act_is_global": "0", + "act_referer": "0", + "act_default_flow": "0", + "act_master_diagram": "0", + "bou_x": "196", + "bou_y": "202", + "bou_width": "160", + "bou_height": "40", + "bou_container": "bpmnDiagram" + }, + { + "act_uid": "4796081945368f2695b1270062047288", + "act_name": "Triggers PMFSendMessage", + "act_type": "TASK", + "act_is_for_compensation": "0", + "act_start_quantity": "1", + "act_completion_quantity": "0", + "act_task_type": "EMPTY", + "act_implementation": "", + "act_instantiate": "0", + "act_script_type": "", + "act_script": "", + "act_loop_type": "NONE", + "act_test_before": "0", + "act_loop_maximum": "0", + "act_loop_condition": "0", + "act_loop_cardinality": "0", + "act_loop_behavior": "0", + "act_is_adhoc": "0", + "act_is_collapsed": "0", + "act_completion_condition": "0", + "act_ordering": "0", + "act_cancel_remaining_instances": "0", + "act_protocol": "0", + "act_method": "0", + "act_is_global": "0", + "act_referer": "0", + "act_default_flow": "0", + "act_master_diagram": "0", + "bou_x": "1005", + "bou_y": "202", + "bou_width": "160", + "bou_height": "40", + "bou_container": "bpmnDiagram" + }, + { + "act_uid": "4833626825368f2195b3ac4033349844", + "act_name": "Review Output Document", + "act_type": "TASK", + "act_is_for_compensation": "0", + "act_start_quantity": "1", + "act_completion_quantity": "0", + "act_task_type": "EMPTY", + "act_implementation": "", + "act_instantiate": "0", + "act_script_type": "", + "act_script": "", + "act_loop_type": "NONE", + "act_test_before": "0", + "act_loop_maximum": "0", + "act_loop_condition": "0", + "act_loop_cardinality": "0", + "act_loop_behavior": "0", + "act_is_adhoc": "0", + "act_is_collapsed": "0", + "act_completion_condition": "0", + "act_ordering": "0", + "act_cancel_remaining_instances": "0", + "act_protocol": "0", + "act_method": "0", + "act_is_global": "0", + "act_referer": "0", + "act_default_flow": "0", + "act_master_diagram": "0", + "bou_x": "1005", + "bou_y": "59", + "bou_width": "160", + "bou_height": "40", + "bou_container": "bpmnDiagram" + }, + { + "act_uid": "6118533245368f421638d97014103681", + "act_name": "Pause Case - Trigger", + "act_type": "TASK", + "act_is_for_compensation": "0", + "act_start_quantity": "1", + "act_completion_quantity": "0", + "act_task_type": "EMPTY", + "act_implementation": "", + "act_instantiate": "0", + "act_script_type": "", + "act_script": "", + "act_loop_type": "NONE", + "act_test_before": "0", + "act_loop_maximum": "0", + "act_loop_condition": "0", + "act_loop_cardinality": "0", + "act_loop_behavior": "0", + "act_is_adhoc": "0", + "act_is_collapsed": "0", + "act_completion_condition": "0", + "act_ordering": "0", + "act_cancel_remaining_instances": "0", + "act_protocol": "0", + "act_method": "0", + "act_is_global": "0", + "act_referer": "0", + "act_default_flow": "0", + "act_master_diagram": "0", + "bou_x": "2488", + "bou_y": "406", + "bou_width": "160", + "bou_height": "40", + "bou_container": "bpmnDiagram" + }, + { + "act_uid": "6274755055368eed1116388064384542", + "act_name": "Dynaform", + "act_type": "TASK", + "act_is_for_compensation": "0", + "act_start_quantity": "1", + "act_completion_quantity": "0", + "act_task_type": "EMPTY", + "act_implementation": "", + "act_instantiate": "0", + "act_script_type": "", + "act_script": "", + "act_loop_type": "NONE", + "act_test_before": "0", + "act_loop_maximum": "0", + "act_loop_condition": "0", + "act_loop_cardinality": "0", + "act_loop_behavior": "0", + "act_is_adhoc": "0", + "act_is_collapsed": "0", + "act_completion_condition": "0", + "act_ordering": "0", + "act_cancel_remaining_instances": "0", + "act_protocol": "0", + "act_method": "0", + "act_is_global": "0", + "act_referer": "0", + "act_default_flow": "0", + "act_master_diagram": "0", + "bou_x": "196", + "bou_y": "118", + "bou_width": "160", + "bou_height": "40", + "bou_container": "bpmnDiagram" + }, + { + "act_uid": "6280799825368f1656d31c2002395440", + "act_name": "Dependent Fields (Dynaform & Grid)", + "act_type": "TASK", + "act_is_for_compensation": "0", + "act_start_quantity": "1", + "act_completion_quantity": "0", + "act_task_type": "EMPTY", + "act_implementation": "", + "act_instantiate": "0", + "act_script_type": "", + "act_script": "", + "act_loop_type": "NONE", + "act_test_before": "0", + "act_loop_maximum": "0", + "act_loop_condition": "0", + "act_loop_cardinality": "0", + "act_loop_behavior": "0", + "act_is_adhoc": "0", + "act_is_collapsed": "0", + "act_completion_condition": "0", + "act_ordering": "0", + "act_cancel_remaining_instances": "0", + "act_protocol": "0", + "act_method": "0", + "act_is_global": "0", + "act_referer": "0", + "act_default_flow": "0", + "act_master_diagram": "0", + "bou_x": "694", + "bou_y": "513", + "bou_width": "160", + "bou_height": "40", + "bou_container": "bpmnDiagram" + }, + { + "act_uid": "6927549145368f1653fb6f0093362462", + "act_name": "Output Document", + "act_type": "TASK", + "act_is_for_compensation": "0", + "act_start_quantity": "1", + "act_completion_quantity": "0", + "act_task_type": "EMPTY", + "act_implementation": "", + "act_instantiate": "0", + "act_script_type": "", + "act_script": "", + "act_loop_type": "NONE", + "act_test_before": "0", + "act_loop_maximum": "0", + "act_loop_condition": "0", + "act_loop_cardinality": "0", + "act_loop_behavior": "0", + "act_is_adhoc": "0", + "act_is_collapsed": "0", + "act_completion_condition": "0", + "act_ordering": "0", + "act_cancel_remaining_instances": "0", + "act_protocol": "0", + "act_method": "0", + "act_is_global": "0", + "act_referer": "0", + "act_default_flow": "0", + "act_master_diagram": "0", + "bou_x": "696", + "bou_y": "59", + "bou_width": "160", + "bou_height": "40", + "bou_container": "bpmnDiagram" + }, + { + "act_uid": "8040741035368f36d553a36034443608", + "act_name": "PM Table", + "act_type": "TASK", + "act_is_for_compensation": "0", + "act_start_quantity": "1", + "act_completion_quantity": "0", + "act_task_type": "EMPTY", + "act_implementation": "", + "act_instantiate": "0", + "act_script_type": "", + "act_script": "", + "act_loop_type": "NONE", + "act_test_before": "0", + "act_loop_maximum": "0", + "act_loop_condition": "0", + "act_loop_cardinality": "0", + "act_loop_behavior": "0", + "act_is_adhoc": "0", + "act_is_collapsed": "0", + "act_completion_condition": "0", + "act_ordering": "0", + "act_cancel_remaining_instances": "0", + "act_protocol": "0", + "act_method": "0", + "act_is_global": "0", + "act_referer": "0", + "act_default_flow": "0", + "act_master_diagram": "0", + "bou_x": "1442", + "bou_y": "446", + "bou_width": "160", + "bou_height": "40", + "bou_container": "bpmnDiagram" + }, + { + "act_uid": "8224351215368f44960c399079885403", + "act_name": "Paused Case", + "act_type": "TASK", + "act_is_for_compensation": "0", + "act_start_quantity": "1", + "act_completion_quantity": "0", + "act_task_type": "EMPTY", + "act_implementation": "", + "act_instantiate": "0", + "act_script_type": "", + "act_script": "", + "act_loop_type": "NONE", + "act_test_before": "0", + "act_loop_maximum": "0", + "act_loop_condition": "0", + "act_loop_cardinality": "0", + "act_loop_behavior": "0", + "act_is_adhoc": "0", + "act_is_collapsed": "0", + "act_completion_condition": "0", + "act_ordering": "0", + "act_cancel_remaining_instances": "0", + "act_protocol": "0", + "act_method": "0", + "act_is_global": "0", + "act_referer": "0", + "act_default_flow": "0", + "act_master_diagram": "0", + "bou_x": "2745", + "bou_y": "406", + "bou_width": "160", + "bou_height": "40", + "bou_container": "bpmnDiagram" + }, + { + "act_uid": "8550422725368f1656034f9074743258", + "act_name": "Grid - Triggers", + "act_type": "TASK", + "act_is_for_compensation": "0", + "act_start_quantity": "1", + "act_completion_quantity": "0", + "act_task_type": "EMPTY", + "act_implementation": "", + "act_instantiate": "0", + "act_script_type": "", + "act_script": "", + "act_loop_type": "NONE", + "act_test_before": "0", + "act_loop_maximum": "0", + "act_loop_condition": "0", + "act_loop_cardinality": "0", + "act_loop_behavior": "0", + "act_is_adhoc": "0", + "act_is_collapsed": "0", + "act_completion_condition": "0", + "act_ordering": "0", + "act_cancel_remaining_instances": "0", + "act_protocol": "0", + "act_method": "0", + "act_is_global": "0", + "act_referer": "0", + "act_default_flow": "0", + "act_master_diagram": "0", + "bou_x": "694", + "bou_y": "357", + "bou_width": "160", + "bou_height": "40", + "bou_container": "bpmnDiagram" + }, + { + "act_uid": "8695265075368f421582956031048869", + "act_name": "Final 1", + "act_type": "TASK", + "act_is_for_compensation": "0", + "act_start_quantity": "1", + "act_completion_quantity": "0", + "act_task_type": "EMPTY", + "act_implementation": "", + "act_instantiate": "0", + "act_script_type": "", + "act_script": "", + "act_loop_type": "NONE", + "act_test_before": "0", + "act_loop_maximum": "0", + "act_loop_condition": "0", + "act_loop_cardinality": "0", + "act_loop_behavior": "0", + "act_is_adhoc": "0", + "act_is_collapsed": "0", + "act_completion_condition": "0", + "act_ordering": "0", + "act_cancel_remaining_instances": "0", + "act_protocol": "0", + "act_method": "0", + "act_is_global": "0", + "act_referer": "0", + "act_default_flow": "0", + "act_master_diagram": "0", + "bou_x": "2493", + "bou_y": "208", + "bou_width": "160", + "bou_height": "40", + "bou_container": "bpmnDiagram" + } + ], + "events": [ + { + "evn_uid": "6901238975368f4997188f4036127933", + "evn_name": "End # 1", + "evn_type": "END", + "evn_marker": "EMPTY", + "evn_is_interrupting": "1", + "evn_cancel_activity": "0", + "evn_activity_ref": null, + "evn_wait_for_completion": "0", + "evn_error_name": null, + "evn_error_code": null, + "evn_escalation_name": null, + "evn_escalation_code": null, + "evn_message": "", + "evn_operation_implementation_ref": null, + "evn_time_date": null, + "evn_time_cycle": null, + "evn_time_duration": null, + "evn_behavior": "THROW", + "evn_operation_name": null, + "bou_x": "3231", + "bou_y": "345", + "bou_width": "33", + "bou_height": "33", + "bou_container": "bpmnDiagram" + }, + { + "evn_uid": "9488118085368eed1297503010235783", + "evn_name": "Start # 1", + "evn_type": "START", + "evn_marker": "EMPTY", + "evn_is_interrupting": "1", + "evn_cancel_activity": "0", + "evn_activity_ref": null, + "evn_wait_for_completion": "0", + "evn_error_name": null, + "evn_error_code": null, + "evn_escalation_name": null, + "evn_escalation_code": null, + "evn_message": "LEAD", + "evn_operation_implementation_ref": null, + "evn_time_date": null, + "evn_time_cycle": null, + "evn_time_duration": null, + "evn_behavior": "CATCH", + "evn_operation_name": null, + "bou_x": "29", + "bou_y": "121", + "bou_width": "33", + "bou_height": "33", + "bou_container": "bpmnDiagram" + } + ], + "gateways": [ + { + "gat_uid": "1573074525368f39563c645029053057", + "gat_name": "Parallel # 2", + "gat_type": "PARALLEL", + "gat_direction": "CONVERGING", + "gat_instantiate": "0", + "gat_activation_count": "0", + "gat_waiting_for_start": "1", + "gat_default_flow": "0", + "gat_event_gateway_type": "NONE", + "bou_x": "1983", + "bou_y": "334", + "bou_width": "33", + "bou_height": "33", + "bou_container": "bpmnDiagram" + }, + { + "gat_uid": "2130856495368f3595be289092246691", + "gat_name": "undefined # 2", + "gat_type": "COMPLEX", + "gat_direction": "DIVERGING", + "gat_instantiate": "0", + "gat_activation_count": "0", + "gat_waiting_for_start": "1", + "gat_default_flow": "0", + "gat_event_gateway_type": "NONE", + "bou_x": "1272", + "bou_y": "516", + "bou_width": "33", + "bou_height": "33", + "bou_container": "bpmnDiagram" + }, + { + "gat_uid": "5003058515368f3f97c3852067167833", + "gat_name": "undefined # 3", + "gat_type": "INCLUSIVE", + "gat_direction": "DIVERGING", + "gat_instantiate": "0", + "gat_activation_count": "0", + "gat_waiting_for_start": "1", + "gat_default_flow": "0", + "gat_event_gateway_type": "NONE", + "bou_x": "2389", + "bou_y": "322", + "bou_width": "33", + "bou_height": "33", + "bou_container": "bpmnDiagram" + }, + { + "gat_uid": "8391283425368f15123f198066068855", + "gat_name": "Parallel # 1", + "gat_type": "PARALLEL", + "gat_direction": "DIVERGING", + "gat_instantiate": "0", + "gat_activation_count": "0", + "gat_waiting_for_start": "1", + "gat_default_flow": "0", + "gat_event_gateway_type": "NONE", + "bou_x": "512", + "bou_y": "290", + "bou_width": "33", + "bou_height": "33", + "bou_container": "bpmnDiagram" + }, + { + "gat_uid": "8483077695368f2e1578c22013725409", + "gat_name": "undefined # 1", + "gat_type": "EXCLUSIVE", + "gat_direction": "DIVERGING", + "gat_instantiate": "0", + "gat_activation_count": "0", + "gat_waiting_for_start": "1", + "gat_default_flow": "0", + "gat_event_gateway_type": "NONE", + "bou_x": "1260", + "bou_y": "302", + "bou_width": "33", + "bou_height": "33", + "bou_container": "bpmnDiagram" + } + ], + "flows": [ + { + "flo_uid": "1191412195368f435ddf5c8066477542", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "5003058515368f3f97c3852067167833", + "flo_element_origin_type": "bpmnGateway", + "flo_element_dest": "6118533245368f421638d97014103681", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": "@@TXT_NUMERO>=5", + "flo_x1": "2401", + "flo_y1": "421", + "flo_x2": "2482", + "flo_y2": "421", + "flo_state": [ + { + "x": 2406, + "y": 355 + }, + { + "x": 2406, + "y": 426 + }, + { + "x": 2487, + "y": 426 + } + ] + }, + { + "flo_uid": "1518639365368f2698d5fc5062234709", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "2875638555368f165542516003504891", + "flo_element_origin_type": "bpmnActivity", + "flo_element_dest": "4796081945368f2695b1270062047288", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "849", + "flo_y1": "217", + "flo_x2": "999", + "flo_y2": "217", + "flo_state": [ + { + "x": 1032, + "y": 222 + }, + { + "x": 1145, + "y": 222 + } + ] + }, + { + "flo_uid": "1547394435368f395744510080505165", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "2523767555368f22d419373008089487", + "flo_element_origin_type": "bpmnActivity", + "flo_element_dest": "1573074525368f39563c645029053057", + "flo_element_dest_type": "bpmnGateway", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "1697", + "flo_y1": "346", + "flo_x2": "1978", + "flo_y2": "346", + "flo_state": [ + { + "x": 1702, + "y": 101 + }, + { + "x": 1702, + "y": 351 + }, + { + "x": 1983, + "y": 351 + } + ] + }, + { + "flo_uid": "1913806215368f4717c4f46048252199", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "8695265075368f421582956031048869", + "flo_element_origin_type": "bpmnActivity", + "flo_element_dest": "3287598595368f45d714018043209407", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "2650", + "flo_y1": "297", + "flo_x2": "2981", + "flo_y2": "297", + "flo_state": [ + { + "x": 2655, + "y": 228 + }, + { + "x": 2820, + "y": 228 + }, + { + "x": 2820, + "y": 302 + }, + { + "x": 2986, + "y": 302 + } + ] + }, + { + "flo_uid": "2007628975368f56031cfc5016773301", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "8391283425368f15123f198066068855", + "flo_element_origin_type": "bpmnGateway", + "flo_element_dest": "2875638555368f165542516003504891", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "524", + "flo_y1": "217", + "flo_x2": "688", + "flo_y2": "217", + "flo_state": [ + { + "x": 529, + "y": 290 + }, + { + "x": 529, + "y": 222 + }, + { + "x": 871, + "y": 222 + } + ] + }, + { + "flo_uid": "2026958365368f2e1654eb4061826681", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "1160076165368f2cd7416c7095931710", + "flo_element_origin_type": "bpmnActivity", + "flo_element_dest": "8483077695368f2e1578c22013725409", + "flo_element_dest_type": "bpmnGateway", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "1156", + "flo_y1": "314", + "flo_x2": "1255", + "flo_y2": "314", + "flo_state": [ + { + "x": 1161, + "y": 377 + }, + { + "x": 1210, + "y": 377 + }, + { + "x": 1210, + "y": 319 + }, + { + "x": 1260, + "y": 319 + } + ] + }, + { + "flo_uid": "2038407405368f560319371080908793", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "8391283425368f15123f198066068855", + "flo_element_origin_type": "bpmnGateway", + "flo_element_dest": "6927549145368f1653fb6f0093362462", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "524", + "flo_y1": "74", + "flo_x2": "690", + "flo_y2": "74", + "flo_state": [ + { + "x": 529, + "y": 290 + }, + { + "x": 529, + "y": 79 + }, + { + "x": 873, + "y": 79 + } + ] + }, + { + "flo_uid": "2044954295368f6ac53c018017310832", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "4790702485368efad167477011123879", + "flo_element_origin_type": "bpmnActivity", + "flo_element_dest": "2072984565368efc137a394001073529", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "271", + "flo_y1": "281", + "flo_x2": "271", + "flo_y2": "281", + "flo_state": [ + { + "x": 276, + "y": 244 + }, + { + "x": 276, + "y": 284 + } + ] + }, + { + "flo_uid": "2343288565368f2a5805763022475364", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "4796081945368f2695b1270062047288", + "flo_element_origin_type": "bpmnActivity", + "flo_element_dest": "3683085655368f269668a52008262297", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "1162", + "flo_y1": "217", + "flo_x2": "1366", + "flo_y2": "217", + "flo_state": [ + { + "x": 1308, + "y": 222 + }, + { + "x": 1371, + "y": 222 + } + ] + }, + { + "flo_uid": "2600242895368f435ddbb02025794740", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "5003058515368f3f97c3852067167833", + "flo_element_origin_type": "bpmnGateway", + "flo_element_dest": "8695265075368f421582956031048869", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": "@@TXT_NUMERO<5", + "flo_x1": "2401", + "flo_y1": "223", + "flo_x2": "2487", + "flo_y2": "223", + "flo_state": [ + { + "x": 2406, + "y": 322 + }, + { + "x": 2406, + "y": 228 + }, + { + "x": 2492, + "y": 228 + } + ] + }, + { + "flo_uid": "2913492955368f3bd9ac640062122177", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "8040741035368f36d553a36034443608", + "flo_element_origin_type": "bpmnActivity", + "flo_element_dest": "1573074525368f39563c645029053057", + "flo_element_dest_type": "bpmnGateway", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "1599", + "flo_y1": "346", + "flo_x2": "1978", + "flo_y2": "346", + "flo_state": [ + { + "x": 1604, + "y": 466 + }, + { + "x": 1793, + "y": 466 + }, + { + "x": 1793, + "y": 351 + }, + { + "x": 1983, + "y": 351 + } + ] + }, + { + "flo_uid": "3091487135368f40d934026098146173", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "1662057995368f3d166c493099132622", + "flo_element_origin_type": "bpmnActivity", + "flo_element_dest": "5003058515368f3f97c3852067167833", + "flo_element_dest_type": "bpmnGateway", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "2248", + "flo_y1": "334", + "flo_x2": "2384", + "flo_y2": "334", + "flo_state": [ + { + "x": 2253, + "y": 354 + }, + { + "x": 2321, + "y": 354 + }, + { + "x": 2321, + "y": 339 + }, + { + "x": 2389, + "y": 339 + } + ] + }, + { + "flo_uid": "3224505315368f4498e7119039206504", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "6118533245368f421638d97014103681", + "flo_element_origin_type": "bpmnActivity", + "flo_element_dest": "8224351215368f44960c399079885403", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "2645", + "flo_y1": "421", + "flo_x2": "2739", + "flo_y2": "421", + "flo_state": [ + { + "x": 2650, + "y": 426 + }, + { + "x": 2697, + "y": 426 + }, + { + "x": 2697, + "y": 433 + }, + { + "x": 2744, + "y": 433 + } + ] + }, + { + "flo_uid": "3793867825368f30977db88025447953", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "8483077695368f2e1578c22013725409", + "flo_element_origin_type": "bpmnGateway", + "flo_element_dest": "3834232595368f2f55a4787031141076", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": "@@Tarea == 'Final'", + "flo_x1": "1272", + "flo_y1": "388", + "flo_x2": "1436", + "flo_y2": "388", + "flo_state": [ + { + "x": 1277, + "y": 335 + }, + { + "x": 1277, + "y": 393 + }, + { + "x": 1441, + "y": 393 + } + ] + }, + { + "flo_uid": "3972379525368f38176c762043873350", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "2130856495368f3595be289092246691", + "flo_element_origin_type": "bpmnGateway", + "flo_element_dest": "4135711835368f381521244073774350", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "1284", + "flo_y1": "601", + "flo_x2": "1425", + "flo_y2": "601", + "flo_state": [ + { + "x": 1289, + "y": 549 + }, + { + "x": 1289, + "y": 606 + }, + { + "x": 1430, + "y": 606 + } + ] + }, + { + "flo_uid": "4390850535368f6988674a0015793276", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "6274755055368eed1116388064384542", + "flo_element_origin_type": "bpmnActivity", + "flo_element_dest": "4790702485368efad167477011123879", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "271", + "flo_y1": "196", + "flo_x2": "271", + "flo_y2": "196", + "flo_state": [ + { + "x": 276, + "y": 160 + }, + { + "x": 276, + "y": 201 + } + ] + }, + { + "flo_uid": "4803191605368f345b3a6b8047457993", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "6280799825368f1656d31c2002395440", + "flo_element_origin_type": "bpmnActivity", + "flo_element_dest": "3566890705368f33167fc22032897213", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "851", + "flo_y1": "528", + "flo_x2": "1001", + "flo_y2": "528", + "flo_state": [ + { + "x": 1034, + "y": 533 + }, + { + "x": 1090, + "y": 533 + }, + { + "x": 1090, + "y": 520 + }, + { + "x": 1147, + "y": 520 + } + ] + }, + { + "flo_uid": "5013271455368f31d653d03052460487", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "3109778415368f2f54dcfb6033675546", + "flo_element_origin_type": "bpmnActivity", + "flo_element_dest": "3834232595368f2f55a4787031141076", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "1517", + "flo_y1": "367", + "flo_x2": "1517", + "flo_y2": "367", + "flo_state": [ + { + "x": 1522, + "y": 329 + }, + { + "x": 1522, + "y": 372 + } + ] + }, + { + "flo_uid": "5054357485368f57402b5a1097543899", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "8391283425368f15123f198066068855", + "flo_element_origin_type": "bpmnGateway", + "flo_element_dest": "6280799825368f1656d31c2002395440", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "524", + "flo_y1": "528", + "flo_x2": "688", + "flo_y2": "528", + "flo_state": [ + { + "x": 529, + "y": 323 + }, + { + "x": 529, + "y": 533 + }, + { + "x": 871, + "y": 533 + } + ] + }, + { + "flo_uid": "5413651545368f151378aa5059398327", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "2072984565368efc137a394001073529", + "flo_element_origin_type": "bpmnActivity", + "flo_element_dest": "8391283425368f15123f198066068855", + "flo_element_dest_type": "bpmnGateway", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "353", + "flo_y1": "302", + "flo_x2": "507", + "flo_y2": "302", + "flo_state": [ + { + "x": 358, + "y": 307 + }, + { + "x": 512, + "y": 307 + } + ] + }, + { + "flo_uid": "5609011085368f560320ab1060422094", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "8391283425368f15123f198066068855", + "flo_element_origin_type": "bpmnGateway", + "flo_element_dest": "8550422725368f1656034f9074743258", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "524", + "flo_y1": "372", + "flo_x2": "688", + "flo_y2": "372", + "flo_state": [ + { + "x": 529, + "y": 323 + }, + { + "x": 529, + "y": 377 + }, + { + "x": 871, + "y": 377 + } + ] + }, + { + "flo_uid": "5860127485368f3bd9b39b3007810423", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "3038060175368f269739a45028031318", + "flo_element_origin_type": "bpmnActivity", + "flo_element_dest": "1573074525368f39563c645029053057", + "flo_element_dest_type": "bpmnGateway", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "1773", + "flo_y1": "346", + "flo_x2": "1978", + "flo_y2": "346", + "flo_state": [ + { + "x": 1778, + "y": 222 + }, + { + "x": 1880, + "y": 222 + }, + { + "x": 1880, + "y": 351 + }, + { + "x": 1983, + "y": 351 + } + ] + }, + { + "flo_uid": "5988521395368f5c4155a03026459281", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "8483077695368f2e1578c22013725409", + "flo_element_origin_type": "bpmnGateway", + "flo_element_dest": "8550422725368f1656034f9074743258", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": "@@Tarea == 'Return'", + "flo_x1": "1272", + "flo_y1": "394", + "flo_x2": "769", + "flo_y2": "394", + "flo_state": [ + { + "x": 1277, + "y": 335 + }, + { + "x": 1277, + "y": 419 + }, + { + "x": 774, + "y": 419 + }, + { + "x": 774, + "y": 399 + } + ] + }, + { + "flo_uid": "6379254485368f381768ed8069158089", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "2130856495368f3595be289092246691", + "flo_element_origin_type": "bpmnGateway", + "flo_element_dest": "8040741035368f36d553a36034443608", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "1284", + "flo_y1": "461", + "flo_x2": "1436", + "flo_y2": "461", + "flo_state": [ + { + "x": 1289, + "y": 513 + }, + { + "x": 1289, + "y": 466 + }, + { + "x": 1441, + "y": 466 + } + ] + }, + { + "flo_uid": "6569327175368f2a58090b9014389732", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "3683085655368f269668a52008262297", + "flo_element_origin_type": "bpmnActivity", + "flo_element_dest": "3038060175368f269739a45028031318", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "1529", + "flo_y1": "217", + "flo_x2": "1610", + "flo_y2": "217", + "flo_state": [ + { + "x": 1534, + "y": 222 + }, + { + "x": 1615, + "y": 222 + } + ] + }, + { + "flo_uid": "6852205735368f3a97466e6008736456", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "3834232595368f2f55a4787031141076", + "flo_element_origin_type": "bpmnActivity", + "flo_element_dest": "1573074525368f39563c645029053057", + "flo_element_dest_type": "bpmnGateway", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "1599", + "flo_y1": "346", + "flo_x2": "1978", + "flo_y2": "346", + "flo_state": [ + { + "x": 1604, + "y": 393 + }, + { + "x": 1793, + "y": 393 + }, + { + "x": 1793, + "y": 351 + }, + { + "x": 1983, + "y": 351 + } + ] + }, + { + "flo_uid": "7089504865368f36d790159087328792", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "3566890705368f33167fc22032897213", + "flo_element_origin_type": "bpmnActivity", + "flo_element_dest": "2130856495368f3595be289092246691", + "flo_element_dest_type": "bpmnGateway", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "1164", + "flo_y1": "528", + "flo_x2": "1267", + "flo_y2": "528", + "flo_state": [ + { + "x": 1169, + "y": 533 + }, + { + "x": 1220, + "y": 533 + }, + { + "x": 1220, + "y": 530 + }, + { + "x": 1272, + "y": 530 + } + ] + }, + { + "flo_uid": "7123397535368f2cd9b3402049226355", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "8550422725368f1656034f9074743258", + "flo_element_origin_type": "bpmnActivity", + "flo_element_dest": "1160076165368f2cd7416c7095931710", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "851", + "flo_y1": "372", + "flo_x2": "993", + "flo_y2": "372", + "flo_state": [ + { + "x": 1034, + "y": 377 + }, + { + "x": 1086, + "y": 377 + }, + { + "x": 1086, + "y": 358 + }, + { + "x": 1139, + "y": 358 + } + ] + }, + { + "flo_uid": "7568645035368f3bd9b0120051841046", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "4135711835368f381521244073774350", + "flo_element_origin_type": "bpmnActivity", + "flo_element_dest": "1573074525368f39563c645029053057", + "flo_element_dest_type": "bpmnGateway", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "1506", + "flo_y1": "346", + "flo_x2": "1978", + "flo_y2": "346", + "flo_state": [ + { + "x": 1511, + "y": 585 + }, + { + "x": 1511, + "y": 351 + }, + { + "x": 1983, + "y": 351 + } + ] + }, + { + "flo_uid": "7638638815368f4d5c959f3021775318", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "8224351215368f44960c399079885403", + "flo_element_origin_type": "bpmnActivity", + "flo_element_dest": "3287598595368f45d714018043209407", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "2902", + "flo_y1": "297", + "flo_x2": "2981", + "flo_y2": "297", + "flo_state": [ + { + "x": 2907, + "y": 426 + }, + { + "x": 2946, + "y": 426 + }, + { + "x": 2946, + "y": 302 + }, + { + "x": 2986, + "y": 302 + } + ] + }, + { + "flo_uid": "7864168035368f3e5864262068407103", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "1573074525368f39563c645029053057", + "flo_element_origin_type": "bpmnGateway", + "flo_element_dest": "1662057995368f3d166c493099132622", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "2011", + "flo_y1": "346", + "flo_x2": "2085", + "flo_y2": "346", + "flo_state": [ + { + "x": 2016, + "y": 351 + }, + { + "x": 2053, + "y": 351 + }, + { + "x": 2053, + "y": 354 + }, + { + "x": 2090, + "y": 354 + } + ] + }, + { + "flo_uid": "8101936905368f22d59a7d1076933076", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "4833626825368f2195b3ac4033349844", + "flo_element_origin_type": "bpmnActivity", + "flo_element_dest": "2202457115368f21965c7f9036908008", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "1162", + "flo_y1": "74", + "flo_x2": "1376", + "flo_y2": "74", + "flo_state": [ + { + "x": 1308, + "y": 79 + }, + { + "x": 1381, + "y": 79 + } + ] + }, + { + "flo_uid": "8478135335368f49981dc89000362701", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "3287598595368f45d714018043209407", + "flo_element_origin_type": "bpmnActivity", + "flo_element_dest": "6901238975368f4997188f4036127933", + "flo_element_dest_type": "bpmnEvent", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "3144", + "flo_y1": "340", + "flo_x2": "3243", + "flo_y2": "340", + "flo_state": [ + { + "x": 3149, + "y": 302 + }, + { + "x": 3248, + "y": 302 + }, + { + "x": 3248, + "y": 345 + } + ] + }, + { + "flo_uid": "8488200385368f22d59e426021505231", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "2202457115368f21965c7f9036908008", + "flo_element_origin_type": "bpmnActivity", + "flo_element_dest": "2523767555368f22d419373008089487", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "1539", + "flo_y1": "74", + "flo_x2": "1616", + "flo_y2": "74", + "flo_state": [ + { + "x": 1544, + "y": 79 + }, + { + "x": 1621, + "y": 79 + } + ] + }, + { + "flo_uid": "8618893775368f30977a177022912705", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "8483077695368f2e1578c22013725409", + "flo_element_origin_type": "bpmnGateway", + "flo_element_dest": "3109778415368f2f54dcfb6033675546", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": "@@Tarea == 'Continuar'", + "flo_x1": "1272", + "flo_y1": "302", + "flo_x2": "1436", + "flo_y2": "302", + "flo_state": [ + { + "x": 1277, + "y": 302 + }, + { + "x": 1277, + "y": 282 + }, + { + "x": 1359, + "y": 282 + }, + { + "x": 1359, + "y": 307 + }, + { + "x": 1441, + "y": 307 + } + ] + }, + { + "flo_uid": "9039123345368eed1304761063323736", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "9488118085368eed1297503010235783", + "flo_element_origin_type": "bpmnEvent", + "flo_element_dest": "6274755055368eed1116388064384542", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "57", + "flo_y1": "133", + "flo_x2": "190", + "flo_y2": "133", + "flo_state": [ + { + "x": 62, + "y": 138 + }, + { + "x": 128, + "y": 138 + }, + { + "x": 128, + "y": 141 + }, + { + "x": 195, + "y": 141 + } + ] + }, + { + "flo_uid": "9100657945368f22d595b21016049170", + "flo_type": "SEQUENCE", + "flo_name": null, + "flo_element_origin": "6927549145368f1653fb6f0093362462", + "flo_element_origin_type": "bpmnActivity", + "flo_element_dest": "4833626825368f2195b3ac4033349844", + "flo_element_dest_type": "bpmnActivity", + "flo_is_inmediate": "1", + "flo_condition": null, + "flo_x1": "853", + "flo_y1": "74", + "flo_x2": "999", + "flo_y2": "74", + "flo_state": [ + { + "x": 1036, + "y": 79 + }, + { + "x": 1145, + "y": 79 + } + ] + } + ], + "artifacts": [], + "laneset": [], + "lanes": [] + } + ] +} \ No newline at end of file From 5c1819ec4daa3042d7645de48084ed90f854402d Mon Sep 17 00:00:00 2001 From: Wendy Nestor Date: Tue, 6 May 2014 22:56:17 -0400 Subject: [PATCH 5/6] Modificacion al feature project y eliminacion de archivos --- .../basic_sequence_project_resources.feature | 2 +- .../remove_users_and_web_entry.feature | 71 -- features/json/process_template_v1.json | 715 ------------------ features/json/process_template_v1.json.save | 714 ----------------- 4 files changed, 1 insertion(+), 1501 deletions(-) delete mode 100644 features/backend/projects/web_entry/remove_users_and_web_entry.feature delete mode 100644 features/json/process_template_v1.json delete mode 100644 features/json/process_template_v1.json.save diff --git a/features/backend/projects/project/basic_sequence_project_resources.feature b/features/backend/projects/project/basic_sequence_project_resources.feature index 8554b016d..22981a76e 100644 --- a/features/backend/projects/project/basic_sequence_project_resources.feature +++ b/features/backend/projects/project/basic_sequence_project_resources.feature @@ -449,7 +449,7 @@ Scenario Outline: Update the Projects and then check if the values had changed Scenario Outline: Get definition of a project - Given that I want to get a resource with the key "new_uid" stored in session array as variable "project_new_uid_" in postion 0 + Given that I want to get a resource with the key "new_uid" stored in session array as variable "project_new_uid_" in position 0 And I request "project" Then the response status code should be 200 And the response charset is "UTF-8" diff --git a/features/backend/projects/web_entry/remove_users_and_web_entry.feature b/features/backend/projects/web_entry/remove_users_and_web_entry.feature deleted file mode 100644 index ef53f7c4a..000000000 --- a/features/backend/projects/web_entry/remove_users_and_web_entry.feature +++ /dev/null @@ -1,71 +0,0 @@ -@ProcessMakerMichelangelo @RestAPI -Feature: Web Entry - Remove Assignee and Web Entries - - Background: - Given that I have a valid access_token - - - Scenario Outline: Remove an assignee of an activity - Given that I want to delete a resource with the key "obj_uid" stored in session array - And I request "project/28733629952e66a362c4f63066393844/activity//assignee/" - And the content type is "application/json" - Then the response status code should be 200 - And the response charset is "UTF-8" - And the type is "object" - - Examples: - | tas_uid | tas_title | aas_uid | - | 44199549652e66ba533bb06088252754 | Task 1 | 00000000000000000000000000000001 | - | 56118778152e66babcc2103002009439 | Task 2 | 00000000000000000000000000000001 | - | 18096002352e66bc1643af8048493068 | Task 3 | 00000000000000000000000000000001 | - - - Scenario Outline: Delete a Web Entry of a Project - Given that I want to delete a resource with the key "obj_uid" stored in session array - And I request "project/28733629952e66a362c4f63066393844/web-entry//" - And the content type is "application/json" - Then the response status code should be 200 - And the response charset is "UTF-8" - And the type is "object" - - Examples: - | tas_uid | tas_title | dyn_uid | dyn_title | - | 44199549652e66ba533bb06088252754 | Task 1 | 60308801852e66b7181ae21045247174 |DynaForm Demo1 | - | 56118778152e66babcc2103002009439 | Task 2 | 99869771852e66b7dc4b858088901665 |DynaForm Demo2 | - - Scenario Outline: List assignees of an activity - Given I request "project/28733629952e66a362c4f63066393844/activity//assignee" - And the content type is "application/json" - Then the response status code should be 200 - And the response charset is "UTF-8" - And the type is "array" - And the json data is an empty array - - Examples: - | tas_uid | tas_title | - | 44199549652e66ba533bb06088252754 | Task 1 | - | 56118778152e66babcc2103002009439 | Task 2 | - | 18096002352e66bc1643af8048493068 | Task 3 | - - Scenario Outline: List assignees of an activity - Given I request "project/28733629952e66a362c4f63066393844/activity//assignee" - And the content type is "application/json" - Then the response status code should be 200 - And the response charset is "UTF-8" - And the type is "array" - And the json data is an empty array - - Examples: - | tas_uid | tas_title | - | 44199549652e66ba533bb06088252754 | Task 1 | - | 56118778152e66babcc2103002009439 | Task 2 | - | 18096002352e66bc1643af8048493068 | Task 3 | - - - Scenario: Get list Web Entries of a Project - And I request "project/28733629952e66a362c4f63066393844/web-entries" - And the content type is "application/json" - Then the response status code should be 200 - And the response charset is "UTF-8" - And the type is "array" - And the json data is an empty array \ No newline at end of file diff --git a/features/json/process_template_v1.json b/features/json/process_template_v1.json deleted file mode 100644 index 3b7b91189..000000000 --- a/features/json/process_template_v1.json +++ /dev/null @@ -1,715 +0,0 @@ -{ - "prj_uid": "6e60d25b2a779b263104f141c215466b", - "prj_name": "Project #1 , Creación de Proceso para derivaciones (parallel)-”ejemplo”; ‘comillas’. Título con caraccteres especiales”!@#$%^&*()_+{}[]”?><”, - "prj_description": "Creación de Proceso para derivaciones (parallel)-”ejemplo”; ‘comillas’. Título con caracteres especiales”!@#$%^&*()_+{}[]”?><”, - "diagrams": [ - { - "dia_uid": "a5242da840064218638061532405176", - "pro_uid": "68269130852b04ccbda0558053566350", - "laneset": [], - "lanes": [], - "activities": [ - { - "act_uid": "20130110852b04cd0da0710001476342", - "act_name": "Task # 1", - "act_type": "TASK", - "act_task_type": "EMPTY", - "act_is_for_compensation": false, - "act_start_quantity": 1, - "act_completion_quantity": 0, - "act_implementation": "", - "act_instantiate": false, - "act_script_type": "", - "act_script": "", - "act_loop_type": "NONE", - "act_test_before": null, - "act_loop_maximum": 0, - "act_loop_condition": null, - "act_loop_cardinality": 0, - "act_loop_behavior": null, - "act_is_adhoc": false, - "act_is_collapsed": false, - "act_completion_condition": null, - "act_ordering": null, - "act_cancel_remaining_instances": true, - "act_protocol": null, - "act_method": null, - "act_is_global": false, - "act_referer": null, - "act_default_flow": 0, - "act_master_diagram": null, - "bou_x": 334, - "bou_y": 110, - "bou_width": 100, - "bou_height": 50, - "bou_container": "bpmnDiagram", - "bou_element_id": "70770714052b04ccbda05a2045860900" - }, - { - "act_uid": "55963679852b04cfdda1ca7057330775", - "act_name": "Tarea con Título Compleato y simbolos especiales ‘!@#$%^&*()_+=:”?>;’/.[]{}’" y texto largo, - "act_type": "TASK", - "act_task_type": "EMPTY", - "act_is_for_compensation": false, - "act_start_quantity": 1, - "act_completion_quantity": 0, - "act_implementation": "", - "act_instantiate": false, - "act_script_type": "", - "act_script": "", - "act_loop_type": "NONE", - "act_test_before": null, - "act_loop_maximum": 0, - "act_loop_condition": null, - "act_loop_cardinality": 0, - "act_loop_behavior": null, - "act_is_adhoc": false, - "act_is_collapsed": false, - "act_completion_condition": null, - "act_ordering": null, - "act_cancel_remaining_instances": true, - "act_protocol": null, - "act_method": null, - "act_is_global": false, - "act_referer": null, - "act_default_flow": 0, - "act_master_diagram": null, - "bou_x": 135, - "bou_y": 327, - "bou_width": 100, - "bou_height": 50, - "bou_container": "bpmnDiagram", - "bou_element_id": "70770714052b04ccbda05a2045860900" - }, - { - "act_uid": "36275645952b04d03da2683059221904", - "act_name": "Task # 3", - "act_type": "TASK", - "act_task_type": "EMPTY", - "act_is_for_compensation": false, - "act_start_quantity": 1, - "act_completion_quantity": 0, - "act_implementation": "", - "act_instantiate": false, - "act_script_type": "", - "act_script": "", - "act_loop_type": "NONE", - "act_test_before": null, - "act_loop_maximum": 0, - "act_loop_condition": null, - "act_loop_cardinality": 0, - "act_loop_behavior": null, - "act_is_adhoc": false, - "act_is_collapsed": false, - "act_completion_condition": null, - "act_ordering": null, - "act_cancel_remaining_instances": true, - "act_protocol": null, - "act_method": null, - "act_is_global": false, - "act_referer": null, - "act_default_flow": 0, - "act_master_diagram": null, - "bou_x": 336, - "bou_y": 329, - "bou_width": 100, - "bou_height": 50, - "bou_container": "bpmnDiagram", - "bou_element_id": "70770714052b04ccbda05a2045860900" - }, - { - "act_uid": "39924412652b04d0bda3cc4088664712", - "act_name": "Task # 4", - "act_type": "TASK", - "act_task_type": "EMPTY", - "act_is_for_compensation": false, - "act_start_quantity": 1, - "act_completion_quantity": 0, - "act_implementation": "", - "act_instantiate": false, - "act_script_type": "", - "act_script": "", - "act_loop_type": "NONE", - "act_test_before": null, - "act_loop_maximum": 0, - "act_loop_condition": null, - "act_loop_cardinality": 0, - "act_loop_behavior": null, - "act_is_adhoc": false, - "act_is_collapsed": false, - "act_completion_condition": null, - "act_ordering": null, - "act_cancel_remaining_instances": true, - "act_protocol": null, - "act_method": null, - "act_is_global": false, - "act_referer": null, - "act_default_flow": 0, - "act_master_diagram": null, - "bou_x": 467, - "bou_y": 331, - "bou_width": 100, - "bou_height": 50, - "bou_container": "bpmnDiagram", - "bou_element_id": "70770714052b04ccbda05a2045860900" - }, - { - "act_uid": "81865611252b04d14da4f39027749188", - "act_name": "Task # 5", - "act_type": "TASK", - "act_task_type": "EMPTY", - "act_is_for_compensation": false, - "act_start_quantity": 1, - "act_completion_quantity": 0, - "act_implementation": "", - "act_instantiate": false, - "act_script_type": "", - "act_script": "", - "act_loop_type": "NONE", - "act_test_before": null, - "act_loop_maximum": 0, - "act_loop_condition": null, - "act_loop_cardinality": 0, - "act_loop_behavior": null, - "act_is_adhoc": false, - "act_is_collapsed": false, - "act_completion_condition": null, - "act_ordering": null, - "act_cancel_remaining_instances": true, - "act_protocol": null, - "act_method": null, - "act_is_global": false, - "act_referer": null, - "act_default_flow": 0, - "act_master_diagram": null, - "bou_x": 634, - "bou_y": 331, - "bou_width": 100, - "bou_height": 50, - "bou_container": "bpmnDiagram", - "bou_element_id": "70770714052b04ccbda05a2045860900" - }, - { - "act_uid": "43669577152b05b69daabe5029145631", - "act_name": "Task # 6", - "act_type": "TASK", - "act_task_type": "EMPTY", - "act_is_for_compensation": false, - "act_start_quantity": 1, - "act_completion_quantity": 0, - "act_implementation": "", - "act_instantiate": false, - "act_script_type": "", - "act_script": "", - "act_loop_type": "NONE", - "act_test_before": null, - "act_loop_maximum": 0, - "act_loop_condition": null, - "act_loop_cardinality": 0, - "act_loop_behavior": null, - "act_is_adhoc": false, - "act_is_collapsed": false, - "act_completion_condition": null, - "act_ordering": null, - "act_cancel_remaining_instances": true, - "act_protocol": null, - "act_method": null, - "act_is_global": false, - "act_referer": null, - "act_default_flow": 0, - "act_master_diagram": null, - "bou_x": 429, - "bou_y": 531, - "bou_width": 100, - "bou_height": 50, - "bou_container": "bpmnDiagram", - "bou_element_id": "70770714052b04ccbda05a2045860900" - } - ], - "events": [ - { - "evn_uid": "55171305452b04cd3da08c9074517180", - "evn_name": "Start # 1", - "evn_type": "START", - "evn_marker": "MESSAGE", - "evn_is_interrupting": true, - "evn_cancel_activity": false, - "evn_activity_ref": null, - "evn_wait_for_completion": false, - "evn_error_name": null, - "evn_error_code": null, - "evn_escalation_name": null, - "evn_escalation_code": null, - "evn_message": "LEAD", - "evn_operation_name": null, - "evn_operation_implementation_ref": null, - "evn_time_date": null, - "evn_time_cycle": null, - "evn_time_duration": null, - "evn_behavior": "CATCH", - "bou_x": 367, - "bou_y": 32, - "bou_width": 33, - "bou_height": 33, - "bou_container": "bpmnDiagram", - "bou_element_id": "70770714052b04ccbda05a2045860900" - }, - { - "evn_uid": "57589846552b05b73daea69075516155", - "evn_name": "End # 1", - "evn_type": "END", - "evn_marker": "EMPTY", - "evn_is_interrupting": true, - "evn_cancel_activity": false, - "evn_activity_ref": null, - "evn_wait_for_completion": false, - "evn_error_name": null, - "evn_error_code": null, - "evn_escalation_name": null, - "evn_escalation_code": null, - "evn_message": "", - "evn_operation_name": null, - "evn_operation_implementation_ref": null, - "evn_time_date": null, - "evn_time_cycle": null, - "evn_time_duration": null, - "evn_behavior": "THROW", - "bou_x": 579, - "bou_y": 621, - "bou_width": 33, - "bou_height": 33, - "bou_container": "bpmnDiagram", - "bou_element_id": "70770714052b04ccbda05a2045860900" - } - ], - "gateways": [ - { - "gat_uid": "37050857352b04ceada1799074850936", - "gat_name": "Parallel by Evaluation # 1", - "gat_type": "PARALLEL_EVALUATION", - "gat_direction": null, - "gat_instantiate": false, - "gat_event_gateway_type": "NONE", - "gat_activation_count": 0, - "gat_waiting_for_start": true, - "gat_default_flow": 0, - "bou_x": 363, - "bou_y": 205, - "bou_width": 45, - "bou_height": 45, - "bou_container": "bpmnDiagram", - "bou_element_id": "70770714052b04ccbda05a2045860900" - }, - { - "gat_uid": "96977315752b04d25da5fb6015463105", - "gat_name": "Parallel Join # 1", - "gat_type": "PARALLEL_JOIN", - "gat_direction": null, - "gat_instantiate": false, - "gat_event_gateway_type": "NONE", - "gat_activation_count": 0, - "gat_waiting_for_start": true, - "gat_default_flow": 0, - "bou_x": 391, - "bou_y": 457, - "bou_width": 45, - "bou_height": 45, - "bou_container": "bpmnDiagram", - "bou_element_id": "70770714052b04ccbda05a2045860900" - } - ], - "flows": [ - { - "flo_uid": "85852223452b04cd9da0d24062477197", - "flo_type": "SEQUENCE", - "flo_name": null, - "flo_element_origin": "55171305452b04cd3da08c9074517180", - "flo_element_origin_type": "bpmnEvent", - "flo_element_dest": "20130110852b04cd0da0710001476342", - "flo_element_dest_type": "bpmnActivity", - "flo_is_inmediate": true, - "flo_condition": null, - "flo_state": [ - { - "x": 382, - "y": 67 - }, - { - "x": 382, - "y": 87 - }, - { - "x": 383, - "y": 87 - }, - { - "x": 383, - "y": 108 - } - ], - "flo_x1": 382, - "flo_y1": 114, - "flo_x2": 388, - "flo_y2": 114 - }, - { - "flo_uid": "98521752352b04cf9da1bc8031684305", - "flo_type": "SEQUENCE", - "flo_name": null, - "flo_element_origin": "20130110852b04cd0da0710001476342", - "flo_element_origin_type": "bpmnActivity", - "flo_element_dest": "37050857352b04ceada1799074850936", - "flo_element_dest_type": "bpmnGateway", - "flo_is_inmediate": true, - "flo_condition": null, - "flo_state": [ - { - "x": 383, - "y": 163 - }, - { - "x": 383, - "y": 184 - }, - { - "x": 386, - "y": 184 - }, - { - "x": 386, - "y": 205 - } - ], - "flo_x1": 383, - "flo_y1": 205, - "flo_x2": 386, - "flo_y2": 205 - }, - { - "flo_uid": "51012823052b04d00da25b0076746454", - "flo_type": "SEQUENCE", - "flo_name": null, - "flo_element_origin": "37050857352b04ceada1799074850936", - "flo_element_origin_type": "bpmnGateway", - "flo_element_dest": "55963679852b04cfdda1ca7057330775", - "flo_element_dest_type": "bpmnActivity", - "flo_is_inmediate": true, - "flo_condition": null, - "flo_state": [ - { - "x": 386, - "y": 250 - }, - { - "x": 386, - "y": 287 - }, - { - "x": 184, - "y": 287 - }, - { - "x": 184, - "y": 325 - } - ], - "flo_x1": 386, - "flo_y1": 325, - "flo_x2": 223, - "flo_y2": 325 - }, - { - "flo_uid": "21566164052b04d06da2be5053173210", - "flo_type": "SEQUENCE", - "flo_name": null, - "flo_element_origin": "37050857352b04ceada1799074850936", - "flo_element_origin_type": "bpmnGateway", - "flo_element_dest": "36275645952b04d03da2683059221904", - "flo_element_dest_type": "bpmnActivity", - "flo_is_inmediate": true, - "flo_condition": null, - "flo_state": [ - { - "x": 386, - "y": 250 - }, - { - "x": 386, - "y": 288 - }, - { - "x": 385, - "y": 288 - }, - { - "x": 385, - "y": 327 - } - ], - "flo_x1": 386, - "flo_y1": 336, - "flo_x2": 439, - "flo_y2": 336 - }, - { - "flo_uid": "13502002652b04d0eda4297008861549", - "flo_type": "SEQUENCE", - "flo_name": null, - "flo_element_origin": "37050857352b04ceada1799074850936", - "flo_element_origin_type": "bpmnGateway", - "flo_element_dest": "39924412652b04d0bda3cc4088664712", - "flo_element_dest_type": "bpmnActivity", - "flo_is_inmediate": true, - "flo_condition": null, - "flo_state": [ - { - "x": 386, - "y": 250 - }, - { - "x": 386, - "y": 289 - }, - { - "x": 516, - "y": 289 - }, - { - "x": 516, - "y": 329 - } - ], - "flo_x1": 386, - "flo_y1": 341, - "flo_x2": 556, - "flo_y2": 341, - "_action": "CREATE" - }, - { - "flo_uid": "51780192952b04d1ada5389065057435", - "flo_type": "SEQUENCE", - "flo_name": null, - "flo_element_origin": "37050857352b04ceada1799074850936", - "flo_element_origin_type": "bpmnGateway", - "flo_element_dest": "81865611252b04d14da4f39027749188", - "flo_element_dest_type": "bpmnActivity", - "flo_is_inmediate": true, - "flo_condition": null, - "flo_state": [ - { - "x": 386, - "y": 250 - }, - { - "x": 386, - "y": 289 - }, - { - "x": 683, - "y": 289 - }, - { - "x": 683, - "y": 329 - } - ], - "flo_x1": 386, - "flo_y1": 329, - "flo_x2": 683, - "flo_y2": 329 - }, - { - "flo_uid": "11527570252b04d29da6573070436369", - "flo_type": "SEQUENCE", - "flo_name": null, - "flo_element_origin": "36275645952b04d03da2683059221904", - "flo_element_origin_type": "bpmnActivity", - "flo_element_dest": "96977315752b04d25da5fb6015463105", - "flo_element_dest_type": "bpmnGateway", - "flo_is_inmediate": true, - "flo_condition": null, - "flo_state": [ - { - "x": 385, - "y": 382 - }, - { - "x": 385, - "y": 419 - }, - { - "x": 414, - "y": 419 - }, - { - "x": 414, - "y": 457 - } - ], - "flo_x1": 385, - "flo_y1": 480, - "flo_x2": 414, - "flo_y2": 480 - }, - { - "flo_uid": "99492263452b04d2dda6d16026220307", - "flo_type": "SEQUENCE", - "flo_name": null, - "flo_element_origin": "39924412652b04d0bda3cc4088664712", - "flo_element_origin_type": "bpmnActivity", - "flo_element_dest": "96977315752b04d25da5fb6015463105", - "flo_element_dest_type": "bpmnGateway", - "flo_is_inmediate": true, - "flo_condition": null, - "flo_state": [ - { - "x": 516, - "y": 384 - }, - { - "x": 516, - "y": 420 - }, - { - "x": 414, - "y": 420 - }, - { - "x": 414, - "y": 457 - } - ], - "flo_x1": 516, - "flo_y1": 480, - "flo_x2": 414, - "flo_y2": 480 - }, - { - "flo_uid": "61995297952b04d31da7337053386832", - "flo_type": "SEQUENCE", - "flo_name": null, - "flo_element_origin": "81865611252b04d14da4f39027749188", - "flo_element_origin_type": "bpmnActivity", - "flo_element_dest": "96977315752b04d25da5fb6015463105", - "flo_element_dest_type": "bpmnGateway", - "flo_is_inmediate": true, - "flo_condition": null, - "flo_state": [ - { - "x": 683, - "y": 384 - }, - { - "x": 683, - "y": 480 - }, - { - "x": 436, - "y": 480 - } - ], - "flo_x1": 683, - "flo_y1": 503, - "flo_x2": 436, - "flo_y2": 503 - }, - { - "flo_uid": "52373453752b04d34da7826007505462", - "flo_type": "SEQUENCE", - "flo_name": null, - "flo_element_origin": "55963679852b04cfdda1ca7057330775", - "flo_element_origin_type": "bpmnActivity", - "flo_element_dest": "96977315752b04d25da5fb6015463105", - "flo_element_dest_type": "bpmnGateway", - "flo_is_inmediate": true, - "flo_condition": null, - "flo_state": [ - { - "x": 184, - "y": 380 - }, - { - "x": 184, - "y": 480 - }, - { - "x": 391, - "y": 480 - } - ], - "flo_x1": 184, - "flo_y1": 503, - "flo_x2": 391, - "flo_y2": 503 - }, - { - "flo_uid": "98839915852b05b6cdab1d9031584510", - "flo_type": "SEQUENCE", - "flo_name": null, - "flo_element_origin": "96977315752b04d25da5fb6015463105", - "flo_element_origin_type": "bpmnGateway", - "flo_element_dest": "43669577152b05b69daabe5029145631", - "flo_element_dest_type": "bpmnActivity", - "flo_is_inmediate": true, - "flo_condition": null, - "flo_state": [ - { - "x": 414, - "y": 457 - }, - { - "x": 414, - "y": 437 - }, - { - "x": 478, - "y": 437 - }, - { - "x": 478, - "y": 529 - } - ], - "flo_x1": 414, - "flo_y1": 600, - "flo_x2": 443, - "flo_y2": 600 - }, - { - "flo_uid": "30547450952b05b75daefd9056968485", - "flo_type": "SEQUENCE", - "flo_name": null, - "flo_element_origin": "43669577152b05b69daabe5029145631", - "flo_element_origin_type": "bpmnActivity", - "flo_element_dest": "57589846552b05b73daea69075516155", - "flo_element_dest_type": "bpmnEvent", - "flo_is_inmediate": true, - "flo_condition": null, - "flo_state": [ - { - "x": 478, - "y": 529 - }, - { - "x": 478, - "y": 509 - }, - { - "x": 594, - "y": 509 - }, - { - "x": 594, - "y": 619 - } - ], - "flo_x1": 478, - "flo_y1": 664, - "flo_x2": 531, - "flo_y2": 664 - } - ], - "artifacts": [] - } - ] -} diff --git a/features/json/process_template_v1.json.save b/features/json/process_template_v1.json.save deleted file mode 100644 index 56553428b..000000000 --- a/features/json/process_template_v1.json.save +++ /dev/null @@ -1,714 +0,0 @@ - "prj_uid": "6e60d25b2a779b263104f141c215466b", - "prj_name": "Project #1 (parallel-by-ev)", - "prj_description": "", - "diagrams": [ - { - "dia_uid": "a5242da840064218638061532405176", - "pro_uid": "68269130852b04ccbda0558053566350", - "laneset": [], - "lanes": [], - "activities": [ - { - "act_uid": "20130110852b04cd0da0710001476342", - "act_name": "Task # 1", - "act_type": "TASK", - "act_task_type": "EMPTY", - "act_is_for_compensation": false, - "act_start_quantity": 1, - "act_completion_quantity": 0, - "act_implementation": "", - "act_instantiate": false, - "act_script_type": "", - "act_script": "", - "act_loop_type": "NONE", - "act_test_before": null, - "act_loop_maximum": 0, - "act_loop_condition": null, - "act_loop_cardinality": 0, - "act_loop_behavior": null, - "act_is_adhoc": false, - "act_is_collapsed": false, - "act_completion_condition": null, - "act_ordering": null, - "act_cancel_remaining_instances": true, - "act_protocol": null, - "act_method": null, - "act_is_global": false, - "act_referer": null, - "act_default_flow": 0, - "act_master_diagram": null, - "bou_x": 334, - "bou_y": 110, - "bou_width": 100, - "bou_height": 50, - "bou_container": "bpmnDiagram", - "bou_element_id": "70770714052b04ccbda05a2045860900" - }, - { - "act_uid": "55963679852b04cfdda1ca7057330775", - "act_name": "Task # 2", - "act_type": "TASK", - "act_task_type": "EMPTY", - "act_is_for_compensation": false, - "act_start_quantity": 1, - "act_completion_quantity": 0, - "act_implementation": "", - "act_instantiate": false, - "act_script_type": "", - "act_script": "", - "act_loop_type": "NONE", - "act_test_before": null, - "act_loop_maximum": 0, - "act_loop_condition": null, - "act_loop_cardinality": 0, - "act_loop_behavior": null, - "act_is_adhoc": false, - "act_is_collapsed": false, - "act_completion_condition": null, - "act_ordering": null, - "act_cancel_remaining_instances": true, - "act_protocol": null, - "act_method": null, - "act_is_global": false, - "act_referer": null, - "act_default_flow": 0, - "act_master_diagram": null, - "bou_x": 135, - "bou_y": 327, - "bou_width": 100, - "bou_height": 50, - "bou_container": "bpmnDiagram", - "bou_element_id": "70770714052b04ccbda05a2045860900" - }, - { - "act_uid": "36275645952b04d03da2683059221904", - "act_name": "Task # 3", - "act_type": "TASK", - "act_task_type": "EMPTY", - "act_is_for_compensation": false, - "act_start_quantity": 1, - "act_completion_quantity": 0, - "act_implementation": "", - "act_instantiate": false, - "act_script_type": "", - "act_script": "", - "act_loop_type": "NONE", - "act_test_before": null, - "act_loop_maximum": 0, - "act_loop_condition": null, - "act_loop_cardinality": 0, - "act_loop_behavior": null, - "act_is_adhoc": false, - "act_is_collapsed": false, - "act_completion_condition": null, - "act_ordering": null, - "act_cancel_remaining_instances": true, - "act_protocol": null, - "act_method": null, - "act_is_global": false, - "act_referer": null, - "act_default_flow": 0, - "act_master_diagram": null, - "bou_x": 336, - "bou_y": 329, - "bou_width": 100, - "bou_height": 50, - "bou_container": "bpmnDiagram", - "bou_element_id": "70770714052b04ccbda05a2045860900" - }, - { - "act_uid": "39924412652b04d0bda3cc4088664712", - "act_name": "Task # 4", - "act_type": "TASK", - "act_task_type": "EMPTY", - "act_is_for_compensation": false, - "act_start_quantity": 1, - "act_completion_quantity": 0, - "act_implementation": "", - "act_instantiate": false, - "act_script_type": "", - "act_script": "", - "act_loop_type": "NONE", - "act_test_before": null, - "act_loop_maximum": 0, - "act_loop_condition": null, - "act_loop_cardinality": 0, - "act_loop_behavior": null, - "act_is_adhoc": false, - "act_is_collapsed": false, - "act_completion_condition": null, - "act_ordering": null, - "act_cancel_remaining_instances": true, - "act_protocol": null, - "act_method": null, - "act_is_global": false, - "act_referer": null, - "act_default_flow": 0, - "act_master_diagram": null, - "bou_x": 467, - "bou_y": 331, - "bou_width": 100, - "bou_height": 50, - "bou_container": "bpmnDiagram", - "bou_element_id": "70770714052b04ccbda05a2045860900" - }, - { - "act_uid": "81865611252b04d14da4f39027749188", - "act_name": "Task # 5", - "act_type": "TASK", - "act_task_type": "EMPTY", - "act_is_for_compensation": false, - "act_start_quantity": 1, - "act_completion_quantity": 0, - "act_implementation": "", - "act_instantiate": false, - "act_script_type": "", - "act_script": "", - "act_loop_type": "NONE", - "act_test_before": null, - "act_loop_maximum": 0, - "act_loop_condition": null, - "act_loop_cardinality": 0, - "act_loop_behavior": null, - "act_is_adhoc": false, - "act_is_collapsed": false, - "act_completion_condition": null, - "act_ordering": null, - "act_cancel_remaining_instances": true, - "act_protocol": null, - "act_method": null, - "act_is_global": false, - "act_referer": null, - "act_default_flow": 0, - "act_master_diagram": null, - "bou_x": 634, - "bou_y": 331, - "bou_width": 100, - "bou_height": 50, - "bou_container": "bpmnDiagram", - "bou_element_id": "70770714052b04ccbda05a2045860900" - }, - { - "act_uid": "43669577152b05b69daabe5029145631", - "act_name": "Task # 6", - "act_type": "TASK", - "act_task_type": "EMPTY", - "act_is_for_compensation": false, - "act_start_quantity": 1, - "act_completion_quantity": 0, - "act_implementation": "", - "act_instantiate": false, - "act_script_type": "", - "act_script": "", - "act_loop_type": "NONE", - "act_test_before": null, - "act_loop_maximum": 0, - "act_loop_condition": null, - "act_loop_cardinality": 0, - "act_loop_behavior": null, - "act_is_adhoc": false, - "act_is_collapsed": false, - "act_completion_condition": null, - "act_ordering": null, - "act_cancel_remaining_instances": true, - "act_protocol": null, - "act_method": null, - "act_is_global": false, - "act_referer": null, - "act_default_flow": 0, - "act_master_diagram": null, - "bou_x": 429, - "bou_y": 531, - "bou_width": 100, - "bou_height": 50, - "bou_container": "bpmnDiagram", - "bou_element_id": "70770714052b04ccbda05a2045860900" - } - ], - "events": [ - { - "evn_uid": "55171305452b04cd3da08c9074517180", - "evn_name": "Start # 1", - "evn_type": "START", - "evn_marker": "MESSAGE", - "evn_is_interrupting": true, - "evn_cancel_activity": false, - "evn_activity_ref": null, - "evn_wait_for_completion": false, - "evn_error_name": null, - "evn_error_code": null, - "evn_escalation_name": null, - "evn_escalation_code": null, - "evn_message": "LEAD", - "evn_operation_name": null, - "evn_operation_implementation_ref": null, - "evn_time_date": null, - "evn_time_cycle": null, - "evn_time_duration": null, - "evn_behavior": "CATCH", - "bou_x": 367, - "bou_y": 32, - "bou_width": 33, - "bou_height": 33, - "bou_container": "bpmnDiagram", - "bou_element_id": "70770714052b04ccbda05a2045860900" - }, - { - "evn_uid": "57589846552b05b73daea69075516155", - "evn_name": "End # 1", - "evn_type": "END", - "evn_marker": "EMPTY", - "evn_is_interrupting": true, - "evn_cancel_activity": false, - "evn_activity_ref": null, - "evn_wait_for_completion": false, - "evn_error_name": null, - "evn_error_code": null, - "evn_escalation_name": null, - "evn_escalation_code": null, - "evn_message": "", - "evn_operation_name": null, - "evn_operation_implementation_ref": null, - "evn_time_date": null, - "evn_time_cycle": null, - "evn_time_duration": null, - "evn_behavior": "THROW", - "bou_x": 579, - "bou_y": 621, - "bou_width": 33, - "bou_height": 33, - "bou_container": "bpmnDiagram", - "bou_element_id": "70770714052b04ccbda05a2045860900" - } - ], - "gateways": [ - { - "gat_uid": "37050857352b04ceada1799074850936", - "gat_name": "Parallel by Evaluation # 1", - "gat_type": "PARALLEL_EVALUATION", - "gat_direction": null, - "gat_instantiate": false, - "gat_event_gateway_type": "NONE", - "gat_activation_count": 0, - "gat_waiting_for_start": true, - "gat_default_flow": 0, - "bou_x": 363, - "bou_y": 205, - "bou_width": 45, - "bou_height": 45, - "bou_container": "bpmnDiagram", - "bou_element_id": "70770714052b04ccbda05a2045860900" - }, - { - "gat_uid": "96977315752b04d25da5fb6015463105", - "gat_name": "Parallel Join # 1", - "gat_type": "PARALLEL_JOIN", - "gat_direction": null, - "gat_instantiate": false, - "gat_event_gateway_type": "NONE", - "gat_activation_count": 0, - "gat_waiting_for_start": true, - "gat_default_flow": 0, - "bou_x": 391, - "bou_y": 457, - "bou_width": 45, - "bou_height": 45, - "bou_container": "bpmnDiagram", - "bou_element_id": "70770714052b04ccbda05a2045860900" - } - ], - "flows": [ - { - "flo_uid": "85852223452b04cd9da0d24062477197", - "flo_type": "SEQUENCE", - "flo_name": null, - "flo_element_origin": "55171305452b04cd3da08c9074517180", - "flo_element_origin_type": "bpmnEvent", - "flo_element_dest": "20130110852b04cd0da0710001476342", - "flo_element_dest_type": "bpmnActivity", - "flo_is_inmediate": true, - "flo_condition": null, - "flo_state": [ - { - "x": 382, - "y": 67 - }, - { - "x": 382, - "y": 87 - }, - { - "x": 383, - "y": 87 - }, - { - "x": 383, - "y": 108 - } - ], - "flo_x1": 382, - "flo_y1": 114, - "flo_x2": 388, - "flo_y2": 114 - }, - { - "flo_uid": "98521752352b04cf9da1bc8031684305", - "flo_type": "SEQUENCE", - "flo_name": null, - "flo_element_origin": "20130110852b04cd0da0710001476342", - "flo_element_origin_type": "bpmnActivity", - "flo_element_dest": "37050857352b04ceada1799074850936", - "flo_element_dest_type": "bpmnGateway", - "flo_is_inmediate": true, - "flo_condition": null, - "flo_state": [ - { - "x": 383, - "y": 163 - }, - { - "x": 383, - "y": 184 - }, - { - "x": 386, - "y": 184 - }, - { - "x": 386, - "y": 205 - } - ], - "flo_x1": 383, - "flo_y1": 205, - "flo_x2": 386, - "flo_y2": 205 - }, - { - "flo_uid": "51012823052b04d00da25b0076746454", - "flo_type": "SEQUENCE", - "flo_name": null, - "flo_element_origin": "37050857352b04ceada1799074850936", - "flo_element_origin_type": "bpmnGateway", - "flo_element_dest": "55963679852b04cfdda1ca7057330775", - "flo_element_dest_type": "bpmnActivity", - "flo_is_inmediate": true, - "flo_condition": null, - "flo_state": [ - { - "x": 386, - "y": 250 - }, - { - "x": 386, - "y": 287 - }, - { - "x": 184, - "y": 287 - }, - { - "x": 184, - "y": 325 - } - ], - "flo_x1": 386, - "flo_y1": 325, - "flo_x2": 223, - "flo_y2": 325 - }, - { - "flo_uid": "21566164052b04d06da2be5053173210", - "flo_type": "SEQUENCE", - "flo_name": null, - "flo_element_origin": "37050857352b04ceada1799074850936", - "flo_element_origin_type": "bpmnGateway", - "flo_element_dest": "36275645952b04d03da2683059221904", - "flo_element_dest_type": "bpmnActivity", - "flo_is_inmediate": true, - "flo_condition": null, - "flo_state": [ - { - "x": 386, - "y": 250 - }, - { - "x": 386, - "y": 288 - }, - { - "x": 385, - "y": 288 - }, - { - "x": 385, - "y": 327 - } - ], - "flo_x1": 386, - "flo_y1": 336, - "flo_x2": 439, - "flo_y2": 336 - }, - { - "flo_uid": "13502002652b04d0eda4297008861549", - "flo_type": "SEQUENCE", - "flo_name": null, - "flo_element_origin": "37050857352b04ceada1799074850936", - "flo_element_origin_type": "bpmnGateway", - "flo_element_dest": "39924412652b04d0bda3cc4088664712", - "flo_element_dest_type": "bpmnActivity", - "flo_is_inmediate": true, - "flo_condition": null, - "flo_state": [ - { - "x": 386, - "y": 250 - }, - { - "x": 386, - "y": 289 - }, - { - "x": 516, - "y": 289 - }, - { - "x": 516, - "y": 329 - } - ], - "flo_x1": 386, - "flo_y1": 341, - "flo_x2": 556, - "flo_y2": 341, - "_action": "CREATE" - }, - { - "flo_uid": "51780192952b04d1ada5389065057435", - "flo_type": "SEQUENCE", - "flo_name": null, - "flo_element_origin": "37050857352b04ceada1799074850936", - "flo_element_origin_type": "bpmnGateway", - "flo_element_dest": "81865611252b04d14da4f39027749188", - "flo_element_dest_type": "bpmnActivity", - "flo_is_inmediate": true, - "flo_condition": null, - "flo_state": [ - { - "x": 386, - "y": 250 - }, - { - "x": 386, - "y": 289 - }, - { - "x": 683, - "y": 289 - }, - { - "x": 683, - "y": 329 - } - ], - "flo_x1": 386, - "flo_y1": 329, - "flo_x2": 683, - "flo_y2": 329 - }, - { - "flo_uid": "11527570252b04d29da6573070436369", - "flo_type": "SEQUENCE", - "flo_name": null, - "flo_element_origin": "36275645952b04d03da2683059221904", - "flo_element_origin_type": "bpmnActivity", - "flo_element_dest": "96977315752b04d25da5fb6015463105", - "flo_element_dest_type": "bpmnGateway", - "flo_is_inmediate": true, - "flo_condition": null, - "flo_state": [ - { - "x": 385, - "y": 382 - }, - { - "x": 385, - "y": 419 - }, - { - "x": 414, - "y": 419 - }, - { - "x": 414, - "y": 457 - } - ], - "flo_x1": 385, - "flo_y1": 480, - "flo_x2": 414, - "flo_y2": 480 - }, - { - "flo_uid": "99492263452b04d2dda6d16026220307", - "flo_type": "SEQUENCE", - "flo_name": null, - "flo_element_origin": "39924412652b04d0bda3cc4088664712", - "flo_element_origin_type": "bpmnActivity", - "flo_element_dest": "96977315752b04d25da5fb6015463105", - "flo_element_dest_type": "bpmnGateway", - "flo_is_inmediate": true, - "flo_condition": null, - "flo_state": [ - { - "x": 516, - "y": 384 - }, - { - "x": 516, - "y": 420 - }, - { - "x": 414, - "y": 420 - }, - { - "x": 414, - "y": 457 - } - ], - "flo_x1": 516, - "flo_y1": 480, - "flo_x2": 414, - "flo_y2": 480 - }, - { - "flo_uid": "61995297952b04d31da7337053386832", - "flo_type": "SEQUENCE", - "flo_name": null, - "flo_element_origin": "81865611252b04d14da4f39027749188", - "flo_element_origin_type": "bpmnActivity", - "flo_element_dest": "96977315752b04d25da5fb6015463105", - "flo_element_dest_type": "bpmnGateway", - "flo_is_inmediate": true, - "flo_condition": null, - "flo_state": [ - { - "x": 683, - "y": 384 - }, - { - "x": 683, - "y": 480 - }, - { - "x": 436, - "y": 480 - } - ], - "flo_x1": 683, - "flo_y1": 503, - "flo_x2": 436, - "flo_y2": 503 - }, - { - "flo_uid": "52373453752b04d34da7826007505462", - "flo_type": "SEQUENCE", - "flo_name": null, - "flo_element_origin": "55963679852b04cfdda1ca7057330775", - "flo_element_origin_type": "bpmnActivity", - "flo_element_dest": "96977315752b04d25da5fb6015463105", - "flo_element_dest_type": "bpmnGateway", - "flo_is_inmediate": true, - "flo_condition": null, - "flo_state": [ - { - "x": 184, - "y": 380 - }, - { - "x": 184, - "y": 480 - }, - { - "x": 391, - "y": 480 - } - ], - "flo_x1": 184, - "flo_y1": 503, - "flo_x2": 391, - "flo_y2": 503 - }, - { - "flo_uid": "98839915852b05b6cdab1d9031584510", - "flo_type": "SEQUENCE", - "flo_name": null, - "flo_element_origin": "96977315752b04d25da5fb6015463105", - "flo_element_origin_type": "bpmnGateway", - "flo_element_dest": "43669577152b05b69daabe5029145631", - "flo_element_dest_type": "bpmnActivity", - "flo_is_inmediate": true, - "flo_condition": null, - "flo_state": [ - { - "x": 414, - "y": 457 - }, - { - "x": 414, - "y": 437 - }, - { - "x": 478, - "y": 437 - }, - { - "x": 478, - "y": 529 - } - ], - "flo_x1": 414, - "flo_y1": 600, - "flo_x2": 443, - "flo_y2": 600 - }, - { - "flo_uid": "30547450952b05b75daefd9056968485", - "flo_type": "SEQUENCE", - "flo_name": null, - "flo_element_origin": "43669577152b05b69daabe5029145631", - "flo_element_origin_type": "bpmnActivity", - "flo_element_dest": "57589846552b05b73daea69075516155", - "flo_element_dest_type": "bpmnEvent", - "flo_is_inmediate": true, - "flo_condition": null, - "flo_state": [ - { - "x": 478, - "y": 529 - }, - { - "x": 478, - "y": 509 - }, - { - "x": 594, - "y": 509 - }, - { - "x": 594, - "y": 619 - } - ], - "flo_x1": 478, - "flo_y1": 664, - "flo_x2": 531, - "flo_y2": 664 - } - ], - "artifacts": [] - } - ] -} From d11288aa60825d6afb7877a5da83fcce15efc009 Mon Sep 17 00:00:00 2001 From: Erik Amaru Ortiz Date: Wed, 7 May 2014 09:24:46 -0400 Subject: [PATCH 6/6] Litle update for Exporter class, export_version metadata was added, and a ")" char was removed from export_datetime meta key --- .../src/ProcessMaker/Exporter/Exporter.php | 43 +++++++++++++------ .../src/ProcessMaker/Services/Api/Project.php | 1 + 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/Exporter/Exporter.php b/workflow/engine/src/ProcessMaker/Exporter/Exporter.php index bdb6b2231..df6c61c7a 100644 --- a/workflow/engine/src/ProcessMaker/Exporter/Exporter.php +++ b/workflow/engine/src/ProcessMaker/Exporter/Exporter.php @@ -21,7 +21,15 @@ abstract class Exporter */ protected $bpmnProject; - protected $projectData; + /** + * @var array + */ + protected $projectData = array(); + + /** + * @var array + */ + protected $metadata = array(); public function __construct($prjUid) { @@ -29,6 +37,16 @@ abstract class Exporter $this->bpmnProject = Project\Bpmn::load($prjUid); $this->projectData = $this->bpmnProject->getProject(); + + $this->metadata = array( + "vendor_version" => \System::getVersion(), + "vendor_version_code" => "Michelangelo", + "export_timestamp" => date("U"), + "export_datetime" => date("Y-m-d\TH:i:sP"), + "export_server_addr" => isset($_SERVER["SERVER_ADDR"]) ? $_SERVER["SERVER_ADDR"].":".$_SERVER["SERVER_PORT"] : "Unknown", + "export_server_os" => PHP_OS , + "export_server_php_version" => PHP_VERSION_ID, + ); } /** @@ -73,6 +91,7 @@ abstract class Exporter $data = array(); $data["metadata"] = $this->getMetadata(); + $data["metadata"]["workspace"] = defined("SYS_SYS") ? SYS_SYS : "Unknown"; $data["metadata"]["name"] = $this->getProjectName(); $data["metadata"]["uid"] = $this->getProjectUid(); @@ -166,22 +185,22 @@ abstract class Exporter return self::VERSION; } + public function setMetadata($key, $value) + { + $this->metadata[$key] = $value; + } + /** * Returns all metadata to include on export content * * @return array */ - public function getMetadata() + public function getMetadata($key = "", $default = "") { - return array( - "vendor_version" => \System::getVersion(), - "vendor_version_code" => "Michelangelo", - "export_timestamp" => date("U"), - "export_datetime" => date("Y-m-d\TH:i:sP)"), - "export_server_addr" => isset($_SERVER["SERVER_ADDR"]) ? $_SERVER["SERVER_ADDR"].":".$_SERVER["SERVER_PORT"] : "Unknown", - "export_server_os" => PHP_OS , - "export_server_php_version" => PHP_VERSION_ID, - "workspace" => defined("SYS_SYS") ? SYS_SYS : "Unknown", - ); + if (! empty($key)) { + return isset($this->metadata[$key]) ? $this->metadata[$key] : $default; + } else { + return $this->metadata; + } } } \ No newline at end of file diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Project.php b/workflow/engine/src/ProcessMaker/Services/Api/Project.php index b77e43511..e78448041 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api/Project.php +++ b/workflow/engine/src/ProcessMaker/Services/Api/Project.php @@ -101,6 +101,7 @@ class Project extends Api $version = \ProcessMaker\Util\Common::getLastVersion($outputDir . $exporter->getProjectName() . "-*.pmx") + 1; $outputFilename = $outputDir . sprintf("%s-%s.%s", $exporter->getProjectName(), $version, "pmx"); + $exporter->setMetadata("export_version", $version); $exporter->saveExport($outputFilename); $httpStream = new \ProcessMaker\Util\IO\HttpStream();