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

HOR-1329 Agregar los campos PRO_TITLE y PRO_DESCRIPTION en la tabla PROCESS

Browse Source
This commit is contained in:
Ronald Q
2016-06-20 16:50:57 -04:00
parent a41785f378
commit c6e803c6f0
18 changed files with 393 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
workflow/engine/classes/class.AppSolr.php
View File

@@ -2734,7 +2734,7 @@ class AppSolr
$c->addSelectColumn (ApplicationPeer::APP_DATA); $c->addSelectColumn (ApplicationPeer::APP_DATA);
$c->addAsColumn ('APP_TITLE', 'capp.CON_VALUE'); $c->addAsColumn ('APP_TITLE', 'capp.CON_VALUE');
$c->addAsColumn ('PRO_TITLE', 'cpro.CON_VALUE'); $c->addSelectColumn ('pro.PRO_TITLE');
$c->addSelectColumn ('ad.DEL_INDEX'); $c->addSelectColumn ('ad.DEL_INDEX');
$c->addSelectColumn ('ad.DEL_PREVIOUS'); $c->addSelectColumn ('ad.DEL_PREVIOUS');
@@ -2767,7 +2767,6 @@ class AppSolr
$c->addAsColumn("PRO_CATEGORY_UID", "pro.PRO_CATEGORY"); $c->addAsColumn("PRO_CATEGORY_UID", "pro.PRO_CATEGORY");
$c->addAlias ('capp', 'CONTENT'); $c->addAlias ('capp', 'CONTENT');
$c->addAlias ('cpro', 'CONTENT');
$c->addAlias ('ad', 'APP_DELEGATION'); $c->addAlias ('ad', 'APP_DELEGATION');
$c->addAlias ('at', 'APP_THREAD'); $c->addAlias ('at', 'APP_THREAD');
$c->addAlias ('ade', 'APP_DELAY'); $c->addAlias ('ade', 'APP_DELAY');
@@ -2787,22 +2786,7 @@ class AppSolr
DBAdapter::getStringDelimiter () . 'en' . DBAdapter::getStringDelimiter () DBAdapter::getStringDelimiter () . 'en' . DBAdapter::getStringDelimiter ()
); );
$c->addJoinMC ($aConditions, Criteria::LEFT_JOIN); $c->addJoinMC ($aConditions, Criteria::LEFT_JOIN);
$c->addJoin (ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
$aConditions = array ();
$aConditions [] = array (
ApplicationPeer::PRO_UID,
'cpro.CON_ID'
);
$aConditions [] = array (
'cpro.CON_CATEGORY',
DBAdapter::getStringDelimiter () . 'PRO_TITLE' . DBAdapter::getStringDelimiter ()
);
$aConditions [] = array (
'cpro.CON_LANG',
DBAdapter::getStringDelimiter () . 'en' . DBAdapter::getStringDelimiter ()
);
$c->addJoinMC ($aConditions, Criteria::LEFT_JOIN);
$c->addJoin (ApplicationPeer::APP_UID, 'ad.APP_UID', Criteria::JOIN); $c->addJoin (ApplicationPeer::APP_UID, 'ad.APP_UID', Criteria::JOIN);
$aConditions = array (); $aConditions = array ();

39
workflow/engine/classes/class.case.php
View File

@@ -200,10 +200,9 @@ class Cases
$c = new Criteria(); $c = new Criteria();
$c->addSelectColumn(TaskPeer::TAS_UID); $c->addSelectColumn(TaskPeer::TAS_UID);
$c->addSelectColumn(TaskPeer::PRO_UID); $c->addSelectColumn(TaskPeer::PRO_UID);
$c->addSelectColumn(ProcessPeer::PRO_TITLE);
$c->addAsColumn('TAS_TITLE', 'C1.CON_VALUE'); $c->addAsColumn('TAS_TITLE', 'C1.CON_VALUE');
$c->addAsColumn('PRO_TITLE', 'C2.CON_VALUE');
$c->addAlias('C1', 'CONTENT'); $c->addAlias('C1', 'CONTENT');
$c->addAlias('C2', 'CONTENT');
$aConditions = array(); $aConditions = array();
$aConditions[] = array(TaskPeer::TAS_UID, 'C1.CON_ID'); $aConditions[] = array(TaskPeer::TAS_UID, 'C1.CON_ID');
$aConditions[] = array( $aConditions[] = array(
@@ -213,15 +212,7 @@ class Cases
'C1.CON_LANG', DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter() 'C1.CON_LANG', DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter()
); );
$c->addJoinMC($aConditions, Criteria::LEFT_JOIN); $c->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$aConditions = array(); $c->addJoin (TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
$aConditions[] = array(TaskPeer::PRO_UID, 'C2.CON_ID');
$aConditions[] = array(
'C2.CON_CATEGORY', DBAdapter::getStringDelimiter() . 'PRO_TITLE' . DBAdapter::getStringDelimiter()
);
$aConditions[] = array(
'C2.CON_LANG', DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter()
);
$c->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN); $c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN);
$c->addAscendingOrderByColumn('PRO_TITLE'); $c->addAscendingOrderByColumn('PRO_TITLE');
$c->addAscendingOrderByColumn('TAS_TITLE'); $c->addAscendingOrderByColumn('TAS_TITLE');
@@ -304,10 +295,9 @@ class Cases
$c = new Criteria(); $c = new Criteria();
$c->addSelectColumn(TaskPeer::TAS_UID); $c->addSelectColumn(TaskPeer::TAS_UID);
$c->addSelectColumn(TaskPeer::PRO_UID); $c->addSelectColumn(TaskPeer::PRO_UID);
$c->addSelectColumn(ProcessPeer::PRO_TITLE);
$c->addAsColumn('TAS_TITLE', 'C1.CON_VALUE'); $c->addAsColumn('TAS_TITLE', 'C1.CON_VALUE');
$c->addAsColumn('PRO_TITLE', 'C2.CON_VALUE');
$c->addAlias('C1', 'CONTENT'); $c->addAlias('C1', 'CONTENT');
$c->addAlias('C2', 'CONTENT');
if ($typeView == 'category') { if ($typeView == 'category') {
$c->addAsColumn('PRO_CATEGORY', 'PCS.PRO_CATEGORY'); $c->addAsColumn('PRO_CATEGORY', 'PCS.PRO_CATEGORY');
$c->addAsColumn('CATEGORY_NAME', 'PCSCAT.CATEGORY_NAME'); $c->addAsColumn('CATEGORY_NAME', 'PCSCAT.CATEGORY_NAME');
@@ -330,15 +320,7 @@ class Cases
'C1.CON_LANG', DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter() 'C1.CON_LANG', DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter()
); );
$c->addJoinMC($aConditions, Criteria::LEFT_JOIN); $c->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$aConditions = array(); $c->addJoin (TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
$aConditions[] = array(TaskPeer::PRO_UID, 'C2.CON_ID');
$aConditions[] = array(
'C2.CON_CATEGORY', DBAdapter::getStringDelimiter() . 'PRO_TITLE' . DBAdapter::getStringDelimiter()
);
$aConditions[] = array(
'C2.CON_LANG', DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter()
);
$c->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN); $c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN);
$c->addAscendingOrderByColumn('PRO_TITLE'); $c->addAscendingOrderByColumn('PRO_TITLE');
@@ -447,10 +429,9 @@ class Cases
$c = new Criteria(); $c = new Criteria();
$c->addSelectColumn(TaskPeer::TAS_UID); $c->addSelectColumn(TaskPeer::TAS_UID);
$c->addSelectColumn(TaskPeer::PRO_UID); $c->addSelectColumn(TaskPeer::PRO_UID);
$c->addSelectColumn(ProcessPeer::PRO_TITLE);
$c->addAsColumn('TAS_TITLE', 'C1.CON_VALUE'); $c->addAsColumn('TAS_TITLE', 'C1.CON_VALUE');
$c->addAsColumn('PRO_TITLE', 'C2.CON_VALUE');
$c->addAlias('C1', 'CONTENT'); $c->addAlias('C1', 'CONTENT');
$c->addAlias('C2', 'CONTENT');
$aConditions = array(); $aConditions = array();
$aConditions[] = array(TaskPeer::TAS_UID, 'C1.CON_ID'); $aConditions[] = array(TaskPeer::TAS_UID, 'C1.CON_ID');
$aConditions[] = array( $aConditions[] = array(
@@ -460,15 +441,7 @@ class Cases
'C1.CON_LANG', DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter() 'C1.CON_LANG', DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter()
); );
$c->addJoinMC($aConditions, Criteria::LEFT_JOIN); $c->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$aConditions = array(); $c->addJoin (TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
$aConditions[] = array(TaskPeer::PRO_UID, 'C2.CON_ID');
$aConditions[] = array(
'C2.CON_CATEGORY', DBAdapter::getStringDelimiter() . 'PRO_TITLE' . DBAdapter::getStringDelimiter()
);
$aConditions[] = array(
'C2.CON_LANG', DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter()
);
$c->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN); $c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN);
$c->addAscendingOrderByColumn('PRO_TITLE'); $c->addAscendingOrderByColumn('PRO_TITLE');
$c->addAscendingOrderByColumn('TAS_TITLE'); $c->addAscendingOrderByColumn('TAS_TITLE');

8
workflow/engine/classes/class.pmFunctions.php
View File

