fernando/luos
1
0
Fork 0
Code Releases Activity

HOR-1387 Agregar los campos que se guardan en CONTENT que están relacionados a APPLICATION

Browse Source
This commit is contained in:
Ronald Q
2016-06-30 14:23:53 -04:00
parent e8caa0ae5d
commit 41b01296e0
10 changed files with 281 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2609,6 +2609,7 @@ class AppSolr
$c = new Criteria (); $c = new Criteria ();
$c->addSelectColumn (ApplicationPeer::APP_UID); $c->addSelectColumn (ApplicationPeer::APP_UID);
$c->addSelectColumn (ApplicationPeer::APP_TITLE);
$c->addSelectColumn (ApplicationPeer::APP_NUMBER); $c->addSelectColumn (ApplicationPeer::APP_NUMBER);
$c->addSelectColumn (ApplicationPeer::APP_STATUS); $c->addSelectColumn (ApplicationPeer::APP_STATUS);
$c->addSelectColumn (ApplicationPeer::PRO_UID); $c->addSelectColumn (ApplicationPeer::PRO_UID);
@@ -2616,10 +2617,9 @@ class AppSolr
$c->addSelectColumn (ApplicationPeer::APP_FINISH_DATE); $c->addSelectColumn (ApplicationPeer::APP_FINISH_DATE);
$c->addSelectColumn (ApplicationPeer::APP_UPDATE_DATE); $c->addSelectColumn (ApplicationPeer::APP_UPDATE_DATE);
$c->addSelectColumn (ApplicationPeer::APP_DATA); $c->addSelectColumn (ApplicationPeer::APP_DATA);
$c->addAsColumn ('APP_TITLE', 'capp.CON_VALUE'); $c->addSelectColumn (ProcessPeer::PRO_TITLE);
$c->addAsColumn ('PRO_TITLE', 'cpro.CON_VALUE');
$c->addSelectColumn ('ad.DEL_INDEX'); $c->addSelectColumn ('ad.DEL_INDEX');
$c->addSelectColumn ('ad.DEL_PREVIOUS'); $c->addSelectColumn ('ad.DEL_PREVIOUS');
$c->addSelectColumn ('ad.TAS_UID'); $c->addSelectColumn ('ad.TAS_UID');
@@ -2644,43 +2644,12 @@ class AppSolr
$c->addSelectColumn ('at.APP_THREAD_PARENT'); $c->addSelectColumn ('at.APP_THREAD_PARENT');
$c->addSelectColumn ('at.APP_THREAD_STATUS'); $c->addSelectColumn ('at.APP_THREAD_STATUS');
$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');
$aConditions = array (); $c->addJoin (ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
$aConditions [] = array (
ApplicationPeer::APP_UID,
'capp.CON_ID'
);
$aConditions [] = array (
'capp.CON_CATEGORY',
DBAdapter::getStringDelimiter () . 'APP_TITLE' . DBAdapter::getStringDelimiter ()
);
$aConditions [] = array (
'capp.CON_LANG',
DBAdapter::getStringDelimiter () . 'en' . DBAdapter::getStringDelimiter ()
);
$c->addJoinMC ($aConditions, 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 ();
$aConditions [] = array ( $aConditions [] = array (
'ad.APP_UID', 'ad.APP_UID',
@@ -2725,6 +2694,7 @@ class AppSolr
$c = new Criteria (); $c = new Criteria ();
$c->addSelectColumn (ApplicationPeer::APP_UID); $c->addSelectColumn (ApplicationPeer::APP_UID);
$c->addSelectColumn (ApplicationPeer::APP_TITLE);
$c->addSelectColumn (ApplicationPeer::APP_NUMBER); $c->addSelectColumn (ApplicationPeer::APP_NUMBER);
$c->addSelectColumn (ApplicationPeer::APP_STATUS); $c->addSelectColumn (ApplicationPeer::APP_STATUS);
$c->addSelectColumn (ApplicationPeer::PRO_UID); $c->addSelectColumn (ApplicationPeer::PRO_UID);
@@ -2733,7 +2703,6 @@ class AppSolr
$c->addSelectColumn (ApplicationPeer::APP_UPDATE_DATE); $c->addSelectColumn (ApplicationPeer::APP_UPDATE_DATE);
$c->addSelectColumn (ApplicationPeer::APP_DATA); $c->addSelectColumn (ApplicationPeer::APP_DATA);
$c->addAsColumn ('APP_TITLE', 'capp.CON_VALUE');
$c->addSelectColumn ('pro.PRO_TITLE'); $c->addSelectColumn ('pro.PRO_TITLE');
$c->addSelectColumn ('ad.DEL_INDEX'); $c->addSelectColumn ('ad.DEL_INDEX');
@@ -2766,26 +2735,11 @@ class AppSolr
$c->addAsColumn("PRO_CATEGORY_UID", "pro.PRO_CATEGORY"); $c->addAsColumn("PRO_CATEGORY_UID", "pro.PRO_CATEGORY");
$c->addAlias ('capp', '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');
$c->addAlias ("pro", ProcessPeer::TABLE_NAME); $c->addAlias ("pro", ProcessPeer::TABLE_NAME);
$aConditions = array ();
$aConditions [] = array (
ApplicationPeer::APP_UID,
'capp.CON_ID'
);
$aConditions [] = array (
'capp.CON_CATEGORY',
DBAdapter::getStringDelimiter () . 'APP_TITLE' . DBAdapter::getStringDelimiter ()
);
$aConditions [] = array (
'capp.CON_LANG',
DBAdapter::getStringDelimiter () . 'en' . DBAdapter::getStringDelimiter ()
);
$c->addJoinMC ($aConditions, Criteria::LEFT_JOIN);
$c->addJoin (ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN); $c->addJoin (ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
$c->addJoin (ApplicationPeer::APP_UID, 'ad.APP_UID', Criteria::JOIN); $c->addJoin (ApplicationPeer::APP_UID, 'ad.APP_UID', Criteria::JOIN);

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

@@ -2706,6 +2706,7 @@ class Cases
$c = new Criteria('workflow'); $c = new Criteria('workflow');
$c->clearSelectColumns(); $c->clearSelectColumns();
$c->addSelectColumn(ApplicationPeer::APP_UID); $c->addSelectColumn(ApplicationPeer::APP_UID);
$c->addSelectColumn(ApplicationPeer::APP_TITLE);
$c->addSelectColumn(ApplicationPeer::APP_NUMBER); $c->addSelectColumn(ApplicationPeer::APP_NUMBER);
$c->addSelectColumn(ApplicationPeer::APP_UPDATE_DATE); $c->addSelectColumn(ApplicationPeer::APP_UPDATE_DATE);
$c->addSelectColumn(ApplicationPeer::PRO_UID); $c->addSelectColumn(ApplicationPeer::PRO_UID);
@@ -2730,7 +2731,6 @@ class Cases
$c->addSelectColumn(UsersPeer::USR_UID); $c->addSelectColumn(UsersPeer::USR_UID);
$c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)"); $c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)");
$c->addSelectColumn(ApplicationPeer::APP_STATUS); $c->addSelectColumn(ApplicationPeer::APP_STATUS);
$c->addAsColumn('APP_TITLE', 'APP_TITLE.CON_VALUE');
$c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE'); $c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE');
$c->addAsColumn('APP_TAS_TITLE', 'TAS_TITLE.CON_VALUE'); $c->addAsColumn('APP_TAS_TITLE', 'TAS_TITLE.CON_VALUE');
//$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME'); //$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME');
@@ -2740,7 +2740,6 @@ class Cases
APP_LAST_USER.USR_FIRSTNAME)" APP_LAST_USER.USR_FIRSTNAME)"
); );
$c->addAlias("APP_TITLE", 'CONTENT');
$c->addAlias("PRO_TITLE", 'CONTENT'); $c->addAlias("PRO_TITLE", 'CONTENT');
$c->addAlias("TAS_TITLE", 'CONTENT'); $c->addAlias("TAS_TITLE", 'CONTENT');
$c->addAlias("APP_PREV_DEL", 'APP_DELEGATION'); $c->addAlias("APP_PREV_DEL", 'APP_DELEGATION');
@@ -2754,12 +2753,6 @@ class Cases
$c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN); $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
$del = DBAdapter::getStringDelimiter(); $del = DBAdapter::getStringDelimiter();
$appTitleConds = array();
$appTitleConds[] = array(ApplicationPeer::APP_UID, 'APP_TITLE.CON_ID');
$appTitleConds[] = array('APP_TITLE.CON_CATEGORY', $del . 'APP_TITLE' . $del);
$appTitleConds[] = array('APP_TITLE.CON_LANG', $del . SYS_LANG . $del);
$c->addJoinMC($appTitleConds, Criteria::LEFT_JOIN);
$proTitleConds = array(); $proTitleConds = array();
$proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID'); $proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID');
$proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del); $proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del);
@@ -2955,6 +2948,7 @@ class Cases
$c = new Criteria('workflow'); $c = new Criteria('workflow');
$c->clearSelectColumns(); $c->clearSelectColumns();
$c->addSelectColumn(ApplicationPeer::APP_UID); $c->addSelectColumn(ApplicationPeer::APP_UID);
$c->addSelectColumn(ApplicationPeer::APP_TITLE);
$c->addSelectColumn(ApplicationPeer::APP_NUMBER); $c->addSelectColumn(ApplicationPeer::APP_NUMBER);
$c->addSelectColumn(ApplicationPeer::APP_UPDATE_DATE); $c->addSelectColumn(ApplicationPeer::APP_UPDATE_DATE);
$c->addSelectColumn(ApplicationPeer::PRO_UID); $c->addSelectColumn(ApplicationPeer::PRO_UID);
@@ -2974,11 +2968,9 @@ class Cases
$c->addSelectColumn(UsersPeer::USR_UID); $c->addSelectColumn(UsersPeer::USR_UID);
$c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)"); $c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)");
$c->addSelectColumn(ApplicationPeer::APP_STATUS); $c->addSelectColumn(ApplicationPeer::APP_STATUS);
$c->addAsColumn('APP_TITLE', 'APP_TITLE.CON_VALUE');
$c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE'); $c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE');
$c->addAsColumn('APP_TAS_TITLE', 'TAS_TITLE.CON_VALUE'); $c->addAsColumn('APP_TAS_TITLE', 'TAS_TITLE.CON_VALUE');
$c->addAlias("APP_TITLE", 'CONTENT');
$c->addAlias("PRO_TITLE", 'CONTENT'); $c->addAlias("PRO_TITLE", 'CONTENT');
$c->addAlias("TAS_TITLE", 'CONTENT'); $c->addAlias("TAS_TITLE", 'CONTENT');
@@ -2990,11 +2982,6 @@ class Cases
$c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN); $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
$del = DBAdapter::getStringDelimiter(); $del = DBAdapter::getStringDelimiter();
$appTitleConds = array();
$appTitleConds[] = array(ApplicationPeer::APP_UID, 'APP_TITLE.CON_ID');
$appTitleConds[] = array('APP_TITLE.CON_CATEGORY', $del . 'APP_TITLE' . $del);
$appTitleConds[] = array('APP_TITLE.CON_LANG', $del . SYS_LANG . $del);
$c->addJoinMC($appTitleConds, Criteria::LEFT_JOIN);
// //
$proTitleConds = array(); $proTitleConds = array();
$proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID'); $proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID');
@@ -3141,7 +3128,7 @@ class Cases
$c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)"); $c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)");
$c->addSelectColumn(ApplicationPeer::APP_STATUS); $c->addSelectColumn(ApplicationPeer::APP_STATUS);
if ($titles) { if ($titles) {
$c->addAsColumn('APP_TITLE', 'APP_TITLE.CON_VALUE'); $c->addSelectColumn(ApplicationPeer::APP_TITLE);
$c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE'); $c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE');
$c->addAsColumn('APP_TAS_TITLE', 'TAS_TITLE.CON_VALUE'); $c->addAsColumn('APP_TAS_TITLE', 'TAS_TITLE.CON_VALUE');
} }
@@ -3150,7 +3137,6 @@ class Cases
'APP_DEL_PREVIOUS_USER', "CONCAT(APP_LAST_USER.USR_LASTNAME, ' ', APP_LAST_USER.USR_FIRSTNAME)"); 'APP_DEL_PREVIOUS_USER', "CONCAT(APP_LAST_USER.USR_LASTNAME, ' ', APP_LAST_USER.USR_FIRSTNAME)");
if ($titles) { if ($titles) {
$c->addAlias("APP_TITLE", 'CONTENT');
$c->addAlias("PRO_TITLE", 'CONTENT'); $c->addAlias("PRO_TITLE", 'CONTENT');
$c->addAlias("TAS_TITLE", 'CONTENT'); $c->addAlias("TAS_TITLE", 'CONTENT');
} }
@@ -3166,12 +3152,6 @@ class Cases
if ($titles) { if ($titles) {
$del = DBAdapter::getStringDelimiter(); $del = DBAdapter::getStringDelimiter();
$appTitleConds = array();
$appTitleConds[] = array(ApplicationPeer::APP_UID, 'APP_TITLE.CON_ID');
$appTitleConds[] = array('APP_TITLE.CON_CATEGORY', $del . 'APP_TITLE' . $del);
$appTitleConds[] = array('APP_TITLE.CON_LANG', $del . SYS_LANG . $del);
$c->addJoinMC($appTitleConds, Criteria::LEFT_JOIN);
$proTitleConds = array(); $proTitleConds = array();
$proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID'); $proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID');
$proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del); $proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del);
@@ -3224,6 +3204,7 @@ class Cases
$c = new Criteria('workflow'); $c = new Criteria('workflow');
$c->clearSelectColumns(); $c->clearSelectColumns();
$c->addSelectColumn(ApplicationPeer::APP_UID); $c->addSelectColumn(ApplicationPeer::APP_UID);
$c->addSelectColumn(ApplicationPeer::APP_TITLE);
$c->addSelectColumn(ApplicationPeer::APP_NUMBER); $c->addSelectColumn(ApplicationPeer::APP_NUMBER);
$c->addSelectColumn(ApplicationPeer::APP_UPDATE_DATE); $c->addSelectColumn(ApplicationPeer::APP_UPDATE_DATE);
$c->addSelectColumn(AppDelegationPeer::DEL_PRIORITY); $c->addSelectColumn(AppDelegationPeer::DEL_PRIORITY);
@@ -3240,14 +3221,12 @@ class Cases
$c->addSelectColumn(UsersPeer::USR_UID); $c->addSelectColumn(UsersPeer::USR_UID);
$c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)"); $c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)");
$c->addSelectColumn(ApplicationPeer::APP_STATUS); $c->addSelectColumn(ApplicationPeer::APP_STATUS);
$c->addAsColumn('APP_TITLE', 'APP_TITLE.CON_VALUE');
$c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE'); $c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE');
$c->addAsColumn('APP_TAS_TITLE', 'TAS_TITLE.CON_VALUE'); $c->addAsColumn('APP_TAS_TITLE', 'TAS_TITLE.CON_VALUE');
//$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME'); //$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME');
$c->addAsColumn( $c->addAsColumn(
'APP_DEL_PREVIOUS_USER', "CONCAT(APP_LAST_USER.USR_LASTNAME, ' ', APP_LAST_USER.USR_FIRSTNAME)"); 'APP_DEL_PREVIOUS_USER', "CONCAT(APP_LAST_USER.USR_LASTNAME, ' ', APP_LAST_USER.USR_FIRSTNAME)");
$c->addAlias("APP_TITLE", 'CONTENT');
$c->addAlias("PRO_TITLE", 'CONTENT'); $c->addAlias("PRO_TITLE", 'CONTENT');
$c->addAlias("TAS_TITLE", 'CONTENT'); $c->addAlias("TAS_TITLE", 'CONTENT');
$c->addAlias("APP_PREV_DEL", 'APP_DELEGATION'); $c->addAlias("APP_PREV_DEL", 'APP_DELEGATION');
@@ -3261,12 +3240,6 @@ class Cases
$c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN); $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
$del = DBAdapter::getStringDelimiter(); $del = DBAdapter::getStringDelimiter();
$appTitleConds = array();
$appTitleConds[] = array(ApplicationPeer::APP_UID, 'APP_TITLE.CON_ID');
$appTitleConds[] = array('APP_TITLE.CON_CATEGORY', $del . 'APP_TITLE' . $del);
$appTitleConds[] = array('APP_TITLE.CON_LANG', $del . SYS_LANG . $del);
$c->addJoinMC($appTitleConds, Criteria::LEFT_JOIN);
$proTitleConds = array(); $proTitleConds = array();
$proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID'); $proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID');
$proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del); $proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del);
@@ -6804,6 +6777,7 @@ class Cases
$c = new Criteria('workflow'); $c = new Criteria('workflow');
$c->clearSelectColumns(); $c->clearSelectColumns();
$c->addSelectColumn(ApplicationPeer::APP_UID); $c->addSelectColumn(ApplicationPeer::APP_UID);
$c->addSelectColumn(ApplicationPeer::APP_TITLE);
$c->addSelectColumn(ApplicationPeer::APP_NUMBER); $c->addSelectColumn(ApplicationPeer::APP_NUMBER);
$c->addSelectColumn(ApplicationPeer::APP_UPDATE_DATE); $c->addSelectColumn(ApplicationPeer::APP_UPDATE_DATE);
$c->addSelectColumn(AppDelegationPeer::DEL_PRIORITY); $c->addSelectColumn(AppDelegationPeer::DEL_PRIORITY);
@@ -6818,7 +6792,6 @@ class Cases
$c->addSelectColumn(UsersPeer::USR_UID); $c->addSelectColumn(UsersPeer::USR_UID);
$c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)"); $c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)");
$c->addSelectColumn(ApplicationPeer::APP_STATUS); $c->addSelectColumn(ApplicationPeer::APP_STATUS);
$c->addAsColumn('APP_TITLE', 'APP_TITLE.CON_VALUE');
$c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE'); $c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE');
$c->addAsColumn('APP_TAS_TITLE', 'TAS_TITLE.CON_VALUE'); $c->addAsColumn('APP_TAS_TITLE', 'TAS_TITLE.CON_VALUE');
//$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME'); //$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME');
@@ -6826,7 +6799,6 @@ class Cases
'APP_DEL_PREVIOUS_USER', "CONCAT(APP_LAST_USER.USR_LASTNAME, ' ', APP_LAST_USER.USR_FIRSTNAME)" 'APP_DEL_PREVIOUS_USER', "CONCAT(APP_LAST_USER.USR_LASTNAME, ' ', APP_LAST_USER.USR_FIRSTNAME)"
); );
$c->addAlias("APP_TITLE", 'CONTENT');
$c->addAlias("PRO_TITLE", 'CONTENT'); $c->addAlias("PRO_TITLE", 'CONTENT');
$c->addAlias("TAS_TITLE", 'CONTENT'); $c->addAlias("TAS_TITLE", 'CONTENT');
$c->addAlias("APP_PREV_DEL", 'APP_DELEGATION'); $c->addAlias("APP_PREV_DEL", 'APP_DELEGATION');
@@ -6840,12 +6812,6 @@ class Cases
$c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN); $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
$del = DBAdapter::getStringDelimiter(); $del = DBAdapter::getStringDelimiter();
$appTitleConds = array();
$appTitleConds[] = array(ApplicationPeer::APP_UID, 'APP_TITLE.CON_ID');
$appTitleConds[] = array('APP_TITLE.CON_CATEGORY', $del . 'APP_TITLE' . $del);
$appTitleConds[] = array('APP_TITLE.CON_LANG', $del . SYS_LANG . $del);
$c->addJoinMC($appTitleConds, Criteria::LEFT_JOIN);
$proTitleConds = array(); $proTitleConds = array();
$proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID'); $proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID');
$proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del); $proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del);

