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

Merged in qronald/processmaker/HOR-1387 (pull request #4497)

Browse Source 
HOR-1387
This commit is contained in:
Julio Cesar Laura Avendaño
2016-07-11 17:33:53 -04:00
parent f50516ca7f 4780c3fb41
commit ee750c0c12
15 changed files with 299 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,9 +125,9 @@ class AppEvent extends BaseAppEvent
$oCriteria->addSelectColumn( EventPeer::PRO_UID );
$oCriteria->addSelectColumn( EventPeer::EVN_WHEN_OCCURS );
$oCriteria->addSelectColumn( EventPeer::EVN_ACTION );
$oCriteria->addSelectColumn( ApplicationPeer::APP_TITLE );
$oCriteria->addAsColumn( 'EVN_DESCRIPTION', 'C1.CON_VALUE' );
$oCriteria->addAsColumn( 'TAS_TITLE', 'C2.CON_VALUE' );
$oCriteria->addAsColumn( 'APP_TITLE', 'C3.CON_VALUE' );
$oCriteria->addAsColumn( 'PRO_TITLE', 'C4.CON_VALUE' );
$oCriteria->addAlias( 'C1', 'CONTENT' );
$oCriteria->addAlias( 'C2', 'CONTENT' );
@@ -157,14 +157,7 @@ class AppEvent extends BaseAppEvent
$aConditions[] = array ('C2.CON_LANG',$del . SYS_LANG . $del
);
$oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN );
$aConditions = array ();
$aConditions[] = array (AppDelegationPeer::APP_UID,'C3.CON_ID'
);
$aConditions[] = array ('C3.CON_CATEGORY',$del . 'APP_TITLE' . $del
);
$aConditions[] = array ('C3.CON_LANG',$del . SYS_LANG . $del
);
$oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN );
$oCriteria->addJoin(AppEventPeer::APP_UID, ApplicationPeer::APP_UID, Criteria::LEFT_JOIN);
$aConditions = array ();
$aConditions[] = array (AppDelegationPeer::PRO_UID,'C4.CON_ID'
);

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

