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

Cambios para draft

Browse Source
This commit is contained in:
Brayan Pereyra
2015-02-06 14:57:59 -04:00
parent 5c3a4ac977
commit 8be9610114
17 changed files with 762 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
workflow/engine/classes/class.configuration.php
View File

@@ -373,9 +373,10 @@ class Configurations // extends Configuration
*/
public function getFormats()
{
$this->UserConfig = array();
if (!isset($this->UserConfig)) {
$this->UserConfig = $this->getConfiguration("ENVIRONMENT_SETTINGS", "");
$this->UserConfig = $this->getConfiguration("ENVIRONMENT_SETTINGS", "");
if (is_numeric($this->UserConfig)) {
$this->UserConfig = array();
}
//Setting defaults

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

@@ -322,6 +322,9 @@ class ListInbox extends BaseListInbox
$limit = isset($filters['limit']) ? $filters['limit'] : "25";
$paged = isset($filters['paged']) ? $filters['paged'] : 1;
if ($filters['action'] == 'draft') {
$criteria->add( ListInboxPeer::DEL_INDEX, 1, Criteria::EQUAL );
}
if ($dir == "DESC") {
$criteria->addDescendingOrderByColumn($sort);
} else {

26
workflow/engine/classes/model/ListParticipatedLast.php
View File

@@ -25,6 +25,28 @@ class ListParticipatedLast extends BaseListParticipatedLast
*/
public function create($data)
{
$criteria = new Criteria();
$criteria->addSelectColumn(UsersPeer::USR_USERNAME);
$criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
$criteria->addSelectColumn(UsersPeer::USR_LASTNAME);
$criteria->add( UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL );
$dataset = UsersPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next();
$aRow = $dataset->getRow();
$data['DEL_CURRENT_USR_USERNAME'] = $aRow['USR_USERNAME'];
$data['DEL_CURRENT_USR_FIRSTNAME'] = $aRow['USR_FIRSTNAME'];
$data['DEL_CURRENT_USR_LASTNAME'] = $aRow['USR_LASTNAME'];
$criteria = new Criteria();
$criteria->addSelectColumn(ApplicationPeer::APP_STATUS);
$criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
$dataset = UsersPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next();
$aRow = $dataset->getRow();
$data['APP_STATUS'] = $aRow['APP_STATUS'];
$con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME );
try {
$this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
@@ -182,11 +204,15 @@ class ListParticipatedLast extends BaseListParticipatedLast
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_TITLE);
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_PRO_TITLE);
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_TAS_TITLE);
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_STATUS);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_INDEX);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PREVIOUS_USR_USERNAME);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PREVIOUS_USR_FIRSTNAME);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PREVIOUS_USR_LASTNAME);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_CURRENT_USR_USERNAME);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_CURRENT_USR_FIRSTNAME);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_CURRENT_USR_LASTNAME);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_DELEGATE_DATE);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_INIT_DATE);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_DUE_DATE);

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