196
workflow/engine/classes/model/Application.php
View File

@@ -46,15 +46,15 @@ class Application extends BaseApplication
* This value goes in the content table * This value goes in the content table
* @var string * @var string
*/ */
protected $app_title = ''; protected $app_title_content = '';
protected $app_description = ''; protected $app_description_content = '';
//protected $app_proc_code = ''; //protected $app_proc_code = '';
/** /**
* Get the [app_title] column value. * Get the [app_title_content] column value.
* @return string * @return string
*/ */
public function getAppTitle() public function getAppTitleContent()
{ {
$oApplication = new Application; $oApplication = new Application;
if (!$oApplication->exists($this->getAppUid())) { if (!$oApplication->exists($this->getAppUid())) {
@@ -66,18 +66,18 @@ class Application extends BaseApplication
} }
$lang = defined('SYS_LANG')? SYS_LANG : 'en'; $lang = defined('SYS_LANG')? SYS_LANG : 'en';
$this->app_title = Content::load('APP_TITLE', '', $this->getAppUid(), $lang); $this->app_title_content = Content::load('APP_TITLE', '', $this->getAppUid(), $lang);
return $this->app_title; return $this->app_title_content;
} }
/** /**
* Set the [app_title] column value. * Set the [app_title_content] column value.
* *
* @param string $v new value * @param string $v new value
* @return void * @return void
*/ */
public function setAppTitle($v) public function setAppTitleContent($v)
{ {
if ($this->getAppUid() == '') { if ($this->getAppUid() == '') {
throw (new Exception( "Error in setAppTitle, the APP_UID can't be blank")); throw (new Exception( "Error in setAppTitle, the APP_UID can't be blank"));
@@ -89,163 +89,36 @@ class Application extends BaseApplication
$v = (string) $v; $v = (string) $v;
} }
if ($this->app_title !== $v || $v === '') { if ($this->app_title_content !== $v || $v === '') {
$this->app_title = $v; $this->app_title_content = $v;
$lang = defined('SYS_LANG')? SYS_LANG : 'en'; $lang = defined('SYS_LANG')? SYS_LANG : 'en';
$res = Content::addContent('APP_TITLE', '', $this->getAppUid(), $lang, $this->app_title); $res = Content::addContent('APP_TITLE', '', $this->getAppUid(), $lang, $this->app_title_content);
} }
} // set() } // set()
/** /**
* Get the [app_description] column value. * Get the [app_description_content] column value.
* @return string * @return string
*/ */
public function getAppDescription() public function getAppDescriptionContent()
{ {
if ($this->getAppUid() == '') { if ($this->getAppUid() == '') {
throw (new Exception( "Error in getAppDescription, the APP_UID can't be blank")); throw (new Exception( "Error in getAppDescription, the APP_UID can't be blank"));
} }
$lang = defined('SYS_LANG')? SYS_LANG : 'en'; $lang = defined('SYS_LANG')? SYS_LANG : 'en';
$this->app_description = Content::load('APP_DESCRIPTION', '', $this->getAppUid(), $lang); $this->app_description_content = Content::load('APP_DESCRIPTION', '', $this->getAppUid(), $lang);
return $this->app_description; return $this->app_description_content;
}
public function isEmptyInContent($content, $field, $lang)
{
if (isset($content[$field][$lang])) {
if (trim($content[$field][$lang]) != '') {
return false;
}
}
return true;
}
public function updateInsertContent($content, $field, $value)
{
if (isset($content[$field]['en'])) {
//update
$con = ContentPeer::retrieveByPK($field, '', $this->getAppUid(), 'en');
$con->setConValue($value);
if ($con->validate()) {
$res = $con->save();
}
} else {
//insert
$con = new Content();
$con->setConCategory($field);
$con->setConParent('');
$con->setConId($this->getAppUid());
$con->setConLang('en');
$con->setConValue($value);
if ($con->validate()) {
$res = $con->save();
}
}
}
public function normalizeContent($content, $field, $lang)
{
$value = '';
//if the lang row is not empty, update in 'en' row and continue
if (!$this->isEmptyInContent($content, $field, $lang)) {
//update/insert only if this lang is != 'en', with this always we will have an en row with last value
$value = $content[$field][$lang];
if ($lang != 'en') {
$this->updateInsertContent($content, $field, $value);
}
} else {
//if the lang row is empty, and 'en' row is not empty return 'en' value
if (!$this->isEmptyInContent($content, $field, 'en')) {
$value = $content[$field]['en'];
}
//if the lang row is empty, and 'en' row is empty get value for 'other' row and update in 'en'
//row and continue
if ($this->isEmptyInContent($content, $field, 'en')) {
if (isset($content[$field]) && is_array($content[$field])) {
foreach ($content[$field] as $lan => $val) {
if (trim($val) != '') {
$value = $val;
if ($lan != 'en') {
$this->updateInsertContent($content, $field , $value);
continue;
}
}
}
} else {
$this->updateInsertContent($content, $field, '');
}
}
}
return $value;
} }
/** /**
* Get the [app_description] , [app_title] column values. * Set the [app_description_content] column value.
* @return array of string
*/
public function getContentFields()
{
if ($this->getAppUid() == '') {
throw (new Exception("Error in getContentFields, the APP_UID can't be blank"));
}
$lang = defined('SYS_LANG')? SYS_LANG : 'en';
$c = new Criteria();
$c->clearSelectColumns();
$c->addSelectColumn(ContentPeer::CON_CATEGORY);
$c->addSelectColumn(ContentPeer::CON_LANG);
$c->addSelectColumn(ContentPeer::CON_VALUE);
$c->add(ContentPeer::CON_ID, $this->getAppUid());
//$c->add(ContentPeer::CON_LANG, $lang);
$c->addAscendingOrderByColumn('CON_CATEGORY');
$c->addAscendingOrderByColumn('CON_LANG');
$rs = ContentPeer::doSelectRS($c);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$rs->next();
$content = array();
while ($row = $rs->getRow()) {
$conCategory = $row['CON_CATEGORY'];
$conLang = $row['CON_LANG'];
if (!isset($content[$conCategory])) {
$content[$conCategory] = array();
}
if (!isset($content[$conCategory][$conLang])) {
$content[$conCategory][$conLang] = array();
}
$content[$conCategory][$conLang] = $row['CON_VALUE'];
$rs->next();
$row = $rs->getRow();
}
$appTitle = $this->normalizeContent($content, 'APP_TITLE', $lang);
$appDescription = $this->normalizeContent($content, 'APP_DESCRIPTION', $lang);
$res['APP_TITLE'] = $appTitle;
$res['APP_DESCRIPTION'] = $appDescription;
return $res;
}
/**
* Set the [app_description] column value.
* *
* @param string $v new value * @param string $v new value
* @return void * @return void
*/ */
public function setAppDescription($v) public function setAppDescriptionContent($v)
{ {
if ($this->getAppUid() == '') { if ($this->getAppUid() == '') {
throw ( new Exception( "Error in setAppTitle, the APP_UID can't be blank") ); throw ( new Exception( "Error in setAppTitle, the APP_UID can't be blank") );
@@ -257,10 +130,10 @@ class Application extends BaseApplication
$v = (string) $v; $v = (string) $v;
} }
if ($this->app_description !== $v || $v === '') { if ($this->app_description_content !== $v || $v === '') {
$this->app_description = $v; $this->app_description_content = $v;
$lang = defined('SYS_LANG')? SYS_LANG : 'en'; $lang = defined('SYS_LANG')? SYS_LANG : 'en';
$res = Content::addContent('APP_DESCRIPTION', '', $this->getAppUid(), $lang, $this->app_description); $res = Content::addContent('APP_DESCRIPTION', '', $this->getAppUid(), $lang, $this->app_description_content);
} }
} // set() } // set()
@@ -315,23 +188,13 @@ class Application extends BaseApplication
$con = Propel::getConnection(ApplicationPeer::DATABASE_NAME); $con = Propel::getConnection(ApplicationPeer::DATABASE_NAME);
try { try {
$oApplication = ApplicationPeer::retrieveByPk( $AppUid ); $oApplication = ApplicationPeer::retrieveByPK( $AppUid );
if (!$oApplication) { if (!$oApplication) {
return false; return false;
} }
if (is_object($oApplication) && get_class ($oApplication) == 'Application' ) { if (is_object($oApplication) && get_class ($oApplication) == 'Application' ) {
$aFields = $oApplication->toArray(BasePeer::TYPE_FIELDNAME); $aFields = $oApplication->toArray(BasePeer::TYPE_FIELDNAME);
$this->fromArray($aFields, BasePeer::TYPE_FIELDNAME); $this->fromArray($aFields, BasePeer::TYPE_FIELDNAME);
//this is the new function to optimize content queries
$aContentFields = $oApplication->getContentFields();
$aFields['APP_TITLE'] = $aContentFields['APP_TITLE'];
$aFields['APP_DESCRIPTION'] = $aContentFields['APP_DESCRIPTION'];
$this->app_title = $aFields['APP_TITLE'];
$this->app_description = $aFields['APP_DESCRIPTION'];
//$aFields['APP_PROC_CODE'] = $oApplication->getAppProcCode(); //$aFields['APP_PROC_CODE'] = $oApplication->getAppProcCode();
//$this->setAppProcCode($oApplication->getAppProcCode()); //$this->setAppProcCode($oApplication->getAppProcCode());
@@ -383,16 +246,17 @@ class Application extends BaseApplication
$this->setAppNumber($maxNumber); $this->setAppNumber($maxNumber);
$this->setAppData(serialize(['APP_NUMBER' => $maxNumber, 'PIN' => $pin])); $this->setAppData(serialize(['APP_NUMBER' => $maxNumber, 'PIN' => $pin]));
$this->setAppTitle('#' . $maxNumber);
$this->setAppDescription('');
if ($this->validate()) { if ($this->validate()) {
$con->begin(); $con->begin();
$res = $this->save(); $res = $this->save();
$con->commit(); $con->commit();
$this->setAppTitleContent('#' . $maxNumber);
$this->setAppDescriptionContent('');
//to do: ID_CASE in translation $this->setAppTitle(G::LoadTranslation('ID_CASE') . $maxNumber); //to do: ID_CASE in translation $this->setAppTitle(G::LoadTranslation('ID_CASE') . $maxNumber);
$lang = defined('SYS_LANG')? SYS_LANG : 'en';
Content::insertContent('APP_TITLE', '', $this->getAppUid(), $lang, '#' . $maxNumber);
Content::insertContent('APP_DESCRIPTION', '', $this->getAppUid(), $lang, '');
//Content::insertContent('APP_PROC_CODE', '', $this->getAppUid(), $lang, ''); //Content::insertContent('APP_PROC_CODE', '', $this->getAppUid(), $lang, '');
$con->commit(); $con->commit();
@@ -431,10 +295,10 @@ class Application extends BaseApplication
if ($oApp->validate()) { if ($oApp->validate()) {
if (isset($aData['APP_TITLE'])) { if (isset($aData['APP_TITLE'])) {
$oApp->setAppTitle($aData['APP_TITLE']); $this->setAppTitleContent($aData['APP_TITLE']);
} }
if (isset($aData['APP_DESCRIPTION'])) { if (isset($aData['APP_DESCRIPTION'])) {
$oApp->setAppDescription($aData['APP_DESCRIPTION']); $this->setAppDescriptionContent($aData['APP_DESCRIPTION']);
} }
//if ( isset ( $aData['APP_PROC_CODE'] ) ) //if ( isset ( $aData['APP_PROC_CODE'] ) )
@@ -511,6 +375,8 @@ class Application extends BaseApplication
$this->setAppUid(G::generateUniqueID()); $this->setAppUid(G::generateUniqueID());
$this->setAppNumber($maxNumber); $this->setAppNumber($maxNumber);
$this->setAppTitle('');
$this->setAppDescription('');
$this->setAppParent(isset($aData['APP_PARENT'])? $aData['APP_PARENT'] : 0); $this->setAppParent(isset($aData['APP_PARENT'])? $aData['APP_PARENT'] : 0);
$this->setAppStatus(isset($aData['APP_STATUS'])? $aData['APP_STATUS'] : 'DRAFT'); $this->setAppStatus(isset($aData['APP_STATUS'])? $aData['APP_STATUS'] : 'DRAFT');
$this->setProUid($aData['PRO_UID']); $this->setProUid($aData['PRO_UID']);
@@ -558,8 +424,8 @@ class Application extends BaseApplication
if ($this->validate()) { if ($this->validate()) {
$res = $this->save(); $res = $this->save();
$this->setAppTitle(''); $this->setAppTitleContent('');
$this->setAppDescription(''); $this->setAppDescriptionContent('');
$this->setAppProcCode(''); $this->setAppProcCode('');
} else { } else {
// Something went wrong. We can now get the validationFailures and handle them. // Something went wrong. We can now get the validationFailures and handle them.

11
workflow/engine/classes/model/ListInbox.php
View File

@@ -266,14 +266,13 @@ class ListInbox extends BaseListInbox
$aRow = $dataset->getRow(); $aRow = $dataset->getRow();
if ($aRow['CON_VALUE'] == '') { if ($aRow['CON_VALUE'] == '') {
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(ContentPeer::CON_VALUE); $criteria->addSelectColumn(ApplicationPeer::APP_TITLE);
$criteria->add( ContentPeer::CON_ID, $data['APP_UID'], Criteria::EQUAL ); $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
$criteria->add( ContentPeer::CON_CATEGORY, 'APP_TITLE', Criteria::EQUAL ); $dataset = ApplicationPeer::doSelectRS($criteria);
$criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
$dataset = ContentPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next(); $dataset->next();
$aRow = $dataset->getRow(); $aRowApp = $dataset->getRow();
$aRow['CON_VALUE'] = $aRowApp['APP_TITLE'];
} }
$data['APP_TITLE'] = $aRow['CON_VALUE']; $data['APP_TITLE'] = $aRow['CON_VALUE'];

14
workflow/engine/classes/model/ListUnassigned.php
View File

@@ -101,6 +101,7 @@ class ListUnassigned extends BaseListUnassigned
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn( ApplicationPeer::APP_NUMBER ); $criteria->addSelectColumn( ApplicationPeer::APP_NUMBER );
$criteria->addSelectColumn( ApplicationPeer::APP_TITLE );
$criteria->addSelectColumn( ApplicationPeer::APP_UPDATE_DATE ); $criteria->addSelectColumn( ApplicationPeer::APP_UPDATE_DATE );
$criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
$dataset = ApplicationPeer::doSelectRS($criteria); $dataset = ApplicationPeer::doSelectRS($criteria);
@@ -109,19 +110,6 @@ class ListUnassigned extends BaseListUnassigned
$aRow = $dataset->getRow(); $aRow = $dataset->getRow();
$data = array_merge($data, $aRow); $data = array_merge($data, $aRow);
$criteria = new Criteria();
$criteria->addSelectColumn(ContentPeer::CON_VALUE);
$criteria->add( ContentPeer::CON_ID, $data['APP_UID'], Criteria::EQUAL );
$criteria->add( ContentPeer::CON_CATEGORY, 'APP_TITLE', Criteria::EQUAL );
$criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL );
$dataset = ContentPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next();
$aRow = $dataset->getRow();
$data['APP_TITLE'] = $aRow['CON_VALUE'];
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(ContentPeer::CON_VALUE); $criteria->addSelectColumn(ContentPeer::CON_VALUE);
$criteria->add( ContentPeer::CON_ID, $data['PRO_UID'], Criteria::EQUAL ); $criteria->add( ContentPeer::CON_ID, $data['PRO_UID'], Criteria::EQUAL );

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

@@ -67,6 +67,10 @@ class ApplicationMapBuilder
$tMap->addPrimaryKey('APP_UID', 'AppUid', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addPrimaryKey('APP_UID', 'AppUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('APP_TITLE', 'AppTitle', 'string', CreoleTypes::LONGVARCHAR, true, null);
$tMap->addColumn('APP_DESCRIPTION', 'AppDescription', 'string', CreoleTypes::LONGVARCHAR, false, null);
$tMap->addColumn('APP_NUMBER', 'AppNumber', 'int', CreoleTypes::INTEGER, true, null); $tMap->addColumn('APP_NUMBER', 'AppNumber', 'int', CreoleTypes::INTEGER, true, null);
$tMap->addColumn('APP_PARENT', 'AppParent', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addColumn('APP_PARENT', 'AppParent', 'string', CreoleTypes::VARCHAR, true, 32);

294
workflow/engine/classes/model/om/BaseApplication.php
View File

@@ -33,6 +33,18 @@ abstract class BaseApplication extends BaseObject implements Persistent
*/ */
protected $app_uid = ''; protected $app_uid = '';
/**
* The value for the app_title field.
* @var string
*/
protected $app_title;
/**
* The value for the app_description field.
* @var string
*/
protected $app_description;
/** /**
* The value for the app_number field. * The value for the app_number field.
* @var int * @var int
@@ -166,6 +178,28 @@ abstract class BaseApplication extends BaseObject implements Persistent
return $this->app_uid; return $this->app_uid;
} }
/**
* Get the [app_title] column value.
*
* @return string
*/
public function getAppTitle()
{
return $this->app_title;
}
/**
* Get the [app_description] column value.
*
* @return string
*/
public function getAppDescription()
{
return $this->app_description;
}
/** /**
* Get the [app_number] column value. * Get the [app_number] column value.
* *
@@ -470,6 +504,50 @@ abstract class BaseApplication extends BaseObject implements Persistent
} // setAppUid() } // setAppUid()
/**
* Set the value of [app_title] column.
*
* @param string $v new value
* @return void
*/
public function setAppTitle($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->app_title !== $v) {
$this->app_title = $v;
$this->modifiedColumns[] = ApplicationPeer::APP_TITLE;
}
} // setAppTitle()
/**
* Set the value of [app_description] column.
*
* @param string $v new value
* @return void
*/
public function setAppDescription($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->app_description !== $v) {
$this->app_description = $v;
$this->modifiedColumns[] = ApplicationPeer::APP_DESCRIPTION;
}
} // setAppDescription()
/** /**
* Set the value of [app_number] column. * Set the value of [app_number] column.
* *
@@ -901,48 +979,52 @@ abstract class BaseApplication extends BaseObject implements Persistent
$this->app_uid = $rs->getString($startcol + 0); $this->app_uid = $rs->getString($startcol + 0);
$this->app_number = $rs->getInt($startcol + 1); $this->app_title = $rs->getString($startcol + 1);
$this->app_parent = $rs->getString($startcol + 2); $this->app_description = $rs->getString($startcol + 2);
$this->app_status = $rs->getString($startcol + 3); $this->app_number = $rs->getInt($startcol + 3);
$this->pro_uid = $rs->getString($startcol + 4); $this->app_parent = $rs->getString($startcol + 4);
$this->app_proc_status = $rs->getString($startcol + 5); $this->app_status = $rs->getString($startcol + 5);
$this->app_proc_code = $rs->getString($startcol + 6); $this->pro_uid = $rs->getString($startcol + 6);
$this->app_parallel = $rs->getString($startcol + 7); $this->app_proc_status = $rs->getString($startcol + 7);
$this->app_init_user = $rs->getString($startcol + 8); $this->app_proc_code = $rs->getString($startcol + 8);
$this->app_cur_user = $rs->getString($startcol + 9); $this->app_parallel = $rs->getString($startcol + 9);
$this->app_create_date = $rs->getTimestamp($startcol + 10, null); $this->app_init_user = $rs->getString($startcol + 10);
$this->app_init_date = $rs->getTimestamp($startcol + 11, null); $this->app_cur_user = $rs->getString($startcol + 11);
$this->app_finish_date = $rs->getTimestamp($startcol + 12, null); $this->app_create_date = $rs->getTimestamp($startcol + 12, null);
$this->app_update_date = $rs->getTimestamp($startcol + 13, null); $this->app_init_date = $rs->getTimestamp($startcol + 13, null);
$this->app_data = $rs->getString($startcol + 14); $this->app_finish_date = $rs->getTimestamp($startcol + 14, null);
$this->app_pin = $rs->getString($startcol + 15); $this->app_update_date = $rs->getTimestamp($startcol + 15, null);
$this->app_duration = $rs->getFloat($startcol + 16); $this->app_data = $rs->getString($startcol + 16);
$this->app_delay_duration = $rs->getFloat($startcol + 17); $this->app_pin = $rs->getString($startcol + 17);
$this->app_drive_folder_uid = $rs->getString($startcol + 18); $this->app_duration = $rs->getFloat($startcol + 18);
$this->app_delay_duration = $rs->getFloat($startcol + 19);
$this->app_drive_folder_uid = $rs->getString($startcol + 20);
$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 + 19; // 19 = ApplicationPeer::NUM_COLUMNS - ApplicationPeer::NUM_LAZY_LOAD_COLUMNS). return $startcol + 21; // 21 = ApplicationPeer::NUM_COLUMNS - ApplicationPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) { } catch (Exception $e) {
throw new PropelException("Error populating Application object", $e); throw new PropelException("Error populating Application object", $e);
@@ -1150,57 +1232,63 @@ abstract class BaseApplication extends BaseObject implements Persistent
return $this->getAppUid(); return $this->getAppUid();
break; break;
case 1: case 1:
return $this->getAppNumber(); return $this->getAppTitle();
break; break;
case 2: case 2:
return $this->getAppParent(); return $this->getAppDescription();
break; break;
case 3: case 3:
return $this->getAppStatus(); return $this->getAppNumber();
break; break;
case 4: case 4:
return $this->getProUid(); return $this->getAppParent();
break; break;
case 5: case 5:
return $this->getAppProcStatus(); return $this->getAppStatus();
break; break;
case 6: case 6:
return $this->getAppProcCode(); return $this->getProUid();
break; break;
case 7: case 7:
return $this->getAppParallel(); return $this->getAppProcStatus();
break; break;
case 8: case 8:
return $this->getAppInitUser(); return $this->getAppProcCode();
break; break;
case 9: case 9:
return $this->getAppCurUser(); return $this->getAppParallel();
break; break;
case 10: case 10:
return $this->getAppCreateDate(); return $this->getAppInitUser();
break; break;
case 11: case 11:
return $this->getAppInitDate(); return $this->getAppCurUser();
break; break;
case 12: case 12:
return $this->getAppFinishDate(); return $this->getAppCreateDate();
break; break;
case 13: case 13:
return $this->getAppUpdateDate(); return $this->getAppInitDate();
break; break;
case 14: case 14:
return $this->getAppData(); return $this->getAppFinishDate();
break; break;
case 15: case 15:
return $this->getAppPin(); return $this->getAppUpdateDate();
break; break;
case 16: case 16:
return $this->getAppDuration(); return $this->getAppData();
break; break;
case 17: case 17:
return $this->getAppDelayDuration(); return $this->getAppPin();
break; break;
case 18: case 18:
return $this->getAppDuration();
break;
case 19:
return $this->getAppDelayDuration();
break;
case 20:
return $this->getAppDriveFolderUid(); return $this->getAppDriveFolderUid();
break; break;
default: default:
@@ -1224,24 +1312,26 @@ abstract class BaseApplication extends BaseObject implements Persistent
$keys = ApplicationPeer::getFieldNames($keyType); $keys = ApplicationPeer::getFieldNames($keyType);
$result = array( $result = array(
$keys[0] => $this->getAppUid(), $keys[0] => $this->getAppUid(),
$keys[1] => $this->getAppNumber(), $keys[1] => $this->getAppTitle(),
$keys[2] => $this->getAppParent(), $keys[2] => $this->getAppDescription(),
$keys[3] => $this->getAppStatus(), $keys[3] => $this->getAppNumber(),
$keys[4] => $this->getProUid(), $keys[4] => $this->getAppParent(),
$keys[5] => $this->getAppProcStatus(), $keys[5] => $this->getAppStatus(),
$keys[6] => $this->getAppProcCode(), $keys[6] => $this->getProUid(),
$keys[7] => $this->getAppParallel(), $keys[7] => $this->getAppProcStatus(),
$keys[8] => $this->getAppInitUser(), $keys[8] => $this->getAppProcCode(),
$keys[9] => $this->getAppCurUser(), $keys[9] => $this->getAppParallel(),
$keys[10] => $this->getAppCreateDate(), $keys[10] => $this->getAppInitUser(),
$keys[11] => $this->getAppInitDate(), $keys[11] => $this->getAppCurUser(),
$keys[12] => $this->getAppFinishDate(), $keys[12] => $this->getAppCreateDate(),
$keys[13] => $this->getAppUpdateDate(), $keys[13] => $this->getAppInitDate(),
$keys[14] => $this->getAppData(), $keys[14] => $this->getAppFinishDate(),
$keys[15] => $this->getAppPin(), $keys[15] => $this->getAppUpdateDate(),
$keys[16] => $this->getAppDuration(), $keys[16] => $this->getAppData(),
$keys[17] => $this->getAppDelayDuration(), $keys[17] => $this->getAppPin(),
$keys[18] => $this->getAppDriveFolderUid(), $keys[18] => $this->getAppDuration(),
$keys[19] => $this->getAppDelayDuration(),
$keys[20] => $this->getAppDriveFolderUid(),
); );
return $result; return $result;
} }
@@ -1277,57 +1367,63 @@ abstract class BaseApplication extends BaseObject implements Persistent
$this->setAppUid($value); $this->setAppUid($value);
break; break;
case 1: case 1:
$this->setAppNumber($value); $this->setAppTitle($value);
break; break;
case 2: case 2:
$this->setAppParent($value); $this->setAppDescription($value);
break; break;
case 3: case 3:
$this->setAppStatus($value); $this->setAppNumber($value);
break; break;
case 4: case 4:
$this->setProUid($value); $this->setAppParent($value);
break; break;
case 5: case 5:
$this->setAppProcStatus($value); $this->setAppStatus($value);
break; break;
case 6: case 6:
$this->setAppProcCode($value); $this->setProUid($value);
break; break;
case 7: case 7:
$this->setAppParallel($value); $this->setAppProcStatus($value);
break; break;
case 8: case 8:
$this->setAppInitUser($value); $this->setAppProcCode($value);
break; break;
case 9: case 9:
$this->setAppCurUser($value); $this->setAppParallel($value);
break; break;
case 10: case 10:
$this->setAppCreateDate($value); $this->setAppInitUser($value);
break; break;
case 11: case 11:
$this->setAppInitDate($value); $this->setAppCurUser($value);
break; break;
case 12: case 12:
$this->setAppFinishDate($value); $this->setAppCreateDate($value);
break; break;
case 13: case 13:
$this->setAppUpdateDate($value); $this->setAppInitDate($value);
break; break;
case 14: case 14:
$this->setAppData($value); $this->setAppFinishDate($value);
break; break;
case 15: case 15:
$this->setAppPin($value); $this->setAppUpdateDate($value);
break; break;
case 16: case 16:
$this->setAppDuration($value); $this->setAppData($value);
break; break;
case 17: case 17:
$this->setAppDelayDuration($value); $this->setAppPin($value);
break; break;
case 18: case 18:
$this->setAppDuration($value);
break;
case 19:
$this->setAppDelayDuration($value);
break;
case 20:
$this->setAppDriveFolderUid($value); $this->setAppDriveFolderUid($value);
break; break;
} // switch() } // switch()
@@ -1358,75 +1454,83 @@ abstract class BaseApplication extends BaseObject implements Persistent
} }
if (array_key_exists($keys[1], $arr)) { if (array_key_exists($keys[1], $arr)) {
$this->setAppNumber($arr[$keys[1]]); $this->setAppTitle($arr[$keys[1]]);
} }
if (array_key_exists($keys[2], $arr)) { if (array_key_exists($keys[2], $arr)) {
$this->setAppParent($arr[$keys[2]]); $this->setAppDescription($arr[$keys[2]]);
} }
if (array_key_exists($keys[3], $arr)) { if (array_key_exists($keys[3], $arr)) {
$this->setAppStatus($arr[$keys[3]]); $this->setAppNumber($arr[$keys[3]]);
} }
if (array_key_exists($keys[4], $arr)) { if (array_key_exists($keys[4], $arr)) {
$this->setProUid($arr[$keys[4]]); $this->setAppParent($arr[$keys[4]]);
} }
if (array_key_exists($keys[5], $arr)) { if (array_key_exists($keys[5], $arr)) {
$this->setAppProcStatus($arr[$keys[5]]); $this->setAppStatus($arr[$keys[5]]);
} }
if (array_key_exists($keys[6], $arr)) { if (array_key_exists($keys[6], $arr)) {
$this->setAppProcCode($arr[$keys[6]]); $this->setProUid($arr[$keys[6]]);
} }
if (array_key_exists($keys[7], $arr)) { if (array_key_exists($keys[7], $arr)) {
$this->setAppParallel($arr[$keys[7]]); $this->setAppProcStatus($arr[$keys[7]]);
} }
if (array_key_exists($keys[8], $arr)) { if (array_key_exists($keys[8], $arr)) {
$this->setAppInitUser($arr[$keys[8]]); $this->setAppProcCode($arr[$keys[8]]);
} }
if (array_key_exists($keys[9], $arr)) { if (array_key_exists($keys[9], $arr)) {
$this->setAppCurUser($arr[$keys[9]]); $this->setAppParallel($arr[$keys[9]]);
} }
if (array_key_exists($keys[10], $arr)) { if (array_key_exists($keys[10], $arr)) {
$this->setAppCreateDate($arr[$keys[10]]); $this->setAppInitUser($arr[$keys[10]]);
} }
if (array_key_exists($keys[11], $arr)) { if (array_key_exists($keys[11], $arr)) {
$this->setAppInitDate($arr[$keys[11]]); $this->setAppCurUser($arr[$keys[11]]);
} }
if (array_key_exists($keys[12], $arr)) { if (array_key_exists($keys[12], $arr)) {
$this->setAppFinishDate($arr[$keys[12]]); $this->setAppCreateDate($arr[$keys[12]]);
} }
if (array_key_exists($keys[13], $arr)) { if (array_key_exists($keys[13], $arr)) {
$this->setAppUpdateDate($arr[$keys[13]]); $this->setAppInitDate($arr[$keys[13]]);
} }
if (array_key_exists($keys[14], $arr)) { if (array_key_exists($keys[14], $arr)) {
$this->setAppData($arr[$keys[14]]); $this->setAppFinishDate($arr[$keys[14]]);
} }
if (array_key_exists($keys[15], $arr)) { if (array_key_exists($keys[15], $arr)) {
$this->setAppPin($arr[$keys[15]]); $this->setAppUpdateDate($arr[$keys[15]]);
} }
if (array_key_exists($keys[16], $arr)) { if (array_key_exists($keys[16], $arr)) {
$this->setAppDuration($arr[$keys[16]]); $this->setAppData($arr[$keys[16]]);
} }
if (array_key_exists($keys[17], $arr)) { if (array_key_exists($keys[17], $arr)) {
$this->setAppDelayDuration($arr[$keys[17]]); $this->setAppPin($arr[$keys[17]]);
} }
if (array_key_exists($keys[18], $arr)) { if (array_key_exists($keys[18], $arr)) {
$this->setAppDriveFolderUid($arr[$keys[18]]); $this->setAppDuration($arr[$keys[18]]);
}
if (array_key_exists($keys[19], $arr)) {
$this->setAppDelayDuration($arr[$keys[19]]);
}
if (array_key_exists($keys[20], $arr)) {
$this->setAppDriveFolderUid($arr[$keys[20]]);
} }
} }
@@ -1444,6 +1548,14 @@ abstract class BaseApplication extends BaseObject implements Persistent
$criteria->add(ApplicationPeer::APP_UID, $this->app_uid); $criteria->add(ApplicationPeer::APP_UID, $this->app_uid);
} }
if ($this->isColumnModified(ApplicationPeer::APP_TITLE)) {
$criteria->add(ApplicationPeer::APP_TITLE, $this->app_title);
}
if ($this->isColumnModified(ApplicationPeer::APP_DESCRIPTION)) {
$criteria->add(ApplicationPeer::APP_DESCRIPTION, $this->app_description);
}
if ($this->isColumnModified(ApplicationPeer::APP_NUMBER)) { if ($this->isColumnModified(ApplicationPeer::APP_NUMBER)) {
$criteria->add(ApplicationPeer::APP_NUMBER, $this->app_number); $criteria->add(ApplicationPeer::APP_NUMBER, $this->app_number);
} }
@@ -1570,6 +1682,10 @@ abstract class BaseApplication extends BaseObject implements Persistent
public function copyInto($copyObj, $deepCopy = false) public function copyInto($copyObj, $deepCopy = false)
{ {
$copyObj->setAppTitle($this->app_title);
$copyObj->setAppDescription($this->app_description);
$copyObj->setAppNumber($this->app_number); $copyObj->setAppNumber($this->app_number);
$copyObj->setAppParent($this->app_parent); $copyObj->setAppParent($this->app_parent);

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

@@ -25,7 +25,7 @@ abstract class BaseApplicationPeer
const CLASS_DEFAULT = 'classes.model.Application'; const CLASS_DEFAULT = 'classes.model.Application';
/** The total number of columns. */ /** The total number of columns. */
const NUM_COLUMNS = 19; const NUM_COLUMNS = 21;
/** 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 BaseApplicationPeer
/** the column name for the APP_UID field */ /** the column name for the APP_UID field */
const APP_UID = 'APPLICATION.APP_UID'; const APP_UID = 'APPLICATION.APP_UID';
/** the column name for the APP_TITLE field */
const APP_TITLE = 'APPLICATION.APP_TITLE';
/** the column name for the APP_DESCRIPTION field */
const APP_DESCRIPTION = 'APPLICATION.APP_DESCRIPTION';
/** the column name for the APP_NUMBER field */ /** the column name for the APP_NUMBER field */
const APP_NUMBER = 'APPLICATION.APP_NUMBER'; const APP_NUMBER = 'APPLICATION.APP_NUMBER';
@@ -99,10 +105,10 @@ abstract class BaseApplicationPeer
* 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 ('AppUid', 'AppNumber', 'AppParent', 'AppStatus', 'ProUid', 'AppProcStatus', 'AppProcCode', 'AppParallel', 'AppInitUser', 'AppCurUser', 'AppCreateDate', 'AppInitDate', 'AppFinishDate', 'AppUpdateDate', 'AppData', 'AppPin', 'AppDuration', 'AppDelayDuration', 'AppDriveFolderUid', ), BasePeer::TYPE_PHPNAME => array ('AppUid', 'AppTitle', 'AppDescription', 'AppNumber', 'AppParent', 'AppStatus', 'ProUid', 'AppProcStatus', 'AppProcCode', 'AppParallel', 'AppInitUser', 'AppCurUser', 'AppCreateDate', 'AppInitDate', 'AppFinishDate', 'AppUpdateDate', 'AppData', 'AppPin', 'AppDuration', 'AppDelayDuration', 'AppDriveFolderUid', ),
BasePeer::TYPE_COLNAME => array (ApplicationPeer::APP_UID, ApplicationPeer::APP_NUMBER, ApplicationPeer::APP_PARENT, ApplicationPeer::APP_STATUS, ApplicationPeer::PRO_UID, ApplicationPeer::APP_PROC_STATUS, ApplicationPeer::APP_PROC_CODE, ApplicationPeer::APP_PARALLEL, ApplicationPeer::APP_INIT_USER, ApplicationPeer::APP_CUR_USER, ApplicationPeer::APP_CREATE_DATE, ApplicationPeer::APP_INIT_DATE, ApplicationPeer::APP_FINISH_DATE, ApplicationPeer::APP_UPDATE_DATE, ApplicationPeer::APP_DATA, ApplicationPeer::APP_PIN, ApplicationPeer::APP_DURATION, ApplicationPeer::APP_DELAY_DURATION, ApplicationPeer::APP_DRIVE_FOLDER_UID, ), BasePeer::TYPE_COLNAME => array (ApplicationPeer::APP_UID, ApplicationPeer::APP_TITLE, ApplicationPeer::APP_DESCRIPTION, ApplicationPeer::APP_NUMBER, ApplicationPeer::APP_PARENT, ApplicationPeer::APP_STATUS, ApplicationPeer::PRO_UID, ApplicationPeer::APP_PROC_STATUS, ApplicationPeer::APP_PROC_CODE, ApplicationPeer::APP_PARALLEL, ApplicationPeer::APP_INIT_USER, ApplicationPeer::APP_CUR_USER, ApplicationPeer::APP_CREATE_DATE, ApplicationPeer::APP_INIT_DATE, ApplicationPeer::APP_FINISH_DATE, ApplicationPeer::APP_UPDATE_DATE, ApplicationPeer::APP_DATA, ApplicationPeer::APP_PIN, ApplicationPeer::APP_DURATION, ApplicationPeer::APP_DELAY_DURATION, ApplicationPeer::APP_DRIVE_FOLDER_UID, ),
BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'APP_NUMBER', 'APP_PARENT', 'APP_STATUS', 'PRO_UID', 'APP_PROC_STATUS', 'APP_PROC_CODE', 'APP_PARALLEL', 'APP_INIT_USER', 'APP_CUR_USER', 'APP_CREATE_DATE', 'APP_INIT_DATE', 'APP_FINISH_DATE', 'APP_UPDATE_DATE', 'APP_DATA', 'APP_PIN', 'APP_DURATION', 'APP_DELAY_DURATION', 'APP_DRIVE_FOLDER_UID', ), BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'APP_TITLE', 'APP_DESCRIPTION', 'APP_NUMBER', 'APP_PARENT', 'APP_STATUS', 'PRO_UID', 'APP_PROC_STATUS', 'APP_PROC_CODE', 'APP_PARALLEL', 'APP_INIT_USER', 'APP_CUR_USER', 'APP_CREATE_DATE', 'APP_INIT_DATE', 'APP_FINISH_DATE', 'APP_UPDATE_DATE', 'APP_DATA', 'APP_PIN', 'APP_DURATION', 'APP_DELAY_DURATION', 'APP_DRIVE_FOLDER_UID', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, ) 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, )
); );
/** /**
@@ -112,10 +118,10 @@ abstract class BaseApplicationPeer
* 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 ('AppUid' => 0, 'AppNumber' => 1, 'AppParent' => 2, 'AppStatus' => 3, 'ProUid' => 4, 'AppProcStatus' => 5, 'AppProcCode' => 6, 'AppParallel' => 7, 'AppInitUser' => 8, 'AppCurUser' => 9, 'AppCreateDate' => 10, 'AppInitDate' => 11, 'AppFinishDate' => 12, 'AppUpdateDate' => 13, 'AppData' => 14, 'AppPin' => 15, 'AppDuration' => 16, 'AppDelayDuration' => 17, 'AppDriveFolderUid' => 18, ), BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'AppTitle' => 1, 'AppDescription' => 2, 'AppNumber' => 3, 'AppParent' => 4, 'AppStatus' => 5, 'ProUid' => 6, 'AppProcStatus' => 7, 'AppProcCode' => 8, 'AppParallel' => 9, 'AppInitUser' => 10, 'AppCurUser' => 11, 'AppCreateDate' => 12, 'AppInitDate' => 13, 'AppFinishDate' => 14, 'AppUpdateDate' => 15, 'AppData' => 16, 'AppPin' => 17, 'AppDuration' => 18, 'AppDelayDuration' => 19, 'AppDriveFolderUid' => 20, ),
BasePeer::TYPE_COLNAME => array (ApplicationPeer::APP_UID => 0, ApplicationPeer::APP_NUMBER => 1, ApplicationPeer::APP_PARENT => 2, ApplicationPeer::APP_STATUS => 3, ApplicationPeer::PRO_UID => 4, ApplicationPeer::APP_PROC_STATUS => 5, ApplicationPeer::APP_PROC_CODE => 6, ApplicationPeer::APP_PARALLEL => 7, ApplicationPeer::APP_INIT_USER => 8, ApplicationPeer::APP_CUR_USER => 9, ApplicationPeer::APP_CREATE_DATE => 10, ApplicationPeer::APP_INIT_DATE => 11, ApplicationPeer::APP_FINISH_DATE => 12, ApplicationPeer::APP_UPDATE_DATE => 13, ApplicationPeer::APP_DATA => 14, ApplicationPeer::APP_PIN => 15, ApplicationPeer::APP_DURATION => 16, ApplicationPeer::APP_DELAY_DURATION => 17, ApplicationPeer::APP_DRIVE_FOLDER_UID => 18, ), BasePeer::TYPE_COLNAME => array (ApplicationPeer::APP_UID => 0, ApplicationPeer::APP_TITLE => 1, ApplicationPeer::APP_DESCRIPTION => 2, ApplicationPeer::APP_NUMBER => 3, ApplicationPeer::APP_PARENT => 4, ApplicationPeer::APP_STATUS => 5, ApplicationPeer::PRO_UID => 6, ApplicationPeer::APP_PROC_STATUS => 7, ApplicationPeer::APP_PROC_CODE => 8, ApplicationPeer::APP_PARALLEL => 9, ApplicationPeer::APP_INIT_USER => 10, ApplicationPeer::APP_CUR_USER => 11, ApplicationPeer::APP_CREATE_DATE => 12, ApplicationPeer::APP_INIT_DATE => 13, ApplicationPeer::APP_FINISH_DATE => 14, ApplicationPeer::APP_UPDATE_DATE => 15, ApplicationPeer::APP_DATA => 16, ApplicationPeer::APP_PIN => 17, ApplicationPeer::APP_DURATION => 18, ApplicationPeer::APP_DELAY_DURATION => 19, ApplicationPeer::APP_DRIVE_FOLDER_UID => 20, ),
BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'APP_NUMBER' => 1, 'APP_PARENT' => 2, 'APP_STATUS' => 3, 'PRO_UID' => 4, 'APP_PROC_STATUS' => 5, 'APP_PROC_CODE' => 6, 'APP_PARALLEL' => 7, 'APP_INIT_USER' => 8, 'APP_CUR_USER' => 9, 'APP_CREATE_DATE' => 10, 'APP_INIT_DATE' => 11, 'APP_FINISH_DATE' => 12, 'APP_UPDATE_DATE' => 13, 'APP_DATA' => 14, 'APP_PIN' => 15, 'APP_DURATION' => 16, 'APP_DELAY_DURATION' => 17, 'APP_DRIVE_FOLDER_UID' => 18, ), BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'APP_TITLE' => 1, 'APP_DESCRIPTION' => 2, 'APP_NUMBER' => 3, 'APP_PARENT' => 4, 'APP_STATUS' => 5, 'PRO_UID' => 6, 'APP_PROC_STATUS' => 7, 'APP_PROC_CODE' => 8, 'APP_PARALLEL' => 9, 'APP_INIT_USER' => 10, 'APP_CUR_USER' => 11, 'APP_CREATE_DATE' => 12, 'APP_INIT_DATE' => 13, 'APP_FINISH_DATE' => 14, 'APP_UPDATE_DATE' => 15, 'APP_DATA' => 16, 'APP_PIN' => 17, 'APP_DURATION' => 18, 'APP_DELAY_DURATION' => 19, 'APP_DRIVE_FOLDER_UID' => 20, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, ) 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, )
); );
/** /**
@@ -218,6 +224,10 @@ abstract class BaseApplicationPeer
$criteria->addSelectColumn(ApplicationPeer::APP_UID); $criteria->addSelectColumn(ApplicationPeer::APP_UID);
$criteria->addSelectColumn(ApplicationPeer::APP_TITLE);
$criteria->addSelectColumn(ApplicationPeer::APP_DESCRIPTION);
$criteria->addSelectColumn(ApplicationPeer::APP_NUMBER); $criteria->addSelectColumn(ApplicationPeer::APP_NUMBER);
$criteria->addSelectColumn(ApplicationPeer::APP_PARENT); $criteria->addSelectColumn(ApplicationPeer::APP_PARENT);

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

@@ -22,6 +22,8 @@
<parameter name="Comment" value="The application"/> <parameter name="Comment" value="The application"/>
</vendor> </vendor>
<column name="APP_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/> <column name="APP_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
<column name="APP_TITLE" type="LONGVARCHAR" required="true"/>
<column name="APP_DESCRIPTION" type="LONGVARCHAR"/>
<column name="APP_NUMBER" type="INTEGER" required="true" default="0"/> <column name="APP_NUMBER" type="INTEGER" required="true" default="0"/>
<column name="APP_PARENT" type="VARCHAR" size="32" required="true" default="0"/> <column name="APP_PARENT" type="VARCHAR" size="32" required="true" default="0"/>
<column name="APP_STATUS" type="VARCHAR" size="100" required="true" default=""/> <column name="APP_STATUS" type="VARCHAR" size="100" required="true" default=""/>

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

@@ -13,6 +13,8 @@ DROP TABLE IF EXISTS `APPLICATION`;
CREATE TABLE `APPLICATION` CREATE TABLE `APPLICATION`
( (
`APP_UID` VARCHAR(32) default '' NOT NULL, `APP_UID` VARCHAR(32) default '' NOT NULL,
`APP_TITLE` MEDIUMTEXT NOT NULL,
`APP_DESCRIPTION` MEDIUMTEXT,
`APP_NUMBER` INTEGER default 0 NOT NULL, `APP_NUMBER` INTEGER default 0 NOT NULL,
`APP_PARENT` VARCHAR(32) default '0' NOT NULL, `APP_PARENT` VARCHAR(32) default '0' NOT NULL,
`APP_STATUS` VARCHAR(100) default '' NOT NULL, `APP_STATUS` VARCHAR(100) default '' NOT NULL,
@@ -37,7 +39,6 @@ CREATE TABLE `APPLICATION`
KEY `indexAppStatus`(`APP_STATUS`), KEY `indexAppStatus`(`APP_STATUS`),
KEY `indexAppCreateDate`(`APP_CREATE_DATE`) KEY `indexAppCreateDate`(`APP_CREATE_DATE`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='The application'; )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='The application';
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
#-- APP_SEQUENCE #-- APP_SEQUENCE
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------