@@ -46,15 +46,15 @@ class Application extends BaseApplication
* This value goes in the content table
* @var string
*/
protected $app_title = '';
protected $app_description = '';
protected $app_title_content = '';
protected $app_description_content = '';
//protected $app_proc_code = '';
/**
* Get the [app_title] column value.
* Get the [app_title_content] column value.
* @return string
*/
public function getAppTitle()
public function getAppTitleContent()
{
$oApplication = new Application;
if (!$oApplication->exists($this->getAppUid())) {
@@ -66,18 +66,18 @@ class Application extends BaseApplication
}
$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
* @return void
*/
public function setAppTitle($v)
public function setAppTitleContent($v)
{
if ($this->getAppUid() == '') {
throw (new Exception( "Error in setAppTitle, the APP_UID can't be blank"));
@@ -89,163 +89,36 @@ class Application extends BaseApplication
$v = (string) $v;
}
if ($this->app_title !== $v || $v === '') {
$this->app_title = $v;
if ($this->app_title_content !== $v || $v === '') {
$this->app_title_content = $v;
$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()
/**
* Get the [app_description] column value.
* Get the [app_description_content] column value.
* @return string
*/
public function getAppDescription()
public function getAppDescriptionContent()
{
if ($this->getAppUid() == '') {
throw (new Exception( "Error in getAppDescription, the APP_UID can't be blank"));
}
$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;
}
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;
return $this->app_description_content;
}
/**
* Get the [app_description] , [app_title] column values.
* @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.
* Set the [app_description_content] column value.
*
* @param string $v new value
* @return void
*/
public function setAppDescription($v)
public function setAppDescriptionContent($v)
{
if ($this->getAppUid() == '') {
throw ( new Exception( "Error in setAppTitle, the APP_UID can't be blank") );
@@ -257,10 +130,10 @@ class Application extends BaseApplication
$v = (string) $v;
}
if ($this->app_description !== $v || $v === '') {
$this->app_description = $v;
if ($this->app_description_content !== $v || $v === '') {
$this->app_description_content = $v;
$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()
@@ -315,23 +188,13 @@ class Application extends BaseApplication
$con = Propel::getConnection(ApplicationPeer::DATABASE_NAME);
try {
$oApplication = ApplicationPeer::retrieveByPk( $AppUid );
$oApplication = ApplicationPeer::retrieveByPK( $AppUid );
if (!$oApplication) {
return false;
}
if (is_object($oApplication) && get_class ($oApplication) == 'Application' ) {
$aFields = $oApplication->toArray(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();
//$this->setAppProcCode($oApplication->getAppProcCode());
@@ -383,16 +246,17 @@ class Application extends BaseApplication
$this->setAppNumber($maxNumber);
$this->setAppData(serialize(['APP_NUMBER' => $maxNumber, 'PIN' => $pin]));
$this->setAppTitle('#' . $maxNumber);
$this->setAppDescription('');
if ($this->validate()) {
$con->begin();
$res = $this->save();
$con->commit();
$this->setAppTitleContent('#' . $maxNumber);
$this->setAppDescriptionContent('');
//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, '');
$con->commit();
@@ -431,10 +295,10 @@ class Application extends BaseApplication
if ($oApp->validate()) {
if (isset($aData['APP_TITLE'])) {
$oApp->setAppTitle($aData['APP_TITLE']);
$this->setAppTitleContent($aData['APP_TITLE']);
}
if (isset($aData['APP_DESCRIPTION'])) {
$oApp->setAppDescription($aData['APP_DESCRIPTION']);
$this->setAppDescriptionContent($aData['APP_DESCRIPTION']);
}
//if ( isset ( $aData['APP_PROC_CODE'] ) )
@@ -511,6 +375,8 @@ class Application extends BaseApplication
$this->setAppUid(G::generateUniqueID());
$this->setAppNumber($maxNumber);
$this->setAppTitle('');
$this->setAppDescription('');
$this->setAppParent(isset($aData['APP_PARENT'])? $aData['APP_PARENT'] : 0);
$this->setAppStatus(isset($aData['APP_STATUS'])? $aData['APP_STATUS'] : 'DRAFT');
$this->setProUid($aData['PRO_UID']);
@@ -558,8 +424,8 @@ class Application extends BaseApplication
if ($this->validate()) {
$res = $this->save();
$this->setAppTitle('');
$this->setAppDescription('');
$this->setAppTitleContent('');
$this->setAppDescriptionContent('');
$this->setAppProcCode('');
} else {
// Something went wrong. We can now get the validationFailures and handle them.

10
workflow/engine/classes/model/ListCanceled.php
View File

@@ -25,15 +25,13 @@ class ListCanceled extends BaseListCanceled {
public function create($data)
{
$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);
$criteria->addSelectColumn(ApplicationPeer::APP_TITLE);
$criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
$dataset = ApplicationPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next();
$aRow = $dataset->getRow();
$data['APP_TITLE'] = $aRow['CON_VALUE'];
$data['APP_TITLE'] = $aRow['APP_TITLE'];
$criteria = new Criteria();
$criteria->addSelectColumn(ContentPeer::CON_VALUE);

10
workflow/engine/classes/model/ListCompleted.php
View File

@@ -35,15 +35,13 @@ class ListCompleted extends BaseListCompleted
}
$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);
$criteria->addSelectColumn(ApplicationPeer::APP_TITLE);
$criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
$dataset = ApplicationPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next();
$aRow = $dataset->getRow();
$data['APP_TITLE'] = $aRow['CON_VALUE'];
$data['APP_TITLE'] = $aRow['APP_TITLE'];
$criteria = new Criteria();

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

@@ -266,14 +266,13 @@ class ListInbox extends BaseListInbox
$aRow = $dataset->getRow();
if ($aRow['CON_VALUE'] == '') {
$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);
$criteria->addSelectColumn(ApplicationPeer::APP_TITLE);
$criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
$dataset = ApplicationPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next();
$aRow = $dataset->getRow();
$aRowApp = $dataset->getRow();
$aRow['CON_VALUE'] = $aRowApp['APP_TITLE'];
}
$data['APP_TITLE'] = $aRow['CON_VALUE'];

10
workflow/engine/classes/model/ListPaused.php
View File

@@ -25,15 +25,13 @@ class ListPaused extends BaseListPaused {
public function create($data)
{
$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);
$criteria->addSelectColumn(ApplicationPeer::APP_TITLE);
$criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
$dataset = ApplicationPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next();
$aRow = $dataset->getRow();
$data['APP_TITLE'] = $aRow['CON_VALUE'];
$data['APP_TITLE'] = $aRow['APP_TITLE'];
$criteria = new Criteria();
$criteria->addSelectColumn(ContentPeer::CON_VALUE);

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

@@ -101,6 +101,7 @@ class ListUnassigned extends BaseListUnassigned
$criteria = new Criteria();
$criteria->addSelectColumn( ApplicationPeer::APP_NUMBER );
$criteria->addSelectColumn( ApplicationPeer::APP_TITLE );
$criteria->addSelectColumn( ApplicationPeer::APP_UPDATE_DATE );
$criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
$dataset = ApplicationPeer::doSelectRS($criteria);
@@ -109,19 +110,6 @@ class ListUnassigned extends BaseListUnassigned
$aRow = $dataset->getRow();
$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->addSelectColumn(ContentPeer::CON_VALUE);
$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->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_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 = '';
/**
* 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.
* @var int
@@ -166,6 +178,28 @@ abstract class BaseApplication extends BaseObject implements Persistent
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.
*
@@ -470,6 +504,50 @@ abstract class BaseApplication extends BaseObject implements Persistent
} // 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.
*
@@ -901,48 +979,52 @@ abstract class BaseApplication extends BaseObject implements Persistent
$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->setNew(false);
// 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) {
throw new PropelException("Error populating Application object", $e);
@@ -1150,57 +1232,63 @@ abstract class BaseApplication extends BaseObject implements Persistent
return $this->getAppUid();
break;
case 1:
return $this->getAppNumber();
return $this->getAppTitle();
break;
case 2:
return $this->getAppParent();
return $this->getAppDescription();
break;
case 3:
return $this->getAppStatus();
return $this->getAppNumber();
break;
case 4:
return $this->getProUid();
return $this->getAppParent();
break;
case 5:
return $this->getAppProcStatus();
return $this->getAppStatus();
break;
case 6:
return $this->getAppProcCode();
return $this->getProUid();
break;
case 7:
return $this->getAppParallel();
return $this->getAppProcStatus();
break;
case 8:
return $this->getAppInitUser();
return $this->getAppProcCode();
break;
case 9:
return $this->getAppCurUser();
return $this->getAppParallel();
break;
case 10:
return $this->getAppCreateDate();
return $this->getAppInitUser();
break;
case 11:
return $this->getAppInitDate();
return $this->getAppCurUser();
break;
case 12:
return $this->getAppFinishDate();
return $this->getAppCreateDate();
break;
case 13:
return $this->getAppUpdateDate();
return $this->getAppInitDate();
break;
case 14:
return $this->getAppData();
return $this->getAppFinishDate();
break;
case 15:
return $this->getAppPin();
return $this->getAppUpdateDate();
break;
case 16:
return $this->getAppDuration();
return $this->getAppData();
break;
case 17:
return $this->getAppDelayDuration();
return $this->getAppPin();
break;
case 18:
return $this->getAppDuration();
break;
case 19:
return $this->getAppDelayDuration();
break;
case 20:
return $this->getAppDriveFolderUid();
break;
default:
@@ -1224,24 +1312,26 @@ abstract class BaseApplication extends BaseObject implements Persistent
$keys = ApplicationPeer::getFieldNames($keyType);
$result = array(
$keys[0] => $this->getAppUid(),
$keys[1] => $this->getAppNumber(),
$keys[2] => $this->getAppParent(),
$keys[3] => $this->getAppStatus(),
$keys[4] => $this->getProUid(),
$keys[5] => $this->getAppProcStatus(),
$keys[6] => $this->getAppProcCode(),
$keys[7] => $this->getAppParallel(),
$keys[8] => $this->getAppInitUser(),
$keys[9] => $this->getAppCurUser(),
$keys[10] => $this->getAppCreateDate(),
$keys[11] => $this->getAppInitDate(),
$keys[12] => $this->getAppFinishDate(),
$keys[13] => $this->getAppUpdateDate(),
$keys[14] => $this->getAppData(),
$keys[15] => $this->getAppPin(),
$keys[16] => $this->getAppDuration(),
$keys[17] => $this->getAppDelayDuration(),
$keys[18] => $this->getAppDriveFolderUid(),
$keys[1] => $this->getAppTitle(),
$keys[2] => $this->getAppDescription(),
$keys[3] => $this->getAppNumber(),
$keys[4] => $this->getAppParent(),
$keys[5] => $this->getAppStatus(),
$keys[6] => $this->getProUid(),
$keys[7] => $this->getAppProcStatus(),
$keys[8] => $this->getAppProcCode(),
$keys[9] => $this->getAppParallel(),
$keys[10] => $this->getAppInitUser(),
$keys[11] => $this->getAppCurUser(),
$keys[12] => $this->getAppCreateDate(),
$keys[13] => $this->getAppInitDate(),
$keys[14] => $this->getAppFinishDate(),
$keys[15] => $this->getAppUpdateDate(),
$keys[16] => $this->getAppData(),
$keys[17] => $this->getAppPin(),
$keys[18] => $this->getAppDuration(),
$keys[19] => $this->getAppDelayDuration(),
$keys[20] => $this->getAppDriveFolderUid(),
);
return $result;
}
@@ -1277,57 +1367,63 @@ abstract class BaseApplication extends BaseObject implements Persistent
$this->setAppUid($value);
break;
case 1:
$this->setAppNumber($value);
$this->setAppTitle($value);
break;
case 2:
$this->setAppParent($value);
$this->setAppDescription($value);
break;
case 3:
$this->setAppStatus($value);
$this->setAppNumber($value);
break;
case 4:
$this->setProUid($value);
$this->setAppParent($value);
break;
case 5:
$this->setAppProcStatus($value);
$this->setAppStatus($value);
break;
case 6:
$this->setAppProcCode($value);
$this->setProUid($value);
break;
case 7:
$this->setAppParallel($value);
$this->setAppProcStatus($value);
break;
case 8:
$this->setAppInitUser($value);
$this->setAppProcCode($value);
break;
case 9:
$this->setAppCurUser($value);
$this->setAppParallel($value);
break;
case 10:
$this->setAppCreateDate($value);
$this->setAppInitUser($value);
break;
case 11:
$this->setAppInitDate($value);
$this->setAppCurUser($value);
break;
case 12:
$this->setAppFinishDate($value);
$this->setAppCreateDate($value);
break;
case 13:
$this->setAppUpdateDate($value);
$this->setAppInitDate($value);
break;
case 14:
$this->setAppData($value);
$this->setAppFinishDate($value);
break;
case 15:
$this->setAppPin($value);
$this->setAppUpdateDate($value);
break;
case 16:
$this->setAppDuration($value);
$this->setAppData($value);
break;
case 17:
$this->setAppDelayDuration($value);
$this->setAppPin($value);
break;
case 18:
$this->setAppDuration($value);
break;
case 19:
$this->setAppDelayDuration($value);
break;
case 20:
$this->setAppDriveFolderUid($value);
break;
} // switch()
@@ -1358,75 +1454,83 @@ abstract class BaseApplication extends BaseObject implements Persistent
}
if (array_key_exists($keys[1], $arr)) {
$this->setAppNumber($arr[$keys[1]]);
$this->setAppTitle($arr[$keys[1]]);
}
if (array_key_exists($keys[2], $arr)) {
$this->setAppParent($arr[$keys[2]]);
$this->setAppDescription($arr[$keys[2]]);
}
if (array_key_exists($keys[3], $arr)) {
$this->setAppStatus($arr[$keys[3]]);
$this->setAppNumber($arr[$keys[3]]);
}
if (array_key_exists($keys[4], $arr)) {
$this->setProUid($arr[$keys[4]]);
$this->setAppParent($arr[$keys[4]]);
}
if (array_key_exists($keys[5], $arr)) {
$this->setAppProcStatus($arr[$keys[5]]);
$this->setAppStatus($arr[$keys[5]]);
}
if (array_key_exists($keys[6], $arr)) {
$this->setAppProcCode($arr[$keys[6]]);
$this->setProUid($arr[$keys[6]]);
}
if (array_key_exists($keys[7], $arr)) {
$this->setAppParallel($arr[$keys[7]]);
$this->setAppProcStatus($arr[$keys[7]]);
}
if (array_key_exists($keys[8], $arr)) {
$this->setAppInitUser($arr[$keys[8]]);
$this->setAppProcCode($arr[$keys[8]]);
}
if (array_key_exists($keys[9], $arr)) {
$this->setAppCurUser($arr[$keys[9]]);
$this->setAppParallel($arr[$keys[9]]);
}
if (array_key_exists($keys[10], $arr)) {
$this->setAppCreateDate($arr[$keys[10]]);
$this->setAppInitUser($arr[$keys[10]]);
}
if (array_key_exists($keys[11], $arr)) {
$this->setAppInitDate($arr[$keys[11]]);
$this->setAppCurUser($arr[$keys[11]]);
}
if (array_key_exists($keys[12], $arr)) {
$this->setAppFinishDate($arr[$keys[12]]);
$this->setAppCreateDate($arr[$keys[12]]);
}
if (array_key_exists($keys[13], $arr)) {
$this->setAppUpdateDate($arr[$keys[13]]);
$this->setAppInitDate($arr[$keys[13]]);
}
if (array_key_exists($keys[14], $arr)) {
$this->setAppData($arr[$keys[14]]);
$this->setAppFinishDate($arr[$keys[14]]);
}
if (array_key_exists($keys[15], $arr)) {
$this->setAppPin($arr[$keys[15]]);
$this->setAppUpdateDate($arr[$keys[15]]);
}
if (array_key_exists($keys[16], $arr)) {
$this->setAppDuration($arr[$keys[16]]);
$this->setAppData($arr[$keys[16]]);
}
if (array_key_exists($keys[17], $arr)) {
$this->setAppDelayDuration($arr[$keys[17]]);
$this->setAppPin($arr[$keys[17]]);
}
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);
}
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)) {
$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)
{
$copyObj->setAppTitle($this->app_title);
$copyObj->setAppDescription($this->app_description);
$copyObj->setAppNumber($this->app_number);
$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';
/** The total number of columns. */
const NUM_COLUMNS = 19;
const NUM_COLUMNS = 21;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -34,6 +34,12 @@ abstract class BaseApplicationPeer
/** the column name for the APP_UID field */
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 */
const APP_NUMBER = 'APPLICATION.APP_NUMBER';
@@ -99,10 +105,10 @@ abstract class BaseApplicationPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
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_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_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_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, )
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_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_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, 19, 20, )
);
/**
@@ -112,10 +118,10 @@ abstract class BaseApplicationPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
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_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_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_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 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_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_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, 19, 20, )
);
/**
@@ -218,6 +224,10 @@ abstract class BaseApplicationPeer
$criteria->addSelectColumn(ApplicationPeer::APP_UID);
$criteria->addSelectColumn(ApplicationPeer::APP_TITLE);
$criteria->addSelectColumn(ApplicationPeer::APP_DESCRIPTION);
$criteria->addSelectColumn(ApplicationPeer::APP_NUMBER);
$criteria->addSelectColumn(ApplicationPeer::APP_PARENT);