diff --git a/workflow/engine/classes/model/Process.php b/workflow/engine/classes/model/Process.php index a47a68306..5e1c751f3 100755 --- a/workflow/engine/classes/model/Process.php +++ b/workflow/engine/classes/model/Process.php @@ -173,13 +173,13 @@ class Process extends BaseProcess $this->setProTimeunit( 'DAYS' ); $this->setProStatus( 'ACTIVE' ); $this->setProTypeDay( '' ); - $this->setProType( 'NORMAL' ); + $this->setProType((isset($aData["PRO_TYPE"]))? $aData["PRO_TYPE"]: "NORMAL"); $this->setProAssignment( 'FALSE' ); $this->setProShowMap( '' ); $this->setProShowMessage( '' ); $this->setProShowDelegate( '' ); $this->setProShowDynaform( '' ); - $this->setProCategory( $aData['PRO_CATEGORY'] ); + $this->setProCategory((isset($aData["PRO_CATEGORY"]))? $aData["PRO_CATEGORY"]: ""); $this->setProSubCategory( '' ); $this->setProIndustry( '' ); $this->setProCreateDate( date("Y-m-d H:i:s") ); diff --git a/workflow/engine/classes/model/map/ProcessMapBuilder.php b/workflow/engine/classes/model/map/ProcessMapBuilder.php index ab4a2a653..087ea7644 100755 --- a/workflow/engine/classes/model/map/ProcessMapBuilder.php +++ b/workflow/engine/classes/model/map/ProcessMapBuilder.php @@ -77,7 +77,7 @@ class ProcessMapBuilder $tMap->addColumn('PRO_TYPE_DAY', 'ProTypeDay', 'string', CreoleTypes::CHAR, true, 1); - $tMap->addColumn('PRO_TYPE', 'ProType', 'string', CreoleTypes::VARCHAR, true, 20); + $tMap->addColumn('PRO_TYPE', 'ProType', 'string', CreoleTypes::VARCHAR, true, 256); $tMap->addColumn('PRO_ASSIGNMENT', 'ProAssignment', 'string', CreoleTypes::VARCHAR, true, 20); @@ -87,6 +87,8 @@ class ProcessMapBuilder $tMap->addColumn('PRO_SUBPROCESS', 'ProSubprocess', 'int', CreoleTypes::TINYINT, true, null); + $tMap->addColumn('PRO_TRI_OPEN', 'ProTriOpen', 'string', CreoleTypes::VARCHAR, true, 32); + $tMap->addColumn('PRO_TRI_DELETED', 'ProTriDeleted', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addColumn('PRO_TRI_CANCELED', 'ProTriCanceled', 'string', CreoleTypes::VARCHAR, true, 32); @@ -137,8 +139,6 @@ class ProcessMapBuilder $tMap->addValidator('PRO_STATUS', 'validValues', 'propel.validator.ValidValuesValidator', 'ACTIVE|INACTIVE|DISABLED', 'Please select a valid Process Status.'); - $tMap->addValidator('PRO_TYPE', 'validValues', 'propel.validator.ValidValuesValidator', 'NORMAL', 'Please select a valid Process Type.'); - $tMap->addValidator('PRO_ASSIGNMENT', 'validValues', 'propel.validator.ValidValuesValidator', 'TRUE|FALSE', 'Please select a valid Process Assignment'); } // doBuild() diff --git a/workflow/engine/classes/model/om/BaseProcessPeer.php b/workflow/engine/classes/model/om/BaseProcessPeer.php index 40addd748..11aea4ff8 100755 --- a/workflow/engine/classes/model/om/BaseProcessPeer.php +++ b/workflow/engine/classes/model/om/BaseProcessPeer.php @@ -670,9 +670,6 @@ abstract class BaseProcessPeer if ($obj->isNew() || $obj->isColumnModified(ProcessPeer::PRO_STATUS)) $columns[ProcessPeer::PRO_STATUS] = $obj->getProStatus(); - if ($obj->isNew() || $obj->isColumnModified(ProcessPeer::PRO_TYPE)) - $columns[ProcessPeer::PRO_TYPE] = $obj->getProType(); - if ($obj->isNew() || $obj->isColumnModified(ProcessPeer::PRO_ASSIGNMENT)) $columns[ProcessPeer::PRO_ASSIGNMENT] = $obj->getProAssignment(); diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index 8408509b1..577c1511f 100755 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -835,7 +835,7 @@ - + @@ -870,9 +870,6 @@ - - - @@ -5212,4 +5209,3 @@ - diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql index 4aea764b5..715c6c08e 100755 --- a/workflow/engine/data/mysql/schema.sql +++ b/workflow/engine/data/mysql/schema.sql @@ -404,7 +404,7 @@ CREATE TABLE `PROCESS` `PRO_TIMEUNIT` VARCHAR(20) default 'DAYS' NOT NULL, `PRO_STATUS` VARCHAR(20) default 'ACTIVE' NOT NULL, `PRO_TYPE_DAY` CHAR(1) default '0' NOT NULL, - `PRO_TYPE` VARCHAR(20) default 'NORMAL' NOT NULL, + `PRO_TYPE` VARCHAR(256) default 'NORMAL' NOT NULL, `PRO_ASSIGNMENT` VARCHAR(20) default 'FALSE' NOT NULL, `PRO_SHOW_MAP` TINYINT default 1 NOT NULL, `PRO_SHOW_MESSAGE` TINYINT default 1 NOT NULL, diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Process.php b/workflow/engine/src/ProcessMaker/BusinessModel/Process.php index 8347dce10..8cee2a521 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Process.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Process.php @@ -16,7 +16,7 @@ class Process "PRO_TIMEUNIT" => array("type" => "string", "required" => false, "empty" => false, "defaultValues" => array("DAYS"), "fieldNameAux" => "processTimeunit"), "PRO_STATUS" => array("type" => "string", "required" => true, "empty" => false, "defaultValues" => array("ACTIVE", "INACTIVE"), "fieldNameAux" => "processStatus"), "PRO_TYPE_DAY" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "processTypeDay"), - "PRO_TYPE" => array("type" => "string", "required" => false, "empty" => false, "defaultValues" => array("NORMAL"), "fieldNameAux" => "processType"), + "PRO_TYPE" => array("type" => "string", "required" => false, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "processType"), "PRO_ASSIGNMENT" => array("type" => "int", "required" => false, "empty" => false, "defaultValues" => array(0, 1), "fieldNameAux" => "processAssignment"), "PRO_SHOW_MAP" => array("type" => "int", "required" => false, "empty" => false, "defaultValues" => array(0, 1), "fieldNameAux" => "processShowMap"), "PRO_SHOW_MESSAGE" => array("type" => "int", "required" => false, "empty" => false, "defaultValues" => array(0, 1), "fieldNameAux" => "processShowMessage"), diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php index 44cbcd12f..3b8b2ffe1 100755 --- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php +++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php @@ -77,6 +77,14 @@ class BpmnWorkflow extends Project\Bpmn $wpData["PRO_CREATE_USER"] = $data["PRJ_AUTHOR"]; } + if (array_key_exists("PRJ_TYPE", $data)) { + $wpData["PRO_TYPE"] = $data["PRJ_TYPE"]; + } + + if (array_key_exists("PRJ_CATEGORY", $data)) { + $wpData["PRO_CATEGORY"] = $data["PRJ_CATEGORY"]; + } + $this->wp = new Project\Workflow(); $this->wp->create($wpData); @@ -1208,6 +1216,14 @@ class BpmnWorkflow extends Project\Bpmn $data["PRJ_UID"] = $projectData["prj_uid"]; $data["PRJ_AUTHOR"] = $projectData["prj_author"]; + if (isset($projectData["prj_type"])) { + $data["PRJ_TYPE"] = $projectData["prj_type"]; + } + + if (isset($projectData["prj_category"])) { + $data["PRJ_CATEGORY"] = $projectData["prj_category"]; + } + $bwp->create($data); $diagramData = $processData = array();