fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Solving conflicts with branch 3.1-CONTENT

Browse Source
This commit is contained in:
Julio Cesar Laura Avendaño
2016-07-20 16:28:13 -04:00
parent 7592f29485 44a7f81750
commit 001901314b
74 changed files with 2694 additions and 2826 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
workflow/engine/classes/model/om/BaseProcessPeer.php
View File

@@ -25,7 +25,7 @@ abstract class BaseProcessPeer
const CLASS_DEFAULT = 'classes.model.Process';
/** The total number of columns. */
const NUM_COLUMNS = 35;
const NUM_COLUMNS = 37;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -34,6 +34,12 @@ abstract class BaseProcessPeer
/** the column name for the PRO_UID field */
const PRO_UID = 'PROCESS.PRO_UID';
/** the column name for the PRO_TITLE field */
const PRO_TITLE = 'PROCESS.PRO_TITLE';
/** the column name for the PRO_DESCRIPTION field */
const PRO_DESCRIPTION = 'PROCESS.PRO_DESCRIPTION';
/** the column name for the PRO_PARENT field */
const PRO_PARENT = 'PROCESS.PRO_PARENT';
@@ -150,10 +156,10 @@ abstract class BaseProcessPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('ProUid', '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', ),
BasePeer::TYPE_COLNAME => array (ProcessPeer::PRO_UID, 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, ),
BasePeer::TYPE_FIELDNAME => array ('PRO_UID', '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', ),
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, )
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', ),
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, ),
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', ),
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, )
);
/**
@@ -163,10 +169,10 @@ abstract class BaseProcessPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('ProUid' => 0, 'ProParent' => 1, 'ProTime' => 2, 'ProTimeunit' => 3, 'ProStatus' => 4, 'ProTypeDay' => 5, 'ProType' => 6, 'ProAssignment' => 7, 'ProShowMap' => 8, 'ProShowMessage' => 9, 'ProSubprocess' => 10, 'ProTriOpen' => 11, 'ProTriDeleted' => 12, 'ProTriCanceled' => 13, 'ProTriPaused' => 14, 'ProTriReassigned' => 15, 'ProTriUnpaused' => 16, 'ProTypeProcess' => 17, 'ProShowDelegate' => 18, 'ProShowDynaform' => 19, 'ProCategory' => 20, 'ProSubCategory' => 21, 'ProIndustry' => 22, 'ProUpdateDate' => 23, 'ProCreateDate' => 24, 'ProCreateUser' => 25, 'ProHeight' => 26, 'ProWidth' => 27, 'ProTitleX' => 28, 'ProTitleY' => 29, 'ProDebug' => 30, 'ProDynaforms' => 31, 'ProDerivationScreenTpl' => 32, 'ProCost' => 33, 'ProUnitCost' => 34, 'ProItee' => 35, ),
BasePeer::TYPE_COLNAME => array (ProcessPeer::PRO_UID => 0, ProcessPeer::PRO_PARENT => 1, ProcessPeer::PRO_TIME => 2, ProcessPeer::PRO_TIMEUNIT => 3, ProcessPeer::PRO_STATUS => 4, ProcessPeer::PRO_TYPE_DAY => 5, ProcessPeer::PRO_TYPE => 6, ProcessPeer::PRO_ASSIGNMENT => 7, ProcessPeer::PRO_SHOW_MAP => 8, ProcessPeer::PRO_SHOW_MESSAGE => 9, ProcessPeer::PRO_SUBPROCESS => 10, ProcessPeer::PRO_TRI_OPEN => 11, ProcessPeer::PRO_TRI_DELETED => 12, ProcessPeer::PRO_TRI_CANCELED => 13, ProcessPeer::PRO_TRI_PAUSED => 14, ProcessPeer::PRO_TRI_REASSIGNED => 15, ProcessPeer::PRO_TRI_UNPAUSED => 16, ProcessPeer::PRO_TYPE_PROCESS => 17, ProcessPeer::PRO_SHOW_DELEGATE => 18, ProcessPeer::PRO_SHOW_DYNAFORM => 19, ProcessPeer::PRO_CATEGORY => 20, ProcessPeer::PRO_SUB_CATEGORY => 21, ProcessPeer::PRO_INDUSTRY => 22, ProcessPeer::PRO_UPDATE_DATE => 23, ProcessPeer::PRO_CREATE_DATE => 24, ProcessPeer::PRO_CREATE_USER => 25, ProcessPeer::PRO_HEIGHT => 26, ProcessPeer::PRO_WIDTH => 27, ProcessPeer::PRO_TITLE_X => 28, ProcessPeer::PRO_TITLE_Y => 29, ProcessPeer::PRO_DEBUG => 30, ProcessPeer::PRO_DYNAFORMS => 31, ProcessPeer::PRO_DERIVATION_SCREEN_TPL => 32, ProcessPeer::PRO_COST => 33, ProcessPeer::PRO_UNIT_COST => 34, ProcessPeer::PRO_ITEE => 35, ),
BasePeer::TYPE_FIELDNAME => array ('PRO_UID' => 0, 'PRO_PARENT' => 1, 'PRO_TIME' => 2, 'PRO_TIMEUNIT' => 3, 'PRO_STATUS' => 4, 'PRO_TYPE_DAY' => 5, 'PRO_TYPE' => 6, 'PRO_ASSIGNMENT' => 7, 'PRO_SHOW_MAP' => 8, 'PRO_SHOW_MESSAGE' => 9, 'PRO_SUBPROCESS' => 10, 'PRO_TRI_OPEN' => 11, 'PRO_TRI_DELETED' => 12, 'PRO_TRI_CANCELED' => 13, 'PRO_TRI_PAUSED' => 14, 'PRO_TRI_REASSIGNED' => 15, 'PRO_TRI_UNPAUSED' => 16, 'PRO_TYPE_PROCESS' => 17, 'PRO_SHOW_DELEGATE' => 18, 'PRO_SHOW_DYNAFORM' => 19, 'PRO_CATEGORY' => 20, 'PRO_SUB_CATEGORY' => 21, 'PRO_INDUSTRY' => 22, 'PRO_UPDATE_DATE' => 23, 'PRO_CREATE_DATE' => 24, 'PRO_CREATE_USER' => 25, 'PRO_HEIGHT' => 26, 'PRO_WIDTH' => 27, 'PRO_TITLE_X' => 28, 'PRO_TITLE_Y' => 29, 'PRO_DEBUG' => 30, 'PRO_DYNAFORMS' => 31, 'PRO_DERIVATION_SCREEN_TPL' => 32, 'PRO_COST' => 33, 'PRO_UNIT_COST' => 34, 'PRO_ITEE' => 35, ),
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, )
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, ),
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, ),
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, ),
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, )
);
/**
@@ -269,6 +275,10 @@ abstract class BaseProcessPeer
$criteria->addSelectColumn(ProcessPeer::PRO_UID);
$criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
$criteria->addSelectColumn(ProcessPeer::PRO_DESCRIPTION);
$criteria->addSelectColumn(ProcessPeer::PRO_PARENT);
$criteria->addSelectColumn(ProcessPeer::PRO_TIME);