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

Merged in 3.1 (pull request #4703)

Browse Source 
Updating branch HOR-1500 with last 3.1 changes
This commit is contained in:
Julio Cesar Laura Avendaño
2016-08-08 10:31:01 -04:00
parent 31076554e5 64985f5b76
commit 08c72686be
68 changed files with 1569 additions and 1201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/model/CaseScheduler.php
View File

@@ -80,7 +80,7 @@ class CaseScheduler extends BaseCaseScheduler
break;
}
G::auditLog("CreateCaseScheduler", "Scheduler Name: ".$aData['SCH_NAME'].", Task: ".$aData['TAS_UID'].", Perform this task: ".$perform.", Start Date: ".$aData['SCH_START_DATE'].", End Date: ".$aData['SCH_END_DATE'].", Execution time : ".$aData['SCH_START_TIME']);
G::auditLog("CreateCaseScheduler", "Scheduler Name: ".$aData['SCH_NAME'].", Task: ".$aData['TAS_UID'].", Perform this task: ".$perform.", Start Date: ".$aData['SCH_START_DATE'].", End Date: " . ((array_key_exists('SCH_END_DATE', $aData))? $aData['SCH_END_DATE'] : '') . ", Execution time : ".$aData['SCH_START_TIME']);
return $result;
} catch (Exception $e) {

36
workflow/engine/classes/model/NotificationQueue.php
View File

@@ -27,6 +27,8 @@ class NotificationQueue extends BaseNotificationQueue
$this->setNotData($arrayData['NOT_DATA']);
$this->setNotStatus($arrayData['NOT_STATUS']);
$this->setNotSendDate('now');
$this->setAppUid($arrayData['APP_UID']);
$this->setDelIndex($arrayData['DEL_INDEX']);
if ($this->validate()) {
$cnn->begin();
@@ -62,6 +64,40 @@ class NotificationQueue extends BaseNotificationQueue
return $notifications;
}
/**
* This method changes the state of a notification when the case ended before running the cron.php
*/
public function checkIfCasesOpenForResendingNotification()
{
$arrayCondition = array();
$criteria = new Criteria();
$criteria->clearSelectColumns();
$criteria->addSelectColumn(NotificationQueuePeer::APP_UID);
$criteria->addSelectColumn(NotificationQueuePeer::DEL_INDEX);
$criteria->addSelectColumn(NotificationQueuePeer::NOT_UID);
$criteria->add(AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNOTNULL);
$arrayCondition[] = array(NotificationQueuePeer::APP_UID, AppDelegationPeer::APP_UID, Criteria::EQUAL);
$arrayCondition[] = array(NotificationQueuePeer::DEL_INDEX, AppDelegationPeer::DEL_INDEX, Criteria::EQUAL);
$criteria->addJoinMC($arrayCondition, Criteria::LEFT_JOIN);
$rs = NotificationQueuePeer::doSelectRS($criteria);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$notUID = array();
while ($rs->next()) {
$row = $rs->getRow();
if ($row['DEL_INDEX'] != 0 && $row['APP_UID'] != '') {
array_push($notUID, $row['NOT_UID']);
}
}
$criteriaSet = new Criteria("workflow");
$criteriaSet->add(NotificationQueuePeer::NOT_STATUS, 'sent');
$criteriaSet->add(NotificationQueuePeer::NOT_SEND_DATE, date('Y-m-d H:i:s'));
$criteriaWhere = new Criteria("workflow");
$criteriaWhere->add(NotificationQueuePeer::NOT_UID, $notUID, Criteria::IN);
\BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow"));
}
public function loadStatusDeviceType($status, $devType)
{
try {

20
workflow/engine/classes/model/OutputDocument.php
View File

@@ -264,7 +264,16 @@ class OutputDocument extends BaseOutputDocument
$iResult = $oOutputDocument->save();
$oConnection->commit();
//Add Audit Log
$description = "Output Document Name: ".$aData['OUT_DOC_TITLE'].", Output Document Uid: ".$aData['OUT_DOC_UID'].", Filename generated: ".$aData['OUT_DOC_FILENAME'];
$description = 'Output Document Uid: ' . $aData['OUT_DOC_UID'];
if (array_key_exists('OUT_DOC_TITLE', $aData) && (string)($aData['OUT_DOC_TITLE']) != '') {
$description .= ', Output Document Name: ' . $aData['OUT_DOC_TITLE'];
}
if (array_key_exists('OUT_DOC_FILENAME', $aData) && (string)($aData['OUT_DOC_FILENAME']) != '') {
$description .= ', Filename generated: ' . $aData['OUT_DOC_FILENAME'];
}
if(!empty($aData['OUT_DOC_DESCRIPTION'])){
$description .= ", Description: ".$aData['OUT_DOC_DESCRIPTION'];
}
@@ -274,12 +283,11 @@ class OutputDocument extends BaseOutputDocument
if(!empty($aData['OUT_DOC_REPORT_GENERATOR'])){
$description .= ", Output Document to Generate: ".$aData['OUT_DOC_GENERATE'];
}
if($aData['OUT_DOC_PDF_SECURITY_ENABLED']==0){
$pdfSecurity = 'Disabled';
}else{
$pdfSecurity = 'Enabled';
if (array_key_exists('OUT_DOC_PDF_SECURITY_ENABLED', $aData) && (string)($aData['OUT_DOC_PDF_SECURITY_ENABLED']) != '') {
$description .= ', PDF Security: ' . (((int)($aData['OUT_DOC_PDF_SECURITY_ENABLED']) != 0)? 'Enabled' : 'Disabled');
}
$description .= ", PDF Security: ".$pdfSecurity;
if(!empty($aData['OUT_DOC_VERSIONING'])){
$description .= ", Enable Versioning: Yes";
}

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

@@ -83,7 +83,7 @@ class ListCompletedMapBuilder
$tMap->addColumn('APP_CREATE_DATE', 'AppCreateDate', 'int', CreoleTypes::TIMESTAMP, false, null);
$tMap->addColumn('APP_FINISH_DATE', 'AppFinishDate', 'int', CreoleTypes::TIMESTAMP, true, null);
$tMap->addColumn('APP_FINISH_DATE', 'AppFinishDate', 'int', CreoleTypes::TIMESTAMP, false, null);
$tMap->addColumn('DEL_INDEX', 'DelIndex', 'int', CreoleTypes::INTEGER, true, null);

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

@@ -79,6 +79,10 @@ class NotificationQueueMapBuilder
$tMap->addColumn('NOT_SEND_DATE', 'NotSendDate', 'int', CreoleTypes::TIMESTAMP, true, null);
$tMap->addColumn('APP_UID', 'AppUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('DEL_INDEX', 'DelIndex', 'int', CreoleTypes::INTEGER, true, null);
} // doBuild()
} // NotificationQueueMapBuilder

4
workflow/engine/classes/model/om/BaseAppAssignSelfServiceValue.php
View File

@@ -55,7 +55,7 @@ abstract class BaseAppAssignSelfServiceValue extends BaseObject implements Persi
* The value for the grp_uid field.
* @var string
*/
protected $grp_uid = '';
protected $grp_uid;
/**
* Flag to prevent endless save loop, if this object is referenced
@@ -229,7 +229,7 @@ abstract class BaseAppAssignSelfServiceValue extends BaseObject implements Persi
$v = (string) $v;
}
if ($this->grp_uid !== $v || $v === '') {
if ($this->grp_uid !== $v) {
$this->grp_uid = $v;
$this->modifiedColumns[] = AppAssignSelfServiceValuePeer::GRP_UID;
}

4
workflow/engine/classes/model/om/BaseAppMessage.php
View File

@@ -133,7 +133,7 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
* The value for the app_msg_error field.
* @var string
*/
protected $app_msg_error = '';
protected $app_msg_error;
/**
* Flag to prevent endless save loop, if this object is referenced
@@ -792,7 +792,7 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
$v = (string) $v;
}
if ($this->app_msg_error !== $v || $v === '') {
if ($this->app_msg_error !== $v) {
$this->app_msg_error = $v;
$this->modifiedColumns[] = AppMessagePeer::APP_MSG_ERROR;
}

4
workflow/engine/classes/model/om/BaseCatalog.php
View File

@@ -55,7 +55,7 @@ abstract class BaseCatalog extends BaseObject implements Persistent
* The value for the cat_observation field.
* @var string
*/
protected $cat_observation = '';
protected $cat_observation;
/**
* The value for the cat_create_date field.
@@ -305,7 +305,7 @@ abstract class BaseCatalog extends BaseObject implements Persistent
$v = (string) $v;
}
if ($this->cat_observation !== $v || $v === '') {
if ($this->cat_observation !== $v) {
$this->cat_observation = $v;
$this->modifiedColumns[] = CatalogPeer::CAT_OBSERVATION;
}

54
workflow/engine/classes/model/om/BaseListUnassigned.php
View File

@@ -35,7 +35,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
/**
* The value for the del_index field.
* @var string
* @var int
*/
protected $del_index = 0;
@@ -151,7 +151,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
/**
* Get the [del_index] column value.
*
* @return string
* @return int
*/
public function getDelIndex()
{
@@ -230,7 +230,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
*
* @return string
*/
public function getAppPreviousUsrUsername()
public function getDelPreviousUsrUsername()
{
return $this->del_previous_usr_username;
@@ -241,7 +241,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
*
* @return string
*/
public function getAppPreviousUsrFirstname()
public function getDelPreviousUsrFirstname()
{
return $this->del_previous_usr_firstname;
@@ -252,7 +252,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
*
* @return string
*/
public function getAppPreviousUsrLastname()
public function getDelPreviousUsrLastname()
{
return $this->del_previous_usr_lastname;
@@ -558,7 +558,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
* @param string $v new value
* @return void
*/
public function setAppPreviousUsrUsername($v)
public function setDelPreviousUsrUsername($v)
{
// Since the native PHP type for this column is string,
@@ -572,7 +572,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
$this->modifiedColumns[] = ListUnassignedPeer::DEL_PREVIOUS_USR_USERNAME;
}
} // setAppPreviousUsrUsername()
} // setDelPreviousUsrUsername()
/**
* Set the value of [del_previous_usr_firstname] column.
@@ -580,7 +580,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
* @param string $v new value
* @return void
*/
public function setAppPreviousUsrFirstname($v)
public function setDelPreviousUsrFirstname($v)
{
// Since the native PHP type for this column is string,
@@ -594,7 +594,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
$this->modifiedColumns[] = ListUnassignedPeer::DEL_PREVIOUS_USR_FIRSTNAME;
}
} // setAppPreviousUsrFirstname()
} // setDelPreviousUsrFirstname()
/**
* Set the value of [del_previous_usr_lastname] column.
@@ -602,7 +602,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
* @param string $v new value
* @return void
*/
public function setAppPreviousUsrLastname($v)
public function setDelPreviousUsrLastname($v)
{
// Since the native PHP type for this column is string,
@@ -616,7 +616,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
$this->modifiedColumns[] = ListUnassignedPeer::DEL_PREVIOUS_USR_LASTNAME;
}
} // setAppPreviousUsrLastname()
} // setDelPreviousUsrLastname()
/**
* Set the value of [app_update_date] column.
@@ -1032,13 +1032,13 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
return $this->getAppTasTitle();
break;
case 8:
return $this->getAppPreviousUsrUsername();
return $this->getDelPreviousUsrUsername();
break;
case 9:
return $this->getAppPreviousUsrFirstname();
return $this->getDelPreviousUsrFirstname();
break;
case 10:
return $this->getAppPreviousUsrLastname();
return $this->getDelPreviousUsrLastname();
break;
case 11:
return $this->getAppUpdateDate();
@@ -1083,9 +1083,9 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
$keys[5] => $this->getAppTitle(),
$keys[6] => $this->getAppProTitle(),
$keys[7] => $this->getAppTasTitle(),
$keys[8] => $this->getAppPreviousUsrUsername(),
$keys[9] => $this->getAppPreviousUsrFirstname(),
$keys[10] => $this->getAppPreviousUsrLastname(),
$keys[8] => $this->getDelPreviousUsrUsername(),
$keys[9] => $this->getDelPreviousUsrFirstname(),
$keys[10] => $this->getDelPreviousUsrLastname(),
$keys[11] => $this->getAppUpdateDate(),
$keys[12] => $this->getDelPreviousUsrUid(),
$keys[13] => $this->getDelDelegateDate(),
@@ -1147,13 +1147,13 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
$this->setAppTasTitle($value);
break;
case 8:
$this->setAppPreviousUsrUsername($value);
$this->setDelPreviousUsrUsername($value);
break;
case 9:
$this->setAppPreviousUsrFirstname($value);
$this->setDelPreviousUsrFirstname($value);
break;
case 10:
$this->setAppPreviousUsrLastname($value);
$this->setDelPreviousUsrLastname($value);
break;
case 11:
$this->setAppUpdateDate($value);
@@ -1226,15 +1226,15 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
}
if (array_key_exists($keys[8], $arr)) {
$this->setAppPreviousUsrUsername($arr[$keys[8]]);
$this->setDelPreviousUsrUsername($arr[$keys[8]]);
}
if (array_key_exists($keys[9], $arr)) {
$this->setAppPreviousUsrFirstname($arr[$keys[9]]);
$this->setDelPreviousUsrFirstname($arr[$keys[9]]);
}
if (array_key_exists($keys[10], $arr)) {
$this->setAppPreviousUsrLastname($arr[$keys[10]]);
$this->setDelPreviousUsrLastname($arr[$keys[10]]);
}
if (array_key_exists($keys[11], $arr)) {
@@ -1410,11 +1410,11 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
$copyObj->setAppTasTitle($this->app_tas_title);
$copyObj->setAppPreviousUsrUsername($this->del_previous_usr_username);
$copyObj->setDelPreviousUsrUsername($this->del_previous_usr_username);
$copyObj->setAppPreviousUsrFirstname($this->del_previous_usr_firstname);
$copyObj->setDelPreviousUsrFirstname($this->del_previous_usr_firstname);
$copyObj->setAppPreviousUsrLastname($this->del_previous_usr_lastname);
$copyObj->setDelPreviousUsrLastname($this->del_previous_usr_lastname);
$copyObj->setAppUpdateDate($this->app_update_date);
@@ -1431,7 +1431,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
$copyObj->setAppUid(''); // this is a pkey column, so set to default value
$copyObj->setDelIndex(0); // this is a pkey column, so set to default value
$copyObj->setDelIndex('0'); // this is a pkey column, so set to default value
}

4
workflow/engine/classes/model/om/BaseListUnassignedPeer.php
View File

@@ -103,7 +103,7 @@ abstract class BaseListUnassignedPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'TasUid' => 2, 'ProUid' => 3, 'AppNumber' => 4, 'AppTitle' => 5, 'AppProTitle' => 6, 'AppTasTitle' => 7, 'AppPreviousUsrUsername' => 8, 'AppPreviousUsrFirstname' => 9, 'AppPreviousUsrLastname' => 10, 'AppUpdateDate' => 11, 'DelPreviousUsrUid' => 12, 'DelDelegateDate' => 13, 'DelDueDate' => 14, 'DelPriority' => 15, ),
BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'TasUid' => 2, 'ProUid' => 3, 'AppNumber' => 4, 'AppTitle' => 5, 'AppProTitle' => 6, 'AppTasTitle' => 7, 'DelPreviousUsrUsername' => 8, 'DelPreviousUsrFirstname' => 9, 'DelPreviousUsrLastname' => 10, 'AppUpdateDate' => 11, 'DelPreviousUsrUid' => 12, 'DelDelegateDate' => 13, 'DelDueDate' => 14, 'DelPriority' => 15, ),
BasePeer::TYPE_COLNAME => array (ListUnassignedPeer::APP_UID => 0, ListUnassignedPeer::DEL_INDEX => 1, ListUnassignedPeer::TAS_UID => 2, ListUnassignedPeer::PRO_UID => 3, ListUnassignedPeer::APP_NUMBER => 4, ListUnassignedPeer::APP_TITLE => 5, ListUnassignedPeer::APP_PRO_TITLE => 6, ListUnassignedPeer::APP_TAS_TITLE => 7, ListUnassignedPeer::DEL_PREVIOUS_USR_USERNAME => 8, ListUnassignedPeer::DEL_PREVIOUS_USR_FIRSTNAME => 9, ListUnassignedPeer::DEL_PREVIOUS_USR_LASTNAME => 10, ListUnassignedPeer::APP_UPDATE_DATE => 11, ListUnassignedPeer::DEL_PREVIOUS_USR_UID => 12, ListUnassignedPeer::DEL_DELEGATE_DATE => 13, ListUnassignedPeer::DEL_DUE_DATE => 14, ListUnassignedPeer::DEL_PRIORITY => 15, ),
BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'TAS_UID' => 2, 'PRO_UID' => 3, 'APP_NUMBER' => 4, 'APP_TITLE' => 5, 'APP_PRO_TITLE' => 6, 'APP_TAS_TITLE' => 7, 'DEL_PREVIOUS_USR_USERNAME' => 8, 'DEL_PREVIOUS_USR_FIRSTNAME' => 9, 'DEL_PREVIOUS_USR_LASTNAME' => 10, 'APP_UPDATE_DATE' => 11, 'DEL_PREVIOUS_USR_UID' => 12, 'DEL_DELEGATE_DATE' => 13, 'DEL_DUE_DATE' => 14, 'DEL_PRIORITY' => 15, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, )
@@ -595,7 +595,7 @@ abstract class BaseListUnassignedPeer
/**
* Retrieve object using using composite pkey values.
* @param string $app_uid
* @param string $del_index
* @param int $del_index
* @param Connection $con
* @return ListUnassigned
*/

118
workflow/engine/classes/model/om/BaseNotificationQueue.php
View File

@@ -69,6 +69,18 @@ abstract class BaseNotificationQueue extends BaseObject implements Persistent
*/
protected $not_send_date;
/**
* The value for the app_uid field.
* @var string
*/
protected $app_uid = '';
/**
* The value for the del_index field.
* @var int
*/
protected $del_index = 0;
/**
* Flag to prevent endless save loop, if this object is referenced
* by another object which falls in this transaction.
@@ -181,6 +193,28 @@ abstract class BaseNotificationQueue extends BaseObject implements Persistent
}
}
/**
* Get the [app_uid] column value.
*
* @return string
*/
public function getAppUid()
{
return $this->app_uid;
}
/**
* Get the [del_index] column value.
*
* @return int
*/
public function getDelIndex()
{
return $this->del_index;
}
/**
* Set the value of [not_uid] column.
*
@@ -342,6 +376,50 @@ abstract class BaseNotificationQueue extends BaseObject implements Persistent
} // setNotSendDate()
/**
* Set the value of [app_uid] column.
*
* @param string $v new value
* @return void
*/
public function setAppUid($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_uid !== $v || $v === '') {
$this->app_uid = $v;
$this->modifiedColumns[] = NotificationQueuePeer::APP_UID;
}
} // setAppUid()
/**
* Set the value of [del_index] column.
*
* @param int $v new value
* @return void
*/
public function setDelIndex($v)
{
// Since the native PHP type for this column is integer,
// we will cast the input value to an int (if it is not).
if ($v !== null && !is_int($v) && is_numeric($v)) {
$v = (int) $v;
}
if ($this->del_index !== $v || $v === 0) {
$this->del_index = $v;
$this->modifiedColumns[] = NotificationQueuePeer::DEL_INDEX;
}
} // setDelIndex()
/**
* Hydrates (populates) the object variables with values from the database resultset.
*
@@ -373,12 +451,16 @@ abstract class BaseNotificationQueue extends BaseObject implements Persistent
$this->not_send_date = $rs->getTimestamp($startcol + 6, null);
$this->app_uid = $rs->getString($startcol + 7);
$this->del_index = $rs->getInt($startcol + 8);
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 7; // 7 = NotificationQueuePeer::NUM_COLUMNS - NotificationQueuePeer::NUM_LAZY_LOAD_COLUMNS).
return $startcol + 9; // 9 = NotificationQueuePeer::NUM_COLUMNS - NotificationQueuePeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating NotificationQueue object", $e);
@@ -603,6 +685,12 @@ abstract class BaseNotificationQueue extends BaseObject implements Persistent
case 6:
return $this->getNotSendDate();
break;
case 7:
return $this->getAppUid();
break;
case 8:
return $this->getDelIndex();
break;
default:
return null;
break;
@@ -630,6 +718,8 @@ abstract class BaseNotificationQueue extends BaseObject implements Persistent
$keys[4] => $this->getNotData(),
$keys[5] => $this->getNotStatus(),
$keys[6] => $this->getNotSendDate(),
$keys[7] => $this->getAppUid(),
$keys[8] => $this->getDelIndex(),
);
return $result;
}
@@ -682,6 +772,12 @@ abstract class BaseNotificationQueue extends BaseObject implements Persistent
case 6:
$this->setNotSendDate($value);
break;
case 7:
$this->setAppUid($value);
break;
case 8:
$this->setDelIndex($value);
break;
} // switch()
}
@@ -733,6 +829,14 @@ abstract class BaseNotificationQueue extends BaseObject implements Persistent
$this->setNotSendDate($arr[$keys[6]]);
}
if (array_key_exists($keys[7], $arr)) {
$this->setAppUid($arr[$keys[7]]);
}
if (array_key_exists($keys[8], $arr)) {
$this->setDelIndex($arr[$keys[8]]);
}
}
/**
@@ -772,6 +876,14 @@ abstract class BaseNotificationQueue extends BaseObject implements Persistent
$criteria->add(NotificationQueuePeer::NOT_SEND_DATE, $this->not_send_date);
}
if ($this->isColumnModified(NotificationQueuePeer::APP_UID)) {
$criteria->add(NotificationQueuePeer::APP_UID, $this->app_uid);
}
if ($this->isColumnModified(NotificationQueuePeer::DEL_INDEX)) {
$criteria->add(NotificationQueuePeer::DEL_INDEX, $this->del_index);
}
return $criteria;
}
@@ -838,6 +950,10 @@ abstract class BaseNotificationQueue extends BaseObject implements Persistent
$copyObj->setNotSendDate($this->not_send_date);
$copyObj->setAppUid($this->app_uid);
$copyObj->setDelIndex($this->del_index);
$copyObj->setNew(true);

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

@@ -25,7 +25,7 @@ abstract class BaseNotificationQueuePeer
const CLASS_DEFAULT = 'classes.model.NotificationQueue';
/** The total number of columns. */
const NUM_COLUMNS = 7;
const NUM_COLUMNS = 9;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -52,6 +52,12 @@ abstract class BaseNotificationQueuePeer
/** the column name for the NOT_SEND_DATE field */
const NOT_SEND_DATE = 'NOTIFICATION_QUEUE.NOT_SEND_DATE';
/** the column name for the APP_UID field */
const APP_UID = 'NOTIFICATION_QUEUE.APP_UID';
/** the column name for the DEL_INDEX field */
const DEL_INDEX = 'NOTIFICATION_QUEUE.DEL_INDEX';
/** The PHP to DB Name Mapping */
private static $phpNameMap = null;
@@ -63,10 +69,10 @@ abstract class BaseNotificationQueuePeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('NotUid', 'DevType', 'DevUid', 'NotMsg', 'NotData', 'NotStatus', 'NotSendDate', ),
BasePeer::TYPE_COLNAME => array (NotificationQueuePeer::NOT_UID, NotificationQueuePeer::DEV_TYPE, NotificationQueuePeer::DEV_UID, NotificationQueuePeer::NOT_MSG, NotificationQueuePeer::NOT_DATA, NotificationQueuePeer::NOT_STATUS, NotificationQueuePeer::NOT_SEND_DATE, ),
BasePeer::TYPE_FIELDNAME => array ('NOT_UID', 'DEV_TYPE', 'DEV_UID', 'NOT_MSG', 'NOT_DATA', 'NOT_STATUS', 'NOT_SEND_DATE', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, )
BasePeer::TYPE_PHPNAME => array ('NotUid', 'DevType', 'DevUid', 'NotMsg', 'NotData', 'NotStatus', 'NotSendDate', 'AppUid', 'DelIndex', ),
BasePeer::TYPE_COLNAME => array (NotificationQueuePeer::NOT_UID, NotificationQueuePeer::DEV_TYPE, NotificationQueuePeer::DEV_UID, NotificationQueuePeer::NOT_MSG, NotificationQueuePeer::NOT_DATA, NotificationQueuePeer::NOT_STATUS, NotificationQueuePeer::NOT_SEND_DATE, NotificationQueuePeer::APP_UID, NotificationQueuePeer::DEL_INDEX, ),
BasePeer::TYPE_FIELDNAME => array ('NOT_UID', 'DEV_TYPE', 'DEV_UID', 'NOT_MSG', 'NOT_DATA', 'NOT_STATUS', 'NOT_SEND_DATE', 'APP_UID', 'DEL_INDEX', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, )
);
/**
@@ -76,10 +82,10 @@ abstract class BaseNotificationQueuePeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('NotUid' => 0, 'DevType' => 1, 'DevUid' => 2, 'NotMsg' => 3, 'NotData' => 4, 'NotStatus' => 5, 'NotSendDate' => 6, ),
BasePeer::TYPE_COLNAME => array (NotificationQueuePeer::NOT_UID => 0, NotificationQueuePeer::DEV_TYPE => 1, NotificationQueuePeer::DEV_UID => 2, NotificationQueuePeer::NOT_MSG => 3, NotificationQueuePeer::NOT_DATA => 4, NotificationQueuePeer::NOT_STATUS => 5, NotificationQueuePeer::NOT_SEND_DATE => 6, ),
BasePeer::TYPE_FIELDNAME => array ('NOT_UID' => 0, 'DEV_TYPE' => 1, 'DEV_UID' => 2, 'NOT_MSG' => 3, 'NOT_DATA' => 4, 'NOT_STATUS' => 5, 'NOT_SEND_DATE' => 6, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, )
BasePeer::TYPE_PHPNAME => array ('NotUid' => 0, 'DevType' => 1, 'DevUid' => 2, 'NotMsg' => 3, 'NotData' => 4, 'NotStatus' => 5, 'NotSendDate' => 6, 'AppUid' => 7, 'DelIndex' => 8, ),
BasePeer::TYPE_COLNAME => array (NotificationQueuePeer::NOT_UID => 0, NotificationQueuePeer::DEV_TYPE => 1, NotificationQueuePeer::DEV_UID => 2, NotificationQueuePeer::NOT_MSG => 3, NotificationQueuePeer::NOT_DATA => 4, NotificationQueuePeer::NOT_STATUS => 5, NotificationQueuePeer::NOT_SEND_DATE => 6, NotificationQueuePeer::APP_UID => 7, NotificationQueuePeer::DEL_INDEX => 8, ),
BasePeer::TYPE_FIELDNAME => array ('NOT_UID' => 0, 'DEV_TYPE' => 1, 'DEV_UID' => 2, 'NOT_MSG' => 3, 'NOT_DATA' => 4, 'NOT_STATUS' => 5, 'NOT_SEND_DATE' => 6, 'APP_UID' => 7, 'DEL_INDEX' => 8, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, )
);
/**
@@ -194,6 +200,10 @@ abstract class BaseNotificationQueuePeer
$criteria->addSelectColumn(NotificationQueuePeer::NOT_SEND_DATE);
$criteria->addSelectColumn(NotificationQueuePeer::APP_UID);
$criteria->addSelectColumn(NotificationQueuePeer::DEL_INDEX);
}
const COUNT = 'COUNT(NOTIFICATION_QUEUE.NOT_UID)';

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

@@ -250,10 +250,10 @@ abstract class BaseProcess extends BaseObject implements Persistent
protected $pro_unit_cost = '';
/**
* The value for the pro_debug field.
* The value for the pro_itee field.
* @var int
*/
protected $pro_itee = 1;
protected $pro_itee = 0;
/**
* The value for the pro_action_done field.
@@ -727,7 +727,7 @@ abstract class BaseProcess extends BaseObject implements Persistent
/**
* Get the [pro_itee] column value.
*
* @return string
* @return int
*/
public function getProItee()
{
@@ -1577,7 +1577,7 @@ abstract class BaseProcess extends BaseObject implements Persistent
$v = (int) $v;
}
if ($this->pro_itee !== $v || $v === 1) {
if ($this->pro_itee !== $v || $v === 0) {
$this->pro_itee = $v;
$this->modifiedColumns[] = ProcessPeer::PRO_ITEE;
}
@@ -1697,7 +1697,7 @@ abstract class BaseProcess extends BaseObject implements Persistent
$this->pro_unit_cost = $rs->getString($startcol + 36);
$this->pro_itee = $rs->getString($startcol + 37);
$this->pro_itee = $rs->getInt($startcol + 37);
$this->pro_action_done = $rs->getString($startcol + 38);

4
workflow/engine/classes/model/om/BaseTimerEvent.php
View File

@@ -85,7 +85,7 @@ abstract class BaseTimerEvent extends BaseObject implements Persistent
* The value for the tmrevn_configuration_data field.
* @var string
*/
protected $tmrevn_configuration_data = '';
protected $tmrevn_configuration_data;
/**
* The value for the tmrevn_next_run_date field.
@@ -611,7 +611,7 @@ abstract class BaseTimerEvent extends BaseObject implements Persistent
$v = (string) $v;
}
if ($this->tmrevn_configuration_data !== $v || $v === '') {
if ($this->tmrevn_configuration_data !== $v) {
$this->tmrevn_configuration_data = $v;
$this->modifiedColumns[] = TimerEventPeer::TMREVN_CONFIGURATION_DATA;
}