diff --git a/workflow/engine/classes/model/map/AppMessageMapBuilder.php b/workflow/engine/classes/model/map/AppMessageMapBuilder.php index eeaf03527..a193709ea 100644 --- a/workflow/engine/classes/model/map/AppMessageMapBuilder.php +++ b/workflow/engine/classes/model/map/AppMessageMapBuilder.php @@ -63,7 +63,9 @@ class AppMessageMapBuilder $tMap = $this->dbMap->addTable('APP_MESSAGE'); $tMap->setPhpName('AppMessage'); - $tMap->setUseIdGenerator(false); + $tMap->setUseIdGenerator(true); + + $tMap->addColumn('APP_MSG_ID', 'AppMsgId', 'int', CreoleTypes::INTEGER, true, null); $tMap->addPrimaryKey('APP_MSG_UID', 'AppMsgUid', 'string', CreoleTypes::VARCHAR, true, 32); diff --git a/workflow/engine/classes/model/om/BaseAppMessage.php b/workflow/engine/classes/model/om/BaseAppMessage.php index 79c96dd13..f76f427c5 100644 --- a/workflow/engine/classes/model/om/BaseAppMessage.php +++ b/workflow/engine/classes/model/om/BaseAppMessage.php @@ -27,6 +27,12 @@ abstract class BaseAppMessage extends BaseObject implements Persistent */ protected static $peer; + /** + * The value for the app_msg_id field. + * @var int + */ + protected $app_msg_id; + /** * The value for the app_msg_uid field. * @var string @@ -179,6 +185,17 @@ abstract class BaseAppMessage extends BaseObject implements Persistent */ protected $alreadyInValidation = false; + /** + * Get the [app_msg_id] column value. + * + * @return int + */ + public function getAppMsgId() + { + + return $this->app_msg_id; + } + /** * Get the [app_msg_uid] column value. * @@ -474,6 +491,28 @@ abstract class BaseAppMessage extends BaseObject implements Persistent return $this->app_number; } + /** + * Set the value of [app_msg_id] column. + * + * @param int $v new value + * @return void + */ + public function setAppMsgId($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->app_msg_id !== $v) { + $this->app_msg_id = $v; + $this->modifiedColumns[] = AppMessagePeer::APP_MSG_ID; + } + + } // setAppMsgId() + /** * Set the value of [app_msg_uid] column. * @@ -1011,58 +1050,60 @@ abstract class BaseAppMessage extends BaseObject implements Persistent { try { - $this->app_msg_uid = $rs->getString($startcol + 0); + $this->app_msg_id = $rs->getInt($startcol + 0); - $this->msg_uid = $rs->getString($startcol + 1); + $this->app_msg_uid = $rs->getString($startcol + 1); - $this->app_uid = $rs->getString($startcol + 2); + $this->msg_uid = $rs->getString($startcol + 2); - $this->del_index = $rs->getInt($startcol + 3); + $this->app_uid = $rs->getString($startcol + 3); - $this->app_msg_type = $rs->getString($startcol + 4); + $this->del_index = $rs->getInt($startcol + 4); - $this->app_msg_type_id = $rs->getInt($startcol + 5); + $this->app_msg_type = $rs->getString($startcol + 5); - $this->app_msg_subject = $rs->getString($startcol + 6); + $this->app_msg_type_id = $rs->getInt($startcol + 6); - $this->app_msg_from = $rs->getString($startcol + 7); + $this->app_msg_subject = $rs->getString($startcol + 7); - $this->app_msg_to = $rs->getString($startcol + 8); + $this->app_msg_from = $rs->getString($startcol + 8); - $this->app_msg_body = $rs->getString($startcol + 9); + $this->app_msg_to = $rs->getString($startcol + 9); - $this->app_msg_date = $rs->getTimestamp($startcol + 10, null); + $this->app_msg_body = $rs->getString($startcol + 10); - $this->app_msg_cc = $rs->getString($startcol + 11); + $this->app_msg_date = $rs->getTimestamp($startcol + 11, null); - $this->app_msg_bcc = $rs->getString($startcol + 12); + $this->app_msg_cc = $rs->getString($startcol + 12); - $this->app_msg_template = $rs->getString($startcol + 13); + $this->app_msg_bcc = $rs->getString($startcol + 13); - $this->app_msg_status = $rs->getString($startcol + 14); + $this->app_msg_template = $rs->getString($startcol + 14); - $this->app_msg_status_id = $rs->getInt($startcol + 15); + $this->app_msg_status = $rs->getString($startcol + 15); - $this->app_msg_attach = $rs->getString($startcol + 16); + $this->app_msg_status_id = $rs->getInt($startcol + 16); - $this->app_msg_send_date = $rs->getTimestamp($startcol + 17, null); + $this->app_msg_attach = $rs->getString($startcol + 17); - $this->app_msg_show_message = $rs->getInt($startcol + 18); + $this->app_msg_send_date = $rs->getTimestamp($startcol + 18, null); - $this->app_msg_error = $rs->getString($startcol + 19); + $this->app_msg_show_message = $rs->getInt($startcol + 19); - $this->pro_id = $rs->getInt($startcol + 20); + $this->app_msg_error = $rs->getString($startcol + 20); - $this->tas_id = $rs->getInt($startcol + 21); + $this->pro_id = $rs->getInt($startcol + 21); - $this->app_number = $rs->getInt($startcol + 22); + $this->tas_id = $rs->getInt($startcol + 22); + + $this->app_number = $rs->getInt($startcol + 23); $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 23; // 23 = AppMessagePeer::NUM_COLUMNS - AppMessagePeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 24; // 24 = AppMessagePeer::NUM_COLUMNS - AppMessagePeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating AppMessage object", $e); @@ -1267,72 +1308,75 @@ abstract class BaseAppMessage extends BaseObject implements Persistent { switch($pos) { case 0: - return $this->getAppMsgUid(); + return $this->getAppMsgId(); break; case 1: - return $this->getMsgUid(); + return $this->getAppMsgUid(); break; case 2: - return $this->getAppUid(); + return $this->getMsgUid(); break; case 3: - return $this->getDelIndex(); + return $this->getAppUid(); break; case 4: - return $this->getAppMsgType(); + return $this->getDelIndex(); break; case 5: - return $this->getAppMsgTypeId(); + return $this->getAppMsgType(); break; case 6: - return $this->getAppMsgSubject(); + return $this->getAppMsgTypeId(); break; case 7: - return $this->getAppMsgFrom(); + return $this->getAppMsgSubject(); break; case 8: - return $this->getAppMsgTo(); + return $this->getAppMsgFrom(); break; case 9: - return $this->getAppMsgBody(); + return $this->getAppMsgTo(); break; case 10: - return $this->getAppMsgDate(); + return $this->getAppMsgBody(); break; case 11: - return $this->getAppMsgCc(); + return $this->getAppMsgDate(); break; case 12: - return $this->getAppMsgBcc(); + return $this->getAppMsgCc(); break; case 13: - return $this->getAppMsgTemplate(); + return $this->getAppMsgBcc(); break; case 14: - return $this->getAppMsgStatus(); + return $this->getAppMsgTemplate(); break; case 15: - return $this->getAppMsgStatusId(); + return $this->getAppMsgStatus(); break; case 16: - return $this->getAppMsgAttach(); + return $this->getAppMsgStatusId(); break; case 17: - return $this->getAppMsgSendDate(); + return $this->getAppMsgAttach(); break; case 18: - return $this->getAppMsgShowMessage(); + return $this->getAppMsgSendDate(); break; case 19: - return $this->getAppMsgError(); + return $this->getAppMsgShowMessage(); break; case 20: - return $this->getProId(); + return $this->getAppMsgError(); break; case 21: - return $this->getTasId(); + return $this->getProId(); break; case 22: + return $this->getTasId(); + break; + case 23: return $this->getAppNumber(); break; default: @@ -1355,29 +1399,30 @@ abstract class BaseAppMessage extends BaseObject implements Persistent { $keys = AppMessagePeer::getFieldNames($keyType); $result = array( - $keys[0] => $this->getAppMsgUid(), - $keys[1] => $this->getMsgUid(), - $keys[2] => $this->getAppUid(), - $keys[3] => $this->getDelIndex(), - $keys[4] => $this->getAppMsgType(), - $keys[5] => $this->getAppMsgTypeId(), - $keys[6] => $this->getAppMsgSubject(), - $keys[7] => $this->getAppMsgFrom(), - $keys[8] => $this->getAppMsgTo(), - $keys[9] => $this->getAppMsgBody(), - $keys[10] => $this->getAppMsgDate(), - $keys[11] => $this->getAppMsgCc(), - $keys[12] => $this->getAppMsgBcc(), - $keys[13] => $this->getAppMsgTemplate(), - $keys[14] => $this->getAppMsgStatus(), - $keys[15] => $this->getAppMsgStatusId(), - $keys[16] => $this->getAppMsgAttach(), - $keys[17] => $this->getAppMsgSendDate(), - $keys[18] => $this->getAppMsgShowMessage(), - $keys[19] => $this->getAppMsgError(), - $keys[20] => $this->getProId(), - $keys[21] => $this->getTasId(), - $keys[22] => $this->getAppNumber(), + $keys[0] => $this->getAppMsgId(), + $keys[1] => $this->getAppMsgUid(), + $keys[2] => $this->getMsgUid(), + $keys[3] => $this->getAppUid(), + $keys[4] => $this->getDelIndex(), + $keys[5] => $this->getAppMsgType(), + $keys[6] => $this->getAppMsgTypeId(), + $keys[7] => $this->getAppMsgSubject(), + $keys[8] => $this->getAppMsgFrom(), + $keys[9] => $this->getAppMsgTo(), + $keys[10] => $this->getAppMsgBody(), + $keys[11] => $this->getAppMsgDate(), + $keys[12] => $this->getAppMsgCc(), + $keys[13] => $this->getAppMsgBcc(), + $keys[14] => $this->getAppMsgTemplate(), + $keys[15] => $this->getAppMsgStatus(), + $keys[16] => $this->getAppMsgStatusId(), + $keys[17] => $this->getAppMsgAttach(), + $keys[18] => $this->getAppMsgSendDate(), + $keys[19] => $this->getAppMsgShowMessage(), + $keys[20] => $this->getAppMsgError(), + $keys[21] => $this->getProId(), + $keys[22] => $this->getTasId(), + $keys[23] => $this->getAppNumber(), ); return $result; } @@ -1410,72 +1455,75 @@ abstract class BaseAppMessage extends BaseObject implements Persistent { switch($pos) { case 0: - $this->setAppMsgUid($value); + $this->setAppMsgId($value); break; case 1: - $this->setMsgUid($value); + $this->setAppMsgUid($value); break; case 2: - $this->setAppUid($value); + $this->setMsgUid($value); break; case 3: - $this->setDelIndex($value); + $this->setAppUid($value); break; case 4: - $this->setAppMsgType($value); + $this->setDelIndex($value); break; case 5: - $this->setAppMsgTypeId($value); + $this->setAppMsgType($value); break; case 6: - $this->setAppMsgSubject($value); + $this->setAppMsgTypeId($value); break; case 7: - $this->setAppMsgFrom($value); + $this->setAppMsgSubject($value); break; case 8: - $this->setAppMsgTo($value); + $this->setAppMsgFrom($value); break; case 9: - $this->setAppMsgBody($value); + $this->setAppMsgTo($value); break; case 10: - $this->setAppMsgDate($value); + $this->setAppMsgBody($value); break; case 11: - $this->setAppMsgCc($value); + $this->setAppMsgDate($value); break; case 12: - $this->setAppMsgBcc($value); + $this->setAppMsgCc($value); break; case 13: - $this->setAppMsgTemplate($value); + $this->setAppMsgBcc($value); break; case 14: - $this->setAppMsgStatus($value); + $this->setAppMsgTemplate($value); break; case 15: - $this->setAppMsgStatusId($value); + $this->setAppMsgStatus($value); break; case 16: - $this->setAppMsgAttach($value); + $this->setAppMsgStatusId($value); break; case 17: - $this->setAppMsgSendDate($value); + $this->setAppMsgAttach($value); break; case 18: - $this->setAppMsgShowMessage($value); + $this->setAppMsgSendDate($value); break; case 19: - $this->setAppMsgError($value); + $this->setAppMsgShowMessage($value); break; case 20: - $this->setProId($value); + $this->setAppMsgError($value); break; case 21: - $this->setTasId($value); + $this->setProId($value); break; case 22: + $this->setTasId($value); + break; + case 23: $this->setAppNumber($value); break; } // switch() @@ -1502,95 +1550,99 @@ abstract class BaseAppMessage extends BaseObject implements Persistent $keys = AppMessagePeer::getFieldNames($keyType); if (array_key_exists($keys[0], $arr)) { - $this->setAppMsgUid($arr[$keys[0]]); + $this->setAppMsgId($arr[$keys[0]]); } if (array_key_exists($keys[1], $arr)) { - $this->setMsgUid($arr[$keys[1]]); + $this->setAppMsgUid($arr[$keys[1]]); } if (array_key_exists($keys[2], $arr)) { - $this->setAppUid($arr[$keys[2]]); + $this->setMsgUid($arr[$keys[2]]); } if (array_key_exists($keys[3], $arr)) { - $this->setDelIndex($arr[$keys[3]]); + $this->setAppUid($arr[$keys[3]]); } if (array_key_exists($keys[4], $arr)) { - $this->setAppMsgType($arr[$keys[4]]); + $this->setDelIndex($arr[$keys[4]]); } if (array_key_exists($keys[5], $arr)) { - $this->setAppMsgTypeId($arr[$keys[5]]); + $this->setAppMsgType($arr[$keys[5]]); } if (array_key_exists($keys[6], $arr)) { - $this->setAppMsgSubject($arr[$keys[6]]); + $this->setAppMsgTypeId($arr[$keys[6]]); } if (array_key_exists($keys[7], $arr)) { - $this->setAppMsgFrom($arr[$keys[7]]); + $this->setAppMsgSubject($arr[$keys[7]]); } if (array_key_exists($keys[8], $arr)) { - $this->setAppMsgTo($arr[$keys[8]]); + $this->setAppMsgFrom($arr[$keys[8]]); } if (array_key_exists($keys[9], $arr)) { - $this->setAppMsgBody($arr[$keys[9]]); + $this->setAppMsgTo($arr[$keys[9]]); } if (array_key_exists($keys[10], $arr)) { - $this->setAppMsgDate($arr[$keys[10]]); + $this->setAppMsgBody($arr[$keys[10]]); } if (array_key_exists($keys[11], $arr)) { - $this->setAppMsgCc($arr[$keys[11]]); + $this->setAppMsgDate($arr[$keys[11]]); } if (array_key_exists($keys[12], $arr)) { - $this->setAppMsgBcc($arr[$keys[12]]); + $this->setAppMsgCc($arr[$keys[12]]); } if (array_key_exists($keys[13], $arr)) { - $this->setAppMsgTemplate($arr[$keys[13]]); + $this->setAppMsgBcc($arr[$keys[13]]); } if (array_key_exists($keys[14], $arr)) { - $this->setAppMsgStatus($arr[$keys[14]]); + $this->setAppMsgTemplate($arr[$keys[14]]); } if (array_key_exists($keys[15], $arr)) { - $this->setAppMsgStatusId($arr[$keys[15]]); + $this->setAppMsgStatus($arr[$keys[15]]); } if (array_key_exists($keys[16], $arr)) { - $this->setAppMsgAttach($arr[$keys[16]]); + $this->setAppMsgStatusId($arr[$keys[16]]); } if (array_key_exists($keys[17], $arr)) { - $this->setAppMsgSendDate($arr[$keys[17]]); + $this->setAppMsgAttach($arr[$keys[17]]); } if (array_key_exists($keys[18], $arr)) { - $this->setAppMsgShowMessage($arr[$keys[18]]); + $this->setAppMsgSendDate($arr[$keys[18]]); } if (array_key_exists($keys[19], $arr)) { - $this->setAppMsgError($arr[$keys[19]]); + $this->setAppMsgShowMessage($arr[$keys[19]]); } if (array_key_exists($keys[20], $arr)) { - $this->setProId($arr[$keys[20]]); + $this->setAppMsgError($arr[$keys[20]]); } if (array_key_exists($keys[21], $arr)) { - $this->setTasId($arr[$keys[21]]); + $this->setProId($arr[$keys[21]]); } if (array_key_exists($keys[22], $arr)) { - $this->setAppNumber($arr[$keys[22]]); + $this->setTasId($arr[$keys[22]]); + } + + if (array_key_exists($keys[23], $arr)) { + $this->setAppNumber($arr[$keys[23]]); } } @@ -1604,6 +1656,10 @@ abstract class BaseAppMessage extends BaseObject implements Persistent { $criteria = new Criteria(AppMessagePeer::DATABASE_NAME); + if ($this->isColumnModified(AppMessagePeer::APP_MSG_ID)) { + $criteria->add(AppMessagePeer::APP_MSG_ID, $this->app_msg_id); + } + if ($this->isColumnModified(AppMessagePeer::APP_MSG_UID)) { $criteria->add(AppMessagePeer::APP_MSG_UID, $this->app_msg_uid); } @@ -1750,6 +1806,8 @@ abstract class BaseAppMessage extends BaseObject implements Persistent public function copyInto($copyObj, $deepCopy = false) { + $copyObj->setAppMsgId($this->app_msg_id); + $copyObj->setMsgUid($this->msg_uid); $copyObj->setAppUid($this->app_uid); diff --git a/workflow/engine/classes/model/om/BaseAppMessagePeer.php b/workflow/engine/classes/model/om/BaseAppMessagePeer.php index 749b74386..ae444c469 100644 --- a/workflow/engine/classes/model/om/BaseAppMessagePeer.php +++ b/workflow/engine/classes/model/om/BaseAppMessagePeer.php @@ -25,12 +25,15 @@ abstract class BaseAppMessagePeer const CLASS_DEFAULT = 'classes.model.AppMessage'; /** The total number of columns. */ - const NUM_COLUMNS = 23; + const NUM_COLUMNS = 24; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; + /** the column name for the APP_MSG_ID field */ + const APP_MSG_ID = 'APP_MESSAGE.APP_MSG_ID'; + /** the column name for the APP_MSG_UID field */ const APP_MSG_UID = 'APP_MESSAGE.APP_MSG_UID'; @@ -111,10 +114,10 @@ abstract class BaseAppMessagePeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('AppMsgUid', 'MsgUid', 'AppUid', 'DelIndex', 'AppMsgType', 'AppMsgTypeId', 'AppMsgSubject', 'AppMsgFrom', 'AppMsgTo', 'AppMsgBody', 'AppMsgDate', 'AppMsgCc', 'AppMsgBcc', 'AppMsgTemplate', 'AppMsgStatus', 'AppMsgStatusId', 'AppMsgAttach', 'AppMsgSendDate', 'AppMsgShowMessage', 'AppMsgError', 'ProId', 'TasId', 'AppNumber', ), - BasePeer::TYPE_COLNAME => array (AppMessagePeer::APP_MSG_UID, AppMessagePeer::MSG_UID, AppMessagePeer::APP_UID, AppMessagePeer::DEL_INDEX, AppMessagePeer::APP_MSG_TYPE, AppMessagePeer::APP_MSG_TYPE_ID, AppMessagePeer::APP_MSG_SUBJECT, AppMessagePeer::APP_MSG_FROM, AppMessagePeer::APP_MSG_TO, AppMessagePeer::APP_MSG_BODY, AppMessagePeer::APP_MSG_DATE, AppMessagePeer::APP_MSG_CC, AppMessagePeer::APP_MSG_BCC, AppMessagePeer::APP_MSG_TEMPLATE, AppMessagePeer::APP_MSG_STATUS, AppMessagePeer::APP_MSG_STATUS_ID, AppMessagePeer::APP_MSG_ATTACH, AppMessagePeer::APP_MSG_SEND_DATE, AppMessagePeer::APP_MSG_SHOW_MESSAGE, AppMessagePeer::APP_MSG_ERROR, AppMessagePeer::PRO_ID, AppMessagePeer::TAS_ID, AppMessagePeer::APP_NUMBER, ), - BasePeer::TYPE_FIELDNAME => array ('APP_MSG_UID', 'MSG_UID', 'APP_UID', 'DEL_INDEX', 'APP_MSG_TYPE', 'APP_MSG_TYPE_ID', 'APP_MSG_SUBJECT', 'APP_MSG_FROM', 'APP_MSG_TO', 'APP_MSG_BODY', 'APP_MSG_DATE', 'APP_MSG_CC', 'APP_MSG_BCC', 'APP_MSG_TEMPLATE', 'APP_MSG_STATUS', 'APP_MSG_STATUS_ID', 'APP_MSG_ATTACH', 'APP_MSG_SEND_DATE', 'APP_MSG_SHOW_MESSAGE', 'APP_MSG_ERROR', 'PRO_ID', 'TAS_ID', 'APP_NUMBER', ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, ) + BasePeer::TYPE_PHPNAME => array ('AppMsgId', 'AppMsgUid', 'MsgUid', 'AppUid', 'DelIndex', 'AppMsgType', 'AppMsgTypeId', 'AppMsgSubject', 'AppMsgFrom', 'AppMsgTo', 'AppMsgBody', 'AppMsgDate', 'AppMsgCc', 'AppMsgBcc', 'AppMsgTemplate', 'AppMsgStatus', 'AppMsgStatusId', 'AppMsgAttach', 'AppMsgSendDate', 'AppMsgShowMessage', 'AppMsgError', 'ProId', 'TasId', 'AppNumber', ), + BasePeer::TYPE_COLNAME => array (AppMessagePeer::APP_MSG_ID, AppMessagePeer::APP_MSG_UID, AppMessagePeer::MSG_UID, AppMessagePeer::APP_UID, AppMessagePeer::DEL_INDEX, AppMessagePeer::APP_MSG_TYPE, AppMessagePeer::APP_MSG_TYPE_ID, AppMessagePeer::APP_MSG_SUBJECT, AppMessagePeer::APP_MSG_FROM, AppMessagePeer::APP_MSG_TO, AppMessagePeer::APP_MSG_BODY, AppMessagePeer::APP_MSG_DATE, AppMessagePeer::APP_MSG_CC, AppMessagePeer::APP_MSG_BCC, AppMessagePeer::APP_MSG_TEMPLATE, AppMessagePeer::APP_MSG_STATUS, AppMessagePeer::APP_MSG_STATUS_ID, AppMessagePeer::APP_MSG_ATTACH, AppMessagePeer::APP_MSG_SEND_DATE, AppMessagePeer::APP_MSG_SHOW_MESSAGE, AppMessagePeer::APP_MSG_ERROR, AppMessagePeer::PRO_ID, AppMessagePeer::TAS_ID, AppMessagePeer::APP_NUMBER, ), + BasePeer::TYPE_FIELDNAME => array ('APP_MSG_ID', 'APP_MSG_UID', 'MSG_UID', 'APP_UID', 'DEL_INDEX', 'APP_MSG_TYPE', 'APP_MSG_TYPE_ID', 'APP_MSG_SUBJECT', 'APP_MSG_FROM', 'APP_MSG_TO', 'APP_MSG_BODY', 'APP_MSG_DATE', 'APP_MSG_CC', 'APP_MSG_BCC', 'APP_MSG_TEMPLATE', 'APP_MSG_STATUS', 'APP_MSG_STATUS_ID', 'APP_MSG_ATTACH', 'APP_MSG_SEND_DATE', 'APP_MSG_SHOW_MESSAGE', 'APP_MSG_ERROR', 'PRO_ID', 'TAS_ID', 'APP_NUMBER', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, ) ); /** @@ -124,10 +127,10 @@ abstract class BaseAppMessagePeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('AppMsgUid' => 0, 'MsgUid' => 1, 'AppUid' => 2, 'DelIndex' => 3, 'AppMsgType' => 4, 'AppMsgTypeId' => 5, 'AppMsgSubject' => 6, 'AppMsgFrom' => 7, 'AppMsgTo' => 8, 'AppMsgBody' => 9, 'AppMsgDate' => 10, 'AppMsgCc' => 11, 'AppMsgBcc' => 12, 'AppMsgTemplate' => 13, 'AppMsgStatus' => 14, 'AppMsgStatusId' => 15, 'AppMsgAttach' => 16, 'AppMsgSendDate' => 17, 'AppMsgShowMessage' => 18, 'AppMsgError' => 19, 'ProId' => 20, 'TasId' => 21, 'AppNumber' => 22, ), - BasePeer::TYPE_COLNAME => array (AppMessagePeer::APP_MSG_UID => 0, AppMessagePeer::MSG_UID => 1, AppMessagePeer::APP_UID => 2, AppMessagePeer::DEL_INDEX => 3, AppMessagePeer::APP_MSG_TYPE => 4, AppMessagePeer::APP_MSG_TYPE_ID => 5, AppMessagePeer::APP_MSG_SUBJECT => 6, AppMessagePeer::APP_MSG_FROM => 7, AppMessagePeer::APP_MSG_TO => 8, AppMessagePeer::APP_MSG_BODY => 9, AppMessagePeer::APP_MSG_DATE => 10, AppMessagePeer::APP_MSG_CC => 11, AppMessagePeer::APP_MSG_BCC => 12, AppMessagePeer::APP_MSG_TEMPLATE => 13, AppMessagePeer::APP_MSG_STATUS => 14, AppMessagePeer::APP_MSG_STATUS_ID => 15, AppMessagePeer::APP_MSG_ATTACH => 16, AppMessagePeer::APP_MSG_SEND_DATE => 17, AppMessagePeer::APP_MSG_SHOW_MESSAGE => 18, AppMessagePeer::APP_MSG_ERROR => 19, AppMessagePeer::PRO_ID => 20, AppMessagePeer::TAS_ID => 21, AppMessagePeer::APP_NUMBER => 22, ), - BasePeer::TYPE_FIELDNAME => array ('APP_MSG_UID' => 0, 'MSG_UID' => 1, 'APP_UID' => 2, 'DEL_INDEX' => 3, 'APP_MSG_TYPE' => 4, 'APP_MSG_TYPE_ID' => 5, 'APP_MSG_SUBJECT' => 6, 'APP_MSG_FROM' => 7, 'APP_MSG_TO' => 8, 'APP_MSG_BODY' => 9, 'APP_MSG_DATE' => 10, 'APP_MSG_CC' => 11, 'APP_MSG_BCC' => 12, 'APP_MSG_TEMPLATE' => 13, 'APP_MSG_STATUS' => 14, 'APP_MSG_STATUS_ID' => 15, 'APP_MSG_ATTACH' => 16, 'APP_MSG_SEND_DATE' => 17, 'APP_MSG_SHOW_MESSAGE' => 18, 'APP_MSG_ERROR' => 19, 'PRO_ID' => 20, 'TAS_ID' => 21, 'APP_NUMBER' => 22, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, ) + BasePeer::TYPE_PHPNAME => array ('AppMsgId' => 0, 'AppMsgUid' => 1, 'MsgUid' => 2, 'AppUid' => 3, 'DelIndex' => 4, 'AppMsgType' => 5, 'AppMsgTypeId' => 6, 'AppMsgSubject' => 7, 'AppMsgFrom' => 8, 'AppMsgTo' => 9, 'AppMsgBody' => 10, 'AppMsgDate' => 11, 'AppMsgCc' => 12, 'AppMsgBcc' => 13, 'AppMsgTemplate' => 14, 'AppMsgStatus' => 15, 'AppMsgStatusId' => 16, 'AppMsgAttach' => 17, 'AppMsgSendDate' => 18, 'AppMsgShowMessage' => 19, 'AppMsgError' => 20, 'ProId' => 21, 'TasId' => 22, 'AppNumber' => 23, ), + BasePeer::TYPE_COLNAME => array (AppMessagePeer::APP_MSG_ID => 0, AppMessagePeer::APP_MSG_UID => 1, AppMessagePeer::MSG_UID => 2, AppMessagePeer::APP_UID => 3, AppMessagePeer::DEL_INDEX => 4, AppMessagePeer::APP_MSG_TYPE => 5, AppMessagePeer::APP_MSG_TYPE_ID => 6, AppMessagePeer::APP_MSG_SUBJECT => 7, AppMessagePeer::APP_MSG_FROM => 8, AppMessagePeer::APP_MSG_TO => 9, AppMessagePeer::APP_MSG_BODY => 10, AppMessagePeer::APP_MSG_DATE => 11, AppMessagePeer::APP_MSG_CC => 12, AppMessagePeer::APP_MSG_BCC => 13, AppMessagePeer::APP_MSG_TEMPLATE => 14, AppMessagePeer::APP_MSG_STATUS => 15, AppMessagePeer::APP_MSG_STATUS_ID => 16, AppMessagePeer::APP_MSG_ATTACH => 17, AppMessagePeer::APP_MSG_SEND_DATE => 18, AppMessagePeer::APP_MSG_SHOW_MESSAGE => 19, AppMessagePeer::APP_MSG_ERROR => 20, AppMessagePeer::PRO_ID => 21, AppMessagePeer::TAS_ID => 22, AppMessagePeer::APP_NUMBER => 23, ), + BasePeer::TYPE_FIELDNAME => array ('APP_MSG_ID' => 0, 'APP_MSG_UID' => 1, 'MSG_UID' => 2, 'APP_UID' => 3, 'DEL_INDEX' => 4, 'APP_MSG_TYPE' => 5, 'APP_MSG_TYPE_ID' => 6, 'APP_MSG_SUBJECT' => 7, 'APP_MSG_FROM' => 8, 'APP_MSG_TO' => 9, 'APP_MSG_BODY' => 10, 'APP_MSG_DATE' => 11, 'APP_MSG_CC' => 12, 'APP_MSG_BCC' => 13, 'APP_MSG_TEMPLATE' => 14, 'APP_MSG_STATUS' => 15, 'APP_MSG_STATUS_ID' => 16, 'APP_MSG_ATTACH' => 17, 'APP_MSG_SEND_DATE' => 18, 'APP_MSG_SHOW_MESSAGE' => 19, 'APP_MSG_ERROR' => 20, 'PRO_ID' => 21, 'TAS_ID' => 22, 'APP_NUMBER' => 23, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, ) ); /** @@ -228,6 +231,8 @@ abstract class BaseAppMessagePeer public static function addSelectColumns(Criteria $criteria) { + $criteria->addSelectColumn(AppMessagePeer::APP_MSG_ID); + $criteria->addSelectColumn(AppMessagePeer::APP_MSG_UID); $criteria->addSelectColumn(AppMessagePeer::MSG_UID); diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index 9e5817831..3a067b870 100755 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -366,6 +366,7 @@ + @@ -389,6 +390,9 @@ + + + @@ -405,7 +409,7 @@ - + @@ -414,6 +418,9 @@ + + + diff --git a/workflow/engine/methods/mails/emailsAjax.php b/workflow/engine/methods/mails/emailsAjax.php index d83cf5d07..7f88e783f 100644 --- a/workflow/engine/methods/mails/emailsAjax.php +++ b/workflow/engine/methods/mails/emailsAjax.php @@ -1,5 +1,8 @@ addSelectColumn(AppMessagePeer::APP_MSG_UID); + $criteria->addSelectColumn(AppMessagePeer::APP_MSG_ID); $criteria->addSelectColumn(AppMessagePeer::APP_UID); $criteria->addSelectColumn(AppMessagePeer::DEL_INDEX); $criteria->addSelectColumn(AppMessagePeer::APP_MSG_TYPE); @@ -45,14 +48,9 @@ switch ($req) { $criteria->addSelectColumn(AppMessagePeer::APP_MSG_SEND_DATE); $criteria->addSelectColumn(AppMessagePeer::APP_MSG_SHOW_MESSAGE); $criteria->addSelectColumn(AppMessagePeer::APP_MSG_ERROR); - $criteria->addSelectColumn(ApplicationPeer::PRO_UID); - $criteria->addSelectColumn(ApplicationPeer::APP_TITLE); - $criteria->addSelectColumn(ApplicationPeer::APP_NUMBER); - $criteria->addSelectColumn(ProcessPeer::PRO_TITLE); - $criteria->addSelectColumn(TaskPeer::TAS_TITLE); - $criteria->addJoin(AppMessagePeer::APP_UID, ApplicationPeer::APP_UID, Criteria::LEFT_JOIN); - $criteria->addJoin(AppMessagePeer::TAS_ID, TaskPeer::TAS_ID, Criteria::LEFT_JOIN); - $criteria->addJoin(AppMessagePeer::PRO_ID, ProcessPeer::PRO_ID, Criteria::LEFT_JOIN); + $criteria->addSelectColumn(AppMessagePeer::APP_NUMBER); + $criteria->addSelectColumn(AppMessagePeer::PRO_ID); + $criteria->addSelectColumn(AppMessagePeer::TAS_ID); //Status can be: All, Participated, Pending, Failed if (!empty($msgStatusId)) { @@ -115,7 +113,7 @@ switch ($req) { $criteria->addDescendingOrderByColumn($sort); } } else { - $oCriteria->addDescendingOrderByColumn(AppMessagePeer::APP_MSG_SEND_DATE); + $oCriteria->addDescendingOrderByColumn(AppMessagePeer::APP_MSG_DATE); } if (!empty($limit)) { $criteria->setLimit($limit); @@ -129,11 +127,43 @@ switch ($req) { $index = 1; $content = new Content(); $tasTitleDefault = G::LoadTranslation('ID_TASK_NOT_RELATED'); + $cases = []; + $processes = []; + $tasks = []; while ($result->next()) { $row = $result->getRow(); $row['APP_MSG_STATUS'] = ucfirst($row['APP_MSG_STATUS']); $row['APP_MSG_DATE'] = DateTime::convertUtcToTimeZone($row['APP_MSG_DATE']); + // Complete data with information from another tables + if ($row['APP_NUMBER'] > 0) { + if (!isset($cases[$row['APP_NUMBER']])) { + $record = Application::query()->select(['APP_TITLE'])->where('APP_NUMBER', '=', $row['APP_NUMBER'])->get()->toArray(); + if (!empty($record[0]['APP_TITLE'])) { + $cases[$row['APP_NUMBER']] = $record[0]['APP_TITLE']; + } + } + $row['APP_TITLE'] = $cases[$row['APP_NUMBER']] ?? ''; + } + if ($row['PRO_ID'] > 0) { + if (!isset($processes[$row['PRO_ID']])) { + $record = Process::query()->select(['PRO_TITLE'])->where('PRO_ID', '=', $row['PRO_ID'])->get()->toArray(); + if (!empty($record[0]['PRO_TITLE'])) { + $processes[$row['PRO_ID']] = $record[0]['PRO_TITLE']; + } + } + $row['PRO_TITLE'] = $processes[$row['PRO_ID']] ?? ''; + } + if ($row['TAS_ID'] > 0) { + if (!isset($tasks[$row['TAS_ID']])) { + $record = Task::query()->select(['TAS_TITLE'])->where('TAS_ID', '=', $row['TAS_ID'])->get()->toArray(); + if (!empty($record[0]['TAS_TITLE'])) { + $tasks[$row['TAS_ID']] = $record[0]['TAS_TITLE']; + } + } + $row['TAS_TITLE'] = $tasks[$row['TAS_ID']] ?? ''; + } + switch ($filterBy) { case 'CASES': if ($row['DEL_INDEX'] != 0) { diff --git a/workflow/engine/templates/mails/emailList.js b/workflow/engine/templates/mails/emailList.js index 0600f8f0e..c1cc3d24e 100644 --- a/workflow/engine/templates/mails/emailList.js +++ b/workflow/engine/templates/mails/emailList.js @@ -1,7 +1,3 @@ -/* - * @author: Marco Antonio - * Agos 17st, 2012 - */ new Ext.KeyMap(document, [{ key: Ext.EventObject.F5, fn: function(keycode, e) { @@ -35,22 +31,22 @@ Ext.onReady(function(){ ); var columnRenderer = function(data, metadata, record, rowIndex,columnIndex, store) { if(metadata.id == PMExt.emailConst.taskColumn.name){ - if((PMExt.emailConst.appMsgTypeWithoutTask.includes(record.data.APP_MSG_TYPE)) || (PMExt.emailConst.appMsgTypeWithConditionalTask.includes(record.data.APP_MSG_TYPE) && record.data.DEL_INDEX == 0)){ + if (record.data.TAS_ID == '0') { data = PMExt.emailConst.taskColumn.defaultValue; } } if(metadata.id == PMExt.emailConst.caseColumn.name){ - if(PMExt.emailConst.appMsgTypeWithoutCase.includes(record.data.APP_MSG_TYPE)){ + if (record.data.APP_NUMBER == '0') { data = PMExt.emailConst.caseColumn.defaultValue; } } - if(metadata.id == PMExt.emailConst.processColumn.name){ - if(PMExt.emailConst.appMsgTypeWithoutProcess.includes(record.data.APP_MSG_TYPE)){ + if(metadata.id == PMExt.emailConst.processColumn.name) { + if (record.data.PRO_ID == '0') { data = PMExt.emailConst.processColumn.defaultValue; } } if(metadata.id == PMExt.emailConst.numberColumn.name){ - if(PMExt.emailConst.appMsgTypeWithoutNumber.includes(record.data.APP_MSG_TYPE)){ + if (record.data.APP_NUMBER == '0') { data = PMExt.emailConst.numberColumn.defaultValue; } } @@ -292,8 +288,8 @@ Ext.onReady(function(){ {name : 'APP_MSG_UID'}, {name : 'APP_UID'}, {name : 'DEL_INDEX'}, - {name : 'PRO_UID'}, - {name : 'TAS_UID'}, + {name : 'PRO_ID'}, + {name : 'TAS_ID'}, {name : 'APP_NUMBER'}, {name : 'PRO_TITLE'}, {name : 'TAS_TITLE'}, @@ -350,10 +346,10 @@ Ext.onReady(function(){ {id: "TAS_TITLE", header: _('ID_TASK'), dataIndex: 'TAS_TITLE', width: 100, hidden: false,renderer: columnRenderer, sortable: false}, {id: "APP_MSG_TYPE", header: _('ID_TYPE'), dataIndex: 'APP_MSG_TYPE', width: 50, hidden: false,renderer: columnRenderer, sortable: true}, {id: "APP_MSG_DATE", header: _('ID_DATE_LABEL'), dataIndex: 'APP_MSG_DATE', width: 80, hidden: false, renderer: columnRenderer, sortable: true}, - {id: "APP_MSG_SUBJECT", header: _('ID_SUBJECT'), dataIndex: 'APP_MSG_SUBJECT', width: 80, hidden: false, renderer: columnRenderer, sortable: true}, + {id: "APP_MSG_SUBJECT", header: _('ID_SUBJECT'), dataIndex: 'APP_MSG_SUBJECT', width: 80, hidden: false, renderer: columnRenderer, sortable: false}, {id: "APP_MSG_FROM", header: _('ID_FROM'), dataIndex: 'APP_MSG_FROM', width: 80, hidden: false,renderer: columnRenderer, sortable: true}, {id: "APP_MSG_TO", header: _('ID_TO'), dataIndex: 'APP_MSG_TO', width: 80, hidden: false,renderer: columnRenderer, sortable: true}, - {id: "APP_MSG_ERROR", header: _('ID_ERROR_EMAIL'), dataIndex: 'APP_MSG_ERROR', width: 80, hidden: false,renderer: columnRenderer, sortable: true}, + {id: "APP_MSG_ERROR", header: _('ID_ERROR_EMAIL'), dataIndex: 'APP_MSG_ERROR', width: 80, hidden: false,renderer: columnRenderer, sortable: false}, { header: _('ID_STATUS'),