@@ -74,6 +74,19 @@ class ListPaused extends BaseListPaused {
$aRow = $dataset->getRow();
$data['DEL_PREVIOUS_USR_UID'] = $aRow['USR_UID'];
$criteria = new Criteria();
$criteria->addSelectColumn(UsersPeer::USR_USERNAME);
$criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
$criteria->addSelectColumn(UsersPeer::USR_LASTNAME);
$criteria->add( UsersPeer::USR_UID, $data['DEL_PREVIOUS_USR_UID'], Criteria::EQUAL );
$dataset = UsersPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next();
$aRow = $dataset->getRow();
$data['DEL_PREVIOUS_USR_USERNAME'] = $aRow['USR_USERNAME'];
$data['DEL_PREVIOUS_USR_FIRSTNAME'] = $aRow['USR_FIRSTNAME'];
$data['DEL_PREVIOUS_USR_LASTNAME'] = $aRow['USR_LASTNAME'];
$criteria = new Criteria();
$criteria->addSelectColumn(ContentPeer::CON_VALUE);
$criteria->add( ContentPeer::CON_ID, $data['TAS_UID'], Criteria::EQUAL );
@@ -263,6 +276,9 @@ class ListPaused extends BaseListPaused {
$criteria->addSelectColumn(ListPausedPeer::APP_RESTART_DATE);
$criteria->addSelectColumn(ListPausedPeer::DEL_INDEX);
$criteria->addSelectColumn(ListPausedPeer::DEL_PREVIOUS_USR_UID);
$criteria->addSelectColumn(ListPausedPeer::DEL_PREVIOUS_USR_USERNAME);
$criteria->addSelectColumn(ListPausedPeer::DEL_PREVIOUS_USR_FIRSTNAME);
$criteria->addSelectColumn(ListPausedPeer::DEL_PREVIOUS_USR_LASTNAME);
$criteria->addSelectColumn(ListPausedPeer::DEL_CURRENT_USR_FIRSTNAME);
$criteria->addSelectColumn(ListPausedPeer::DEL_CURRENT_USR_LASTNAME);
$criteria->addSelectColumn(ListPausedPeer::DEL_CURRENT_USR_USERNAME);

8
workflow/engine/classes/model/map/ListParticipatedLastMapBuilder.php
View File

@@ -81,6 +81,8 @@ class ListParticipatedLastMapBuilder
$tMap->addColumn('APP_TAS_TITLE', 'AppTasTitle', 'string', CreoleTypes::VARCHAR, true, 255);
$tMap->addColumn('APP_STATUS', 'AppStatus', 'string', CreoleTypes::VARCHAR, true, 20);
$tMap->addColumn('DEL_INDEX', 'DelIndex', 'int', CreoleTypes::INTEGER, true, null);
$tMap->addColumn('DEL_PREVIOUS_USR_UID', 'DelPreviousUsrUid', 'string', CreoleTypes::VARCHAR, false, 32);
@@ -91,6 +93,12 @@ class ListParticipatedLastMapBuilder
$tMap->addColumn('DEL_PREVIOUS_USR_LASTNAME', 'DelPreviousUsrLastname', 'string', CreoleTypes::VARCHAR, false, 50);
$tMap->addColumn('DEL_CURRENT_USR_USERNAME', 'DelCurrentUsrUsername', 'string', CreoleTypes::VARCHAR, false, 100);
$tMap->addColumn('DEL_CURRENT_USR_FIRSTNAME', 'DelCurrentUsrFirstname', 'string', CreoleTypes::VARCHAR, false, 50);
$tMap->addColumn('DEL_CURRENT_USR_LASTNAME', 'DelCurrentUsrLastname', 'string', CreoleTypes::VARCHAR, false, 50);
$tMap->addColumn('DEL_DELEGATE_DATE', 'DelDelegateDate', 'int', CreoleTypes::TIMESTAMP, true, null);
$tMap->addColumn('DEL_INIT_DATE', 'DelInitDate', 'int', CreoleTypes::TIMESTAMP, false, null);

6
workflow/engine/classes/model/map/ListPausedMapBuilder.php
View File

@@ -89,6 +89,12 @@ class ListPausedMapBuilder
$tMap->addColumn('DEL_PREVIOUS_USR_UID', 'DelPreviousUsrUid', 'string', CreoleTypes::VARCHAR, false, 32);
$tMap->addColumn('DEL_PREVIOUS_USR_USERNAME', 'DelPreviousUsrUsername', 'string', CreoleTypes::VARCHAR, false, 100);
$tMap->addColumn('DEL_PREVIOUS_USR_FIRSTNAME', 'DelPreviousUsrFirstname', 'string', CreoleTypes::VARCHAR, false, 50);
$tMap->addColumn('DEL_PREVIOUS_USR_LASTNAME', 'DelPreviousUsrLastname', 'string', CreoleTypes::VARCHAR, false, 50);
$tMap->addColumn('DEL_CURRENT_USR_USERNAME', 'DelCurrentUsrUsername', 'string', CreoleTypes::VARCHAR, false, 100);
$tMap->addColumn('DEL_CURRENT_USR_FIRSTNAME', 'DelCurrentUsrFirstname', 'string', CreoleTypes::VARCHAR, false, 50);

320
workflow/engine/classes/model/om/BaseListParticipatedLast.php
View File

@@ -75,6 +75,12 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
*/
protected $app_tas_title = '';
/**
* The value for the app_status field.
* @var string
*/
protected $app_status = '0';
/**
* The value for the del_index field.
* @var int
@@ -105,6 +111,24 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
*/
protected $del_previous_usr_lastname = '';
/**
* The value for the del_current_usr_username field.
* @var string
*/
protected $del_current_usr_username = '';
/**
* The value for the del_current_usr_firstname field.
* @var string
*/
protected $del_current_usr_firstname = '';
/**
* The value for the del_current_usr_lastname field.
* @var string
*/
protected $del_current_usr_lastname = '';
/**
* The value for the del_delegate_date field.
* @var int
@@ -231,6 +255,17 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
return $this->app_tas_title;
}
/**
* Get the [app_status] column value.
*
* @return string
*/
public function getAppStatus()
{
return $this->app_status;
}
/**
* Get the [del_index] column value.
*
@@ -286,6 +321,39 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
return $this->del_previous_usr_lastname;
}
/**
* Get the [del_current_usr_username] column value.
*
* @return string
*/
public function getDelCurrentUsrUsername()
{
return $this->del_current_usr_username;
}
/**
* Get the [del_current_usr_firstname] column value.
*
* @return string
*/
public function getDelCurrentUsrFirstname()
{
return $this->del_current_usr_firstname;
}
/**
* Get the [del_current_usr_lastname] column value.
*
* @return string
*/
public function getDelCurrentUsrLastname()
{
return $this->del_current_usr_lastname;
}
/**
* Get the [optionally formatted] [del_delegate_date] column value.
*
@@ -569,6 +637,28 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
} // setAppTasTitle()
/**
* Set the value of [app_status] column.
*
* @param string $v new value
* @return void
*/
public function setAppStatus($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_status !== $v || $v === '0') {
$this->app_status = $v;
$this->modifiedColumns[] = ListParticipatedLastPeer::APP_STATUS;
}
} // setAppStatus()
/**
* Set the value of [del_index] column.
*
@@ -679,6 +769,72 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
} // setDelPreviousUsrLastname()
/**
* Set the value of [del_current_usr_username] column.
*
* @param string $v new value
* @return void
*/
public function setDelCurrentUsrUsername($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->del_current_usr_username !== $v || $v === '') {
$this->del_current_usr_username = $v;
$this->modifiedColumns[] = ListParticipatedLastPeer::DEL_CURRENT_USR_USERNAME;
}
} // setDelCurrentUsrUsername()
/**
* Set the value of [del_current_usr_firstname] column.
*
* @param string $v new value
* @return void
*/
public function setDelCurrentUsrFirstname($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->del_current_usr_firstname !== $v || $v === '') {
$this->del_current_usr_firstname = $v;
$this->modifiedColumns[] = ListParticipatedLastPeer::DEL_CURRENT_USR_FIRSTNAME;
}
} // setDelCurrentUsrFirstname()
/**
* Set the value of [del_current_usr_lastname] column.
*
* @param string $v new value
* @return void
*/
public function setDelCurrentUsrLastname($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->del_current_usr_lastname !== $v || $v === '') {
$this->del_current_usr_lastname = $v;
$this->modifiedColumns[] = ListParticipatedLastPeer::DEL_CURRENT_USR_LASTNAME;
}
} // setDelCurrentUsrLastname()
/**
* Set the value of [del_delegate_date] column.
*
@@ -821,30 +977,38 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
$this->app_tas_title = $rs->getString($startcol + 7);
$this->del_index = $rs->getInt($startcol + 8);
$this->app_status = $rs->getString($startcol + 8);
$this->del_previous_usr_uid = $rs->getString($startcol + 9);
$this->del_index = $rs->getInt($startcol + 9);
$this->del_previous_usr_username = $rs->getString($startcol + 10);
$this->del_previous_usr_uid = $rs->getString($startcol + 10);
$this->del_previous_usr_firstname = $rs->getString($startcol + 11);
$this->del_previous_usr_username = $rs->getString($startcol + 11);
$this->del_previous_usr_lastname = $rs->getString($startcol + 12);
$this->del_previous_usr_firstname = $rs->getString($startcol + 12);
$this->del_delegate_date = $rs->getTimestamp($startcol + 13, null);
$this->del_previous_usr_lastname = $rs->getString($startcol + 13);
$this->del_init_date = $rs->getTimestamp($startcol + 14, null);
$this->del_current_usr_username = $rs->getString($startcol + 14);
$this->del_due_date = $rs->getTimestamp($startcol + 15, null);
$this->del_current_usr_firstname = $rs->getString($startcol + 15);
$this->del_priority = $rs->getString($startcol + 16);
$this->del_current_usr_lastname = $rs->getString($startcol + 16);
$this->del_delegate_date = $rs->getTimestamp($startcol + 17, null);
$this->del_init_date = $rs->getTimestamp($startcol + 18, null);
$this->del_due_date = $rs->getTimestamp($startcol + 19, null);
$this->del_priority = $rs->getString($startcol + 20);
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 17; // 17 = ListParticipatedLastPeer::NUM_COLUMNS - ListParticipatedLastPeer::NUM_LAZY_LOAD_COLUMNS).
return $startcol + 21; // 21 = ListParticipatedLastPeer::NUM_COLUMNS - ListParticipatedLastPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating ListParticipatedLast object", $e);
@@ -1073,30 +1237,42 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
return $this->getAppTasTitle();
break;
case 8:
return $this->getDelIndex();
return $this->getAppStatus();
break;
case 9:
return $this->getDelPreviousUsrUid();
return $this->getDelIndex();
break;
case 10:
return $this->getDelPreviousUsrUsername();
return $this->getDelPreviousUsrUid();
break;
case 11:
return $this->getDelPreviousUsrFirstname();
return $this->getDelPreviousUsrUsername();
break;
case 12:
return $this->getDelPreviousUsrLastname();
return $this->getDelPreviousUsrFirstname();
break;
case 13:
return $this->getDelDelegateDate();
return $this->getDelPreviousUsrLastname();
break;
case 14:
return $this->getDelInitDate();
return $this->getDelCurrentUsrUsername();
break;
case 15:
return $this->getDelDueDate();
return $this->getDelCurrentUsrFirstname();
break;
case 16:
return $this->getDelCurrentUsrLastname();
break;
case 17:
return $this->getDelDelegateDate();
break;
case 18:
return $this->getDelInitDate();
break;
case 19:
return $this->getDelDueDate();
break;
case 20:
return $this->getDelPriority();
break;
default:
@@ -1127,15 +1303,19 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
$keys[5] => $this->getAppTitle(),
$keys[6] => $this->getAppProTitle(),
$keys[7] => $this->getAppTasTitle(),
$keys[8] => $this->getDelIndex(),
$keys[9] => $this->getDelPreviousUsrUid(),
$keys[10] => $this->getDelPreviousUsrUsername(),
$keys[11] => $this->getDelPreviousUsrFirstname(),
$keys[12] => $this->getDelPreviousUsrLastname(),
$keys[13] => $this->getDelDelegateDate(),
$keys[14] => $this->getDelInitDate(),
$keys[15] => $this->getDelDueDate(),
$keys[16] => $this->getDelPriority(),
$keys[8] => $this->getAppStatus(),
$keys[9] => $this->getDelIndex(),
$keys[10] => $this->getDelPreviousUsrUid(),
$keys[11] => $this->getDelPreviousUsrUsername(),
$keys[12] => $this->getDelPreviousUsrFirstname(),
$keys[13] => $this->getDelPreviousUsrLastname(),
$keys[14] => $this->getDelCurrentUsrUsername(),
$keys[15] => $this->getDelCurrentUsrFirstname(),
$keys[16] => $this->getDelCurrentUsrLastname(),
$keys[17] => $this->getDelDelegateDate(),
$keys[18] => $this->getDelInitDate(),
$keys[19] => $this->getDelDueDate(),
$keys[20] => $this->getDelPriority(),
);
return $result;
}
@@ -1192,30 +1372,42 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
$this->setAppTasTitle($value);
break;
case 8:
$this->setDelIndex($value);
$this->setAppStatus($value);
break;
case 9:
$this->setDelPreviousUsrUid($value);
$this->setDelIndex($value);
break;
case 10:
$this->setDelPreviousUsrUsername($value);
$this->setDelPreviousUsrUid($value);
break;
case 11:
$this->setDelPreviousUsrFirstname($value);
$this->setDelPreviousUsrUsername($value);
break;
case 12:
$this->setDelPreviousUsrLastname($value);
$this->setDelPreviousUsrFirstname($value);
break;
case 13:
$this->setDelDelegateDate($value);
$this->setDelPreviousUsrLastname($value);
break;
case 14:
$this->setDelInitDate($value);
$this->setDelCurrentUsrUsername($value);
break;
case 15:
$this->setDelDueDate($value);
$this->setDelCurrentUsrFirstname($value);
break;
case 16:
$this->setDelCurrentUsrLastname($value);
break;
case 17:
$this->setDelDelegateDate($value);
break;
case 18:
$this->setDelInitDate($value);
break;
case 19:
$this->setDelDueDate($value);
break;
case 20:
$this->setDelPriority($value);
break;
} // switch()
@@ -1274,39 +1466,55 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
}
if (array_key_exists($keys[8], $arr)) {
$this->setDelIndex($arr[$keys[8]]);
$this->setAppStatus($arr[$keys[8]]);
}
if (array_key_exists($keys[9], $arr)) {
$this->setDelPreviousUsrUid($arr[$keys[9]]);
$this->setDelIndex($arr[$keys[9]]);
}
if (array_key_exists($keys[10], $arr)) {
$this->setDelPreviousUsrUsername($arr[$keys[10]]);
$this->setDelPreviousUsrUid($arr[$keys[10]]);
}
if (array_key_exists($keys[11], $arr)) {
$this->setDelPreviousUsrFirstname($arr[$keys[11]]);
$this->setDelPreviousUsrUsername($arr[$keys[11]]);
}
if (array_key_exists($keys[12], $arr)) {
$this->setDelPreviousUsrLastname($arr[$keys[12]]);
$this->setDelPreviousUsrFirstname($arr[$keys[12]]);
}
if (array_key_exists($keys[13], $arr)) {
$this->setDelDelegateDate($arr[$keys[13]]);
$this->setDelPreviousUsrLastname($arr[$keys[13]]);
}
if (array_key_exists($keys[14], $arr)) {
$this->setDelInitDate($arr[$keys[14]]);
$this->setDelCurrentUsrUsername($arr[$keys[14]]);
}
if (array_key_exists($keys[15], $arr)) {
$this->setDelDueDate($arr[$keys[15]]);
$this->setDelCurrentUsrFirstname($arr[$keys[15]]);
}
if (array_key_exists($keys[16], $arr)) {
$this->setDelPriority($arr[$keys[16]]);
$this->setDelCurrentUsrLastname($arr[$keys[16]]);
}
if (array_key_exists($keys[17], $arr)) {
$this->setDelDelegateDate($arr[$keys[17]]);
}
if (array_key_exists($keys[18], $arr)) {
$this->setDelInitDate($arr[$keys[18]]);
}
if (array_key_exists($keys[19], $arr)) {
$this->setDelDueDate($arr[$keys[19]]);
}
if (array_key_exists($keys[20], $arr)) {
$this->setDelPriority($arr[$keys[20]]);
}
}
@@ -1352,6 +1560,10 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
$criteria->add(ListParticipatedLastPeer::APP_TAS_TITLE, $this->app_tas_title);
}
if ($this->isColumnModified(ListParticipatedLastPeer::APP_STATUS)) {
$criteria->add(ListParticipatedLastPeer::APP_STATUS, $this->app_status);
}
if ($this->isColumnModified(ListParticipatedLastPeer::DEL_INDEX)) {
$criteria->add(ListParticipatedLastPeer::DEL_INDEX, $this->del_index);
}
@@ -1372,6 +1584,18 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
$criteria->add(ListParticipatedLastPeer::DEL_PREVIOUS_USR_LASTNAME, $this->del_previous_usr_lastname);
}
if ($this->isColumnModified(ListParticipatedLastPeer::DEL_CURRENT_USR_USERNAME)) {
$criteria->add(ListParticipatedLastPeer::DEL_CURRENT_USR_USERNAME, $this->del_current_usr_username);
}
if ($this->isColumnModified(ListParticipatedLastPeer::DEL_CURRENT_USR_FIRSTNAME)) {
$criteria->add(ListParticipatedLastPeer::DEL_CURRENT_USR_FIRSTNAME, $this->del_current_usr_firstname);
}
if ($this->isColumnModified(ListParticipatedLastPeer::DEL_CURRENT_USR_LASTNAME)) {
$criteria->add(ListParticipatedLastPeer::DEL_CURRENT_USR_LASTNAME, $this->del_current_usr_lastname);
}
if ($this->isColumnModified(ListParticipatedLastPeer::DEL_DELEGATE_DATE)) {
$criteria->add(ListParticipatedLastPeer::DEL_DELEGATE_DATE, $this->del_delegate_date);
}
@@ -1466,6 +1690,8 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
$copyObj->setAppTasTitle($this->app_tas_title);
$copyObj->setAppStatus($this->app_status);
$copyObj->setDelIndex($this->del_index);
$copyObj->setDelPreviousUsrUid($this->del_previous_usr_uid);
@@ -1476,6 +1702,12 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
$copyObj->setDelPreviousUsrLastname($this->del_previous_usr_lastname);
$copyObj->setDelCurrentUsrUsername($this->del_current_usr_username);
$copyObj->setDelCurrentUsrFirstname($this->del_current_usr_firstname);
$copyObj->setDelCurrentUsrLastname($this->del_current_usr_lastname);
$copyObj->setDelDelegateDate($this->del_delegate_date);
$copyObj->setDelInitDate($this->del_init_date);

38
workflow/engine/classes/model/om/BaseListParticipatedLastPeer.php
View File

@@ -25,7 +25,7 @@ abstract class BaseListParticipatedLastPeer
const CLASS_DEFAULT = 'classes.model.ListParticipatedLast';
/** The total number of columns. */
const NUM_COLUMNS = 17;
const NUM_COLUMNS = 21;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -55,6 +55,9 @@ abstract class BaseListParticipatedLastPeer
/** the column name for the APP_TAS_TITLE field */
const APP_TAS_TITLE = 'LIST_PARTICIPATED_LAST.APP_TAS_TITLE';
/** the column name for the APP_STATUS field */
const APP_STATUS = 'LIST_PARTICIPATED_LAST.APP_STATUS';
/** the column name for the DEL_INDEX field */
const DEL_INDEX = 'LIST_PARTICIPATED_LAST.DEL_INDEX';
@@ -70,6 +73,15 @@ abstract class BaseListParticipatedLastPeer
/** the column name for the DEL_PREVIOUS_USR_LASTNAME field */
const DEL_PREVIOUS_USR_LASTNAME = 'LIST_PARTICIPATED_LAST.DEL_PREVIOUS_USR_LASTNAME';
/** the column name for the DEL_CURRENT_USR_USERNAME field */
const DEL_CURRENT_USR_USERNAME = 'LIST_PARTICIPATED_LAST.DEL_CURRENT_USR_USERNAME';
/** the column name for the DEL_CURRENT_USR_FIRSTNAME field */
const DEL_CURRENT_USR_FIRSTNAME = 'LIST_PARTICIPATED_LAST.DEL_CURRENT_USR_FIRSTNAME';
/** the column name for the DEL_CURRENT_USR_LASTNAME field */
const DEL_CURRENT_USR_LASTNAME = 'LIST_PARTICIPATED_LAST.DEL_CURRENT_USR_LASTNAME';
/** the column name for the DEL_DELEGATE_DATE field */
const DEL_DELEGATE_DATE = 'LIST_PARTICIPATED_LAST.DEL_DELEGATE_DATE';
@@ -93,10 +105,10 @@ abstract class BaseListParticipatedLastPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('AppUid', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'DelIndex', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', ),
BasePeer::TYPE_COLNAME => array (ListParticipatedLastPeer::APP_UID, ListParticipatedLastPeer::USR_UID, ListParticipatedLastPeer::TAS_UID, ListParticipatedLastPeer::PRO_UID, ListParticipatedLastPeer::APP_NUMBER, ListParticipatedLastPeer::APP_TITLE, ListParticipatedLastPeer::APP_PRO_TITLE, ListParticipatedLastPeer::APP_TAS_TITLE, ListParticipatedLastPeer::DEL_INDEX, ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID, ListParticipatedLastPeer::DEL_PREVIOUS_USR_USERNAME, ListParticipatedLastPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListParticipatedLastPeer::DEL_PREVIOUS_USR_LASTNAME, ListParticipatedLastPeer::DEL_DELEGATE_DATE, ListParticipatedLastPeer::DEL_INIT_DATE, ListParticipatedLastPeer::DEL_DUE_DATE, ListParticipatedLastPeer::DEL_PRIORITY, ),
BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'DEL_INDEX', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, )
BasePeer::TYPE_PHPNAME => array ('AppUid', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppStatus', 'DelIndex', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', ),
BasePeer::TYPE_COLNAME => array (ListParticipatedLastPeer::APP_UID, ListParticipatedLastPeer::USR_UID, ListParticipatedLastPeer::TAS_UID, ListParticipatedLastPeer::PRO_UID, ListParticipatedLastPeer::APP_NUMBER, ListParticipatedLastPeer::APP_TITLE, ListParticipatedLastPeer::APP_PRO_TITLE, ListParticipatedLastPeer::APP_TAS_TITLE, ListParticipatedLastPeer::APP_STATUS, ListParticipatedLastPeer::DEL_INDEX, ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID, ListParticipatedLastPeer::DEL_PREVIOUS_USR_USERNAME, ListParticipatedLastPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListParticipatedLastPeer::DEL_PREVIOUS_USR_LASTNAME, ListParticipatedLastPeer::DEL_CURRENT_USR_USERNAME, ListParticipatedLastPeer::DEL_CURRENT_USR_FIRSTNAME, ListParticipatedLastPeer::DEL_CURRENT_USR_LASTNAME, ListParticipatedLastPeer::DEL_DELEGATE_DATE, ListParticipatedLastPeer::DEL_INIT_DATE, ListParticipatedLastPeer::DEL_DUE_DATE, ListParticipatedLastPeer::DEL_PRIORITY, ),
BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_STATUS', 'DEL_INDEX', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', ),
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, )
);
/**
@@ -106,10 +118,10 @@ abstract class BaseListParticipatedLastPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'UsrUid' => 1, 'TasUid' => 2, 'ProUid' => 3, 'AppNumber' => 4, 'AppTitle' => 5, 'AppProTitle' => 6, 'AppTasTitle' => 7, 'DelIndex' => 8, 'DelPreviousUsrUid' => 9, 'DelPreviousUsrUsername' => 10, 'DelPreviousUsrFirstname' => 11, 'DelPreviousUsrLastname' => 12, 'DelDelegateDate' => 13, 'DelInitDate' => 14, 'DelDueDate' => 15, 'DelPriority' => 16, ),
BasePeer::TYPE_COLNAME => array (ListParticipatedLastPeer::APP_UID => 0, ListParticipatedLastPeer::USR_UID => 1, ListParticipatedLastPeer::TAS_UID => 2, ListParticipatedLastPeer::PRO_UID => 3, ListParticipatedLastPeer::APP_NUMBER => 4, ListParticipatedLastPeer::APP_TITLE => 5, ListParticipatedLastPeer::APP_PRO_TITLE => 6, ListParticipatedLastPeer::APP_TAS_TITLE => 7, ListParticipatedLastPeer::DEL_INDEX => 8, ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID => 9, ListParticipatedLastPeer::DEL_PREVIOUS_USR_USERNAME => 10, ListParticipatedLastPeer::DEL_PREVIOUS_USR_FIRSTNAME => 11, ListParticipatedLastPeer::DEL_PREVIOUS_USR_LASTNAME => 12, ListParticipatedLastPeer::DEL_DELEGATE_DATE => 13, ListParticipatedLastPeer::DEL_INIT_DATE => 14, ListParticipatedLastPeer::DEL_DUE_DATE => 15, ListParticipatedLastPeer::DEL_PRIORITY => 16, ),
BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'USR_UID' => 1, 'TAS_UID' => 2, 'PRO_UID' => 3, 'APP_NUMBER' => 4, 'APP_TITLE' => 5, 'APP_PRO_TITLE' => 6, 'APP_TAS_TITLE' => 7, 'DEL_INDEX' => 8, 'DEL_PREVIOUS_USR_UID' => 9, 'DEL_PREVIOUS_USR_USERNAME' => 10, 'DEL_PREVIOUS_USR_FIRSTNAME' => 11, 'DEL_PREVIOUS_USR_LASTNAME' => 12, 'DEL_DELEGATE_DATE' => 13, 'DEL_INIT_DATE' => 14, 'DEL_DUE_DATE' => 15, 'DEL_PRIORITY' => 16, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, )
BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'UsrUid' => 1, 'TasUid' => 2, 'ProUid' => 3, 'AppNumber' => 4, 'AppTitle' => 5, 'AppProTitle' => 6, 'AppTasTitle' => 7, 'AppStatus' => 8, 'DelIndex' => 9, 'DelPreviousUsrUid' => 10, 'DelPreviousUsrUsername' => 11, 'DelPreviousUsrFirstname' => 12, 'DelPreviousUsrLastname' => 13, 'DelCurrentUsrUsername' => 14, 'DelCurrentUsrFirstname' => 15, 'DelCurrentUsrLastname' => 16, 'DelDelegateDate' => 17, 'DelInitDate' => 18, 'DelDueDate' => 19, 'DelPriority' => 20, ),
BasePeer::TYPE_COLNAME => array (ListParticipatedLastPeer::APP_UID => 0, ListParticipatedLastPeer::USR_UID => 1, ListParticipatedLastPeer::TAS_UID => 2, ListParticipatedLastPeer::PRO_UID => 3, ListParticipatedLastPeer::APP_NUMBER => 4, ListParticipatedLastPeer::APP_TITLE => 5, ListParticipatedLastPeer::APP_PRO_TITLE => 6, ListParticipatedLastPeer::APP_TAS_TITLE => 7, ListParticipatedLastPeer::APP_STATUS => 8, ListParticipatedLastPeer::DEL_INDEX => 9, ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID => 10, ListParticipatedLastPeer::DEL_PREVIOUS_USR_USERNAME => 11, ListParticipatedLastPeer::DEL_PREVIOUS_USR_FIRSTNAME => 12, ListParticipatedLastPeer::DEL_PREVIOUS_USR_LASTNAME => 13, ListParticipatedLastPeer::DEL_CURRENT_USR_USERNAME => 14, ListParticipatedLastPeer::DEL_CURRENT_USR_FIRSTNAME => 15, ListParticipatedLastPeer::DEL_CURRENT_USR_LASTNAME => 16, ListParticipatedLastPeer::DEL_DELEGATE_DATE => 17, ListParticipatedLastPeer::DEL_INIT_DATE => 18, ListParticipatedLastPeer::DEL_DUE_DATE => 19, ListParticipatedLastPeer::DEL_PRIORITY => 20, ),
BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'USR_UID' => 1, 'TAS_UID' => 2, 'PRO_UID' => 3, 'APP_NUMBER' => 4, 'APP_TITLE' => 5, 'APP_PRO_TITLE' => 6, 'APP_TAS_TITLE' => 7, 'APP_STATUS' => 8, 'DEL_INDEX' => 9, 'DEL_PREVIOUS_USR_UID' => 10, 'DEL_PREVIOUS_USR_USERNAME' => 11, 'DEL_PREVIOUS_USR_FIRSTNAME' => 12, 'DEL_PREVIOUS_USR_LASTNAME' => 13, 'DEL_CURRENT_USR_USERNAME' => 14, 'DEL_CURRENT_USR_FIRSTNAME' => 15, 'DEL_CURRENT_USR_LASTNAME' => 16, 'DEL_DELEGATE_DATE' => 17, 'DEL_INIT_DATE' => 18, 'DEL_DUE_DATE' => 19, 'DEL_PRIORITY' => 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, )
);
/**
@@ -226,6 +238,8 @@ abstract class BaseListParticipatedLastPeer
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_TAS_TITLE);
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_STATUS);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_INDEX);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID);
@@ -236,6 +250,12 @@ abstract class BaseListParticipatedLastPeer
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PREVIOUS_USR_LASTNAME);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_CURRENT_USR_USERNAME);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_CURRENT_USR_FIRSTNAME);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_CURRENT_USR_LASTNAME);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_DELEGATE_DATE);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_INIT_DATE);

242
workflow/engine/classes/model/om/BaseListPaused.php
View File

@@ -99,6 +99,24 @@ abstract class BaseListPaused extends BaseObject implements Persistent
*/
protected $del_previous_usr_uid = '';
/**
* The value for the del_previous_usr_username field.
* @var string
*/
protected $del_previous_usr_username = '';
/**
* The value for the del_previous_usr_firstname field.
* @var string
*/
protected $del_previous_usr_firstname = '';
/**
* The value for the del_previous_usr_lastname field.
* @var string
*/
protected $del_previous_usr_lastname = '';
/**
* The value for the del_current_usr_username field.
* @var string
@@ -329,6 +347,39 @@ abstract class BaseListPaused extends BaseObject implements Persistent
return $this->del_previous_usr_uid;
}
/**
* Get the [del_previous_usr_username] column value.
*
* @return string
*/
public function getDelPreviousUsrUsername()
{
return $this->del_previous_usr_username;
}
/**
* Get the [del_previous_usr_firstname] column value.
*
* @return string
*/
public function getDelPreviousUsrFirstname()
{
return $this->del_previous_usr_firstname;
}
/**
* Get the [del_previous_usr_lastname] column value.
*
* @return string
*/
public function getDelPreviousUsrLastname()
{
return $this->del_previous_usr_lastname;
}
/**
* Get the [del_current_usr_username] column value.
*
@@ -747,6 +798,72 @@ abstract class BaseListPaused extends BaseObject implements Persistent
} // setDelPreviousUsrUid()
/**
* Set the value of [del_previous_usr_username] column.
*
* @param string $v new value
* @return void
*/
public function setDelPreviousUsrUsername($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->del_previous_usr_username !== $v || $v === '') {
$this->del_previous_usr_username = $v;
$this->modifiedColumns[] = ListPausedPeer::DEL_PREVIOUS_USR_USERNAME;
}
} // setDelPreviousUsrUsername()
/**
* Set the value of [del_previous_usr_firstname] column.
*
* @param string $v new value
* @return void
*/
public function setDelPreviousUsrFirstname($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->del_previous_usr_firstname !== $v || $v === '') {
$this->del_previous_usr_firstname = $v;
$this->modifiedColumns[] = ListPausedPeer::DEL_PREVIOUS_USR_FIRSTNAME;
}
} // setDelPreviousUsrFirstname()
/**
* Set the value of [del_previous_usr_lastname] column.
*
* @param string $v new value
* @return void
*/
public function setDelPreviousUsrLastname($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->del_previous_usr_lastname !== $v || $v === '') {
$this->del_previous_usr_lastname = $v;
$this->modifiedColumns[] = ListPausedPeer::DEL_PREVIOUS_USR_LASTNAME;
}
} // setDelPreviousUsrLastname()
/**
* Set the value of [del_current_usr_username] column.
*
@@ -963,26 +1080,32 @@ abstract class BaseListPaused extends BaseObject implements Persistent
$this->del_previous_usr_uid = $rs->getString($startcol + 11);
$this->del_current_usr_username = $rs->getString($startcol + 12);
$this->del_previous_usr_username = $rs->getString($startcol + 12);
$this->del_current_usr_firstname = $rs->getString($startcol + 13);
$this->del_previous_usr_firstname = $rs->getString($startcol + 13);
$this->del_current_usr_lastname = $rs->getString($startcol + 14);
$this->del_previous_usr_lastname = $rs->getString($startcol + 14);
$this->del_delegate_date = $rs->getTimestamp($startcol + 15, null);
$this->del_current_usr_username = $rs->getString($startcol + 15);
$this->del_init_date = $rs->getTimestamp($startcol + 16, null);
$this->del_current_usr_firstname = $rs->getString($startcol + 16);
$this->del_due_date = $rs->getTimestamp($startcol + 17, null);
$this->del_current_usr_lastname = $rs->getString($startcol + 17);
$this->del_priority = $rs->getString($startcol + 18);
$this->del_delegate_date = $rs->getTimestamp($startcol + 18, null);
$this->del_init_date = $rs->getTimestamp($startcol + 19, null);
$this->del_due_date = $rs->getTimestamp($startcol + 20, null);
$this->del_priority = $rs->getString($startcol + 21);
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 19; // 19 = ListPausedPeer::NUM_COLUMNS - ListPausedPeer::NUM_LAZY_LOAD_COLUMNS).
return $startcol + 22; // 22 = ListPausedPeer::NUM_COLUMNS - ListPausedPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating ListPaused object", $e);
@@ -1223,24 +1346,33 @@ abstract class BaseListPaused extends BaseObject implements Persistent
return $this->getDelPreviousUsrUid();
break;
case 12:
return $this->getDelCurrentUsrUsername();
return $this->getDelPreviousUsrUsername();
break;
case 13:
return $this->getDelCurrentUsrFirstname();
return $this->getDelPreviousUsrFirstname();
break;
case 14:
return $this->getDelCurrentUsrLastname();
return $this->getDelPreviousUsrLastname();
break;
case 15:
return $this->getDelDelegateDate();
return $this->getDelCurrentUsrUsername();
break;
case 16:
return $this->getDelInitDate();
return $this->getDelCurrentUsrFirstname();
break;
case 17:
return $this->getDelDueDate();
return $this->getDelCurrentUsrLastname();
break;
case 18:
return $this->getDelDelegateDate();
break;
case 19:
return $this->getDelInitDate();
break;
case 20:
return $this->getDelDueDate();
break;
case 21:
return $this->getDelPriority();
break;
default:
@@ -1275,13 +1407,16 @@ abstract class BaseListPaused extends BaseObject implements Persistent
$keys[9] => $this->getAppPausedDate(),
$keys[10] => $this->getAppRestartDate(),
$keys[11] => $this->getDelPreviousUsrUid(),
$keys[12] => $this->getDelCurrentUsrUsername(),
$keys[13] => $this->getDelCurrentUsrFirstname(),
$keys[14] => $this->getDelCurrentUsrLastname(),
$keys[15] => $this->getDelDelegateDate(),
$keys[16] => $this->getDelInitDate(),
$keys[17] => $this->getDelDueDate(),
$keys[18] => $this->getDelPriority(),
$keys[12] => $this->getDelPreviousUsrUsername(),
$keys[13] => $this->getDelPreviousUsrFirstname(),
$keys[14] => $this->getDelPreviousUsrLastname(),
$keys[15] => $this->getDelCurrentUsrUsername(),
$keys[16] => $this->getDelCurrentUsrFirstname(),
$keys[17] => $this->getDelCurrentUsrLastname(),
$keys[18] => $this->getDelDelegateDate(),
$keys[19] => $this->getDelInitDate(),
$keys[20] => $this->getDelDueDate(),
$keys[21] => $this->getDelPriority(),
);
return $result;
}
@@ -1350,24 +1485,33 @@ abstract class BaseListPaused extends BaseObject implements Persistent
$this->setDelPreviousUsrUid($value);
break;
case 12:
$this->setDelCurrentUsrUsername($value);
$this->setDelPreviousUsrUsername($value);
break;
case 13:
$this->setDelCurrentUsrFirstname($value);
$this->setDelPreviousUsrFirstname($value);
break;
case 14:
$this->setDelCurrentUsrLastname($value);
$this->setDelPreviousUsrLastname($value);
break;
case 15:
$this->setDelDelegateDate($value);
$this->setDelCurrentUsrUsername($value);
break;
case 16:
$this->setDelInitDate($value);
$this->setDelCurrentUsrFirstname($value);
break;
case 17:
$this->setDelDueDate($value);
$this->setDelCurrentUsrLastname($value);
break;
case 18:
$this->setDelDelegateDate($value);
break;
case 19:
$this->setDelInitDate($value);
break;
case 20:
$this->setDelDueDate($value);
break;
case 21:
$this->setDelPriority($value);
break;
} // switch()
@@ -1442,31 +1586,43 @@ abstract class BaseListPaused extends BaseObject implements Persistent
}
if (array_key_exists($keys[12], $arr)) {
$this->setDelCurrentUsrUsername($arr[$keys[12]]);
$this->setDelPreviousUsrUsername($arr[$keys[12]]);
}
if (array_key_exists($keys[13], $arr)) {
$this->setDelCurrentUsrFirstname($arr[$keys[13]]);
$this->setDelPreviousUsrFirstname($arr[$keys[13]]);
}
if (array_key_exists($keys[14], $arr)) {
$this->setDelCurrentUsrLastname($arr[$keys[14]]);
$this->setDelPreviousUsrLastname($arr[$keys[14]]);
}
if (array_key_exists($keys[15], $arr)) {
$this->setDelDelegateDate($arr[$keys[15]]);
$this->setDelCurrentUsrUsername($arr[$keys[15]]);
}
if (array_key_exists($keys[16], $arr)) {
$this->setDelInitDate($arr[$keys[16]]);
$this->setDelCurrentUsrFirstname($arr[$keys[16]]);
}
if (array_key_exists($keys[17], $arr)) {
$this->setDelDueDate($arr[$keys[17]]);
$this->setDelCurrentUsrLastname($arr[$keys[17]]);
}
if (array_key_exists($keys[18], $arr)) {
$this->setDelPriority($arr[$keys[18]]);
$this->setDelDelegateDate($arr[$keys[18]]);
}
if (array_key_exists($keys[19], $arr)) {
$this->setDelInitDate($arr[$keys[19]]);
}
if (array_key_exists($keys[20], $arr)) {
$this->setDelDueDate($arr[$keys[20]]);
}
if (array_key_exists($keys[21], $arr)) {
$this->setDelPriority($arr[$keys[21]]);
}
}
@@ -1528,6 +1684,18 @@ abstract class BaseListPaused extends BaseObject implements Persistent
$criteria->add(ListPausedPeer::DEL_PREVIOUS_USR_UID, $this->del_previous_usr_uid);
}
if ($this->isColumnModified(ListPausedPeer::DEL_PREVIOUS_USR_USERNAME)) {
$criteria->add(ListPausedPeer::DEL_PREVIOUS_USR_USERNAME, $this->del_previous_usr_username);
}
if ($this->isColumnModified(ListPausedPeer::DEL_PREVIOUS_USR_FIRSTNAME)) {
$criteria->add(ListPausedPeer::DEL_PREVIOUS_USR_FIRSTNAME, $this->del_previous_usr_firstname);
}
if ($this->isColumnModified(ListPausedPeer::DEL_PREVIOUS_USR_LASTNAME)) {
$criteria->add(ListPausedPeer::DEL_PREVIOUS_USR_LASTNAME, $this->del_previous_usr_lastname);
}
if ($this->isColumnModified(ListPausedPeer::DEL_CURRENT_USR_USERNAME)) {
$criteria->add(ListPausedPeer::DEL_CURRENT_USR_USERNAME, $this->del_current_usr_username);
}
@@ -1642,6 +1810,12 @@ abstract class BaseListPaused extends BaseObject implements Persistent
$copyObj->setDelPreviousUsrUid($this->del_previous_usr_uid);
$copyObj->setDelPreviousUsrUsername($this->del_previous_usr_username);
$copyObj->setDelPreviousUsrFirstname($this->del_previous_usr_firstname);
$copyObj->setDelPreviousUsrLastname($this->del_previous_usr_lastname);
$copyObj->setDelCurrentUsrUsername($this->del_current_usr_username);
$copyObj->setDelCurrentUsrFirstname($this->del_current_usr_firstname);

33
workflow/engine/classes/model/om/BaseListPausedPeer.php
View File

@@ -25,7 +25,7 @@ abstract class BaseListPausedPeer
const CLASS_DEFAULT = 'classes.model.ListPaused';
/** The total number of columns. */
const NUM_COLUMNS = 19;
const NUM_COLUMNS = 22;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -67,6 +67,15 @@ abstract class BaseListPausedPeer
/** the column name for the DEL_PREVIOUS_USR_UID field */
const DEL_PREVIOUS_USR_UID = 'LIST_PAUSED.DEL_PREVIOUS_USR_UID';
/** the column name for the DEL_PREVIOUS_USR_USERNAME field */
const DEL_PREVIOUS_USR_USERNAME = 'LIST_PAUSED.DEL_PREVIOUS_USR_USERNAME';
/** the column name for the DEL_PREVIOUS_USR_FIRSTNAME field */
const DEL_PREVIOUS_USR_FIRSTNAME = 'LIST_PAUSED.DEL_PREVIOUS_USR_FIRSTNAME';
/** the column name for the DEL_PREVIOUS_USR_LASTNAME field */
const DEL_PREVIOUS_USR_LASTNAME = 'LIST_PAUSED.DEL_PREVIOUS_USR_LASTNAME';
/** the column name for the DEL_CURRENT_USR_USERNAME field */
const DEL_CURRENT_USR_USERNAME = 'LIST_PAUSED.DEL_CURRENT_USR_USERNAME';
@@ -99,10 +108,10 @@ abstract class BaseListPausedPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppPausedDate', 'AppRestartDate', 'DelPreviousUsrUid', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', ),
BasePeer::TYPE_COLNAME => array (ListPausedPeer::APP_UID, ListPausedPeer::DEL_INDEX, ListPausedPeer::USR_UID, ListPausedPeer::TAS_UID, ListPausedPeer::PRO_UID, ListPausedPeer::APP_NUMBER, ListPausedPeer::APP_TITLE, ListPausedPeer::APP_PRO_TITLE, ListPausedPeer::APP_TAS_TITLE, ListPausedPeer::APP_PAUSED_DATE, ListPausedPeer::APP_RESTART_DATE, ListPausedPeer::DEL_PREVIOUS_USR_UID, ListPausedPeer::DEL_CURRENT_USR_USERNAME, ListPausedPeer::DEL_CURRENT_USR_FIRSTNAME, ListPausedPeer::DEL_CURRENT_USR_LASTNAME, ListPausedPeer::DEL_DELEGATE_DATE, ListPausedPeer::DEL_INIT_DATE, ListPausedPeer::DEL_DUE_DATE, ListPausedPeer::DEL_PRIORITY, ),
BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_PAUSED_DATE', 'APP_RESTART_DATE', 'DEL_PREVIOUS_USR_UID', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', ),
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', 'DelIndex', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppPausedDate', 'AppRestartDate', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', ),
BasePeer::TYPE_COLNAME => array (ListPausedPeer::APP_UID, ListPausedPeer::DEL_INDEX, ListPausedPeer::USR_UID, ListPausedPeer::TAS_UID, ListPausedPeer::PRO_UID, ListPausedPeer::APP_NUMBER, ListPausedPeer::APP_TITLE, ListPausedPeer::APP_PRO_TITLE, ListPausedPeer::APP_TAS_TITLE, ListPausedPeer::APP_PAUSED_DATE, ListPausedPeer::APP_RESTART_DATE, ListPausedPeer::DEL_PREVIOUS_USR_UID, ListPausedPeer::DEL_PREVIOUS_USR_USERNAME, ListPausedPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListPausedPeer::DEL_PREVIOUS_USR_LASTNAME, ListPausedPeer::DEL_CURRENT_USR_USERNAME, ListPausedPeer::DEL_CURRENT_USR_FIRSTNAME, ListPausedPeer::DEL_CURRENT_USR_LASTNAME, ListPausedPeer::DEL_DELEGATE_DATE, ListPausedPeer::DEL_INIT_DATE, ListPausedPeer::DEL_DUE_DATE, ListPausedPeer::DEL_PRIORITY, ),
BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_PAUSED_DATE', 'APP_RESTART_DATE', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', ),
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, )
);
/**
@@ -112,10 +121,10 @@ abstract class BaseListPausedPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'UsrUid' => 2, 'TasUid' => 3, 'ProUid' => 4, 'AppNumber' => 5, 'AppTitle' => 6, 'AppProTitle' => 7, 'AppTasTitle' => 8, 'AppPausedDate' => 9, 'AppRestartDate' => 10, 'DelPreviousUsrUid' => 11, 'DelCurrentUsrUsername' => 12, 'DelCurrentUsrFirstname' => 13, 'DelCurrentUsrLastname' => 14, 'DelDelegateDate' => 15, 'DelInitDate' => 16, 'DelDueDate' => 17, 'DelPriority' => 18, ),
BasePeer::TYPE_COLNAME => array (ListPausedPeer::APP_UID => 0, ListPausedPeer::DEL_INDEX => 1, ListPausedPeer::USR_UID => 2, ListPausedPeer::TAS_UID => 3, ListPausedPeer::PRO_UID => 4, ListPausedPeer::APP_NUMBER => 5, ListPausedPeer::APP_TITLE => 6, ListPausedPeer::APP_PRO_TITLE => 7, ListPausedPeer::APP_TAS_TITLE => 8, ListPausedPeer::APP_PAUSED_DATE => 9, ListPausedPeer::APP_RESTART_DATE => 10, ListPausedPeer::DEL_PREVIOUS_USR_UID => 11, ListPausedPeer::DEL_CURRENT_USR_USERNAME => 12, ListPausedPeer::DEL_CURRENT_USR_FIRSTNAME => 13, ListPausedPeer::DEL_CURRENT_USR_LASTNAME => 14, ListPausedPeer::DEL_DELEGATE_DATE => 15, ListPausedPeer::DEL_INIT_DATE => 16, ListPausedPeer::DEL_DUE_DATE => 17, ListPausedPeer::DEL_PRIORITY => 18, ),
BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'USR_UID' => 2, 'TAS_UID' => 3, 'PRO_UID' => 4, 'APP_NUMBER' => 5, 'APP_TITLE' => 6, 'APP_PRO_TITLE' => 7, 'APP_TAS_TITLE' => 8, 'APP_PAUSED_DATE' => 9, 'APP_RESTART_DATE' => 10, 'DEL_PREVIOUS_USR_UID' => 11, 'DEL_CURRENT_USR_USERNAME' => 12, 'DEL_CURRENT_USR_FIRSTNAME' => 13, 'DEL_CURRENT_USR_LASTNAME' => 14, 'DEL_DELEGATE_DATE' => 15, 'DEL_INIT_DATE' => 16, 'DEL_DUE_DATE' => 17, 'DEL_PRIORITY' => 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, 'DelIndex' => 1, 'UsrUid' => 2, 'TasUid' => 3, 'ProUid' => 4, 'AppNumber' => 5, 'AppTitle' => 6, 'AppProTitle' => 7, 'AppTasTitle' => 8, 'AppPausedDate' => 9, 'AppRestartDate' => 10, 'DelPreviousUsrUid' => 11, 'DelPreviousUsrUsername' => 12, 'DelPreviousUsrFirstname' => 13, 'DelPreviousUsrLastname' => 14, 'DelCurrentUsrUsername' => 15, 'DelCurrentUsrFirstname' => 16, 'DelCurrentUsrLastname' => 17, 'DelDelegateDate' => 18, 'DelInitDate' => 19, 'DelDueDate' => 20, 'DelPriority' => 21, ),
BasePeer::TYPE_COLNAME => array (ListPausedPeer::APP_UID => 0, ListPausedPeer::DEL_INDEX => 1, ListPausedPeer::USR_UID => 2, ListPausedPeer::TAS_UID => 3, ListPausedPeer::PRO_UID => 4, ListPausedPeer::APP_NUMBER => 5, ListPausedPeer::APP_TITLE => 6, ListPausedPeer::APP_PRO_TITLE => 7, ListPausedPeer::APP_TAS_TITLE => 8, ListPausedPeer::APP_PAUSED_DATE => 9, ListPausedPeer::APP_RESTART_DATE => 10, ListPausedPeer::DEL_PREVIOUS_USR_UID => 11, ListPausedPeer::DEL_PREVIOUS_USR_USERNAME => 12, ListPausedPeer::DEL_PREVIOUS_USR_FIRSTNAME => 13, ListPausedPeer::DEL_PREVIOUS_USR_LASTNAME => 14, ListPausedPeer::DEL_CURRENT_USR_USERNAME => 15, ListPausedPeer::DEL_CURRENT_USR_FIRSTNAME => 16, ListPausedPeer::DEL_CURRENT_USR_LASTNAME => 17, ListPausedPeer::DEL_DELEGATE_DATE => 18, ListPausedPeer::DEL_INIT_DATE => 19, ListPausedPeer::DEL_DUE_DATE => 20, ListPausedPeer::DEL_PRIORITY => 21, ),
BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'USR_UID' => 2, 'TAS_UID' => 3, 'PRO_UID' => 4, 'APP_NUMBER' => 5, 'APP_TITLE' => 6, 'APP_PRO_TITLE' => 7, 'APP_TAS_TITLE' => 8, 'APP_PAUSED_DATE' => 9, 'APP_RESTART_DATE' => 10, 'DEL_PREVIOUS_USR_UID' => 11, 'DEL_PREVIOUS_USR_USERNAME' => 12, 'DEL_PREVIOUS_USR_FIRSTNAME' => 13, 'DEL_PREVIOUS_USR_LASTNAME' => 14, 'DEL_CURRENT_USR_USERNAME' => 15, 'DEL_CURRENT_USR_FIRSTNAME' => 16, 'DEL_CURRENT_USR_LASTNAME' => 17, 'DEL_DELEGATE_DATE' => 18, 'DEL_INIT_DATE' => 19, 'DEL_DUE_DATE' => 20, 'DEL_PRIORITY' => 21, ),
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, )
);
/**
@@ -240,6 +249,12 @@ abstract class BaseListPausedPeer
$criteria->addSelectColumn(ListPausedPeer::DEL_PREVIOUS_USR_UID);
$criteria->addSelectColumn(ListPausedPeer::DEL_PREVIOUS_USR_USERNAME);
$criteria->addSelectColumn(ListPausedPeer::DEL_PREVIOUS_USR_FIRSTNAME);
$criteria->addSelectColumn(ListPausedPeer::DEL_PREVIOUS_USR_LASTNAME);
$criteria->addSelectColumn(ListPausedPeer::DEL_CURRENT_USR_USERNAME);
$criteria->addSelectColumn(ListPausedPeer::DEL_CURRENT_USR_FIRSTNAME);

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

@@ -4014,11 +4014,15 @@
<column name="APP_TITLE" type="VARCHAR" size="255" required="true" default=""/>
<column name="APP_PRO_TITLE" type="VARCHAR" size="255" required="true" default=""/>
<column name="APP_TAS_TITLE" type="VARCHAR" size="255" required="true" default=""/>
<column name="APP_STATUS" type="VARCHAR" size="20" required="true" default="0"/>
<column name="DEL_INDEX" type="INTEGER" required="true" default="0"/>
<column name="DEL_PREVIOUS_USR_UID" type="VARCHAR" size="32" default=""/>
<column name="DEL_PREVIOUS_USR_USERNAME" type="VARCHAR" size="100" default=""/>
<column name="DEL_PREVIOUS_USR_FIRSTNAME" type="VARCHAR" size="50" default=""/>
<column name="DEL_PREVIOUS_USR_LASTNAME" type="VARCHAR" size="50" default=""/>
<column name="DEL_CURRENT_USR_USERNAME" type="VARCHAR" size="100" default=""/>
<column name="DEL_CURRENT_USR_FIRSTNAME" type="VARCHAR" size="50" default=""/>
<column name="DEL_CURRENT_USR_LASTNAME" type="VARCHAR" size="50" default=""/>
<column name="DEL_DELEGATE_DATE" type="TIMESTAMP" required="true"/>
<column name="DEL_INIT_DATE" type="TIMESTAMP" required="false"/>
<column name="DEL_DUE_DATE" type="TIMESTAMP" required="false"/>
@@ -4094,6 +4098,9 @@
<column name="APP_PAUSED_DATE" type="TIMESTAMP" required="true"/>
<column name="APP_RESTART_DATE" type="TIMESTAMP" required="true"/>
<column name="DEL_PREVIOUS_USR_UID" type="VARCHAR" size="32" default=""/>
<column name="DEL_PREVIOUS_USR_USERNAME" type="VARCHAR" size="100" default=""/>
<column name="DEL_PREVIOUS_USR_FIRSTNAME" type="VARCHAR" size="50" default=""/>
<column name="DEL_PREVIOUS_USR_LASTNAME" type="VARCHAR" size="50" default=""/>
<column name="DEL_CURRENT_USR_USERNAME" type="VARCHAR" size="100" default=""/>
<column name="DEL_CURRENT_USR_FIRSTNAME" type="VARCHAR" size="50" default=""/>
<column name="DEL_CURRENT_USR_LASTNAME" type="VARCHAR" size="50" default=""/>

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

@@ -2262,11 +2262,15 @@ CREATE TABLE `LIST_PARTICIPATED_LAST`
`APP_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_PRO_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_TAS_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_STATUS` VARCHAR(20) default '0' NOT NULL,
`DEL_INDEX` INTEGER default 0 NOT NULL,
`DEL_PREVIOUS_USR_UID` VARCHAR(32) default '',
`DEL_PREVIOUS_USR_USERNAME` VARCHAR(100) default '',
`DEL_PREVIOUS_USR_FIRSTNAME` VARCHAR(50) default '',
`DEL_PREVIOUS_USR_LASTNAME` VARCHAR(50) default '',
`DEL_CURRENT_USR_USERNAME` VARCHAR(100) default '',
`DEL_CURRENT_USR_FIRSTNAME` VARCHAR(50) default '',
`DEL_CURRENT_USR_LASTNAME` VARCHAR(50) default '',
`DEL_DELEGATE_DATE` DATETIME NOT NULL,
`DEL_INIT_DATE` DATETIME,
`DEL_DUE_DATE` DATETIME,
@@ -2320,6 +2324,9 @@ CREATE TABLE `LIST_PAUSED`
`APP_PAUSED_DATE` DATETIME NOT NULL,
`APP_RESTART_DATE` DATETIME NOT NULL,
`DEL_PREVIOUS_USR_UID` VARCHAR(32) default '',
`DEL_PREVIOUS_USR_USERNAME` VARCHAR(100) default '',
`DEL_PREVIOUS_USR_FIRSTNAME` VARCHAR(50) default '',
`DEL_PREVIOUS_USR_LASTNAME` VARCHAR(50) default '',
`DEL_CURRENT_USR_USERNAME` VARCHAR(100) default '',
`DEL_CURRENT_USR_FIRSTNAME` VARCHAR(50) default '',
`DEL_CURRENT_USR_LASTNAME` VARCHAR(50) default '',

106
workflow/engine/methods/cases/casesListExtJs.php
View File

@@ -3,12 +3,73 @@ unset($_SESSION['APPLICATION']);
//get the action from GET or POST, default is todo
$action = isset( $_GET['action'] ) ? $_GET['action'] : (isset( $_POST['action'] ) ? $_POST['action'] : 'todo');
$clientId = 'x-pm-local-client';
//fix a previous inconsistency
if ($action == 'selfservice') {
$action = 'unassigned';
//if ( $action == 'sent' ) $action = 'participated';
$urlProxy = '/api/1.0/' . SYS_SYS . '/lists/';
$methodProxy = 'GET';
switch ($action) {
case 'todo':
case 'draft':
$urlProxy .= 'inbox';
break;
case 'sent':
$urlProxy .= 'participated';
break;
case 'search':
case 'participated-history':
$urlProxy = 'proxyCasesList';
break;
case 'paused':
$urlProxy .= 'paused';
break;
case 'cancel':
case 'canceled':
$urlProxy .= 'canceled';
break;
case 'completed':
$urlProxy .= 'completed';
break;
case 'myinbox':
case 'my-inbox':
$urlProxy .= 'my-inbox';
break;
case 'selfservice':
$urlProxy = 'proxyCasesList';
$action = 'unassigned';
break;
}
$client = getClientCredentials($clientId);
$authCode = getAuthorizationCode($client);
$debug = false; //System::isDebugMode();
$loader = Maveriks\Util\ClassLoader::getInstance();
$loader->add(PATH_TRUNK . 'vendor/bshaffer/oauth2-server-php/src/', "OAuth2");
$request = array(
'grant_type' => 'authorization_code',
'code' => $authCode
);
$server = array(
'REQUEST_METHOD' => 'POST'
);
$headers = array(
"PHP_AUTH_USER" => $client['CLIENT_ID'],
"PHP_AUTH_PW" => $client['CLIENT_SECRET'],
"Content-Type" => "multipart/form-data;",
"Authorization" => "Basic " . base64_encode($client['CLIENT_ID'] . ":" . $client['CLIENT_SECRET'])
);
$request = new \OAuth2\Request(array(), $request, array(), array(), array(), $server, null, $headers);
$oauthServer = new \ProcessMaker\Services\OAuth2\Server();
$response = $oauthServer->postToken($request, true);
$clientToken = $response->getParameters();
$clientToken["client_id"] = $client['CLIENT_ID'];
$clientToken["client_secret"] = $client['CLIENT_SECRET'];
G::LoadClass("BasePeer");
G::LoadClass("configuration");
//require_once ("classes/model/Fields.php");
@@ -120,6 +181,9 @@ $oHeadPublisher->assign( 'columns', $columns ); //sending the columns to display
$oHeadPublisher->assign( 'readerFields', $readerFields ); //sending the fields to get from proxy
$oHeadPublisher->assign( 'reassignColumns', $reassignColumns ); //sending the columns to display in grid
$oHeadPublisher->assign( 'action', $action ); //sending the action to make
$oHeadPublisher->assign( 'urlProxy', $urlProxy ); //sending the urlProxy to make
$oHeadPublisher->assign( 'methodProxy', $methodProxy ); //sending the urlProxy to make
$oHeadPublisher->assign( 'credentials', $clientToken ); //sending the SYS_SYS to make
$oHeadPublisher->assign( 'PMDateFormat', $dateFormat ); //sending the fields to get from proxy
$oHeadPublisher->assign( 'statusValues', $status ); //Sending the listing of status
$oHeadPublisher->assign( 'processValues', $processes ); //Sending the listing of processes
@@ -429,3 +493,39 @@ function getAdditionalFields($action, $confCasesList = array())
return $arrayConfig;
}
function getClientCredentials($clientId)
{
$oauthQuery = new ProcessMaker\Services\OAuth2\PmPdo(getDsn());
return $oauthQuery->getClientDetails($clientId);
}
function getDsn()
{
list($host, $port) = strpos(DB_HOST, ':') !== false ? explode(':', DB_HOST) : array(DB_HOST, '');
$port = empty($port) ? '' : ";port=$port";
$dsn = DB_ADAPTER.':host='.$host.';dbname='.DB_NAME.$port;
return array('dsn' => $dsn, 'username' => DB_USER, 'password' => DB_PASS);
}
function getAuthorizationCode($client)
{
\ProcessMaker\Services\OAuth2\Server::setDatabaseSource(getDsn());
\ProcessMaker\Services\OAuth2\Server::setPmClientId($client['CLIENT_ID']);
$oauthServer = new \ProcessMaker\Services\OAuth2\Server();
$userId = $_SESSION['USER_LOGGED'];
$authorize = true;
$_GET = array_merge($_GET, array(
'response_type' => 'code',
'client_id' => $client['CLIENT_ID'],
'scope' => implode(' ', $oauthServer->getScope())
));
$response = $oauthServer->postAuthorize($authorize, $userId, true);
$code = substr($response->getHttpHeader('Location'), strpos($response->getHttpHeader('Location'), 'code=')+5, 40);
return $code;
}

4
workflow/engine/methods/setup/environmentSettingsAjax.php
View File

@@ -36,6 +36,9 @@ switch ($request) {
case "save":
$conf = new Configurations();
$config = $conf->getConfiguration("ENVIRONMENT_SETTINGS", "" );
if (is_numeric($config)) {
$config = array();
}
$config['format'] = $_POST["userFormat"];
$config['dateFormat'] = $_POST["dateFormat"];
$config['startCaseHideProcessInf'] = ((isset( $_POST["hideProcessInf"] )) ? true : false);
@@ -43,6 +46,7 @@ switch ($request) {
$config['casesListRowNumber'] = intval( $_POST["casesListRowNumber"] );
$config['casesListRefreshTime'] = intval( $_POST["txtCasesRefreshTime"]);
$conf->aConfig = $config;
$conf->saveConfig( "ENVIRONMENT_SETTINGS", "" );

28
workflow/engine/src/ProcessMaker/BusinessModel/Lists.php
View File

@@ -44,6 +44,8 @@ class Lists {
$filters["sort"] = isset( $dataList["sort"] ) ? $dataList["sort"] : "";
$filters["dir"] = isset( $dataList["dir"] ) ? $dataList["dir"] : "DESC";
$filters["action"] = isset( $dataList["action"] ) ? $dataList["action"] : "";
// Select list
switch ($listName) {
case 'inbox':
@@ -134,7 +136,30 @@ class Lists {
$result = $list->loadList($userUid, $filters);
if (!empty($result)) {
foreach ($result as &$value) {
$value = array_change_key_case($value, CASE_LOWER);
if (isset($value['DEL_PREVIOUS_USR_UID'])) {
$value['PREVIOUS_USR_UID'] = $value['DEL_PREVIOUS_USR_UID'];
$value['PREVIOUS_USR_USERNAME'] = $value['DEL_PREVIOUS_USR_USERNAME'];
$value['PREVIOUS_USR_FIRSTNAME'] = $value['DEL_PREVIOUS_USR_FIRSTNAME'];
$value['PREVIOUS_USR_LASTNAME'] = $value['DEL_PREVIOUS_USR_LASTNAME'];
}
if (isset($value['DEL_DUE_DATE'])) {
$value['DEL_TASK_DUE_DATE'] = $value['DEL_DUE_DATE'];
}
if (isset($value['APP_PAUSED_DATE'])) {
$value['APP_UPDATE_DATE'] = $value['APP_PAUSED_DATE'];
}
if (isset($value['DEL_CURRENT_USR_USERNAME'])) {
$value['USR_USERNAME'] = $value['DEL_CURRENT_USR_USERNAME'];
$value['USR_FIRSTNAME'] = $value['DEL_CURRENT_USR_FIRSTNAME'];
$value['USR_LASTNAME'] = $value['DEL_CURRENT_USR_LASTNAME'];
$value['APP_UPDATE_DATE'] = $value['DEL_DELEGATE_DATE'];
}
if (isset($value['APP_STATUS'])) {
$value['APP_STATUS_LABEL'] = G::LoadTranslation( "ID_{$value['APP_STATUS']}" );
}
//$value = array_change_key_case($value, CASE_LOWER);
}
}
@@ -152,6 +177,7 @@ class Lists {
$filtersData['date_to'] = $filters["dateTo"];
$response['filters'] = $filtersData;
$response['data'] = $result;
$response['totalCount'] = $list->countTotal($userUid, $filters);
} else {
$response = $result;
}

5
workflow/engine/src/ProcessMaker/Services/Api/Lists.php
View File

@@ -50,7 +50,8 @@ class Lists extends Api
$search = '',
$filter = '',
$date_from = '',
$date_to = ''
$date_to = '',
$action = ''
) {
try {
$dataList['userId'] = $this->getUserId();
@@ -69,6 +70,8 @@ class Lists extends Api
$dataList['dateFrom'] = $date_from;
$dataList['dateTo'] = $date_to;
$dataList['action'] = $action;
$lists = new \ProcessMaker\BusinessModel\Lists();
$response = $lists->getList('inbox', $dataList);
return $response;

14
workflow/engine/templates/cases/casesList.js
View File

@@ -24,6 +24,7 @@ var grid;
var textJump;
var ids = '';
var winReassignInCasesList;
var totalRowsGrid = '';
function formatAMPM(date, initVal, calendarDate) {
@@ -740,7 +741,12 @@ Ext.onReady ( function() {
// Create HttpProxy instance, all CRUD requests will be directed to single proxy url.
var proxyCasesList = new Ext.data.HttpProxy({
api: {
read : 'proxyCasesList'
read : urlProxy
},
method: 'GET',
headers: {
'Content-Type': 'application/json',
'Authorization': 'Bearer ' + credentials.access_token
}
});
@@ -799,12 +805,12 @@ Ext.onReady ( function() {
autoSave: true, // <-- false would delay executing create, update, destroy requests until specifically told to do so with some [save] buton.
sortInfo:{field: 'APP_CACHE_VIEW.APP_NUMBER', direction: "DESC"},
listeners: {
load: function(response){
//console.log(response.reader.jsonData);
if (response.reader.jsonData.result === false) {
load: function(response){
if (response.reader.jsonData.result === false) {
PMExt.notify('ERROR', response.reader.jsonData.message);
//PMExt.error
}
//console.log(response.reader.jsonData);
},
exception: function(dp, type, action, options, response, arg) {
responseObject = Ext.util.JSON.decode(response.responseText);