diff --git a/workflow/engine/classes/model/map/ProcessMapBuilder.php b/workflow/engine/classes/model/map/ProcessMapBuilder.php index 2987fc679..0e8b46e40 100644 --- a/workflow/engine/classes/model/map/ProcessMapBuilder.php +++ b/workflow/engine/classes/model/map/ProcessMapBuilder.php @@ -91,6 +91,8 @@ class ProcessMapBuilder $tMap->addColumn('PRO_SUBPROCESS', 'ProSubprocess', 'int', CreoleTypes::TINYINT, true, null); + $tMap->addColumn('PRO_TRI_CREATE', 'ProTriCreate', 'string', CreoleTypes::VARCHAR, true, 32); + $tMap->addColumn('PRO_TRI_OPEN', 'ProTriOpen', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addColumn('PRO_TRI_DELETED', 'ProTriDeleted', 'string', CreoleTypes::VARCHAR, true, 32); diff --git a/workflow/engine/classes/model/om/BaseProcess.php b/workflow/engine/classes/model/om/BaseProcess.php index 07501717c..9f1b7b169 100644 --- a/workflow/engine/classes/model/om/BaseProcess.php +++ b/workflow/engine/classes/model/om/BaseProcess.php @@ -105,6 +105,12 @@ abstract class BaseProcess extends BaseObject implements Persistent */ protected $pro_subprocess = 0; + /** + * The value for the pro_tri_create field. + * @var string + */ + protected $pro_tri_create = ''; + /** * The value for the pro_tri_open field. * @var string @@ -418,6 +424,17 @@ abstract class BaseProcess extends BaseObject implements Persistent return $this->pro_subprocess; } + /** + * Get the [pro_tri_create] column value. + * + * @return string + */ + public function getProTriCreate() + { + + return $this->pro_tri_create; + } + /** * Get the [pro_tri_open] column value. * @@ -1026,6 +1043,28 @@ abstract class BaseProcess extends BaseObject implements Persistent } // setProSubprocess() + /** + * Set the value of [pro_tri_create] column. + * + * @param string $v new value + * @return void + */ + public function setProTriCreate($v) + { + + // Since the native PHP type for this column is string, + // we will cast the input to a string (if it is not). + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + + if ($this->pro_tri_create !== $v || $v === '') { + $this->pro_tri_create = $v; + $this->modifiedColumns[] = ProcessPeer::PRO_TRI_CREATE; + } + + } // setProTriCreate() + /** * Set the value of [pro_tri_open] column. * @@ -1649,64 +1688,66 @@ abstract class BaseProcess extends BaseObject implements Persistent $this->pro_subprocess = $rs->getInt($startcol + 12); - $this->pro_tri_open = $rs->getString($startcol + 13); + $this->pro_tri_create = $rs->getString($startcol + 13); - $this->pro_tri_deleted = $rs->getString($startcol + 14); + $this->pro_tri_open = $rs->getString($startcol + 14); - $this->pro_tri_canceled = $rs->getString($startcol + 15); + $this->pro_tri_deleted = $rs->getString($startcol + 15); - $this->pro_tri_paused = $rs->getString($startcol + 16); + $this->pro_tri_canceled = $rs->getString($startcol + 16); - $this->pro_tri_reassigned = $rs->getString($startcol + 17); + $this->pro_tri_paused = $rs->getString($startcol + 17); - $this->pro_tri_unpaused = $rs->getString($startcol + 18); + $this->pro_tri_reassigned = $rs->getString($startcol + 18); - $this->pro_type_process = $rs->getString($startcol + 19); + $this->pro_tri_unpaused = $rs->getString($startcol + 19); - $this->pro_show_delegate = $rs->getInt($startcol + 20); + $this->pro_type_process = $rs->getString($startcol + 20); - $this->pro_show_dynaform = $rs->getInt($startcol + 21); + $this->pro_show_delegate = $rs->getInt($startcol + 21); - $this->pro_category = $rs->getString($startcol + 22); + $this->pro_show_dynaform = $rs->getInt($startcol + 22); - $this->pro_sub_category = $rs->getString($startcol + 23); + $this->pro_category = $rs->getString($startcol + 23); - $this->pro_industry = $rs->getInt($startcol + 24); + $this->pro_sub_category = $rs->getString($startcol + 24); - $this->pro_update_date = $rs->getTimestamp($startcol + 25, null); + $this->pro_industry = $rs->getInt($startcol + 25); - $this->pro_create_date = $rs->getTimestamp($startcol + 26, null); + $this->pro_update_date = $rs->getTimestamp($startcol + 26, null); - $this->pro_create_user = $rs->getString($startcol + 27); + $this->pro_create_date = $rs->getTimestamp($startcol + 27, null); - $this->pro_height = $rs->getInt($startcol + 28); + $this->pro_create_user = $rs->getString($startcol + 28); - $this->pro_width = $rs->getInt($startcol + 29); + $this->pro_height = $rs->getInt($startcol + 29); - $this->pro_title_x = $rs->getInt($startcol + 30); + $this->pro_width = $rs->getInt($startcol + 30); - $this->pro_title_y = $rs->getInt($startcol + 31); + $this->pro_title_x = $rs->getInt($startcol + 31); - $this->pro_debug = $rs->getInt($startcol + 32); + $this->pro_title_y = $rs->getInt($startcol + 32); - $this->pro_dynaforms = $rs->getString($startcol + 33); + $this->pro_debug = $rs->getInt($startcol + 33); - $this->pro_derivation_screen_tpl = $rs->getString($startcol + 34); + $this->pro_dynaforms = $rs->getString($startcol + 34); - $this->pro_cost = $rs->getFloat($startcol + 35); + $this->pro_derivation_screen_tpl = $rs->getString($startcol + 35); - $this->pro_unit_cost = $rs->getString($startcol + 36); + $this->pro_cost = $rs->getFloat($startcol + 36); - $this->pro_itee = $rs->getInt($startcol + 37); + $this->pro_unit_cost = $rs->getString($startcol + 37); - $this->pro_action_done = $rs->getString($startcol + 38); + $this->pro_itee = $rs->getInt($startcol + 38); + + $this->pro_action_done = $rs->getString($startcol + 39); $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 39; // 39 = ProcessPeer::NUM_COLUMNS - ProcessPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 40; // 40 = ProcessPeer::NUM_COLUMNS - ProcessPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating Process object", $e); @@ -1950,81 +1991,84 @@ abstract class BaseProcess extends BaseObject implements Persistent return $this->getProSubprocess(); break; case 13: - return $this->getProTriOpen(); + return $this->getProTriCreate(); break; case 14: - return $this->getProTriDeleted(); + return $this->getProTriOpen(); break; case 15: - return $this->getProTriCanceled(); + return $this->getProTriDeleted(); break; case 16: - return $this->getProTriPaused(); + return $this->getProTriCanceled(); break; case 17: - return $this->getProTriReassigned(); + return $this->getProTriPaused(); break; case 18: - return $this->getProTriUnpaused(); + return $this->getProTriReassigned(); break; case 19: - return $this->getProTypeProcess(); + return $this->getProTriUnpaused(); break; case 20: - return $this->getProShowDelegate(); + return $this->getProTypeProcess(); break; case 21: - return $this->getProShowDynaform(); + return $this->getProShowDelegate(); break; case 22: - return $this->getProCategory(); + return $this->getProShowDynaform(); break; case 23: - return $this->getProSubCategory(); + return $this->getProCategory(); break; case 24: - return $this->getProIndustry(); + return $this->getProSubCategory(); break; case 25: - return $this->getProUpdateDate(); + return $this->getProIndustry(); break; case 26: - return $this->getProCreateDate(); + return $this->getProUpdateDate(); break; case 27: - return $this->getProCreateUser(); + return $this->getProCreateDate(); break; case 28: - return $this->getProHeight(); + return $this->getProCreateUser(); break; case 29: - return $this->getProWidth(); + return $this->getProHeight(); break; case 30: - return $this->getProTitleX(); + return $this->getProWidth(); break; case 31: - return $this->getProTitleY(); + return $this->getProTitleX(); break; case 32: - return $this->getProDebug(); + return $this->getProTitleY(); break; case 33: - return $this->getProDynaforms(); + return $this->getProDebug(); break; case 34: - return $this->getProDerivationScreenTpl(); + return $this->getProDynaforms(); break; case 35: - return $this->getProCost(); + return $this->getProDerivationScreenTpl(); break; case 36: - return $this->getProUnitCost(); + return $this->getProCost(); break; case 37: - return $this->getProItee(); + return $this->getProUnitCost(); break; case 38: + return $this->getProItee(); + break; + case 39: return $this->getProActionDone(); break; default: @@ -2060,32 +2104,33 @@ abstract class BaseProcess extends BaseObject implements Persistent $keys[10] => $this->getProShowMap(), $keys[11] => $this->getProShowMessage(), $keys[12] => $this->getProSubprocess(), - $keys[13] => $this->getProTriOpen(), - $keys[14] => $this->getProTriDeleted(), - $keys[15] => $this->getProTriCanceled(), - $keys[16] => $this->getProTriPaused(), - $keys[17] => $this->getProTriReassigned(), - $keys[18] => $this->getProTriUnpaused(), - $keys[19] => $this->getProTypeProcess(), - $keys[20] => $this->getProShowDelegate(), - $keys[21] => $this->getProShowDynaform(), - $keys[22] => $this->getProCategory(), - $keys[23] => $this->getProSubCategory(), - $keys[24] => $this->getProIndustry(), - $keys[25] => $this->getProUpdateDate(), - $keys[26] => $this->getProCreateDate(), - $keys[27] => $this->getProCreateUser(), - $keys[28] => $this->getProHeight(), - $keys[29] => $this->getProWidth(), - $keys[30] => $this->getProTitleX(), - $keys[31] => $this->getProTitleY(), - $keys[32] => $this->getProDebug(), - $keys[33] => $this->getProDynaforms(), - $keys[34] => $this->getProDerivationScreenTpl(), - $keys[35] => $this->getProCost(), - $keys[36] => $this->getProUnitCost(), - $keys[37] => $this->getProItee(), - $keys[38] => $this->getProActionDone(), + $keys[13] => $this->getProTriCreate(), + $keys[14] => $this->getProTriOpen(), + $keys[15] => $this->getProTriDeleted(), + $keys[16] => $this->getProTriCanceled(), + $keys[17] => $this->getProTriPaused(), + $keys[18] => $this->getProTriReassigned(), + $keys[19] => $this->getProTriUnpaused(), + $keys[20] => $this->getProTypeProcess(), + $keys[21] => $this->getProShowDelegate(), + $keys[22] => $this->getProShowDynaform(), + $keys[23] => $this->getProCategory(), + $keys[24] => $this->getProSubCategory(), + $keys[25] => $this->getProIndustry(), + $keys[26] => $this->getProUpdateDate(), + $keys[27] => $this->getProCreateDate(), + $keys[28] => $this->getProCreateUser(), + $keys[29] => $this->getProHeight(), + $keys[30] => $this->getProWidth(), + $keys[31] => $this->getProTitleX(), + $keys[32] => $this->getProTitleY(), + $keys[33] => $this->getProDebug(), + $keys[34] => $this->getProDynaforms(), + $keys[35] => $this->getProDerivationScreenTpl(), + $keys[36] => $this->getProCost(), + $keys[37] => $this->getProUnitCost(), + $keys[38] => $this->getProItee(), + $keys[39] => $this->getProActionDone(), ); return $result; } @@ -2157,81 +2202,84 @@ abstract class BaseProcess extends BaseObject implements Persistent $this->setProSubprocess($value); break; case 13: - $this->setProTriOpen($value); + $this->setProTriCreate($value); break; case 14: - $this->setProTriDeleted($value); + $this->setProTriOpen($value); break; case 15: - $this->setProTriCanceled($value); + $this->setProTriDeleted($value); break; case 16: - $this->setProTriPaused($value); + $this->setProTriCanceled($value); break; case 17: - $this->setProTriReassigned($value); + $this->setProTriPaused($value); break; case 18: - $this->setProTriUnpaused($value); + $this->setProTriReassigned($value); break; case 19: - $this->setProTypeProcess($value); + $this->setProTriUnpaused($value); break; case 20: - $this->setProShowDelegate($value); + $this->setProTypeProcess($value); break; case 21: - $this->setProShowDynaform($value); + $this->setProShowDelegate($value); break; case 22: - $this->setProCategory($value); + $this->setProShowDynaform($value); break; case 23: - $this->setProSubCategory($value); + $this->setProCategory($value); break; case 24: - $this->setProIndustry($value); + $this->setProSubCategory($value); break; case 25: - $this->setProUpdateDate($value); + $this->setProIndustry($value); break; case 26: - $this->setProCreateDate($value); + $this->setProUpdateDate($value); break; case 27: - $this->setProCreateUser($value); + $this->setProCreateDate($value); break; case 28: - $this->setProHeight($value); + $this->setProCreateUser($value); break; case 29: - $this->setProWidth($value); + $this->setProHeight($value); break; case 30: - $this->setProTitleX($value); + $this->setProWidth($value); break; case 31: - $this->setProTitleY($value); + $this->setProTitleX($value); break; case 32: - $this->setProDebug($value); + $this->setProTitleY($value); break; case 33: - $this->setProDynaforms($value); + $this->setProDebug($value); break; case 34: - $this->setProDerivationScreenTpl($value); + $this->setProDynaforms($value); break; case 35: - $this->setProCost($value); + $this->setProDerivationScreenTpl($value); break; case 36: - $this->setProUnitCost($value); + $this->setProCost($value); break; case 37: - $this->setProItee($value); + $this->setProUnitCost($value); break; case 38: + $this->setProItee($value); + break; + case 39: $this->setProActionDone($value); break; } // switch() @@ -2310,107 +2358,111 @@ abstract class BaseProcess extends BaseObject implements Persistent } if (array_key_exists($keys[13], $arr)) { - $this->setProTriOpen($arr[$keys[13]]); + $this->setProTriCreate($arr[$keys[13]]); } if (array_key_exists($keys[14], $arr)) { - $this->setProTriDeleted($arr[$keys[14]]); + $this->setProTriOpen($arr[$keys[14]]); } if (array_key_exists($keys[15], $arr)) { - $this->setProTriCanceled($arr[$keys[15]]); + $this->setProTriDeleted($arr[$keys[15]]); } if (array_key_exists($keys[16], $arr)) { - $this->setProTriPaused($arr[$keys[16]]); + $this->setProTriCanceled($arr[$keys[16]]); } if (array_key_exists($keys[17], $arr)) { - $this->setProTriReassigned($arr[$keys[17]]); + $this->setProTriPaused($arr[$keys[17]]); } if (array_key_exists($keys[18], $arr)) { - $this->setProTriUnpaused($arr[$keys[18]]); + $this->setProTriReassigned($arr[$keys[18]]); } if (array_key_exists($keys[19], $arr)) { - $this->setProTypeProcess($arr[$keys[19]]); + $this->setProTriUnpaused($arr[$keys[19]]); } if (array_key_exists($keys[20], $arr)) { - $this->setProShowDelegate($arr[$keys[20]]); + $this->setProTypeProcess($arr[$keys[20]]); } if (array_key_exists($keys[21], $arr)) { - $this->setProShowDynaform($arr[$keys[21]]); + $this->setProShowDelegate($arr[$keys[21]]); } if (array_key_exists($keys[22], $arr)) { - $this->setProCategory($arr[$keys[22]]); + $this->setProShowDynaform($arr[$keys[22]]); } if (array_key_exists($keys[23], $arr)) { - $this->setProSubCategory($arr[$keys[23]]); + $this->setProCategory($arr[$keys[23]]); } if (array_key_exists($keys[24], $arr)) { - $this->setProIndustry($arr[$keys[24]]); + $this->setProSubCategory($arr[$keys[24]]); } if (array_key_exists($keys[25], $arr)) { - $this->setProUpdateDate($arr[$keys[25]]); + $this->setProIndustry($arr[$keys[25]]); } if (array_key_exists($keys[26], $arr)) { - $this->setProCreateDate($arr[$keys[26]]); + $this->setProUpdateDate($arr[$keys[26]]); } if (array_key_exists($keys[27], $arr)) { - $this->setProCreateUser($arr[$keys[27]]); + $this->setProCreateDate($arr[$keys[27]]); } if (array_key_exists($keys[28], $arr)) { - $this->setProHeight($arr[$keys[28]]); + $this->setProCreateUser($arr[$keys[28]]); } if (array_key_exists($keys[29], $arr)) { - $this->setProWidth($arr[$keys[29]]); + $this->setProHeight($arr[$keys[29]]); } if (array_key_exists($keys[30], $arr)) { - $this->setProTitleX($arr[$keys[30]]); + $this->setProWidth($arr[$keys[30]]); } if (array_key_exists($keys[31], $arr)) { - $this->setProTitleY($arr[$keys[31]]); + $this->setProTitleX($arr[$keys[31]]); } if (array_key_exists($keys[32], $arr)) { - $this->setProDebug($arr[$keys[32]]); + $this->setProTitleY($arr[$keys[32]]); } if (array_key_exists($keys[33], $arr)) { - $this->setProDynaforms($arr[$keys[33]]); + $this->setProDebug($arr[$keys[33]]); } if (array_key_exists($keys[34], $arr)) { - $this->setProDerivationScreenTpl($arr[$keys[34]]); + $this->setProDynaforms($arr[$keys[34]]); } if (array_key_exists($keys[35], $arr)) { - $this->setProCost($arr[$keys[35]]); + $this->setProDerivationScreenTpl($arr[$keys[35]]); } if (array_key_exists($keys[36], $arr)) { - $this->setProUnitCost($arr[$keys[36]]); + $this->setProCost($arr[$keys[36]]); } if (array_key_exists($keys[37], $arr)) { - $this->setProItee($arr[$keys[37]]); + $this->setProUnitCost($arr[$keys[37]]); } if (array_key_exists($keys[38], $arr)) { - $this->setProActionDone($arr[$keys[38]]); + $this->setProItee($arr[$keys[38]]); + } + + if (array_key_exists($keys[39], $arr)) { + $this->setProActionDone($arr[$keys[39]]); } } @@ -2476,6 +2528,10 @@ abstract class BaseProcess extends BaseObject implements Persistent $criteria->add(ProcessPeer::PRO_SUBPROCESS, $this->pro_subprocess); } + if ($this->isColumnModified(ProcessPeer::PRO_TRI_CREATE)) { + $criteria->add(ProcessPeer::PRO_TRI_CREATE, $this->pro_tri_create); + } + if ($this->isColumnModified(ProcessPeer::PRO_TRI_OPEN)) { $criteria->add(ProcessPeer::PRO_TRI_OPEN, $this->pro_tri_open); } @@ -2658,6 +2714,8 @@ abstract class BaseProcess extends BaseObject implements Persistent $copyObj->setProSubprocess($this->pro_subprocess); + $copyObj->setProTriCreate($this->pro_tri_create); + $copyObj->setProTriOpen($this->pro_tri_open); $copyObj->setProTriDeleted($this->pro_tri_deleted); diff --git a/workflow/engine/classes/model/om/BaseProcessPeer.php b/workflow/engine/classes/model/om/BaseProcessPeer.php index f84bb0718..1f875d4b2 100644 --- a/workflow/engine/classes/model/om/BaseProcessPeer.php +++ b/workflow/engine/classes/model/om/BaseProcessPeer.php @@ -25,7 +25,7 @@ abstract class BaseProcessPeer const CLASS_DEFAULT = 'classes.model.Process'; /** The total number of columns. */ - const NUM_COLUMNS = 39; + const NUM_COLUMNS = 40; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -70,6 +70,9 @@ abstract class BaseProcessPeer /** the column name for the PRO_SUBPROCESS field */ const PRO_SUBPROCESS = 'PROCESS.PRO_SUBPROCESS'; + /** the column name for the PRO_TRI_CREATE field */ + const PRO_TRI_CREATE = 'PROCESS.PRO_TRI_CREATE'; + /** the column name for the PRO_TRI_OPEN field */ const PRO_TRI_OPEN = 'PROCESS.PRO_TRI_OPEN'; @@ -159,10 +162,10 @@ abstract class BaseProcessPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('ProUid', 'ProTitle', 'ProDescription', 'ProParent', 'ProTime', 'ProTimeunit', 'ProStatus', 'ProTypeDay', 'ProType', 'ProAssignment', 'ProShowMap', 'ProShowMessage', 'ProSubprocess', 'ProTriOpen', 'ProTriDeleted', 'ProTriCanceled', 'ProTriPaused', 'ProTriReassigned', 'ProTriUnpaused', 'ProTypeProcess', 'ProShowDelegate', 'ProShowDynaform', 'ProCategory', 'ProSubCategory', 'ProIndustry', 'ProUpdateDate', 'ProCreateDate', 'ProCreateUser', 'ProHeight', 'ProWidth', 'ProTitleX', 'ProTitleY', 'ProDebug', 'ProDynaforms', 'ProDerivationScreenTpl', 'ProCost', 'ProUnitCost', 'ProItee', 'ProActionDone', ), - BasePeer::TYPE_COLNAME => array (ProcessPeer::PRO_UID, ProcessPeer::PRO_TITLE, ProcessPeer::PRO_DESCRIPTION, ProcessPeer::PRO_PARENT, ProcessPeer::PRO_TIME, ProcessPeer::PRO_TIMEUNIT, ProcessPeer::PRO_STATUS, ProcessPeer::PRO_TYPE_DAY, ProcessPeer::PRO_TYPE, ProcessPeer::PRO_ASSIGNMENT, ProcessPeer::PRO_SHOW_MAP, ProcessPeer::PRO_SHOW_MESSAGE, ProcessPeer::PRO_SUBPROCESS, ProcessPeer::PRO_TRI_OPEN, ProcessPeer::PRO_TRI_DELETED, ProcessPeer::PRO_TRI_CANCELED, ProcessPeer::PRO_TRI_PAUSED, ProcessPeer::PRO_TRI_REASSIGNED, ProcessPeer::PRO_TRI_UNPAUSED, ProcessPeer::PRO_TYPE_PROCESS, ProcessPeer::PRO_SHOW_DELEGATE, ProcessPeer::PRO_SHOW_DYNAFORM, ProcessPeer::PRO_CATEGORY, ProcessPeer::PRO_SUB_CATEGORY, ProcessPeer::PRO_INDUSTRY, ProcessPeer::PRO_UPDATE_DATE, ProcessPeer::PRO_CREATE_DATE, ProcessPeer::PRO_CREATE_USER, ProcessPeer::PRO_HEIGHT, ProcessPeer::PRO_WIDTH, ProcessPeer::PRO_TITLE_X, ProcessPeer::PRO_TITLE_Y, ProcessPeer::PRO_DEBUG, ProcessPeer::PRO_DYNAFORMS, ProcessPeer::PRO_DERIVATION_SCREEN_TPL, ProcessPeer::PRO_COST, ProcessPeer::PRO_UNIT_COST, ProcessPeer::PRO_ITEE, ProcessPeer::PRO_ACTION_DONE, ), - BasePeer::TYPE_FIELDNAME => array ('PRO_UID', 'PRO_TITLE', 'PRO_DESCRIPTION', 'PRO_PARENT', 'PRO_TIME', 'PRO_TIMEUNIT', 'PRO_STATUS', 'PRO_TYPE_DAY', 'PRO_TYPE', 'PRO_ASSIGNMENT', 'PRO_SHOW_MAP', 'PRO_SHOW_MESSAGE', 'PRO_SUBPROCESS', 'PRO_TRI_OPEN', 'PRO_TRI_DELETED', 'PRO_TRI_CANCELED', 'PRO_TRI_PAUSED', 'PRO_TRI_REASSIGNED', 'PRO_TRI_UNPAUSED', 'PRO_TYPE_PROCESS', 'PRO_SHOW_DELEGATE', 'PRO_SHOW_DYNAFORM', 'PRO_CATEGORY', 'PRO_SUB_CATEGORY', 'PRO_INDUSTRY', 'PRO_UPDATE_DATE', 'PRO_CREATE_DATE', 'PRO_CREATE_USER', 'PRO_HEIGHT', 'PRO_WIDTH', 'PRO_TITLE_X', 'PRO_TITLE_Y', 'PRO_DEBUG', 'PRO_DYNAFORMS', 'PRO_DERIVATION_SCREEN_TPL', 'PRO_COST', 'PRO_UNIT_COST', 'PRO_ITEE', 'PRO_ACTION_DONE', ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, ) + BasePeer::TYPE_PHPNAME => array ('ProUid', 'ProTitle', 'ProDescription', 'ProParent', 'ProTime', 'ProTimeunit', 'ProStatus', 'ProTypeDay', 'ProType', 'ProAssignment', 'ProShowMap', 'ProShowMessage', 'ProSubprocess', 'ProTriCreate', 'ProTriOpen', 'ProTriDeleted', 'ProTriCanceled', 'ProTriPaused', 'ProTriReassigned', 'ProTriUnpaused', 'ProTypeProcess', 'ProShowDelegate', 'ProShowDynaform', 'ProCategory', 'ProSubCategory', 'ProIndustry', 'ProUpdateDate', 'ProCreateDate', 'ProCreateUser', 'ProHeight', 'ProWidth', 'ProTitleX', 'ProTitleY', 'ProDebug', 'ProDynaforms', 'ProDerivationScreenTpl', 'ProCost', 'ProUnitCost', 'ProItee', 'ProActionDone', ), + BasePeer::TYPE_COLNAME => array (ProcessPeer::PRO_UID, ProcessPeer::PRO_TITLE, ProcessPeer::PRO_DESCRIPTION, ProcessPeer::PRO_PARENT, ProcessPeer::PRO_TIME, ProcessPeer::PRO_TIMEUNIT, ProcessPeer::PRO_STATUS, ProcessPeer::PRO_TYPE_DAY, ProcessPeer::PRO_TYPE, ProcessPeer::PRO_ASSIGNMENT, ProcessPeer::PRO_SHOW_MAP, ProcessPeer::PRO_SHOW_MESSAGE, ProcessPeer::PRO_SUBPROCESS, ProcessPeer::PRO_TRI_CREATE, ProcessPeer::PRO_TRI_OPEN, ProcessPeer::PRO_TRI_DELETED, ProcessPeer::PRO_TRI_CANCELED, ProcessPeer::PRO_TRI_PAUSED, ProcessPeer::PRO_TRI_REASSIGNED, ProcessPeer::PRO_TRI_UNPAUSED, ProcessPeer::PRO_TYPE_PROCESS, ProcessPeer::PRO_SHOW_DELEGATE, ProcessPeer::PRO_SHOW_DYNAFORM, ProcessPeer::PRO_CATEGORY, ProcessPeer::PRO_SUB_CATEGORY, ProcessPeer::PRO_INDUSTRY, ProcessPeer::PRO_UPDATE_DATE, ProcessPeer::PRO_CREATE_DATE, ProcessPeer::PRO_CREATE_USER, ProcessPeer::PRO_HEIGHT, ProcessPeer::PRO_WIDTH, ProcessPeer::PRO_TITLE_X, ProcessPeer::PRO_TITLE_Y, ProcessPeer::PRO_DEBUG, ProcessPeer::PRO_DYNAFORMS, ProcessPeer::PRO_DERIVATION_SCREEN_TPL, ProcessPeer::PRO_COST, ProcessPeer::PRO_UNIT_COST, ProcessPeer::PRO_ITEE, ProcessPeer::PRO_ACTION_DONE, ), + BasePeer::TYPE_FIELDNAME => array ('PRO_UID', 'PRO_TITLE', 'PRO_DESCRIPTION', 'PRO_PARENT', 'PRO_TIME', 'PRO_TIMEUNIT', 'PRO_STATUS', 'PRO_TYPE_DAY', 'PRO_TYPE', 'PRO_ASSIGNMENT', 'PRO_SHOW_MAP', 'PRO_SHOW_MESSAGE', 'PRO_SUBPROCESS', 'PRO_TRI_CREATE', 'PRO_TRI_OPEN', 'PRO_TRI_DELETED', 'PRO_TRI_CANCELED', 'PRO_TRI_PAUSED', 'PRO_TRI_REASSIGNED', 'PRO_TRI_UNPAUSED', 'PRO_TYPE_PROCESS', 'PRO_SHOW_DELEGATE', 'PRO_SHOW_DYNAFORM', 'PRO_CATEGORY', 'PRO_SUB_CATEGORY', 'PRO_INDUSTRY', 'PRO_UPDATE_DATE', 'PRO_CREATE_DATE', 'PRO_CREATE_USER', 'PRO_HEIGHT', 'PRO_WIDTH', 'PRO_TITLE_X', 'PRO_TITLE_Y', 'PRO_DEBUG', 'PRO_DYNAFORMS', 'PRO_DERIVATION_SCREEN_TPL', 'PRO_COST', 'PRO_UNIT_COST', 'PRO_ITEE', 'PRO_ACTION_DONE', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, ) ); /** @@ -172,10 +175,10 @@ abstract class BaseProcessPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('ProUid' => 0, 'ProTitle' => 1, 'ProDescription' => 2, 'ProParent' => 3, 'ProTime' => 4, 'ProTimeunit' => 5, 'ProStatus' => 6, 'ProTypeDay' => 7, 'ProType' => 8, 'ProAssignment' => 9, 'ProShowMap' => 10, 'ProShowMessage' => 11, 'ProSubprocess' => 12, 'ProTriOpen' => 13, 'ProTriDeleted' => 14, 'ProTriCanceled' => 15, 'ProTriPaused' => 16, 'ProTriReassigned' => 17, 'ProTriUnpaused' => 18, 'ProTypeProcess' => 19, 'ProShowDelegate' => 20, 'ProShowDynaform' => 21, 'ProCategory' => 22, 'ProSubCategory' => 23, 'ProIndustry' => 24, 'ProUpdateDate' => 25, 'ProCreateDate' => 26, 'ProCreateUser' => 27, 'ProHeight' => 28, 'ProWidth' => 29, 'ProTitleX' => 30, 'ProTitleY' => 31, 'ProDebug' => 32, 'ProDynaforms' => 33, 'ProDerivationScreenTpl' => 34, 'ProCost' => 35, 'ProUnitCost' => 36, 'ProItee' => 37, 'ProActionDone' => 38, ), - BasePeer::TYPE_COLNAME => array (ProcessPeer::PRO_UID => 0, ProcessPeer::PRO_TITLE => 1, ProcessPeer::PRO_DESCRIPTION => 2, ProcessPeer::PRO_PARENT => 3, ProcessPeer::PRO_TIME => 4, ProcessPeer::PRO_TIMEUNIT => 5, ProcessPeer::PRO_STATUS => 6, ProcessPeer::PRO_TYPE_DAY => 7, ProcessPeer::PRO_TYPE => 8, ProcessPeer::PRO_ASSIGNMENT => 9, ProcessPeer::PRO_SHOW_MAP => 10, ProcessPeer::PRO_SHOW_MESSAGE => 11, ProcessPeer::PRO_SUBPROCESS => 12, ProcessPeer::PRO_TRI_OPEN => 13, ProcessPeer::PRO_TRI_DELETED => 14, ProcessPeer::PRO_TRI_CANCELED => 15, ProcessPeer::PRO_TRI_PAUSED => 16, ProcessPeer::PRO_TRI_REASSIGNED => 17, ProcessPeer::PRO_TRI_UNPAUSED => 18, ProcessPeer::PRO_TYPE_PROCESS => 19, ProcessPeer::PRO_SHOW_DELEGATE => 20, ProcessPeer::PRO_SHOW_DYNAFORM => 21, ProcessPeer::PRO_CATEGORY => 22, ProcessPeer::PRO_SUB_CATEGORY => 23, ProcessPeer::PRO_INDUSTRY => 24, ProcessPeer::PRO_UPDATE_DATE => 25, ProcessPeer::PRO_CREATE_DATE => 26, ProcessPeer::PRO_CREATE_USER => 27, ProcessPeer::PRO_HEIGHT => 28, ProcessPeer::PRO_WIDTH => 29, ProcessPeer::PRO_TITLE_X => 30, ProcessPeer::PRO_TITLE_Y => 31, ProcessPeer::PRO_DEBUG => 32, ProcessPeer::PRO_DYNAFORMS => 33, ProcessPeer::PRO_DERIVATION_SCREEN_TPL => 34, ProcessPeer::PRO_COST => 35, ProcessPeer::PRO_UNIT_COST => 36, ProcessPeer::PRO_ITEE => 37, ProcessPeer::PRO_ACTION_DONE => 38, ), - BasePeer::TYPE_FIELDNAME => array ('PRO_UID' => 0, 'PRO_TITLE' => 1, 'PRO_DESCRIPTION' => 2, 'PRO_PARENT' => 3, 'PRO_TIME' => 4, 'PRO_TIMEUNIT' => 5, 'PRO_STATUS' => 6, 'PRO_TYPE_DAY' => 7, 'PRO_TYPE' => 8, 'PRO_ASSIGNMENT' => 9, 'PRO_SHOW_MAP' => 10, 'PRO_SHOW_MESSAGE' => 11, 'PRO_SUBPROCESS' => 12, 'PRO_TRI_OPEN' => 13, 'PRO_TRI_DELETED' => 14, 'PRO_TRI_CANCELED' => 15, 'PRO_TRI_PAUSED' => 16, 'PRO_TRI_REASSIGNED' => 17, 'PRO_TRI_UNPAUSED' => 18, 'PRO_TYPE_PROCESS' => 19, 'PRO_SHOW_DELEGATE' => 20, 'PRO_SHOW_DYNAFORM' => 21, 'PRO_CATEGORY' => 22, 'PRO_SUB_CATEGORY' => 23, 'PRO_INDUSTRY' => 24, 'PRO_UPDATE_DATE' => 25, 'PRO_CREATE_DATE' => 26, 'PRO_CREATE_USER' => 27, 'PRO_HEIGHT' => 28, 'PRO_WIDTH' => 29, 'PRO_TITLE_X' => 30, 'PRO_TITLE_Y' => 31, 'PRO_DEBUG' => 32, 'PRO_DYNAFORMS' => 33, 'PRO_DERIVATION_SCREEN_TPL' => 34, 'PRO_COST' => 35, 'PRO_UNIT_COST' => 36, 'PRO_ITEE' => 37, 'PRO_ACTION_DONE' => 38, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, ) + BasePeer::TYPE_PHPNAME => array ('ProUid' => 0, 'ProTitle' => 1, 'ProDescription' => 2, 'ProParent' => 3, 'ProTime' => 4, 'ProTimeunit' => 5, 'ProStatus' => 6, 'ProTypeDay' => 7, 'ProType' => 8, 'ProAssignment' => 9, 'ProShowMap' => 10, 'ProShowMessage' => 11, 'ProSubprocess' => 12, 'ProTriCreate' => 13, 'ProTriOpen' => 14, 'ProTriDeleted' => 15, 'ProTriCanceled' => 16, 'ProTriPaused' => 17, 'ProTriReassigned' => 18, 'ProTriUnpaused' => 19, 'ProTypeProcess' => 20, 'ProShowDelegate' => 21, 'ProShowDynaform' => 22, 'ProCategory' => 23, 'ProSubCategory' => 24, 'ProIndustry' => 25, 'ProUpdateDate' => 26, 'ProCreateDate' => 27, 'ProCreateUser' => 28, 'ProHeight' => 29, 'ProWidth' => 30, 'ProTitleX' => 31, 'ProTitleY' => 32, 'ProDebug' => 33, 'ProDynaforms' => 34, 'ProDerivationScreenTpl' => 35, 'ProCost' => 36, 'ProUnitCost' => 37, 'ProItee' => 38, 'ProActionDone' => 39, ), + BasePeer::TYPE_COLNAME => array (ProcessPeer::PRO_UID => 0, ProcessPeer::PRO_TITLE => 1, ProcessPeer::PRO_DESCRIPTION => 2, ProcessPeer::PRO_PARENT => 3, ProcessPeer::PRO_TIME => 4, ProcessPeer::PRO_TIMEUNIT => 5, ProcessPeer::PRO_STATUS => 6, ProcessPeer::PRO_TYPE_DAY => 7, ProcessPeer::PRO_TYPE => 8, ProcessPeer::PRO_ASSIGNMENT => 9, ProcessPeer::PRO_SHOW_MAP => 10, ProcessPeer::PRO_SHOW_MESSAGE => 11, ProcessPeer::PRO_SUBPROCESS => 12, ProcessPeer::PRO_TRI_CREATE => 13, ProcessPeer::PRO_TRI_OPEN => 14, ProcessPeer::PRO_TRI_DELETED => 15, ProcessPeer::PRO_TRI_CANCELED => 16, ProcessPeer::PRO_TRI_PAUSED => 17, ProcessPeer::PRO_TRI_REASSIGNED => 18, ProcessPeer::PRO_TRI_UNPAUSED => 19, ProcessPeer::PRO_TYPE_PROCESS => 20, ProcessPeer::PRO_SHOW_DELEGATE => 21, ProcessPeer::PRO_SHOW_DYNAFORM => 22, ProcessPeer::PRO_CATEGORY => 23, ProcessPeer::PRO_SUB_CATEGORY => 24, ProcessPeer::PRO_INDUSTRY => 25, ProcessPeer::PRO_UPDATE_DATE => 26, ProcessPeer::PRO_CREATE_DATE => 27, ProcessPeer::PRO_CREATE_USER => 28, ProcessPeer::PRO_HEIGHT => 29, ProcessPeer::PRO_WIDTH => 30, ProcessPeer::PRO_TITLE_X => 31, ProcessPeer::PRO_TITLE_Y => 32, ProcessPeer::PRO_DEBUG => 33, ProcessPeer::PRO_DYNAFORMS => 34, ProcessPeer::PRO_DERIVATION_SCREEN_TPL => 35, ProcessPeer::PRO_COST => 36, ProcessPeer::PRO_UNIT_COST => 37, ProcessPeer::PRO_ITEE => 38, ProcessPeer::PRO_ACTION_DONE => 39, ), + BasePeer::TYPE_FIELDNAME => array ('PRO_UID' => 0, 'PRO_TITLE' => 1, 'PRO_DESCRIPTION' => 2, 'PRO_PARENT' => 3, 'PRO_TIME' => 4, 'PRO_TIMEUNIT' => 5, 'PRO_STATUS' => 6, 'PRO_TYPE_DAY' => 7, 'PRO_TYPE' => 8, 'PRO_ASSIGNMENT' => 9, 'PRO_SHOW_MAP' => 10, 'PRO_SHOW_MESSAGE' => 11, 'PRO_SUBPROCESS' => 12, 'PRO_TRI_CREATE' => 13, 'PRO_TRI_OPEN' => 14, 'PRO_TRI_DELETED' => 15, 'PRO_TRI_CANCELED' => 16, 'PRO_TRI_PAUSED' => 17, 'PRO_TRI_REASSIGNED' => 18, 'PRO_TRI_UNPAUSED' => 19, 'PRO_TYPE_PROCESS' => 20, 'PRO_SHOW_DELEGATE' => 21, 'PRO_SHOW_DYNAFORM' => 22, 'PRO_CATEGORY' => 23, 'PRO_SUB_CATEGORY' => 24, 'PRO_INDUSTRY' => 25, 'PRO_UPDATE_DATE' => 26, 'PRO_CREATE_DATE' => 27, 'PRO_CREATE_USER' => 28, 'PRO_HEIGHT' => 29, 'PRO_WIDTH' => 30, 'PRO_TITLE_X' => 31, 'PRO_TITLE_Y' => 32, 'PRO_DEBUG' => 33, 'PRO_DYNAFORMS' => 34, 'PRO_DERIVATION_SCREEN_TPL' => 35, 'PRO_COST' => 36, 'PRO_UNIT_COST' => 37, 'PRO_ITEE' => 38, 'PRO_ACTION_DONE' => 39, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, ) ); /** @@ -302,6 +305,8 @@ abstract class BaseProcessPeer $criteria->addSelectColumn(ProcessPeer::PRO_SUBPROCESS); + $criteria->addSelectColumn(ProcessPeer::PRO_TRI_CREATE); + $criteria->addSelectColumn(ProcessPeer::PRO_TRI_OPEN); $criteria->addSelectColumn(ProcessPeer::PRO_TRI_DELETED); diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index 32acc5861..5b02a8651 100644 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -889,6 +889,7 @@ + diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql index 28c906f4c..32fef93db 100644 --- a/workflow/engine/data/mysql/schema.sql +++ b/workflow/engine/data/mysql/schema.sql @@ -436,6 +436,7 @@ CREATE TABLE `PROCESS` `PRO_SHOW_MAP` TINYINT default 1 NOT NULL, `PRO_SHOW_MESSAGE` TINYINT default 1 NOT NULL, `PRO_SUBPROCESS` TINYINT default 0 NOT NULL, + `PRO_TRI_CREATE` VARCHAR(32) default '' NOT NULL, `PRO_TRI_OPEN` VARCHAR(32) default '' NOT NULL, `PRO_TRI_DELETED` VARCHAR(32) default '' NOT NULL, `PRO_TRI_CANCELED` VARCHAR(32) default '' NOT NULL, diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Process.php b/workflow/engine/src/ProcessMaker/BusinessModel/Process.php index ab15ee7f0..e0bd1f559 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Process.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Process.php @@ -26,6 +26,7 @@ class Process "PRO_TRI_PAUSED" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "processTriPaused"), "PRO_TRI_UNPAUSED" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "processTriUnpaused"), "PRO_TRI_REASSIGNED" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "processTriReassigned"), + "PRO_TRI_CREATE" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "processTriCreate"), "PRO_SHOW_DELEGATE" => array("type" => "int", "required" => false, "empty" => false, "defaultValues" => array(0, 1), "fieldNameAux" => "processShowDelegate"), "PRO_SHOW_DYNAFORM" => array("type" => "int", "required" => false, "empty" => false, "defaultValues" => array(0, 1), "fieldNameAux" => "processShowDynaform"), "PRO_CATEGORY" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "processCategory"),