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

HOR-2456

Browse Source
This commit is contained in:
Paula Quispe
2017-01-10 13:41:43 -04:00
parent f99203c055
commit 3a17632d2c
11 changed files with 175 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,7 @@ class Application extends BaseApplication
*/
protected $app_title_content = '';
protected $app_description_content = '';
//protected $app_proc_code = '';
public static $app_status_values = ['DRAFT' => 1, 'TO_DO' => 2, 'COMPLETED' => 3, 'CANCELLED' => 4];
/**
* Get the [app_title_content] column value.
@@ -225,7 +225,8 @@ class Application extends BaseApplication
$this->setAppUid(G::generateUniqueID());
$this->setAppParent('');
$this->setAppStatus('DRAFT');
$this->setProUid( $sProUid);
$this->setAppStatusId(1);
$this->setProUid($sProUid);
$this->setAppProcStatus('');
$this->setAppProcCode('');
$this->setAppParallel('N');
@@ -294,6 +295,9 @@ class Application extends BaseApplication
$oApp->fromArray($aData, BasePeer::TYPE_FIELDNAME);
if ($oApp->validate()) {
if (isset($aData['APP_STATUS'])) {
$oApp->setAppStatusId(self::$app_status_values[$aData['APP_STATUS']]);
}
if (isset($aData['APP_TITLE'])) {
$oApp->setAppTitleContent($aData['APP_TITLE']);
}
@@ -301,9 +305,6 @@ class Application extends BaseApplication
$oApp->setAppDescriptionContent($aData['APP_DESCRIPTION']);
}
//if ( isset ( $aData['APP_PROC_CODE'] ) )
//$oApp->setAppProcCode( $aData['APP_PROC_CODE'] );
$res = $oApp->save();
$con->commit();

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

@@ -77,7 +77,7 @@ class ApplicationMapBuilder
$tMap->addColumn('APP_STATUS', 'AppStatus', 'string', CreoleTypes::VARCHAR, true, 100);
$tMap->addColumn('APP_STATUS_ID', 'AppStatusId', 'int', CreoleTypes::INTEGER, true, null);
$tMap->addColumn('APP_STATUS_ID', 'AppStatusId', 'int', CreoleTypes::TINYINT, true, null);
$tMap->addColumn('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32);