@@ -3033,12 +3033,8 @@ function PMFGetProcessUidByName($processName = '')
$criteria = new Criteria('workflow'); $criteria = new Criteria('workflow');
$criteria->addSelectColumn(ProcessPeer::PRO_UID); $criteria->addSelectColumn(ProcessPeer::PRO_UID);
$criteria->add(ProcessPeer::PRO_TITLE, $processName, Criteria::EQUAL);
$criteria->addJoin(ContentPeer::CON_ID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN); $rsCriteria = ProcessPeer::doSelectRS($criteria);
$criteria->add(ContentPeer::CON_VALUE, $processName, Criteria::EQUAL);
$criteria->add(ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL);
$rsCriteria = ContentPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
if ($rsCriteria->next()) { if ($rsCriteria->next()) {

8
workflow/engine/classes/class.processes.php
View File

@@ -5941,13 +5941,7 @@ class Processes
$criteria = new Criteria("workflow"); $criteria = new Criteria("workflow");
$criteria->addSelectColumn(ProcessPeer::PRO_UID); $criteria->addSelectColumn(ProcessPeer::PRO_UID);
$criteria->addAsColumn("PRO_TITLE", ContentPeer::CON_VALUE); $criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
$arrayCondition = array();
$arrayCondition[] = array(ProcessPeer::PRO_UID, ContentPeer::CON_ID, Criteria::EQUAL);
$arrayCondition[] = array(ContentPeer::CON_CATEGORY, $delimiter . "PRO_TITLE" . $delimiter, Criteria::EQUAL);
$arrayCondition[] = array(ContentPeer::CON_LANG, $delimiter . SYS_LANG . $delimiter, Criteria::EQUAL);
$criteria->addJoinMC($arrayCondition, Criteria::LEFT_JOIN);
if ($processUid != "") { if ($processUid != "") {
$criteria->add(ProcessPeer::PRO_UID, $processUid, Criteria::EQUAL); $criteria->add(ProcessPeer::PRO_UID, $processUid, Criteria::EQUAL);

2
workflow/engine/classes/class.wsBase.php
View File

@@ -178,7 +178,7 @@ class wsBase
while ($aRow = $oDataset->getRow()) { while ($aRow = $oDataset->getRow()) {
$oProcess = new Process(); $oProcess = new Process();
$arrayProcess = $oProcess->Load( $aRow['PRO_UID'] ); $arrayProcess = $oProcess->load( $aRow['PRO_UID'] );
$result[] = array ('guid' => $aRow['PRO_UID'],'name' => $arrayProcess['PRO_TITLE'] $result[] = array ('guid' => $aRow['PRO_UID'],'name' => $arrayProcess['PRO_TITLE']
); );
$oDataset->next(); $oDataset->next();

208
workflow/engine/classes/model/Process.php
View File

@@ -47,7 +47,7 @@ class Process extends BaseProcess
* *
* @var string * @var string
*/ */
protected $pro_title = ''; protected $pro_title_content = '';
public $dir = 'ASC'; public $dir = 'ASC';
public $sort = 'PRO_TITLE'; public $sort = 'PRO_TITLE';
@@ -56,14 +56,14 @@ class Process extends BaseProcess
* *
* @return string * @return string
*/ */
public function getProTitle () public function getProTitleContent ()
{ {
if ($this->getProUid() == '') { if ($this->getProUid() == '') {
throw (new Exception( "Error in getProTitle, the PRO_UID can't be blank" )); throw (new Exception( "Error in getProTitle, the PRO_UID can't be blank" ));
} }
$lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en'; $lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
$this->pro_title = Content::load( 'PRO_TITLE', '', $this->getProUid(), $lang ); $this->pro_title_content = Content::load( 'PRO_TITLE', '', $this->getProUid(), $lang );
return $this->pro_title; return $this->pro_title_content;
} }
/** /**
@@ -72,7 +72,7 @@ class Process extends BaseProcess
* @param string $v new value * @param string $v new value
* @return void * @return void
*/ */
public function setProTitle ($v) public function setProTitleContent ($v)
{ {
if ($this->getProUid() == '') { if ($this->getProUid() == '') {
throw (new Exception( "Error in setProTitle, the PRO_UID can't be blank" . print_r( debug_backtrace(), 1 ) )); throw (new Exception( "Error in setProTitle, the PRO_UID can't be blank" . print_r( debug_backtrace(), 1 ) ));
@@ -83,11 +83,11 @@ class Process extends BaseProcess
$v = (string) $v; $v = (string) $v;
} }
if ($this->pro_title !== $v || $v === '') { if ($this->pro_title_content !== $v || $v === '') {
$this->pro_title = $v; $this->pro_title_content = $v;
$lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en'; $lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
$res = Content::addContent( 'PRO_TITLE', '', $this->getProUid(), $lang, $this->pro_title ); $res = Content::addContent( 'PRO_TITLE', '', $this->getProUid(), $lang, $this->pro_title_content );
} }
} // set() } // set()
@@ -98,21 +98,21 @@ class Process extends BaseProcess
* *
* @var string * @var string
*/ */
protected $pro_description = ''; protected $pro_description_content = '';
/** /**
* Get the [Pro_description] column value. * Get the [Pro_description] column value.
* *
* @return string * @return string
*/ */
public function getProDescription () public function getProDescriptionContent ()
{ {
if ($this->getProUid() == '') { if ($this->getProUid() == '') {
throw (new Exception( "Error in getProDescription, the PRO_UID can't be blank" )); throw (new Exception( "Error in getProDescription, the PRO_UID can't be blank" ));
} }
$lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en'; $lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
$this->pro_description = Content::load( 'PRO_DESCRIPTION', '', $this->getProUid(), $lang ); $this->pro_description_content = Content::load( 'PRO_DESCRIPTION', '', $this->getProUid(), $lang );
return $this->pro_description; return $this->pro_description_content;
} }
/** /**
@@ -121,7 +121,7 @@ class Process extends BaseProcess
* @param string $v new value * @param string $v new value
* @return void * @return void
*/ */
public function setProDescription ($v) public function setProDescriptionContent ($v)
{ {
if ($this->getProUid() == '') { if ($this->getProUid() == '') {
throw (new Exception( "Error in setProDescription, the PRO_UID can't be blank" )); throw (new Exception( "Error in setProDescription, the PRO_UID can't be blank" ));
@@ -132,11 +132,11 @@ class Process extends BaseProcess
$v = (string) $v; $v = (string) $v;
} }
if ($this->pro_description !== $v || $v === '') { if ($this->pro_description_content !== $v || $v === '') {
$this->pro_description = $v; $this->pro_description_content = $v;
$lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en'; $lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
$res = Content::addContent( 'PRO_DESCRIPTION', '', $this->getProUid(), $lang, $this->pro_description ); $res = Content::addContent( 'PRO_DESCRIPTION', '', $this->getProUid(), $lang, $this->pro_description_content );
} }
} // set() } // set()
@@ -168,6 +168,8 @@ class Process extends BaseProcess
} }
$this->setProUid( $sNewProUid ); $this->setProUid( $sNewProUid );
$this->setProTitle((isset($aData['PRO_TITLE'])) ? $aData['PRO_TITLE'] : 'Default Process Title');
$this->setProDescription((isset($aData['PRO_DESCRIPTION'])) ? $aData['PRO_DESCRIPTION'] : 'Default Process Description');
$this->setProParent( $sNewProUid ); $this->setProParent( $sNewProUid );
$this->setProTime( 1 ); $this->setProTime( 1 );
$this->setProTimeunit( 'DAYS' ); $this->setProTimeunit( 'DAYS' );
@@ -195,15 +197,15 @@ class Process extends BaseProcess
$res = $this->save(); $res = $this->save();
if (isset( $aData['PRO_TITLE'] )) { if (isset( $aData['PRO_TITLE'] )) {
$this->setProTitle( $aData['PRO_TITLE'] ); $this->setProTitleContent( $aData['PRO_TITLE'] );
} else { } else {
$this->setProTitle( 'Default Process Title' ); $this->setProTitleContent( 'Default Process Title' );
} }
if (isset( $aData['PRO_DESCRIPTION'] )) { if (isset( $aData['PRO_DESCRIPTION'] )) {
$this->setProDescription( $aData['PRO_DESCRIPTION'] ); $this->setProDescriptionContent( $aData['PRO_DESCRIPTION'] );
} else { } else {
$this->setProDescription( 'Default Process Description' ); $this->setProDescriptionContent( 'Default Process Description' );
} }
$con->commit(); $con->commit();
@@ -264,52 +266,6 @@ class Process extends BaseProcess
// $this->pro_title = $aFields['PRO_TITLE']; // $this->pro_title = $aFields['PRO_TITLE'];
// $this->pro_description = $aFields['PRO_DESCRIPTION']; // $this->pro_description = $aFields['PRO_DESCRIPTION'];
$lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
$c = new Criteria();
$c->clearSelectColumns();
$c->addSelectColumn( ContentPeer::CON_CATEGORY );
$c->addSelectColumn( ContentPeer::CON_VALUE );
$c->add( ContentPeer::CON_ID, $ProUid );
if (! $getAllLang) {
$c->add( ContentPeer::CON_LANG, $lang );
}
$rs = ProcessPeer::doSelectRS( $c, Propel::getDbConnection('workflow_ro') );
$rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$rs->next();
$row = $rs->getRow();
while (is_array( $row )) {
switch ($row['CON_CATEGORY']) {
case 'PRO_TITLE':
$aFields['PRO_TITLE'] = $row['CON_VALUE'];
$this->pro_title = $row['CON_VALUE'];
if ($row['CON_VALUE'] !== '') {
$this->setProTitle( $aFields['PRO_TITLE'] );
}
break;
case 'PRO_DESCRIPTION':
$aFields['PRO_DESCRIPTION'] = $row['CON_VALUE'];
$this->pro_description = $row['CON_VALUE'];
if ($row['CON_VALUE'] !== '') {
$this->setProDescription( $aFields['PRO_DESCRIPTION'] );
}
break;
}
$rs->next();
$row = $rs->getRow();
}
//If the prev script doesn't return anithing try to create the values based on EN
if (! isset( $aFields['PRO_TITLE'] )) {
$aFields['PRO_TITLE'] = $oPro->getProTitle();
$this->setProTitle( $aFields['PRO_TITLE'] );
}
if (! isset( $aFields['PRO_DESCRIPTION'] )) {
$aFields['PRO_DESCRIPTION'] = $oPro->getProDescription();
$this->setProDescription( $aFields['PRO_DESCRIPTION'] );
}
//the following code is to copy the parent in old process, when the parent was empty. //the following code is to copy the parent in old process, when the parent was empty.
if ($oPro->getProParent() == '') { if ($oPro->getProParent() == '') {
$oPro->setProParent( $oPro->getProUid() ); $oPro->setProParent( $oPro->getProUid() );
@@ -345,6 +301,8 @@ class Process extends BaseProcess
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( ProcessPeer::PRO_UID ); $oCriteria->addSelectColumn( ProcessPeer::PRO_UID );
$oCriteria->addSelectColumn( ProcessPeer::PRO_TITLE );
$oCriteria->addSelectColumn( ProcessPeer::PRO_DESCRIPTION );
$oCriteria->addSelectColumn( ProcessPeer::PRO_PARENT ); $oCriteria->addSelectColumn( ProcessPeer::PRO_PARENT );
$oCriteria->addSelectColumn( ProcessPeer::PRO_STATUS ); $oCriteria->addSelectColumn( ProcessPeer::PRO_STATUS );
$oCriteria->addSelectColumn( ProcessPeer::PRO_CATEGORY ); $oCriteria->addSelectColumn( ProcessPeer::PRO_CATEGORY );
@@ -366,39 +324,11 @@ class Process extends BaseProcess
$processes[] = $row; $processes[] = $row;
$uids[] = $processes[sizeof( $processes ) - 1]['PRO_UID']; $uids[] = $processes[sizeof( $processes ) - 1]['PRO_UID'];
} }
//process details will have the info about the processes
$processesDetails = Array ();
//now get the labels for all process, using an array of Uids,
$c = new Criteria( 'workflow' );
//$c->add ( ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL );
$c->add( ContentPeer::CON_LANG, defined( 'SYS_LANG' ) ? SYS_LANG : 'en', Criteria::EQUAL );
$c->add( ContentPeer::CON_ID, $uids, Criteria::IN );
$dt = ContentPeer::doSelectRS( $c, Propel::getDbConnection('workflow_ro') );
$dt->setFetchmode( ResultSet::FETCHMODE_ASSOC );
while ($dt->next()) {
$row = $dt->getRow();
$processesDetails[$row['CON_ID']][$row['CON_CATEGORY']] = $row['CON_VALUE'];
}
G::loadClass( 'configuration' ); G::loadClass( 'configuration' );
$oConf = new Configurations(); $oConf = new Configurations();
$oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' ); $oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' );
foreach ($processes as $i => $process) {
$processes[$i]['PRO_TITLE'] = $processes[$i]['PRO_DESCRIPTION'] = '';
if (isset( $processesDetails[$process['PRO_UID']]['PRO_TITLE'] )) {
$processes[$i]['PRO_TITLE'] = $processesDetails[$process['PRO_UID']]['PRO_TITLE'];
}
if (isset( $processesDetails[$process['PRO_UID']] )) {
$processes[$i]['PRO_DESCRIPTION'] = $processesDetails[$process['PRO_UID']]['PRO_DESCRIPTION'];
}
}
if ($this->dir=='ASC') { if ($this->dir=='ASC') {
usort( $processes, array($this, "ordProcessAsc") ); usort( $processes, array($this, "ordProcessAsc") );
} else { } else {
@@ -429,10 +359,10 @@ class Process extends BaseProcess
$oPro->fromArray( $aData, BasePeer::TYPE_FIELDNAME ); $oPro->fromArray( $aData, BasePeer::TYPE_FIELDNAME );
if ($oPro->validate()) { if ($oPro->validate()) {
if (isset( $aData['PRO_TITLE'] )) { if (isset( $aData['PRO_TITLE'] )) {
$oPro->setProTitle( $aData['PRO_TITLE'] ); $oPro->setProTitleContent( $aData['PRO_TITLE'] );
} }
if (isset( $aData['PRO_DESCRIPTION'] )) { if (isset( $aData['PRO_DESCRIPTION'] )) {
$oPro->setProDescription( $aData['PRO_DESCRIPTION'] ); $oPro->setProDescriptionContent( $aData['PRO_DESCRIPTION'] );
} }
$res = $oPro->save(); $res = $oPro->save();
$con->commit(); $con->commit();
@@ -469,6 +399,8 @@ class Process extends BaseProcess
$con = Propel::getConnection( ProcessPeer::DATABASE_NAME ); $con = Propel::getConnection( ProcessPeer::DATABASE_NAME );
//$con->begin(); //does not allow dual BEGIN //$con->begin(); //does not allow dual BEGIN
$this->setProUid( $aData['PRO_UID'] ); $this->setProUid( $aData['PRO_UID'] );
$this->setProTitle((isset($aData['PRO_TITLE'])) ? $aData['PRO_TITLE'] : 'Default Process Title');
$this->setProDescription((isset($aData['PRO_DESCRIPTION'])) ? $aData['PRO_DESCRIPTION'] : 'Default Process Description');
$this->setProParent( $aData['PRO_PARENT'] ); $this->setProParent( $aData['PRO_PARENT'] );
$this->setProTime( $aData['PRO_TIME'] ); $this->setProTime( $aData['PRO_TIME'] );
$this->setProTimeunit( $aData['PRO_TIMEUNIT'] ); $this->setProTimeunit( $aData['PRO_TIMEUNIT'] );
@@ -514,14 +446,14 @@ class Process extends BaseProcess
$res = $this->save(); $res = $this->save();
if (isset( $aData['PRO_TITLE'] ) && trim( $aData['PRO_TITLE'] ) != '') { if (isset( $aData['PRO_TITLE'] ) && trim( $aData['PRO_TITLE'] ) != '') {
$this->setProTitle( $aData['PRO_TITLE'] ); $this->setProTitleContent( $aData['PRO_TITLE'] );
} else { } else {
$this->setProTitle( 'Default Process Title' ); $this->setProTitleContent( 'Default Process Title' );
} }
if (isset( $aData['PRO_DESCRIPTION'] )) { if (isset( $aData['PRO_DESCRIPTION'] )) {
$this->setProDescription( $aData['PRO_DESCRIPTION'] ); $this->setProDescriptionContent( $aData['PRO_DESCRIPTION'] );
} else { } else {
$this->setProDescription( 'Default Process Description' ); $this->setProDescriptionContent( 'Default Process Description' );
} }
$con->commit(); $con->commit();
@@ -556,9 +488,7 @@ class Process extends BaseProcess
if (! is_null( $oPro )) { if (! is_null( $oPro )) {
Content::removeContent( 'PRO_TITLE', '', $oPro->getProUid() ); Content::removeContent( 'PRO_TITLE', '', $oPro->getProUid() );
Content::removeContent( 'PRO_DESCRIPTION', '', $oPro->getProUid() ); Content::removeContent( 'PRO_DESCRIPTION', '', $oPro->getProUid() );
$this->memcachedDelete(); $this->memcachedDelete();
return $oPro->delete(); return $oPro->delete();
} else { } else {
throw (new Exception( "The row '$ProUid' in table Process doesn't exist!" )); throw (new Exception( "The row '$ProUid' in table Process doesn't exist!" ));
@@ -577,61 +507,44 @@ class Process extends BaseProcess
public static function existsByProTitle ($proTitle) public static function existsByProTitle ($proTitle)
{ {
$oCriteria = new Criteria("workflow"); $oCriteria = new Criteria("workflow");
$oCriteria->addSelectColumn(ProcessPeer::PRO_TITLE);
$oCriteria->addSelectColumn("COUNT(" . ContentPeer::CON_ID . ") AS NUM_REC"); $oCriteria->add( ProcessPeer::PRO_TITLE, $proTitle );
$oDataset = ProcessPeer::doSelectRS( $oCriteria, Propel::getDbConnection('workflow_ro') );
$oCriteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE' );
$oCriteria->add( ContentPeer::CON_LANG, SYS_LANG );
$oCriteria->add( ContentPeer::CON_VALUE, $proTitle );
$oDataset = ContentPeer::doSelectRS( $oCriteria, Propel::getDbConnection('workflow_ro') );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oDataset->next(); $oDataset->next();
$aRow = $oDataset->getRow(); $aRow = $oDataset->getRow();
return ($aRow)? true : false;
return ((int)($aRow["NUM_REC"]) > 0)? true : false;
} }
public static function getByProTitle($proTitle) { public static function getByProTitle($proTitle)
{
$oCriteria = new Criteria("workflow"); $oCriteria = new Criteria("workflow");
$oCriteria->add(ProcessPeer::PRO_TITLE, $proTitle);
$oCriteria->addSelectColumn(ContentPeer::CON_ID); $oDataset = ProcessPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
$oCriteria->add(ContentPeer::CON_CATEGORY, 'PRO_TITLE');
$oCriteria->add(ContentPeer::CON_LANG, SYS_LANG);
$oCriteria->add(ContentPeer::CON_VALUE, $proTitle);
$oDataset = ContentPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next(); $oDataset->next();
$aRow = $oDataset->getRow(); $aRow = $oDataset->getRow();
$oProcess = new Process(); return isset($aRow) ? $aRow : null;
return isset($aRow["CON_ID"]) ? $oProcess->load($aRow["CON_ID"]) : null;
} }
public static function getNextTitle($proTitle) { public static function getNextTitle($proTitle)
{
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(ProcessPeer::PRO_TITLE);
$oCriteria->addSelectColumn(ContentPeer::CON_VALUE); $oCriteria->add(ProcessPeer::PRO_TITLE, $proTitle . '-%', Criteria::LIKE);
$oCriteria->addAscendingOrderByColumn(ProcessPeer::PRO_TITLE);
$oCriteria->add(ContentPeer::CON_CATEGORY, 'PRO_TITLE'); $oDataset = ProcessPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
$oCriteria->add(ContentPeer::CON_LANG, SYS_LANG);
$oCriteria->add(ContentPeer::CON_VALUE, $proTitle . '-%', Criteria::LIKE);
$oCriteria->addAscendingOrderByColumn(ContentPeer::CON_VALUE);
$oDataset = ContentPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$data = array(); $data = array();
$may = 0; $may = 0;
while ($oDataset->next()) { while ($oDataset->next()) {
$row = $oDataset->getRow(); $row = $oDataset->getRow();
$number = explode("-", $row["CON_VALUE"]); $number = explode("-", $row["PRO_TITLE"]);
$number = $number[count($number) - 1] + 0; $number = $number[count($number) - 1] + 0;
if ($number > $may) { if ($number > $may) {
$may = $number; $may = $number;
} }
$row["CON_VALUE"] = $number; $row["PRO_TITLE"] = $number;
$data[] = $row; $data[] = $row;
} }
return $proTitle . "-" . ($may + 1); return $proTitle . "-" . ($may + 1);
@@ -665,6 +578,8 @@ class Process extends BaseProcess
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( ProcessPeer::PRO_UID ); $oCriteria->addSelectColumn( ProcessPeer::PRO_UID );
$oCriteria->addSelectColumn( ProcessPeer::PRO_TITLE );
$oCriteria->addSelectColumn( ProcessPeer::PRO_DESCRIPTION );
$oCriteria->addSelectColumn( ProcessPeer::PRO_PARENT ); $oCriteria->addSelectColumn( ProcessPeer::PRO_PARENT );
$oCriteria->addSelectColumn( ProcessPeer::PRO_STATUS ); $oCriteria->addSelectColumn( ProcessPeer::PRO_STATUS );
$oCriteria->addSelectColumn(ProcessPeer::PRO_TYPE); $oCriteria->addSelectColumn(ProcessPeer::PRO_TYPE);
@@ -744,30 +659,13 @@ class Process extends BaseProcess
$uids[] = $processes[sizeof( $processes ) - 1]['PRO_UID']; $uids[] = $processes[sizeof( $processes ) - 1]['PRO_UID'];
} }
//process details will have the info about the processes
$processesDetails = Array ();
//now get the labels for all process, using an array of Uids,
$c = new Criteria( 'workflow' );
//$c->add ( ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL );
$c->add( ContentPeer::CON_LANG, defined( 'SYS_LANG' ) ? SYS_LANG : 'en', Criteria::EQUAL );
$c->add( ContentPeer::CON_ID, $uids, Criteria::IN );
$dt = ContentPeer::doSelectRS( $c, Propel::getDbConnection('workflow_ro') );
$dt->setFetchmode( ResultSet::FETCHMODE_ASSOC );
while ($dt->next()) {
$row = $dt->getRow();
$processesDetails[$row['CON_ID']][$row['CON_CATEGORY']] = $row['CON_VALUE'];
}
G::loadClass( 'configuration' ); G::loadClass( 'configuration' );
$oConf = new Configurations(); $oConf = new Configurations();
$oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' ); $oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' );
foreach ($processes as $process) { foreach ($processes as $process) {
$proTitle = isset( $processesDetails[$process['PRO_UID']] ) && isset( $processesDetails[$process['PRO_UID']]['PRO_TITLE'] ) ? $processesDetails[$process['PRO_UID']]['PRO_TITLE'] : ''; $proTitle = isset($process['PRO_TITLE'])? $process['PRO_TITLE'] : '';
$proDescription = isset( $processesDetails[$process['PRO_UID']] ) && isset( $processesDetails[$process['PRO_UID']]['PRO_DESCRIPTION'] ) ? $processesDetails[$process['PRO_UID']]['PRO_DESCRIPTION'] : ''; $proDescription = isset($process['PRO_DESCRIPTION']) ? $process['PRO_DESCRIPTION'] : '';
$process["PRO_TYPE_PROCESS"] = ($process["PRO_TYPE_PROCESS"] == "PUBLIC") ? G::LoadTranslation("ID_PUBLIC") : G::LoadTranslation("ID_PRIVATE"); $process["PRO_TYPE_PROCESS"] = ($process["PRO_TYPE_PROCESS"] == "PUBLIC") ? G::LoadTranslation("ID_PUBLIC") : G::LoadTranslation("ID_PRIVATE");
// verify if the title is already set on the current language // verify if the title is already set on the current language

4
workflow/engine/classes/model/map/ProcessMapBuilder.php
View File

@@ -67,6 +67,10 @@ class ProcessMapBuilder
$tMap->addPrimaryKey('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addPrimaryKey('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('PRO_TITLE', 'ProTitle', 'string', CreoleTypes::LONGVARCHAR, true, null);
$tMap->addColumn('PRO_DESCRIPTION', 'ProDescription', 'string', CreoleTypes::LONGVARCHAR, false, null);
$tMap->addColumn('PRO_PARENT', 'ProParent', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addColumn('PRO_PARENT', 'ProParent', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('PRO_TIME', 'ProTime', 'double', CreoleTypes::DOUBLE, true, null); $tMap->addColumn('PRO_TIME', 'ProTime', 'double', CreoleTypes::DOUBLE, true, null);

454
workflow/engine/classes/model/om/BaseProcess.php
View File

@@ -33,6 +33,18 @@ abstract class BaseProcess extends BaseObject implements Persistent
*/ */
protected $pro_uid = ''; protected $pro_uid = '';
/**
* The value for the pro_title field.
* @var string
*/
protected $pro_title;
/**
* The value for the pro_description field.
* @var string
*/
protected $pro_description;
/** /**
* The value for the pro_parent field. * The value for the pro_parent field.
* @var string * @var string
@@ -262,6 +274,28 @@ abstract class BaseProcess extends BaseObject implements Persistent
return $this->pro_uid; return $this->pro_uid;
} }
/**
* Get the [pro_title] column value.
*
* @return string
*/
public function getProTitle()
{
return $this->pro_title;
}
/**
* Get the [pro_description] column value.
*
* @return string
*/
public function getProDescription()
{
return $this->pro_description;
}
/** /**
* Get the [pro_parent] column value. * Get the [pro_parent] column value.
* *
@@ -700,6 +734,50 @@ abstract class BaseProcess extends BaseObject implements Persistent
} // setProUid() } // setProUid()
/**
* Set the value of [pro_title] column.
*
* @param string $v new value
* @return void
*/
public function setProTitle($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_title !== $v) {
$this->pro_title = $v;
$this->modifiedColumns[] = ProcessPeer::PRO_TITLE;
}
} // setProTitle()
/**
* Set the value of [pro_description] column.
*
* @param string $v new value
* @return void
*/
public function setProDescription($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_description !== $v) {
$this->pro_description = $v;
$this->modifiedColumns[] = ProcessPeer::PRO_DESCRIPTION;
}
} // setProDescription()
/** /**
* Set the value of [pro_parent] column. * Set the value of [pro_parent] column.
* *
@@ -1469,80 +1547,84 @@ abstract class BaseProcess extends BaseObject implements Persistent
$this->pro_uid = $rs->getString($startcol + 0); $this->pro_uid = $rs->getString($startcol + 0);
$this->pro_parent = $rs->getString($startcol + 1); $this->pro_title = $rs->getString($startcol + 1);
$this->pro_time = $rs->getFloat($startcol + 2); $this->pro_description = $rs->getString($startcol + 2);
$this->pro_timeunit = $rs->getString($startcol + 3); $this->pro_parent = $rs->getString($startcol + 3);
$this->pro_status = $rs->getString($startcol + 4); $this->pro_time = $rs->getFloat($startcol + 4);
$this->pro_type_day = $rs->getString($startcol + 5); $this->pro_timeunit = $rs->getString($startcol + 5);
$this->pro_type = $rs->getString($startcol + 6); $this->pro_status = $rs->getString($startcol + 6);
$this->pro_assignment = $rs->getString($startcol + 7); $this->pro_type_day = $rs->getString($startcol + 7);
$this->pro_show_map = $rs->getInt($startcol + 8); $this->pro_type = $rs->getString($startcol + 8);
$this->pro_show_message = $rs->getInt($startcol + 9); $this->pro_assignment = $rs->getString($startcol + 9);
$this->pro_subprocess = $rs->getInt($startcol + 10); $this->pro_show_map = $rs->getInt($startcol + 10);
$this->pro_tri_open = $rs->getString($startcol + 11); $this->pro_show_message = $rs->getInt($startcol + 11);
$this->pro_tri_deleted = $rs->getString($startcol + 12); $this->pro_subprocess = $rs->getInt($startcol + 12);
$this->pro_tri_canceled = $rs->getString($startcol + 13); $this->pro_tri_open = $rs->getString($startcol + 13);
$this->pro_tri_paused = $rs->getString($startcol + 14); $this->pro_tri_deleted = $rs->getString($startcol + 14);
$this->pro_tri_reassigned = $rs->getString($startcol + 15); $this->pro_tri_canceled = $rs->getString($startcol + 15);
$this->pro_tri_unpaused = $rs->getString($startcol + 16); $this->pro_tri_paused = $rs->getString($startcol + 16);
$this->pro_type_process = $rs->getString($startcol + 17); $this->pro_tri_reassigned = $rs->getString($startcol + 17);
$this->pro_show_delegate = $rs->getInt($startcol + 18); $this->pro_tri_unpaused = $rs->getString($startcol + 18);
$this->pro_show_dynaform = $rs->getInt($startcol + 19); $this->pro_type_process = $rs->getString($startcol + 19);
$this->pro_category = $rs->getString($startcol + 20); $this->pro_show_delegate = $rs->getInt($startcol + 20);
$this->pro_sub_category = $rs->getString($startcol + 21); $this->pro_show_dynaform = $rs->getInt($startcol + 21);
$this->pro_industry = $rs->getInt($startcol + 22); $this->pro_category = $rs->getString($startcol + 22);
$this->pro_update_date = $rs->getTimestamp($startcol + 23, null); $this->pro_sub_category = $rs->getString($startcol + 23);
$this->pro_create_date = $rs->getTimestamp($startcol + 24, null); $this->pro_industry = $rs->getInt($startcol + 24);
$this->pro_create_user = $rs->getString($startcol + 25); $this->pro_update_date = $rs->getTimestamp($startcol + 25, null);
$this->pro_height = $rs->getInt($startcol + 26); $this->pro_create_date = $rs->getTimestamp($startcol + 26, null);
$this->pro_width = $rs->getInt($startcol + 27); $this->pro_create_user = $rs->getString($startcol + 27);
$this->pro_title_x = $rs->getInt($startcol + 28); $this->pro_height = $rs->getInt($startcol + 28);
$this->pro_title_y = $rs->getInt($startcol + 29); $this->pro_width = $rs->getInt($startcol + 29);
$this->pro_debug = $rs->getInt($startcol + 30); $this->pro_title_x = $rs->getInt($startcol + 30);
$this->pro_dynaforms = $rs->getString($startcol + 31); $this->pro_title_y = $rs->getInt($startcol + 31);
$this->pro_derivation_screen_tpl = $rs->getString($startcol + 32); $this->pro_debug = $rs->getInt($startcol + 32);
$this->pro_cost = $rs->getFloat($startcol + 33); $this->pro_dynaforms = $rs->getString($startcol + 33);
$this->pro_unit_cost = $rs->getString($startcol + 34); $this->pro_derivation_screen_tpl = $rs->getString($startcol + 34);
$this->pro_cost = $rs->getFloat($startcol + 35);
$this->pro_unit_cost = $rs->getString($startcol + 36);
$this->resetModified(); $this->resetModified();
$this->setNew(false); $this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer. // FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 35; // 35 = ProcessPeer::NUM_COLUMNS - ProcessPeer::NUM_LAZY_LOAD_COLUMNS). return $startcol + 37; // 37 = ProcessPeer::NUM_COLUMNS - ProcessPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) { } catch (Exception $e) {
throw new PropelException("Error populating Process object", $e); throw new PropelException("Error populating Process object", $e);
@@ -1750,105 +1832,111 @@ abstract class BaseProcess extends BaseObject implements Persistent
return $this->getProUid(); return $this->getProUid();
break; break;
case 1: case 1:
return $this->getProParent(); return $this->getProTitle();
break; break;
case 2: case 2:
return $this->getProTime(); return $this->getProDescription();
break; break;
case 3: case 3:
return $this->getProTimeunit(); return $this->getProParent();
break; break;
case 4: case 4:
return $this->getProStatus(); return $this->getProTime();
break; break;
case 5: case 5:
return $this->getProTypeDay(); return $this->getProTimeunit();
break; break;
case 6: case 6:
return $this->getProType(); return $this->getProStatus();
break; break;
case 7: case 7:
return $this->getProAssignment(); return $this->getProTypeDay();
break; break;
case 8: case 8:
return $this->getProShowMap(); return $this->getProType();
break; break;
case 9: case 9:
return $this->getProShowMessage(); return $this->getProAssignment();
break; break;
case 10: case 10:
return $this->getProSubprocess(); return $this->getProShowMap();
break; break;
case 11: case 11:
return $this->getProTriOpen(); return $this->getProShowMessage();
break; break;
case 12: case 12:
return $this->getProTriDeleted(); return $this->getProSubprocess();
break; break;
case 13: case 13:
return $this->getProTriCanceled(); return $this->getProTriOpen();
break; break;
case 14: case 14:
return $this->getProTriPaused(); return $this->getProTriDeleted();
break; break;
case 15: case 15:
return $this->getProTriReassigned(); return $this->getProTriCanceled();
break; break;
case 16: case 16:
return $this->getProTriUnpaused(); return $this->getProTriPaused();
break; break;
case 17: case 17:
return $this->getProTypeProcess(); return $this->getProTriReassigned();
break; break;
case 18: case 18:
return $this->getProShowDelegate(); return $this->getProTriUnpaused();
break; break;
case 19: case 19:
return $this->getProShowDynaform(); return $this->getProTypeProcess();
break; break;
case 20: case 20:
return $this->getProCategory(); return $this->getProShowDelegate();
break; break;
case 21: case 21:
return $this->getProSubCategory(); return $this->getProShowDynaform();
break; break;
case 22: case 22:
return $this->getProIndustry(); return $this->getProCategory();
break; break;
case 23: case 23:
return $this->getProUpdateDate(); return $this->getProSubCategory();
break; break;
case 24: case 24:
return $this->getProCreateDate(); return $this->getProIndustry();
break; break;
case 25: case 25:
return $this->getProCreateUser(); return $this->getProUpdateDate();
break; break;
case 26: case 26:
return $this->getProHeight(); return $this->getProCreateDate();
break; break;
case 27: case 27:
return $this->getProWidth(); return $this->getProCreateUser();
break; break;
case 28: case 28:
return $this->getProTitleX(); return $this->getProHeight();
break; break;
case 29: case 29:
return $this->getProTitleY(); return $this->getProWidth();
break; break;
case 30: case 30:
return $this->getProDebug(); return $this->getProTitleX();
break; break;
case 31: case 31:
return $this->getProDynaforms(); return $this->getProTitleY();
break; break;
case 32: case 32:
return $this->getProDerivationScreenTpl(); return $this->getProDebug();
break; break;
case 33: case 33:
return $this->getProCost(); return $this->getProDynaforms();
break; break;
case 34: case 34:
return $this->getProDerivationScreenTpl();
break;
case 35:
return $this->getProCost();
break;
case 36:
return $this->getProUnitCost(); return $this->getProUnitCost();
break; break;
default: default:
@@ -1872,40 +1960,42 @@ abstract class BaseProcess extends BaseObject implements Persistent
$keys = ProcessPeer::getFieldNames($keyType); $keys = ProcessPeer::getFieldNames($keyType);
$result = array( $result = array(
$keys[0] => $this->getProUid(), $keys[0] => $this->getProUid(),
$keys[1] => $this->getProParent(), $keys[1] => $this->getProTitle(),
$keys[2] => $this->getProTime(), $keys[2] => $this->getProDescription(),
$keys[3] => $this->getProTimeunit(), $keys[3] => $this->getProParent(),
$keys[4] => $this->getProStatus(), $keys[4] => $this->getProTime(),
$keys[5] => $this->getProTypeDay(), $keys[5] => $this->getProTimeunit(),
$keys[6] => $this->getProType(), $keys[6] => $this->getProStatus(),
$keys[7] => $this->getProAssignment(), $keys[7] => $this->getProTypeDay(),
$keys[8] => $this->getProShowMap(), $keys[8] => $this->getProType(),
$keys[9] => $this->getProShowMessage(), $keys[9] => $this->getProAssignment(),
$keys[10] => $this->getProSubprocess(), $keys[10] => $this->getProShowMap(),
$keys[11] => $this->getProTriOpen(), $keys[11] => $this->getProShowMessage(),
$keys[12] => $this->getProTriDeleted(), $keys[12] => $this->getProSubprocess(),
$keys[13] => $this->getProTriCanceled(), $keys[13] => $this->getProTriOpen(),
$keys[14] => $this->getProTriPaused(), $keys[14] => $this->getProTriDeleted(),
$keys[15] => $this->getProTriReassigned(), $keys[15] => $this->getProTriCanceled(),
$keys[16] => $this->getProTriUnpaused(), $keys[16] => $this->getProTriPaused(),
$keys[17] => $this->getProTypeProcess(), $keys[17] => $this->getProTriReassigned(),
$keys[18] => $this->getProShowDelegate(), $keys[18] => $this->getProTriUnpaused(),
$keys[19] => $this->getProShowDynaform(), $keys[19] => $this->getProTypeProcess(),
$keys[20] => $this->getProCategory(), $keys[20] => $this->getProShowDelegate(),
$keys[21] => $this->getProSubCategory(), $keys[21] => $this->getProShowDynaform(),
$keys[22] => $this->getProIndustry(), $keys[22] => $this->getProCategory(),
$keys[23] => $this->getProUpdateDate(), $keys[23] => $this->getProSubCategory(),
$keys[24] => $this->getProCreateDate(), $keys[24] => $this->getProIndustry(),
$keys[25] => $this->getProCreateUser(), $keys[25] => $this->getProUpdateDate(),
$keys[26] => $this->getProHeight(), $keys[26] => $this->getProCreateDate(),
$keys[27] => $this->getProWidth(), $keys[27] => $this->getProCreateUser(),
$keys[28] => $this->getProTitleX(), $keys[28] => $this->getProHeight(),
$keys[29] => $this->getProTitleY(), $keys[29] => $this->getProWidth(),
$keys[30] => $this->getProDebug(), $keys[30] => $this->getProTitleX(),
$keys[31] => $this->getProDynaforms(), $keys[31] => $this->getProTitleY(),
$keys[32] => $this->getProDerivationScreenTpl(), $keys[32] => $this->getProDebug(),
$keys[33] => $this->getProCost(), $keys[33] => $this->getProDynaforms(),
$keys[34] => $this->getProUnitCost(), $keys[34] => $this->getProDerivationScreenTpl(),
$keys[35] => $this->getProCost(),
$keys[36] => $this->getProUnitCost(),
); );
return $result; return $result;
} }
@@ -1941,105 +2031,111 @@ abstract class BaseProcess extends BaseObject implements Persistent
$this->setProUid($value); $this->setProUid($value);
break; break;
case 1: case 1:
$this->setProParent($value); $this->setProTitle($value);
break; break;
case 2: case 2:
$this->setProTime($value); $this->setProDescription($value);
break; break;
case 3: case 3:
$this->setProTimeunit($value); $this->setProParent($value);
break; break;
case 4: case 4:
$this->setProStatus($value); $this->setProTime($value);
break; break;
case 5: case 5:
$this->setProTypeDay($value); $this->setProTimeunit($value);
break; break;
case 6: case 6:
$this->setProType($value); $this->setProStatus($value);
break; break;
case 7: case 7:
$this->setProAssignment($value); $this->setProTypeDay($value);
break; break;
case 8: case 8:
$this->setProShowMap($value); $this->setProType($value);
break; break;
case 9: case 9:
$this->setProShowMessage($value); $this->setProAssignment($value);
break; break;
case 10: case 10:
$this->setProSubprocess($value); $this->setProShowMap($value);
break; break;
case 11: case 11:
$this->setProTriOpen($value); $this->setProShowMessage($value);
break; break;
case 12: case 12:
$this->setProTriDeleted($value); $this->setProSubprocess($value);
break; break;
case 13: case 13:
$this->setProTriCanceled($value); $this->setProTriOpen($value);
break; break;
case 14: case 14:
$this->setProTriPaused($value); $this->setProTriDeleted($value);
break; break;
case 15: case 15:
$this->setProTriReassigned($value); $this->setProTriCanceled($value);
break; break;
case 16: case 16:
$this->setProTriUnpaused($value); $this->setProTriPaused($value);
break; break;
case 17: case 17:
$this->setProTypeProcess($value); $this->setProTriReassigned($value);
break; break;
case 18: case 18:
$this->setProShowDelegate($value); $this->setProTriUnpaused($value);
break; break;
case 19: case 19:
$this->setProShowDynaform($value); $this->setProTypeProcess($value);
break; break;
case 20: case 20:
$this->setProCategory($value); $this->setProShowDelegate($value);
break; break;
case 21: case 21:
$this->setProSubCategory($value); $this->setProShowDynaform($value);
break; break;
case 22: case 22:
$this->setProIndustry($value); $this->setProCategory($value);
break; break;
case 23: case 23:
$this->setProUpdateDate($value); $this->setProSubCategory($value);
break; break;
case 24: case 24:
$this->setProCreateDate($value); $this->setProIndustry($value);
break; break;
case 25: case 25:
$this->setProCreateUser($value); $this->setProUpdateDate($value);
break; break;
case 26: case 26:
$this->setProHeight($value); $this->setProCreateDate($value);
break; break;
case 27: case 27:
$this->setProWidth($value); $this->setProCreateUser($value);
break; break;
case 28: case 28:
$this->setProTitleX($value); $this->setProHeight($value);
break; break;
case 29: case 29:
$this->setProTitleY($value); $this->setProWidth($value);
break; break;
case 30: case 30:
$this->setProDebug($value); $this->setProTitleX($value);
break; break;
case 31: case 31:
$this->setProDynaforms($value); $this->setProTitleY($value);
break; break;
case 32: case 32:
$this->setProDerivationScreenTpl($value); $this->setProDebug($value);
break; break;
case 33: case 33:
$this->setProCost($value); $this->setProDynaforms($value);
break; break;
case 34: case 34:
$this->setProDerivationScreenTpl($value);
break;
case 35:
$this->setProCost($value);
break;
case 36:
$this->setProUnitCost($value); $this->setProUnitCost($value);
break; break;
} // switch() } // switch()
@@ -2070,139 +2166,147 @@ abstract class BaseProcess extends BaseObject implements Persistent
} }
if (array_key_exists($keys[1], $arr)) { if (array_key_exists($keys[1], $arr)) {
$this->setProParent($arr[$keys[1]]); $this->setProTitle($arr[$keys[1]]);
} }
if (array_key_exists($keys[2], $arr)) { if (array_key_exists($keys[2], $arr)) {
$this->setProTime($arr[$keys[2]]); $this->setProDescription($arr[$keys[2]]);
} }
if (array_key_exists($keys[3], $arr)) { if (array_key_exists($keys[3], $arr)) {
$this->setProTimeunit($arr[$keys[3]]); $this->setProParent($arr[$keys[3]]);
} }
if (array_key_exists($keys[4], $arr)) { if (array_key_exists($keys[4], $arr)) {
$this->setProStatus($arr[$keys[4]]); $this->setProTime($arr[$keys[4]]);
} }
if (array_key_exists($keys[5], $arr)) { if (array_key_exists($keys[5], $arr)) {
$this->setProTypeDay($arr[$keys[5]]); $this->setProTimeunit($arr[$keys[5]]);
} }
if (array_key_exists($keys[6], $arr)) { if (array_key_exists($keys[6], $arr)) {
$this->setProType($arr[$keys[6]]); $this->setProStatus($arr[$keys[6]]);
} }
if (array_key_exists($keys[7], $arr)) { if (array_key_exists($keys[7], $arr)) {
$this->setProAssignment($arr[$keys[7]]); $this->setProTypeDay($arr[$keys[7]]);
} }
if (array_key_exists($keys[8], $arr)) { if (array_key_exists($keys[8], $arr)) {
$this->setProShowMap($arr[$keys[8]]); $this->setProType($arr[$keys[8]]);
} }
if (array_key_exists($keys[9], $arr)) { if (array_key_exists($keys[9], $arr)) {
$this->setProShowMessage($arr[$keys[9]]); $this->setProAssignment($arr[$keys[9]]);
} }
if (array_key_exists($keys[10], $arr)) { if (array_key_exists($keys[10], $arr)) {
$this->setProSubprocess($arr[$keys[10]]); $this->setProShowMap($arr[$keys[10]]);
} }
if (array_key_exists($keys[11], $arr)) { if (array_key_exists($keys[11], $arr)) {
$this->setProTriOpen($arr[$keys[11]]); $this->setProShowMessage($arr[$keys[11]]);
} }
if (array_key_exists($keys[12], $arr)) { if (array_key_exists($keys[12], $arr)) {
$this->setProTriDeleted($arr[$keys[12]]); $this->setProSubprocess($arr[$keys[12]]);
} }
if (array_key_exists($keys[13], $arr)) { if (array_key_exists($keys[13], $arr)) {
$this->setProTriCanceled($arr[$keys[13]]); $this->setProTriOpen($arr[$keys[13]]);
} }
if (array_key_exists($keys[14], $arr)) { if (array_key_exists($keys[14], $arr)) {
$this->setProTriPaused($arr[$keys[14]]); $this->setProTriDeleted($arr[$keys[14]]);
} }
if (array_key_exists($keys[15], $arr)) { if (array_key_exists($keys[15], $arr)) {
$this->setProTriReassigned($arr[$keys[15]]); $this->setProTriCanceled($arr[$keys[15]]);
} }
if (array_key_exists($keys[16], $arr)) { if (array_key_exists($keys[16], $arr)) {
$this->setProTriUnpaused($arr[$keys[16]]); $this->setProTriPaused($arr[$keys[16]]);
} }
if (array_key_exists($keys[17], $arr)) { if (array_key_exists($keys[17], $arr)) {
$this->setProTypeProcess($arr[$keys[17]]); $this->setProTriReassigned($arr[$keys[17]]);
} }
if (array_key_exists($keys[18], $arr)) { if (array_key_exists($keys[18], $arr)) {
$this->setProShowDelegate($arr[$keys[18]]); $this->setProTriUnpaused($arr[$keys[18]]);
} }
if (array_key_exists($keys[19], $arr)) { if (array_key_exists($keys[19], $arr)) {
$this->setProShowDynaform($arr[$keys[19]]); $this->setProTypeProcess($arr[$keys[19]]);
} }
if (array_key_exists($keys[20], $arr)) { if (array_key_exists($keys[20], $arr)) {
$this->setProCategory($arr[$keys[20]]); $this->setProShowDelegate($arr[$keys[20]]);
} }
if (array_key_exists($keys[21], $arr)) { if (array_key_exists($keys[21], $arr)) {
$this->setProSubCategory($arr[$keys[21]]); $this->setProShowDynaform($arr[$keys[21]]);
} }
if (array_key_exists($keys[22], $arr)) { if (array_key_exists($keys[22], $arr)) {
$this->setProIndustry($arr[$keys[22]]); $this->setProCategory($arr[$keys[22]]);
} }
if (array_key_exists($keys[23], $arr)) { if (array_key_exists($keys[23], $arr)) {
$this->setProUpdateDate($arr[$keys[23]]); $this->setProSubCategory($arr[$keys[23]]);
} }
if (array_key_exists($keys[24], $arr)) { if (array_key_exists($keys[24], $arr)) {
$this->setProCreateDate($arr[$keys[24]]); $this->setProIndustry($arr[$keys[24]]);
} }
if (array_key_exists($keys[25], $arr)) { if (array_key_exists($keys[25], $arr)) {
$this->setProCreateUser($arr[$keys[25]]); $this->setProUpdateDate($arr[$keys[25]]);
} }
if (array_key_exists($keys[26], $arr)) { if (array_key_exists($keys[26], $arr)) {
$this->setProHeight($arr[$keys[26]]); $this->setProCreateDate($arr[$keys[26]]);
} }
if (array_key_exists($keys[27], $arr)) { if (array_key_exists($keys[27], $arr)) {
$this->setProWidth($arr[$keys[27]]); $this->setProCreateUser($arr[$keys[27]]);
} }
if (array_key_exists($keys[28], $arr)) { if (array_key_exists($keys[28], $arr)) {
$this->setProTitleX($arr[$keys[28]]); $this->setProHeight($arr[$keys[28]]);
} }
if (array_key_exists($keys[29], $arr)) { if (array_key_exists($keys[29], $arr)) {
$this->setProTitleY($arr[$keys[29]]); $this->setProWidth($arr[$keys[29]]);
} }
if (array_key_exists($keys[30], $arr)) { if (array_key_exists($keys[30], $arr)) {
$this->setProDebug($arr[$keys[30]]); $this->setProTitleX($arr[$keys[30]]);
} }
if (array_key_exists($keys[31], $arr)) { if (array_key_exists($keys[31], $arr)) {
$this->setProDynaforms($arr[$keys[31]]); $this->setProTitleY($arr[$keys[31]]);
} }
if (array_key_exists($keys[32], $arr)) { if (array_key_exists($keys[32], $arr)) {
$this->setProDerivationScreenTpl($arr[$keys[32]]); $this->setProDebug($arr[$keys[32]]);
} }
if (array_key_exists($keys[33], $arr)) { if (array_key_exists($keys[33], $arr)) {
$this->setProCost($arr[$keys[33]]); $this->setProDynaforms($arr[$keys[33]]);
} }
if (array_key_exists($keys[34], $arr)) { if (array_key_exists($keys[34], $arr)) {
$this->setProUnitCost($arr[$keys[34]]); $this->setProDerivationScreenTpl($arr[$keys[34]]);
}
if (array_key_exists($keys[35], $arr)) {
$this->setProCost($arr[$keys[35]]);
}
if (array_key_exists($keys[36], $arr)) {
$this->setProUnitCost($arr[$keys[36]]);
} }
} }
@@ -2220,6 +2324,14 @@ abstract class BaseProcess extends BaseObject implements Persistent
$criteria->add(ProcessPeer::PRO_UID, $this->pro_uid); $criteria->add(ProcessPeer::PRO_UID, $this->pro_uid);
} }
if ($this->isColumnModified(ProcessPeer::PRO_TITLE)) {
$criteria->add(ProcessPeer::PRO_TITLE, $this->pro_title);
}
if ($this->isColumnModified(ProcessPeer::PRO_DESCRIPTION)) {
$criteria->add(ProcessPeer::PRO_DESCRIPTION, $this->pro_description);
}
if ($this->isColumnModified(ProcessPeer::PRO_PARENT)) { if ($this->isColumnModified(ProcessPeer::PRO_PARENT)) {
$criteria->add(ProcessPeer::PRO_PARENT, $this->pro_parent); $criteria->add(ProcessPeer::PRO_PARENT, $this->pro_parent);
} }
@@ -2410,6 +2522,10 @@ abstract class BaseProcess extends BaseObject implements Persistent
public function copyInto($copyObj, $deepCopy = false) public function copyInto($copyObj, $deepCopy = false)
{ {
$copyObj->setProTitle($this->pro_title);
$copyObj->setProDescription($this->pro_description);
$copyObj->setProParent($this->pro_parent); $copyObj->setProParent($this->pro_parent);
$copyObj->setProTime($this->pro_time); $copyObj->setProTime($this->pro_time);

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

@@ -25,7 +25,7 @@ abstract class BaseProcessPeer
const CLASS_DEFAULT = 'classes.model.Process'; const CLASS_DEFAULT = 'classes.model.Process';
/** The total number of columns. */ /** The total number of columns. */
const NUM_COLUMNS = 35; const NUM_COLUMNS = 37;
/** The number of lazy-loaded columns. */ /** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0; const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -34,6 +34,12 @@ abstract class BaseProcessPeer
/** the column name for the PRO_UID field */ /** the column name for the PRO_UID field */
const PRO_UID = 'PROCESS.PRO_UID'; 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 */ /** the column name for the PRO_PARENT field */
const PRO_PARENT = 'PROCESS.PRO_PARENT'; const PRO_PARENT = 'PROCESS.PRO_PARENT';
@@ -147,10 +153,10 @@ abstract class BaseProcessPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/ */
private static $fieldNames = array ( 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', ), 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', ),
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, ), 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, ),
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', ), 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', ),
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, ) 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, )
); );
/** /**
@@ -160,10 +166,10 @@ abstract class BaseProcessPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/ */
private static $fieldKeys = array ( 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, ), 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, ),
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, ), 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, ),
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, ), 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, ),
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, ) 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, )
); );
/** /**
@@ -266,6 +272,10 @@ abstract class BaseProcessPeer
$criteria->addSelectColumn(ProcessPeer::PRO_UID); $criteria->addSelectColumn(ProcessPeer::PRO_UID);
$criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
$criteria->addSelectColumn(ProcessPeer::PRO_DESCRIPTION);
$criteria->addSelectColumn(ProcessPeer::PRO_PARENT); $criteria->addSelectColumn(ProcessPeer::PRO_PARENT);
$criteria->addSelectColumn(ProcessPeer::PRO_TIME); $criteria->addSelectColumn(ProcessPeer::PRO_TIME);

2
workflow/engine/config/schema.xml
View File

@@ -870,6 +870,8 @@
<parameter name="Comment" value="Store process Information"/> <parameter name="Comment" value="Store process Information"/>
</vendor> </vendor>
<column name="PRO_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/> <column name="PRO_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
<column name="PRO_TITLE" type="LONGVARCHAR" required="true"/>
<column name="PRO_DESCRIPTION" type="LONGVARCHAR"/>
<column name="PRO_PARENT" type="VARCHAR" size="32" required="true" default="0"/> <column name="PRO_PARENT" type="VARCHAR" size="32" required="true" default="0"/>
<column name="PRO_TIME" type="DOUBLE" required="true" default="1"/> <column name="PRO_TIME" type="DOUBLE" required="true" default="1"/>
<column name="PRO_TIMEUNIT" type="VARCHAR" size="20" required="true" null="yes" default="DAYS"/> <column name="PRO_TIMEUNIT" type="VARCHAR" size="20" required="true" null="yes" default="DAYS"/>

12
workflow/engine/controllers/home.php
View File

@@ -714,15 +714,7 @@ class Home extends Controller
$cProcess = new Criteria("workflow"); $cProcess = new Criteria("workflow");
$cProcess->clearSelectColumns(); $cProcess->clearSelectColumns();
$cProcess->addSelectColumn(ProcessPeer::PRO_UID); $cProcess->addSelectColumn(ProcessPeer::PRO_UID);
$cProcess->addSelectColumn(ContentPeer::CON_VALUE); $cProcess->addSelectColumn(ProcessPeer::PRO_TITLE);
$del = DBAdapter::getStringDelimiter();
$conds = array();
$conds[] = array(ProcessPeer::PRO_UID, ContentPeer::CON_ID);
$conds[] = array(ContentPeer::CON_CATEGORY, $del . "PRO_TITLE" . $del);
$conds[] = array(ContentPeer::CON_LANG, $del . $lang . $del);
$cProcess->addJoinMC($conds, Criteria::LEFT_JOIN);
$cProcess->add(ProcessPeer::PRO_STATUS, "ACTIVE"); $cProcess->add(ProcessPeer::PRO_STATUS, "ACTIVE");
$oDataset = ProcessPeer::doSelectRS($cProcess); $oDataset = ProcessPeer::doSelectRS($cProcess);
@@ -730,7 +722,7 @@ class Home extends Controller
$oDataset->next(); $oDataset->next();
while ($aRow = $oDataset->getRow()) { while ($aRow = $oDataset->getRow()) {
$processes[] = array($aRow["PRO_UID"], $aRow["CON_VALUE"]); $processes[] = array($aRow["PRO_UID"], $aRow["PRO_TITLE"]);
$oDataset->next(); $oDataset->next();
} }

2
workflow/engine/data/mysql/schema.sql
View File

@@ -418,6 +418,8 @@ DROP TABLE IF EXISTS `PROCESS`;
CREATE TABLE `PROCESS` CREATE TABLE `PROCESS`
( (
`PRO_UID` VARCHAR(32) default '' NOT NULL, `PRO_UID` VARCHAR(32) default '' NOT NULL,
`PRO_TITLE` MEDIUMTEXT NOT NULL,
`PRO_DESCRIPTION` MEDIUMTEXT,
`PRO_PARENT` VARCHAR(32) default '0' NOT NULL, `PRO_PARENT` VARCHAR(32) default '0' NOT NULL,
`PRO_TIME` DOUBLE default 1 NOT NULL, `PRO_TIME` DOUBLE default 1 NOT NULL,
`PRO_TIMEUNIT` VARCHAR(20) default 'DAYS' NOT NULL, `PRO_TIMEUNIT` VARCHAR(20) default 'DAYS' NOT NULL,

10
workflow/engine/methods/cases/casesConsolidatedListExtJs.php
View File

@@ -211,22 +211,16 @@ function getProcessArray($action, $userUid)
$cProcess = new Criteria("workflow"); $cProcess = new Criteria("workflow");
$cProcess->clearSelectColumns(); $cProcess->clearSelectColumns();
$cProcess->addSelectColumn(ProcessPeer::PRO_UID); $cProcess->addSelectColumn(ProcessPeer::PRO_UID);
$cProcess->addSelectColumn(ContentPeer::CON_VALUE); $cProcess->addSelectColumn(ProcessPeer::PRO_TITLE);
$del = DBAdapter::getStringDelimiter(); $del = DBAdapter::getStringDelimiter();
$conds = array();
$conds[] = array(ProcessPeer::PRO_UID, ContentPeer::CON_ID);
$conds[] = array(ContentPeer::CON_CATEGORY, $del . "PRO_TITLE" . $del);
$conds[] = array(ContentPeer::CON_LANG, $del . $lang . $del);
$cProcess->addJoinMC($conds, Criteria::LEFT_JOIN);
$cProcess->add(ProcessPeer::PRO_STATUS, "ACTIVE"); $cProcess->add(ProcessPeer::PRO_STATUS, "ACTIVE");
$oDataset = ProcessPeer::doSelectRS($cProcess); $oDataset = ProcessPeer::doSelectRS($cProcess);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next(); $oDataset->next();
while ($aRow = $oDataset->getRow()) { while ($aRow = $oDataset->getRow()) {
$processes[] = array($aRow["PRO_UID"], $aRow["CON_VALUE"]); $processes[] = array($aRow["PRO_UID"], $aRow["PRO_TITLE"]);
$oDataset->next(); $oDataset->next();
} }

11
workflow/engine/methods/cases/casesList_Ajax.php
View File

@@ -131,25 +131,20 @@ if ($actionAjax == "processListExtJs") {
//get the processes for this user in this action //get the processes for this user in this action
$cProcess->clearSelectColumns(); $cProcess->clearSelectColumns();
$cProcess->addSelectColumn(ProcessPeer::PRO_UID); $cProcess->addSelectColumn(ProcessPeer::PRO_UID);
$cProcess->addAsColumn('PRO_TITLE', ContentPeer::CON_VALUE); $cProcess->addSelectColumn(ProcessPeer::PRO_TITLE);
if ($categoryUid) { if ($categoryUid) {
$cProcess->add(ProcessPeer::PRO_CATEGORY, $categoryUid); $cProcess->add(ProcessPeer::PRO_CATEGORY, $categoryUid);
} }
$del = \DBAdapter::getStringDelimiter(); $del = \DBAdapter::getStringDelimiter();
$conds = array();
$conds[] = array(ProcessPeer::PRO_UID, ContentPeer::CON_ID);
$conds[] = array(ContentPeer::CON_CATEGORY, $del . 'PRO_TITLE' . $del);
$conds[] = array(ContentPeer::CON_LANG, $del . $lang . $del);
$cProcess->addJoinMC($conds, Criteria::LEFT_JOIN);
$cProcess->add(ProcessPeer::PRO_STATUS, 'ACTIVE'); $cProcess->add(ProcessPeer::PRO_STATUS, 'ACTIVE');
if (!is_null($query)) { if (!is_null($query)) {
$filters = $cProcess->getNewCriterion(ContentPeer::CON_VALUE, '%' . $query . '%', Criteria::LIKE); $filters = $cProcess->getNewCriterion(ProcessPeer::PRO_TITLE, '%' . $query . '%', Criteria::LIKE);
$cProcess->addAnd($filters); $cProcess->addAnd($filters);
} }
$cProcess->addAscendingOrderByColumn(ContentPeer::CON_VALUE); $cProcess->addAscendingOrderByColumn(ProcessPeer::PRO_TITLE);
$oDataset = ProcessPeer::doSelectRS($cProcess); $oDataset = ProcessPeer::doSelectRS($cProcess);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);

5
workflow/engine/methods/cases/cases_SchedulerGetProcesses.php
View File

@@ -11,14 +11,11 @@ G::LoadClass( 'Content' );
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( ProcessPeer::PRO_UID ); $oCriteria->addSelectColumn( ProcessPeer::PRO_UID );
$oCriteria->setDistinct(); $oCriteria->setDistinct();
$oCriteria->addSelectColumn( ContentPeer::CON_VALUE ); $oCriteria->addSelectColumn( ProcessPeer::PRO_TITLE );
$oCriteria->addJoin( ProcessPeer::PRO_UID, TaskPeer::PRO_UID, Criteria::LEFT_JOIN ); $oCriteria->addJoin( ProcessPeer::PRO_UID, TaskPeer::PRO_UID, Criteria::LEFT_JOIN );
$oCriteria->addJoin( ProcessPeer::PRO_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN );
$oCriteria->addJoin( TaskPeer::TAS_UID, TaskUserPeer::TAS_UID, Criteria::LEFT_JOIN ); $oCriteria->addJoin( TaskPeer::TAS_UID, TaskUserPeer::TAS_UID, Criteria::LEFT_JOIN );
$oCriteria->add( TaskUserPeer::USR_UID, $oUserId ); $oCriteria->add( TaskUserPeer::USR_UID, $oUserId );
$oCriteria->add( TaskPeer::TAS_START, 'true' ); $oCriteria->add( TaskPeer::TAS_START, 'true' );
$oCriteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE' );
$oCriteria->add( ContentPeer::CON_LANG, SYS_LANG );
$oCriteria->addAnd( ProcessPeer::PRO_UID, $process ); $oCriteria->addAnd( ProcessPeer::PRO_UID, $process );
$resultSet = TaskUserPeer::doSelectRS( $oCriteria ); $resultSet = TaskUserPeer::doSelectRS( $oCriteria );

15
workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
View File

@@ -2641,6 +2641,7 @@ class Cases
$c->clearSelectColumns(); $c->clearSelectColumns();
$c->addSelectColumn(\TaskPeer::TAS_UID); $c->addSelectColumn(\TaskPeer::TAS_UID);
$c->addSelectColumn(\TaskPeer::PRO_UID); $c->addSelectColumn(\TaskPeer::PRO_UID);
$c->addSelectColumn(\ProcessPeer::PRO_TITLE);
$c->addJoin(\TaskPeer::PRO_UID, \ProcessPeer::PRO_UID, \Criteria::LEFT_JOIN); $c->addJoin(\TaskPeer::PRO_UID, \ProcessPeer::PRO_UID, \Criteria::LEFT_JOIN);
$c->addJoin(\TaskPeer::TAS_UID, \TaskUserPeer::TAS_UID, \Criteria::LEFT_JOIN); $c->addJoin(\TaskPeer::TAS_UID, \TaskUserPeer::TAS_UID, \Criteria::LEFT_JOIN);
$c->add(\ProcessPeer::PRO_STATUS, 'ACTIVE'); $c->add(\ProcessPeer::PRO_STATUS, 'ACTIVE');
@@ -2662,20 +2663,6 @@ class Cases
); );
$c->addJoinMC( $tasTitleConds, \Criteria::LEFT_JOIN ); $c->addJoinMC( $tasTitleConds, \Criteria::LEFT_JOIN );
$c->addAsColumn('PRO_TITLE', 'C2.CON_VALUE');
$c->addAlias("C2", 'CONTENT');
$proTitleConds = array();
$proTitleConds[] = array(\ProcessPeer::PRO_UID, 'C2.CON_ID');
$proTitleConds[] = array(
'C2.CON_CATEGORY',
\DBAdapter::getStringDelimiter() . 'PRO_TITLE' . \DBAdapter::getStringDelimiter()
);
$proTitleConds[] = array(
'C2.CON_LANG',
\DBAdapter::getStringDelimiter() . SYS_LANG . \DBAdapter::getStringDelimiter()
);
$c->addJoinMC( $proTitleConds, \Criteria::LEFT_JOIN );
if ($typeView == 'category') { if ($typeView == 'category') {
$c->addAsColumn('PRO_CATEGORY', 'PCS.PRO_CATEGORY'); $c->addAsColumn('PRO_CATEGORY', 'PCS.PRO_CATEGORY');
$c->addAsColumn('CATEGORY_NAME', 'PCSCAT.CATEGORY_NAME'); $c->addAsColumn('CATEGORY_NAME', 'PCSCAT.CATEGORY_NAME');

17
workflow/engine/src/ProcessMaker/BusinessModel/Light.php
View File

@@ -1098,26 +1098,19 @@ class Light
$cProcess = new Criteria( 'workflow' ); $cProcess = new Criteria( 'workflow' );
$cProcess->clearSelectColumns(); $cProcess->clearSelectColumns();
$cProcess->addSelectColumn( \ProcessPeer::PRO_UID ); $cProcess->addSelectColumn( \ProcessPeer::PRO_UID );
$cProcess->addSelectColumn( \ContentPeer::CON_VALUE ); $cProcess->addSelectColumn( \ProcessPeer::PRO_TITLE );
if ($categoryUid) { if ($categoryUid) {
$cProcess->add( \ProcessPeer::PRO_CATEGORY, $categoryUid ); $cProcess->add( \ProcessPeer::PRO_CATEGORY, $categoryUid );
} }
$del = DBAdapter::getStringDelimiter();
$conds = array ();
$conds[] = array (ProcessPeer::PRO_UID,ContentPeer::CON_ID);
$conds[] = array (ContentPeer::CON_CATEGORY,$del . 'PRO_TITLE' . $del);
$conds[] = array (ContentPeer::CON_LANG,$del . $lang . $del);
$cProcess->addJoinMC( $conds, Criteria::LEFT_JOIN );
$cProcess->add( ProcessPeer::PRO_STATUS, 'ACTIVE' ); $cProcess->add( ProcessPeer::PRO_STATUS, 'ACTIVE' );
$cProcess->addAscendingOrderByColumn(ContentPeer::CON_VALUE); $cProcess->addAscendingOrderByColumn(\ProcessPeer::PRO_TITLE);
$oDataset = ProcessPeer::doSelectRS( $cProcess ); $oDataset = \ProcessPeer::doSelectRS( $cProcess );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC );
$oDataset->next(); $oDataset->next();
while ($aRow = $oDataset->getRow()) { while ($aRow = $oDataset->getRow()) {
$processes[] = array ($aRow['PRO_UID'],$aRow['CON_VALUE'] $processes[] = array ($aRow['PRO_UID'],$aRow['PRO_TITLE']);
);
$oDataset->next(); $oDataset->next();
} }
return print G::json_encode( $processes ); return print G::json_encode( $processes );

11
workflow/engine/src/ProcessMaker/BusinessModel/Process.php
View File

@@ -129,20 +129,13 @@ class Process
$criteria = new \Criteria("workflow"); $criteria = new \Criteria("workflow");
$criteria->addSelectColumn(\ProcessPeer::PRO_UID); $criteria->addSelectColumn(\ProcessPeer::PRO_UID);
$criteria->addSelectColumn(\ProcessPeer::PRO_TITLE);
$criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
$arrayCondition = array();
$arrayCondition[] = array(\ProcessPeer::PRO_UID, "CT.CON_ID", \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "PRO_TITLE" . $delimiter, \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
$criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
if ($processUidExclude != "") { if ($processUidExclude != "") {
$criteria->add(\ProcessPeer::PRO_UID, $processUidExclude, \Criteria::NOT_EQUAL); $criteria->add(\ProcessPeer::PRO_UID, $processUidExclude, \Criteria::NOT_EQUAL);
} }
$criteria->add("CT.CON_VALUE", $processTitle, \Criteria::EQUAL); $criteria->add(\ProcessPeer::PRO_TITLE, $processTitle, \Criteria::EQUAL);
$rsCriteria = \ProcessPeer::doSelectRS($criteria); $rsCriteria = \ProcessPeer::doSelectRS($criteria);