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

I solved all issues about List

Browse Source
This commit is contained in:
Paula V. Quispe
2015-02-27 16:27:11 -04:00
parent 53cd8c5409
commit ea92abf6a0
20 changed files with 5001 additions and 4769 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
workflow/engine/classes/class.case.php
View File

@@ -1060,6 +1060,13 @@ class Cases
$appAssignSelfServiceValue->remove($sAppUid); $appAssignSelfServiceValue->remove($sAppUid);
} }
/*----------------------------------********---------------------------------*/
if(!isset($Fields['DEL_INDEX'])){
$Fields['DEL_INDEX'] = 1;
}
$inbox = new ListInbox();
$inbox->update($Fields);
/*----------------------------------********---------------------------------*/
//Return //Return
return $Fields; return $Fields;
@@ -1190,8 +1197,10 @@ class Cases
$oAppDel = AppDelegationPeer::retrieveByPk($sAppUid, $iDelIndex); $oAppDel = AppDelegationPeer::retrieveByPk($sAppUid, $iDelIndex);
$oAppDel->setDelInitDate("now"); $oAppDel->setDelInitDate("now");
$oAppDel->save(); $oAppDel->save();
/*----------------------------------********---------------------------------*/
$inbox = new ListInbox(); $inbox = new ListInbox();
$inbox->update(array('APP_UID'=>$sAppUid, 'DEL_INDEX'=>$iDelIndex, 'DEL_INIT_DATE'=>Date("Y-m-d H:i:s"))); $inbox->update(array('APP_UID'=>$sAppUid, 'DEL_INDEX'=>$iDelIndex, 'DEL_INIT_DATE'=>Date("Y-m-d H:i:s")));
/*----------------------------------********---------------------------------*/
//update searchindex //update searchindex
if ($this->appSolr != null) { if ($this->appSolr != null) {
$this->appSolr->updateApplicationSearchIndex($sAppUid); $this->appSolr->updateApplicationSearchIndex($sAppUid);
@@ -1911,8 +1920,16 @@ class Cases
throw (new PropelException('The row cannot be created!', new PropelException($msg))); throw (new PropelException('The row cannot be created!', new PropelException($msg)));
} }
} }
/*----------------------------------********---------------------------------*/
$inbox = new ListInbox(); $inbox = new ListInbox();
$inbox->remove($sAppUid, $iDelIndex); $inbox->remove($sAppUid, $iDelIndex);
$data['DEL_THREAD_STATUS'] = 'CLOSED';
$data['APP_UID'] = $sAppUid;
$data['DEL_INDEX'] = $iDelIndex;
$data['USR_UID'] = $appDel->getUsrUid();
$listParticipatedLast = new ListParticipatedLast();
$listParticipatedLast->refresh($data);
/*----------------------------------********---------------------------------*/
} catch (exception $e) { } catch (exception $e) {
throw ($e); throw ($e);
} }
@@ -4099,7 +4116,7 @@ class Cases
if ($this->appSolr != null) { if ($this->appSolr != null) {
$this->appSolr->updateApplicationSearchIndex($sApplicationUID); $this->appSolr->updateApplicationSearchIndex($sApplicationUID);
} }
/*----------------------------------********---------------------------------*/
$data = array ( $data = array (
'APP_UID' => $sApplicationUID, 'APP_UID' => $sApplicationUID,
'DEL_INDEX' => $iIndex, 'DEL_INDEX' => $iIndex,
@@ -4108,6 +4125,7 @@ class Cases
$data = array_merge($aFields, $data); $data = array_merge($aFields, $data);
$oListCanceled = new ListCanceled(); $oListCanceled = new ListCanceled();
$oListCanceled->create($data); $oListCanceled->create($data);
/*----------------------------------********---------------------------------*/
} }
/* /*

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

@@ -777,7 +777,7 @@ class Configurations // extends Configuration
$caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_TASK") : "ID_TASK", "dataIndex" => "APP_TAS_TITLE", "width" => 120); $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_TASK") : "ID_TASK", "dataIndex" => "APP_TAS_TITLE", "width" => 120);
$caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CURRENT_USER") : "ID_CURRENT_USER", "dataIndex" => "APP_CURRENT_USER", "width" => 120, "sortable" => true); $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CURRENT_USER") : "ID_CURRENT_USER", "dataIndex" => "APP_CURRENT_USER", "width" => 120, "sortable" => true);
$caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_LAST_MODIFY") : "ID_LAST_MODIFY", "dataIndex" => "APP_UPDATE_DATE", "width" => 80); $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_LAST_MODIFY") : "ID_LAST_MODIFY", "dataIndex" => "APP_UPDATE_DATE", "width" => 80);
$caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_STATUS") : "ID_STATUS", "dataIndex" => "APP_STATUS_LABEL", "width" => 50); $caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_DEL_THREAD_STATUS") : "ID_DEL_THREAD_STATUS", "dataIndex" => "DEL_THREAD_STATUS", "width" => 50);
$caseReaderFields[] = array("name" => "APP_UID"); $caseReaderFields[] = array("name" => "APP_UID");
$caseReaderFields[] = array("name" => "USR_UID"); $caseReaderFields[] = array("name" => "USR_UID");
@@ -796,7 +796,7 @@ class Configurations // extends Configuration
$caseReaderFields[] = array("name" => "DEL_TASK_DUE_DATE"); $caseReaderFields[] = array("name" => "DEL_TASK_DUE_DATE");
$caseReaderFields[] = array("name" => "APP_UPDATE_DATE"); $caseReaderFields[] = array("name" => "APP_UPDATE_DATE");
$caseReaderFields[] = array("name" => "DEL_PRIORITY"); $caseReaderFields[] = array("name" => "DEL_PRIORITY");
$caseReaderFields[] = array("name" => "APP_STATUS_LABEL"); $caseReaderFields[] = array("name" => "DEL_THREAD_STATUS");
$caseReaderFields[] = array("name" => "APP_FINISH_DATE"); $caseReaderFields[] = array("name" => "APP_FINISH_DATE");
$caseReaderFields[] = array("name" => "CASE_SUMMARY"); $caseReaderFields[] = array("name" => "CASE_SUMMARY");
$caseReaderFields[] = array("name" => "CASE_NOTES_COUNT"); $caseReaderFields[] = array("name" => "CASE_NOTES_COUNT");

4
workflow/engine/classes/class.derivation.php
View File

@@ -972,6 +972,10 @@ class Derivation
} }
$aParentCase['APP_DATA'] = array_merge( $aParentCase['APP_DATA'], $aNewFields ); $aParentCase['APP_DATA'] = array_merge( $aParentCase['APP_DATA'], $aNewFields );
$oCase->updateCase( $aSA['APP_PARENT'], $aParentCase ); $oCase->updateCase( $aSA['APP_PARENT'], $aParentCase );
/*----------------------------------********---------------------------------*/
$inbox = new ListInbox();
$inbox->update($aParentCase);
/*----------------------------------********---------------------------------*/
//Update table SUB_APPLICATION //Update table SUB_APPLICATION
$oSubApplication = new SubApplication(); $oSubApplication = new SubApplication();
$oSubApplication->update( array ('APP_UID' => $sApplicationUID,'APP_PARENT' => $aSA['APP_PARENT'],'DEL_INDEX_PARENT' => $aSA['DEL_INDEX_PARENT'],'DEL_THREAD_PARENT' => $aSA['DEL_THREAD_PARENT'],'SA_STATUS' => 'FINISHED','SA_VALUES_IN' => serialize( $aNewFields ),'SA_FINISH_DATE' => date( 'Y-m-d H:i:s' ) $oSubApplication->update( array ('APP_UID' => $sApplicationUID,'APP_PARENT' => $aSA['APP_PARENT'],'DEL_INDEX_PARENT' => $aSA['DEL_INDEX_PARENT'],'DEL_THREAD_PARENT' => $aSA['DEL_THREAD_PARENT'],'SA_STATUS' => 'FINISHED','SA_VALUES_IN' => serialize( $aNewFields ),'SA_FINISH_DATE' => date( 'Y-m-d H:i:s' )

25
workflow/engine/classes/model/AppDelegation.php
View File

@@ -151,8 +151,15 @@ class AppDelegation extends BaseAppDelegation
if ($this->validate()) { if ($this->validate()) {
try { try {
$res = $this->save(); $res = $this->save();
$inbox = new ListInbox(); /*----------------------------------********---------------------------------*/
$inbox->newRow($this->toArray(BasePeer::TYPE_FIELDNAME), $delPreviusUsrUid); $task = TaskPeer::retrieveByPK( $this->getTasUid() );
$taskType = $task->getTasType();
if($taskType == 'NORMAL'){
$inbox = new ListInbox();
$res = $this->toArray(BasePeer::TYPE_FIELDNAME);
$inbox->newRow($this->toArray(BasePeer::TYPE_FIELDNAME), $delPreviusUsrUid);
}
/*----------------------------------********---------------------------------*/
} catch (PropelException $e) { } catch (PropelException $e) {
throw ($e); throw ($e);
} }
@@ -222,6 +229,10 @@ class AppDelegation extends BaseAppDelegation
$c->addSelectColumn( AppDelegationPeer::PRO_UID ); $c->addSelectColumn( AppDelegationPeer::PRO_UID );
$c->addSelectColumn( AppDelegationPeer::TAS_UID ); $c->addSelectColumn( AppDelegationPeer::TAS_UID );
$c->addSelectColumn( AppDelegationPeer::USR_UID ); $c->addSelectColumn( AppDelegationPeer::USR_UID );
$c->addSelectColumn( AppDelegationPeer::DEL_DELEGATE_DATE );
$c->addSelectColumn( AppDelegationPeer::DEL_INIT_DATE );
$c->addSelectColumn( AppDelegationPeer::DEL_TASK_DUE_DATE );
$c->addSelectColumn( AppDelegationPeer::DEL_FINISH_DATE );
$c->add( AppDelegationPeer::DEL_THREAD_STATUS, 'OPEN' ); $c->add( AppDelegationPeer::DEL_THREAD_STATUS, 'OPEN' );
$c->add( AppDelegationPeer::APP_UID, $AppUid ); $c->add( AppDelegationPeer::APP_UID, $AppUid );
@@ -234,8 +245,14 @@ class AppDelegation extends BaseAppDelegation
while (is_array($row)) { while (is_array($row)) {
$case = array(); $case = array();
$case['TAS_UID'] = $row['TAS_UID']; $case['TAS_UID'] = $row['TAS_UID'];
$case['USR_UID'] = $row['USR_UID']; $case['USR_UID'] = $row['USR_UID'];
$case['DEL_INDEX'] = $row['DEL_INDEX'];
$case['TAS_UID'] = $row['TAS_UID'];
$case['DEL_DELEGATE_DATE'] = $row['DEL_DELEGATE_DATE'];
$case['DEL_INIT_DATE'] = $row['DEL_INIT_DATE'];
$case['DEL_TASK_DUE_DATE'] = $row['DEL_TASK_DUE_DATE'];
$case['DEL_FINISH_DATE'] = $row['DEL_FINISH_DATE'];
$aCases[] = $case; $aCases[] = $case;
$rs->next(); $rs->next();
$row = $rs->getRow(); $row = $rs->getRow();

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

@@ -47,9 +47,11 @@ class ListInbox extends BaseListInbox
// remove and create participated last // remove and create participated last
$listParticipatedLast = new ListParticipatedLast(); $listParticipatedLast = new ListParticipatedLast();
$listParticipatedLast->remove($data['APP_UID'], $data['USR_UID']); $listParticipatedLast->remove($data['APP_UID'], $data['USR_UID'],$data['DEL_INDEX']);
$listParticipatedLast = new ListParticipatedLast(); $listParticipatedLast = new ListParticipatedLast();
$listParticipatedLast->create($data); $listParticipatedLast->create($data);
$listParticipatedLast = new ListParticipatedLast();
$listParticipatedLast->refresh($data);
return $result; return $result;
} catch(Exception $e) { } catch(Exception $e) {
@@ -79,13 +81,18 @@ class ListInbox extends BaseListInbox
// update participated history // update participated history
$listParticipatedHistory = new ListParticipatedHistory(); $listParticipatedHistory = new ListParticipatedHistory();
$listParticipatedHistory->update($data); $listParticipatedHistory->update($data);
//$listParticipatedLast = new ListParticipatedLast();
//$listParticipatedLast->update($data);
/*if(isset($data['APP_UID']) && isset($data['DEL_INDEX'])){
$oRow = ListInboxPeer::retrieveByPK( $data['APP_UID'], $data['DEL_INDEX'] );
if(is_object($oRow)){
$newData = $oRow->toArray( BasePeer::TYPE_FIELDNAME );
$oRow = ListInboxPeer::retrieveByPK( $data['APP_UID'], $data['DEL_INDEX'] ); // update participated last
$newData = $oRow->toArray( BasePeer::TYPE_FIELDNAME ); $listParticipatedLast = new ListParticipatedLast();
$listParticipatedLast->update($newData);
// update participated last }
$listParticipatedLast = new ListParticipatedLast(); }*/
$listParticipatedLast->update($newData);
return $result; return $result;
} else { } else {
$con->rollback(); $con->rollback();
@@ -145,6 +152,7 @@ class ListInbox extends BaseListInbox
} }
public function newRow ($data, $delPreviusUsrUid) { public function newRow ($data, $delPreviusUsrUid) {
$data['DEL_PREVIOUS_USR_UID'] = $delPreviusUsrUid; $data['DEL_PREVIOUS_USR_UID'] = $delPreviusUsrUid;
if (isset($data['DEL_TASK_DUE_DATE'])) { if (isset($data['DEL_TASK_DUE_DATE'])) {
$data['DEL_DUE_DATE'] = $data['DEL_TASK_DUE_DATE']; $data['DEL_DUE_DATE'] = $data['DEL_TASK_DUE_DATE'];
@@ -212,6 +220,10 @@ class ListInbox extends BaseListInbox
$data['DEL_PREVIOUS_USR_FIRSTNAME'] = $aRow['USR_FIRSTNAME']; $data['DEL_PREVIOUS_USR_FIRSTNAME'] = $aRow['USR_FIRSTNAME'];
$data['DEL_PREVIOUS_USR_LASTNAME'] = $aRow['USR_LASTNAME']; $data['DEL_PREVIOUS_USR_LASTNAME'] = $aRow['USR_LASTNAME'];
} }
if(!isset($data['APP_STATUS']) && $data['DEL_INDEX']>1){
$data['APP_STATUS'] = 'TO_DO';
}
self::create($data); self::create($data);
} }
@@ -300,6 +312,7 @@ class ListInbox extends BaseListInbox
$criteria->addSelectColumn(ListInboxPeer::TAS_UID); $criteria->addSelectColumn(ListInboxPeer::TAS_UID);
$criteria->addSelectColumn(ListInboxPeer::PRO_UID); $criteria->addSelectColumn(ListInboxPeer::PRO_UID);
$criteria->addSelectColumn(ListInboxPeer::APP_NUMBER); $criteria->addSelectColumn(ListInboxPeer::APP_NUMBER);
$criteria->addSelectColumn(ListInboxPeer::APP_STATUS);
$criteria->addSelectColumn(ListInboxPeer::APP_TITLE); $criteria->addSelectColumn(ListInboxPeer::APP_TITLE);
$criteria->addSelectColumn(ListInboxPeer::APP_PRO_TITLE); $criteria->addSelectColumn(ListInboxPeer::APP_PRO_TITLE);
$criteria->addSelectColumn(ListInboxPeer::APP_TAS_TITLE); $criteria->addSelectColumn(ListInboxPeer::APP_TAS_TITLE);
@@ -328,9 +341,9 @@ class ListInbox extends BaseListInbox
$paged = isset($filters['paged']) ? $filters['paged'] : 1; $paged = isset($filters['paged']) ? $filters['paged'] : 1;
if ($filters['action'] == 'draft') { if ($filters['action'] == 'draft') {
$criteria->add( ListInboxPeer::DEL_INDEX, 1, Criteria::EQUAL ); $criteria->add( ListInboxPeer::APP_STATUS, 'DRAFT', Criteria::EQUAL );
} else { } else {
$criteria->add( ListInboxPeer::DEL_INDEX, 1, Criteria::NOT_EQUAL ); $criteria->add( ListInboxPeer::APP_STATUS, 'TO_DO', Criteria::EQUAL );
} }
if ($dir == "DESC") { if ($dir == "DESC") {
@@ -353,7 +366,6 @@ class ListInbox extends BaseListInbox
$aRow['DEL_PRIORITY'] = G::LoadTranslation( "ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}" ); $aRow['DEL_PRIORITY'] = G::LoadTranslation( "ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}" );
$data[] = $aRow; $data[] = $aRow;
} }
return $data; return $data;
} }
} }

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

@@ -24,7 +24,7 @@ class ListParticipatedLast extends BaseListParticipatedLast
* *
*/ */
public function create($data) public function create($data)
{ {
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(UsersPeer::USR_USERNAME); $criteria->addSelectColumn(UsersPeer::USR_USERNAME);
$criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME); $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
@@ -73,7 +73,8 @@ class ListParticipatedLast extends BaseListParticipatedLast
* @throws type * @throws type
*/ */
public function update($data) public function update($data)
{ {
$data['DEL_THREAD_STATUS'] = (isset($data['DEL_THREAD_STATUS'])) ? $data['DEL_THREAD_STATUS'] : 'OPEN';
$con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME ); $con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME );
try { try {
$con->begin(); $con->begin();
@@ -92,7 +93,34 @@ class ListParticipatedLast extends BaseListParticipatedLast
throw ($e); throw ($e);
} }
} }
/**
* Refresh List Participated Last
*
* @param type $seqName
* @return type
* @throws type
*
*/
public function refresh ($data)
{
$data['APP_STATUS'] = (empty($data['APP_STATUS'])) ? 'TO_DO' : $data['APP_STATUS'];
$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_UID'] = $data['USR_UID'];
$data['DEL_CURRENT_USR_USERNAME'] = $aRow['USR_USERNAME'];
$data['DEL_CURRENT_USR_FIRSTNAME'] = $aRow['USR_FIRSTNAME'];
$data['DEL_CURRENT_USR_LASTNAME'] = $aRow['USR_LASTNAME'];
$this->update($data);
}
/** /**
* Remove List Participated History * Remove List Participated History
* *
@@ -101,11 +129,12 @@ class ListParticipatedLast extends BaseListParticipatedLast
* @throws type * @throws type
* *
*/ */
public function remove ($app_uid, $usr_uid) public function remove ($app_uid, $usr_uid, $del_index)
{ {
$con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME ); $con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME );
try { try {
$this->setAppUid($app_uid); $this->setAppUid($app_uid);
$this->setDelIndex($del_index);
$this->setUsrUid($usr_uid); $this->setUsrUid($usr_uid);
$con->begin(); $con->begin();
@@ -140,8 +169,8 @@ class ListParticipatedLast extends BaseListParticipatedLast
if ($search != '') { if ($search != '') {
$criteria->add( $criteria->add(
$criteria->getNewCriterion( 'CON_APP.CON_VALUE', '%' . $search . '%', Criteria::LIKE )-> $criteria->getNewCriterion( ListParticipatedLastPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE )->
addOr( $criteria->getNewCriterion( 'CON_TAS.CON_VALUE', '%' . $search . '%', Criteria::LIKE )-> addOr( $criteria->getNewCriterion( ListParticipatedLastPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE )->
addOr( $criteria->getNewCriterion( ListParticipatedLastPeer::APP_NUMBER, $search, Criteria::LIKE ) ) ) ); addOr( $criteria->getNewCriterion( ListParticipatedLastPeer::APP_NUMBER, $search, Criteria::LIKE ) ) ) );
} }
@@ -197,6 +226,7 @@ class ListParticipatedLast extends BaseListParticipatedLast
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_UID); $criteria->addSelectColumn(ListParticipatedLastPeer::APP_UID);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_INDEX);
$criteria->addSelectColumn(ListParticipatedLastPeer::USR_UID); $criteria->addSelectColumn(ListParticipatedLastPeer::USR_UID);
$criteria->addSelectColumn(ListParticipatedLastPeer::TAS_UID); $criteria->addSelectColumn(ListParticipatedLastPeer::TAS_UID);
$criteria->addSelectColumn(ListParticipatedLastPeer::PRO_UID); $criteria->addSelectColumn(ListParticipatedLastPeer::PRO_UID);
@@ -204,8 +234,7 @@ class ListParticipatedLast extends BaseListParticipatedLast
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_TITLE); $criteria->addSelectColumn(ListParticipatedLastPeer::APP_TITLE);
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_PRO_TITLE); $criteria->addSelectColumn(ListParticipatedLastPeer::APP_PRO_TITLE);
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_TAS_TITLE); $criteria->addSelectColumn(ListParticipatedLastPeer::APP_TAS_TITLE);
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_STATUS); $criteria->addSelectColumn(ListParticipatedLastPeer::APP_STATUS);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_INDEX);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID); $criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PREVIOUS_USR_USERNAME); $criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PREVIOUS_USR_USERNAME);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PREVIOUS_USR_FIRSTNAME); $criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PREVIOUS_USR_FIRSTNAME);
@@ -217,6 +246,7 @@ class ListParticipatedLast extends BaseListParticipatedLast
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_INIT_DATE); $criteria->addSelectColumn(ListParticipatedLastPeer::DEL_INIT_DATE);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_DUE_DATE); $criteria->addSelectColumn(ListParticipatedLastPeer::DEL_DUE_DATE);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PRIORITY); $criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PRIORITY);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_THREAD_STATUS);
$arrayTaskTypeToExclude = array("WEBENTRYEVENT", "END-MESSAGE-EVENT", "START-MESSAGE-EVENT", "INTERMEDIATE-THROW-MESSAGE-EVENT", "INTERMEDIATE-CATCH-MESSAGE-EVENT"); $arrayTaskTypeToExclude = array("WEBENTRYEVENT", "END-MESSAGE-EVENT", "START-MESSAGE-EVENT", "INTERMEDIATE-THROW-MESSAGE-EVENT", "INTERMEDIATE-CATCH-MESSAGE-EVENT");

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

@@ -76,6 +76,8 @@ class ListInboxMapBuilder
$tMap->addColumn('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addColumn('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('APP_NUMBER', 'AppNumber', 'int', CreoleTypes::INTEGER, true, null); $tMap->addColumn('APP_NUMBER', 'AppNumber', 'int', CreoleTypes::INTEGER, true, null);
$tMap->addColumn('APP_STATUS', 'AppStatus', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('APP_TITLE', 'AppTitle', 'string', CreoleTypes::VARCHAR, true, 255); $tMap->addColumn('APP_TITLE', 'AppTitle', 'string', CreoleTypes::VARCHAR, true, 255);

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

@@ -66,7 +66,9 @@ class ListParticipatedLastMapBuilder
$tMap->setUseIdGenerator(false); $tMap->setUseIdGenerator(false);
$tMap->addPrimaryKey('APP_UID', 'AppUid', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addPrimaryKey('APP_UID', 'AppUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addPrimaryKey('DEL_INDEX', 'DelIndex', 'int', CreoleTypes::INTEGER, true, null);
$tMap->addPrimaryKey('USR_UID', 'UsrUid', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addPrimaryKey('USR_UID', 'UsrUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('TAS_UID', 'TasUid', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addColumn('TAS_UID', 'TasUid', 'string', CreoleTypes::VARCHAR, true, 32);
@@ -83,8 +85,6 @@ class ListParticipatedLastMapBuilder
$tMap->addColumn('APP_STATUS', 'AppStatus', 'string', CreoleTypes::VARCHAR, false, 20); $tMap->addColumn('APP_STATUS', 'AppStatus', 'string', CreoleTypes::VARCHAR, false, 20);
$tMap->addColumn('DEL_INDEX', 'DelIndex', 'int', CreoleTypes::INTEGER, true, null);
$tMap->addColumn('DEL_PREVIOUS_USR_UID', 'DelPreviousUsrUid', 'string', CreoleTypes::VARCHAR, false, 32); $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_USERNAME', 'DelPreviousUsrUsername', 'string', CreoleTypes::VARCHAR, false, 100);
@@ -106,6 +106,8 @@ class ListParticipatedLastMapBuilder
$tMap->addColumn('DEL_DUE_DATE', 'DelDueDate', 'int', CreoleTypes::TIMESTAMP, false, null); $tMap->addColumn('DEL_DUE_DATE', 'DelDueDate', 'int', CreoleTypes::TIMESTAMP, false, null);
$tMap->addColumn('DEL_PRIORITY', 'DelPriority', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addColumn('DEL_PRIORITY', 'DelPriority', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('DEL_THREAD_STATUS', 'DelThreadStatus', 'string', CreoleTypes::VARCHAR, false, 32);
} // doBuild() } // doBuild()

178
workflow/engine/classes/model/om/BaseListInbox.php
View File

@@ -62,6 +62,12 @@ abstract class BaseListInbox extends BaseObject implements Persistent
* @var int * @var int
*/ */
protected $app_number = 0; protected $app_number = 0;
/**
* The value for the app_status field.
* @var string
*/
protected $app_status = '';
/** /**
* The value for the app_title field. * The value for the app_title field.
@@ -214,6 +220,17 @@ abstract class BaseListInbox extends BaseObject implements Persistent
return $this->app_number; return $this->app_number;
} }
/**
* Get the [app_status] column value.
*
* @return string
*/
public function getAppStatus()
{
return $this->app_status;
}
/** /**
* Get the [app_title] column value. * Get the [app_title] column value.
@@ -562,7 +579,28 @@ abstract class BaseListInbox extends BaseObject implements Persistent
} }
} // setAppNumber() } // setAppNumber()
/**
* 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 === '') {
$this->app_status = $v;
$this->modifiedColumns[] = ListInboxPeer::APP_STATUS;
}
} // setAppStatus()
/** /**
* Set the value of [app_title] column. * Set the value of [app_title] column.
* *
@@ -883,37 +921,39 @@ abstract class BaseListInbox extends BaseObject implements Persistent
$this->pro_uid = $rs->getString($startcol + 4); $this->pro_uid = $rs->getString($startcol + 4);
$this->app_number = $rs->getInt($startcol + 5); $this->app_number = $rs->getInt($startcol + 5);
$this->app_status = $rs->getString($startcol + 6);
$this->app_title = $rs->getString($startcol + 6); $this->app_title = $rs->getString($startcol + 7);
$this->app_pro_title = $rs->getString($startcol + 7); $this->app_pro_title = $rs->getString($startcol + 8);
$this->app_tas_title = $rs->getString($startcol + 8); $this->app_tas_title = $rs->getString($startcol + 9);
$this->app_update_date = $rs->getTimestamp($startcol + 9, null); $this->app_update_date = $rs->getTimestamp($startcol + 10, null);
$this->del_previous_usr_uid = $rs->getString($startcol + 10); $this->del_previous_usr_uid = $rs->getString($startcol + 11);
$this->del_previous_usr_username = $rs->getString($startcol + 11); $this->del_previous_usr_username = $rs->getString($startcol + 12);
$this->del_previous_usr_firstname = $rs->getString($startcol + 12); $this->del_previous_usr_firstname = $rs->getString($startcol + 13);
$this->del_previous_usr_lastname = $rs->getString($startcol + 13); $this->del_previous_usr_lastname = $rs->getString($startcol + 14);
$this->del_delegate_date = $rs->getTimestamp($startcol + 14, null); $this->del_delegate_date = $rs->getTimestamp($startcol + 15, null);
$this->del_init_date = $rs->getTimestamp($startcol + 15, null); $this->del_init_date = $rs->getTimestamp($startcol + 16, null);
$this->del_due_date = $rs->getTimestamp($startcol + 16, null); $this->del_due_date = $rs->getTimestamp($startcol + 17, null);
$this->del_priority = $rs->getString($startcol + 17); $this->del_priority = $rs->getString($startcol + 18);
$this->resetModified(); $this->resetModified();
$this->setNew(false); $this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer. // FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 18; // 18 = ListInboxPeer::NUM_COLUMNS - ListInboxPeer::NUM_LAZY_LOAD_COLUMNS). return $startcol + 19; // 18 = ListInboxPeer::NUM_COLUMNS - ListInboxPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) { } catch (Exception $e) {
throw new PropelException("Error populating ListInbox object", $e); throw new PropelException("Error populating ListInbox object", $e);
@@ -1136,41 +1176,45 @@ abstract class BaseListInbox extends BaseObject implements Persistent
return $this->getAppNumber(); return $this->getAppNumber();
break; break;
case 6: case 6:
return $this->getAppTitle(); return $this->getAppStatus();
break; break;
case 7: case 7:
return $this->getAppProTitle(); return $this->getAppTitle();
break; break;
case 8: case 8:
return $this->getAppTasTitle(); return $this->getAppProTitle();
break; break;
case 9: case 9:
return $this->getAppUpdateDate(); return $this->getAppTasTitle();
break; break;
case 10: case 10:
return $this->getDelPreviousUsrUid(); return $this->getAppUpdateDate();
break; break;
case 11: case 11:
return $this->getDelPreviousUsrUsername(); return $this->getDelPreviousUsrUid();
break; break;
case 12: case 12:
return $this->getDelPreviousUsrFirstname(); return $this->getDelPreviousUsrUsername();
break; break;
case 13: case 13:
return $this->getDelPreviousUsrLastname(); return $this->getDelPreviousUsrFirstname();
break; break;
case 14: case 14:
return $this->getDelDelegateDate(); return $this->getDelPreviousUsrLastname();
break; break;
case 15: case 15:
return $this->getDelInitDate(); return $this->getDelDelegateDate();
break; break;
case 16: case 16:
return $this->getDelDueDate(); return $this->getDelInitDate();
break; break;
case 17: case 17:
return $this->getDelDueDate();
break;
case 18:
return $this->getDelPriority(); return $this->getDelPriority();
break; break;
default: default:
return null; return null;
break; break;
@@ -1197,18 +1241,19 @@ abstract class BaseListInbox extends BaseObject implements Persistent
$keys[3] => $this->getTasUid(), $keys[3] => $this->getTasUid(),
$keys[4] => $this->getProUid(), $keys[4] => $this->getProUid(),
$keys[5] => $this->getAppNumber(), $keys[5] => $this->getAppNumber(),
$keys[6] => $this->getAppTitle(), $keys[6] => $this->getAppStatus(),
$keys[7] => $this->getAppProTitle(), $keys[7] => $this->getAppTitle(),
$keys[8] => $this->getAppTasTitle(), $keys[8] => $this->getAppProTitle(),
$keys[9] => $this->getAppUpdateDate(), $keys[9] => $this->getAppTasTitle(),
$keys[10] => $this->getDelPreviousUsrUid(), $keys[10] => $this->getAppUpdateDate(),
$keys[11] => $this->getDelPreviousUsrUsername(), $keys[11] => $this->getDelPreviousUsrUid(),
$keys[12] => $this->getDelPreviousUsrFirstname(), $keys[12] => $this->getDelPreviousUsrUsername(),
$keys[13] => $this->getDelPreviousUsrLastname(), $keys[13] => $this->getDelPreviousUsrFirstname(),
$keys[14] => $this->getDelDelegateDate(), $keys[14] => $this->getDelPreviousUsrLastname(),
$keys[15] => $this->getDelInitDate(), $keys[15] => $this->getDelDelegateDate(),
$keys[16] => $this->getDelDueDate(), $keys[16] => $this->getDelInitDate(),
$keys[17] => $this->getDelPriority(), $keys[17] => $this->getDelDueDate(),
$keys[18] => $this->getDelPriority(),
); );
return $result; return $result;
} }
@@ -1259,39 +1304,42 @@ abstract class BaseListInbox extends BaseObject implements Persistent
$this->setAppNumber($value); $this->setAppNumber($value);
break; break;
case 6: case 6:
$this->setAppTitle($value); $this->setAppStatus($value);
break; break;
case 7: case 7:
$this->setAppProTitle($value); $this->setAppTitle($value);
break; break;
case 8: case 8:
$this->setAppTasTitle($value); $this->setAppProTitle($value);
break; break;
case 9: case 9:
$this->setAppUpdateDate($value); $this->setAppTasTitle($value);
break; break;
case 10: case 10:
$this->setDelPreviousUsrUid($value); $this->setAppUpdateDate($value);
break; break;
case 11: case 11:
$this->setDelPreviousUsrUsername($value); $this->setDelPreviousUsrUid($value);
break; break;
case 12: case 12:
$this->setDelPreviousUsrFirstname($value); $this->setDelPreviousUsrUsername($value);
break; break;
case 13: case 13:
$this->setDelPreviousUsrLastname($value); $this->setDelPreviousUsrFirstname($value);
break; break;
case 14: case 14:
$this->setDelDelegateDate($value); $this->setDelPreviousUsrLastname($value);
break; break;
case 15: case 15:
$this->setDelInitDate($value); $this->setDelDelegateDate($value);
break; break;
case 16: case 16:
$this->setDelDueDate($value); $this->setDelInitDate($value);
break; break;
case 17: case 17:
$this->setDelDueDate($value);
break;
case 18:
$this->setDelPriority($value); $this->setDelPriority($value);
break; break;
} // switch() } // switch()
@@ -1340,53 +1388,57 @@ abstract class BaseListInbox extends BaseObject implements Persistent
if (array_key_exists($keys[5], $arr)) { if (array_key_exists($keys[5], $arr)) {
$this->setAppNumber($arr[$keys[5]]); $this->setAppNumber($arr[$keys[5]]);
} }
if (array_key_exists($keys[6], $arr)) { if (array_key_exists($keys[6], $arr)) {
$this->setAppTitle($arr[$keys[6]]); $this->setAppStatus($arr[$keys[6]]);
} }
if (array_key_exists($keys[7], $arr)) { if (array_key_exists($keys[7], $arr)) {
$this->setAppProTitle($arr[$keys[7]]); $this->setAppTitle($arr[$keys[7]]);
} }
if (array_key_exists($keys[8], $arr)) { if (array_key_exists($keys[8], $arr)) {
$this->setAppTasTitle($arr[$keys[8]]); $this->setAppProTitle($arr[$keys[8]]);
} }
if (array_key_exists($keys[9], $arr)) { if (array_key_exists($keys[9], $arr)) {
$this->setAppUpdateDate($arr[$keys[9]]); $this->setAppTasTitle($arr[$keys[9]]);
} }
if (array_key_exists($keys[10], $arr)) { if (array_key_exists($keys[10], $arr)) {
$this->setDelPreviousUsrUid($arr[$keys[10]]); $this->setAppUpdateDate($arr[$keys[10]]);
} }
if (array_key_exists($keys[11], $arr)) { if (array_key_exists($keys[11], $arr)) {
$this->setDelPreviousUsrUsername($arr[$keys[11]]); $this->setDelPreviousUsrUid($arr[$keys[11]]);
} }
if (array_key_exists($keys[12], $arr)) { if (array_key_exists($keys[12], $arr)) {
$this->setDelPreviousUsrFirstname($arr[$keys[12]]); $this->setDelPreviousUsrUsername($arr[$keys[12]]);
} }
if (array_key_exists($keys[13], $arr)) { if (array_key_exists($keys[13], $arr)) {
$this->setDelPreviousUsrLastname($arr[$keys[13]]); $this->setDelPreviousUsrFirstname($arr[$keys[13]]);
} }
if (array_key_exists($keys[14], $arr)) { if (array_key_exists($keys[14], $arr)) {
$this->setDelDelegateDate($arr[$keys[14]]); $this->setDelPreviousUsrLastname($arr[$keys[14]]);
} }
if (array_key_exists($keys[15], $arr)) { if (array_key_exists($keys[15], $arr)) {
$this->setDelInitDate($arr[$keys[15]]); $this->setDelDelegateDate($arr[$keys[15]]);
} }
if (array_key_exists($keys[16], $arr)) { if (array_key_exists($keys[16], $arr)) {
$this->setDelDueDate($arr[$keys[16]]); $this->setDelInitDate($arr[$keys[16]]);
} }
if (array_key_exists($keys[17], $arr)) { if (array_key_exists($keys[17], $arr)) {
$this->setDelPriority($arr[$keys[17]]); $this->setDelDueDate($arr[$keys[17]]);
}
if (array_key_exists($keys[18], $arr)) {
$this->setDelPriority($arr[$keys[18]]);
} }
} }
@@ -1423,6 +1475,10 @@ abstract class BaseListInbox extends BaseObject implements Persistent
if ($this->isColumnModified(ListInboxPeer::APP_NUMBER)) { if ($this->isColumnModified(ListInboxPeer::APP_NUMBER)) {
$criteria->add(ListInboxPeer::APP_NUMBER, $this->app_number); $criteria->add(ListInboxPeer::APP_NUMBER, $this->app_number);
} }
if ($this->isColumnModified(ListInboxPeer::APP_STATUS)) {
$criteria->add(ListInboxPeer::APP_STATUS, $this->app_status);
}
if ($this->isColumnModified(ListInboxPeer::APP_TITLE)) { if ($this->isColumnModified(ListInboxPeer::APP_TITLE)) {
$criteria->add(ListInboxPeer::APP_TITLE, $this->app_title); $criteria->add(ListInboxPeer::APP_TITLE, $this->app_title);
@@ -1545,6 +1601,8 @@ abstract class BaseListInbox extends BaseObject implements Persistent
$copyObj->setProUid($this->pro_uid); $copyObj->setProUid($this->pro_uid);
$copyObj->setAppNumber($this->app_number); $copyObj->setAppNumber($this->app_number);
$copyObj->setAppStatus($this->app_status);
$copyObj->setAppTitle($this->app_title); $copyObj->setAppTitle($this->app_title);

19
workflow/engine/classes/model/om/BaseListInboxPeer.php
View File

@@ -48,6 +48,9 @@ abstract class BaseListInboxPeer
/** the column name for the APP_NUMBER field */ /** the column name for the APP_NUMBER field */
const APP_NUMBER = 'LIST_INBOX.APP_NUMBER'; const APP_NUMBER = 'LIST_INBOX.APP_NUMBER';
/** the column name for the APP_STATUS field */
const APP_STATUS = 'LIST_INBOX.APP_STATUS';
/** the column name for the APP_TITLE field */ /** the column name for the APP_TITLE field */
const APP_TITLE = 'LIST_INBOX.APP_TITLE'; const APP_TITLE = 'LIST_INBOX.APP_TITLE';
@@ -96,10 +99,10 @@ abstract class BaseListInboxPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/ */
private static $fieldNames = array ( private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppUpdateDate', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', ), BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppStatus','AppTitle', 'AppProTitle', 'AppTasTitle', 'AppUpdateDate', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', ),
BasePeer::TYPE_COLNAME => array (ListInboxPeer::APP_UID, ListInboxPeer::DEL_INDEX, ListInboxPeer::USR_UID, ListInboxPeer::TAS_UID, ListInboxPeer::PRO_UID, ListInboxPeer::APP_NUMBER, ListInboxPeer::APP_TITLE, ListInboxPeer::APP_PRO_TITLE, ListInboxPeer::APP_TAS_TITLE, ListInboxPeer::APP_UPDATE_DATE, ListInboxPeer::DEL_PREVIOUS_USR_UID, ListInboxPeer::DEL_PREVIOUS_USR_USERNAME, ListInboxPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListInboxPeer::DEL_PREVIOUS_USR_LASTNAME, ListInboxPeer::DEL_DELEGATE_DATE, ListInboxPeer::DEL_INIT_DATE, ListInboxPeer::DEL_DUE_DATE, ListInboxPeer::DEL_PRIORITY, ), BasePeer::TYPE_COLNAME => array (ListInboxPeer::APP_UID, ListInboxPeer::DEL_INDEX, ListInboxPeer::USR_UID, ListInboxPeer::TAS_UID, ListInboxPeer::PRO_UID, ListInboxPeer::APP_NUMBER, ListInboxPeer::APP_STATUS, ListInboxPeer::APP_TITLE, ListInboxPeer::APP_PRO_TITLE, ListInboxPeer::APP_TAS_TITLE, ListInboxPeer::APP_UPDATE_DATE, ListInboxPeer::DEL_PREVIOUS_USR_UID, ListInboxPeer::DEL_PREVIOUS_USR_USERNAME, ListInboxPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListInboxPeer::DEL_PREVIOUS_USR_LASTNAME, ListInboxPeer::DEL_DELEGATE_DATE, ListInboxPeer::DEL_INIT_DATE, ListInboxPeer::DEL_DUE_DATE, ListInboxPeer::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_UPDATE_DATE', '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_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_STATUS', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_UPDATE_DATE', '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, 17, ) BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, )
); );
/** /**
@@ -110,9 +113,9 @@ abstract class BaseListInboxPeer
*/ */
private static $fieldKeys = array ( 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, 'AppUpdateDate' => 9, 'DelPreviousUsrUid' => 10, 'DelPreviousUsrUsername' => 11, 'DelPreviousUsrFirstname' => 12, 'DelPreviousUsrLastname' => 13, 'DelDelegateDate' => 14, 'DelInitDate' => 15, 'DelDueDate' => 16, 'DelPriority' => 17, ), BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'UsrUid' => 2, 'TasUid' => 3, 'ProUid' => 4, 'AppNumber' => 5, 'AppTitle' => 6, 'AppProTitle' => 7, 'AppTasTitle' => 8, 'AppUpdateDate' => 9, 'DelPreviousUsrUid' => 10, 'DelPreviousUsrUsername' => 11, 'DelPreviousUsrFirstname' => 12, 'DelPreviousUsrLastname' => 13, 'DelDelegateDate' => 14, 'DelInitDate' => 15, 'DelDueDate' => 16, 'DelPriority' => 17, ),
BasePeer::TYPE_COLNAME => array (ListInboxPeer::APP_UID => 0, ListInboxPeer::DEL_INDEX => 1, ListInboxPeer::USR_UID => 2, ListInboxPeer::TAS_UID => 3, ListInboxPeer::PRO_UID => 4, ListInboxPeer::APP_NUMBER => 5, ListInboxPeer::APP_TITLE => 6, ListInboxPeer::APP_PRO_TITLE => 7, ListInboxPeer::APP_TAS_TITLE => 8, ListInboxPeer::APP_UPDATE_DATE => 9, ListInboxPeer::DEL_PREVIOUS_USR_UID => 10, ListInboxPeer::DEL_PREVIOUS_USR_USERNAME => 11, ListInboxPeer::DEL_PREVIOUS_USR_FIRSTNAME => 12, ListInboxPeer::DEL_PREVIOUS_USR_LASTNAME => 13, ListInboxPeer::DEL_DELEGATE_DATE => 14, ListInboxPeer::DEL_INIT_DATE => 15, ListInboxPeer::DEL_DUE_DATE => 16, ListInboxPeer::DEL_PRIORITY => 17, ), BasePeer::TYPE_COLNAME => array (ListInboxPeer::APP_UID => 0, ListInboxPeer::DEL_INDEX => 1, ListInboxPeer::USR_UID => 2, ListInboxPeer::TAS_UID => 3, ListInboxPeer::PRO_UID => 4, ListInboxPeer::APP_NUMBER => 5, ListInboxPeer::APP_STATUS => 6, ListInboxPeer::APP_TITLE => 7, ListInboxPeer::APP_PRO_TITLE => 8, ListInboxPeer::APP_TAS_TITLE => 9, ListInboxPeer::APP_UPDATE_DATE => 10, ListInboxPeer::DEL_PREVIOUS_USR_UID => 11, ListInboxPeer::DEL_PREVIOUS_USR_USERNAME => 12, ListInboxPeer::DEL_PREVIOUS_USR_FIRSTNAME => 13, ListInboxPeer::DEL_PREVIOUS_USR_LASTNAME => 14, ListInboxPeer::DEL_DELEGATE_DATE => 15, ListInboxPeer::DEL_INIT_DATE => 16, ListInboxPeer::DEL_DUE_DATE => 17, ListInboxPeer::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_UPDATE_DATE' => 9, 'DEL_PREVIOUS_USR_UID' => 10, 'DEL_PREVIOUS_USR_USERNAME' => 11, 'DEL_PREVIOUS_USR_FIRSTNAME' => 12, 'DEL_PREVIOUS_USR_LASTNAME' => 13, 'DEL_DELEGATE_DATE' => 14, 'DEL_INIT_DATE' => 15, 'DEL_DUE_DATE' => 16, 'DEL_PRIORITY' => 17, ), BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'USR_UID' => 2, 'TAS_UID' => 3, 'PRO_UID' => 4, 'APP_NUMBER' => 5, 'APP_STATUS' => 6, 'APP_TITLE' => 7, 'APP_PRO_TITLE' => 8, 'APP_TAS_TITLE' => 9, 'APP_UPDATE_DATE' => 10, 'DEL_PREVIOUS_USR_UID' => 11, 'DEL_PREVIOUS_USR_USERNAME' => 12, 'DEL_PREVIOUS_USR_FIRSTNAME' => 13, 'DEL_PREVIOUS_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, ) BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18 )
); );
/** /**
@@ -224,6 +227,8 @@ abstract class BaseListInboxPeer
$criteria->addSelectColumn(ListInboxPeer::PRO_UID); $criteria->addSelectColumn(ListInboxPeer::PRO_UID);
$criteria->addSelectColumn(ListInboxPeer::APP_NUMBER); $criteria->addSelectColumn(ListInboxPeer::APP_NUMBER);
$criteria->addSelectColumn(ListInboxPeer::APP_STATUS);
$criteria->addSelectColumn(ListInboxPeer::APP_TITLE); $criteria->addSelectColumn(ListInboxPeer::APP_TITLE);

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

@@ -33,6 +33,12 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
*/ */
protected $app_uid = ''; protected $app_uid = '';
/**
* The value for the del_index field.
* @var int
*/
protected $del_index = 0;
/** /**
* The value for the usr_uid field. * The value for the usr_uid field.
* @var string * @var string
@@ -81,12 +87,6 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
*/ */
protected $app_status = '0'; protected $app_status = '0';
/**
* The value for the del_index field.
* @var int
*/
protected $del_index = 0;
/** /**
* The value for the del_previous_usr_uid field. * The value for the del_previous_usr_uid field.
* @var string * @var string
@@ -152,6 +152,12 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
* @var string * @var string
*/ */
protected $del_priority = '3'; protected $del_priority = '3';
/**
* The value for the del_thread_status field.
* @var string
*/
protected $del_thread_status = '';
/** /**
* Flag to prevent endless save loop, if this object is referenced * Flag to prevent endless save loop, if this object is referenced
@@ -177,7 +183,18 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
return $this->app_uid; return $this->app_uid;
} }
/**
* Get the [del_index] column value.
*
* @return int
*/
public function getDelIndex()
{
return $this->del_index;
}
/** /**
* Get the [usr_uid] column value. * Get the [usr_uid] column value.
* *
@@ -265,18 +282,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
return $this->app_status; return $this->app_status;
} }
/**
* Get the [del_index] column value.
*
* @return int
*/
public function getDelIndex()
{
return $this->del_index;
}
/** /**
* Get the [del_previous_usr_uid] column value. * Get the [del_previous_usr_uid] column value.
* *
@@ -460,6 +466,17 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
return $this->del_priority; return $this->del_priority;
} }
/**
* Get the [del_thread_status] column value.
*
* @return string
*/
public function getDelThreadStatus()
{
return $this->del_thread_status;
}
/** /**
* Set the value of [app_uid] column. * Set the value of [app_uid] column.
@@ -482,6 +499,28 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
} }
} // setAppUid() } // setAppUid()
/**
* Set the value of [del_index] column.
*
* @param int $v new value
* @return void
*/
public function setDelIndex($v)
{
// Since the native PHP type for this column is integer,
// we will cast the input value to an int (if it is not).
if ($v !== null && !is_int($v) && is_numeric($v)) {
$v = (int) $v;
}
if ($this->del_index !== $v || $v === 0) {
$this->del_index = $v;
$this->modifiedColumns[] = ListParticipatedLastPeer::DEL_INDEX;
}
} // setDelIndex()
/** /**
* Set the value of [usr_uid] column. * Set the value of [usr_uid] column.
@@ -659,28 +698,6 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
} // setAppStatus() } // setAppStatus()
/**
* Set the value of [del_index] column.
*
* @param int $v new value
* @return void
*/
public function setDelIndex($v)
{
// Since the native PHP type for this column is integer,
// we will cast the input value to an int (if it is not).
if ($v !== null && !is_int($v) && is_numeric($v)) {
$v = (int) $v;
}
if ($this->del_index !== $v || $v === 0) {
$this->del_index = $v;
$this->modifiedColumns[] = ListParticipatedLastPeer::DEL_INDEX;
}
} // setDelIndex()
/** /**
* Set the value of [del_previous_usr_uid] column. * Set the value of [del_previous_usr_uid] column.
* *
@@ -943,6 +960,28 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
} }
} // setDelPriority() } // setDelPriority()
/**
* Set the value of [del_thread_status] column.
*
* @param string $v new value
* @return void
*/
public function setDelThreadStatus($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_thread_status !== $v || $v === 'OPEN') {
$this->del_thread_status = $v;
$this->modifiedColumns[] = ListParticipatedLastPeer::DEL_THREAD_STATUS;
}
} // setDelThreadStatus()
/** /**
* Hydrates (populates) the object variables with values from the database resultset. * Hydrates (populates) the object variables with values from the database resultset.
@@ -962,24 +1001,24 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
try { try {
$this->app_uid = $rs->getString($startcol + 0); $this->app_uid = $rs->getString($startcol + 0);
$this->del_index = $rs->getInt($startcol + 1);
$this->usr_uid = $rs->getString($startcol + 1); $this->usr_uid = $rs->getString($startcol + 2);
$this->tas_uid = $rs->getString($startcol + 2); $this->tas_uid = $rs->getString($startcol + 3);
$this->pro_uid = $rs->getString($startcol + 3); $this->pro_uid = $rs->getString($startcol + 4);
$this->app_number = $rs->getInt($startcol + 4); $this->app_number = $rs->getInt($startcol + 5);
$this->app_title = $rs->getString($startcol + 5); $this->app_title = $rs->getString($startcol + 6);
$this->app_pro_title = $rs->getString($startcol + 6); $this->app_pro_title = $rs->getString($startcol + 7);
$this->app_tas_title = $rs->getString($startcol + 7); $this->app_tas_title = $rs->getString($startcol + 8);
$this->app_status = $rs->getString($startcol + 8); $this->app_status = $rs->getString($startcol + 9);
$this->del_index = $rs->getInt($startcol + 9);
$this->del_previous_usr_uid = $rs->getString($startcol + 10); $this->del_previous_usr_uid = $rs->getString($startcol + 10);
@@ -1002,13 +1041,15 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
$this->del_due_date = $rs->getTimestamp($startcol + 19, null); $this->del_due_date = $rs->getTimestamp($startcol + 19, null);
$this->del_priority = $rs->getString($startcol + 20); $this->del_priority = $rs->getString($startcol + 20);
$this->del_thread_status = $rs->getString($startcol + 21);
$this->resetModified(); $this->resetModified();
$this->setNew(false); $this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer. // FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 21; // 21 = ListParticipatedLastPeer::NUM_COLUMNS - ListParticipatedLastPeer::NUM_LAZY_LOAD_COLUMNS). return $startcol + 22; // 22 = ListParticipatedLastPeer::NUM_COLUMNS - ListParticipatedLastPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) { } catch (Exception $e) {
throw new PropelException("Error populating ListParticipatedLast object", $e); throw new PropelException("Error populating ListParticipatedLast object", $e);
@@ -1216,32 +1257,32 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
return $this->getAppUid(); return $this->getAppUid();
break; break;
case 1: case 1:
return $this->getUsrUid();
break;
case 2:
return $this->getTasUid();
break;
case 3:
return $this->getProUid();
break;
case 4:
return $this->getAppNumber();
break;
case 5:
return $this->getAppTitle();
break;
case 6:
return $this->getAppProTitle();
break;
case 7:
return $this->getAppTasTitle();
break;
case 8:
return $this->getAppStatus();
break;
case 9:
return $this->getDelIndex(); return $this->getDelIndex();
break; break;
case 2:
return $this->getUsrUid();
break;
case 3:
return $this->getTasUid();
break;
case 4:
return $this->getProUid();
break;
case 5:
return $this->getAppNumber();
break;
case 6:
return $this->getAppTitle();
break;
case 7:
return $this->getAppProTitle();
break;
case 8:
return $this->getAppTasTitle();
break;
case 9:
return $this->getAppStatus();
break;
case 10: case 10:
return $this->getDelPreviousUsrUid(); return $this->getDelPreviousUsrUid();
break; break;
@@ -1275,6 +1316,9 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
case 20: case 20:
return $this->getDelPriority(); return $this->getDelPriority();
break; break;
case 21:
return $this->getDelThreadStatus();
break;
default: default:
return null; return null;
break; break;
@@ -1296,15 +1340,15 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
$keys = ListParticipatedLastPeer::getFieldNames($keyType); $keys = ListParticipatedLastPeer::getFieldNames($keyType);
$result = array( $result = array(
$keys[0] => $this->getAppUid(), $keys[0] => $this->getAppUid(),
$keys[1] => $this->getUsrUid(), $keys[1] => $this->getDelIndex(),
$keys[2] => $this->getTasUid(), $keys[2] => $this->getUsrUid(),
$keys[3] => $this->getProUid(), $keys[3] => $this->getTasUid(),
$keys[4] => $this->getAppNumber(), $keys[4] => $this->getProUid(),
$keys[5] => $this->getAppTitle(), $keys[5] => $this->getAppNumber(),
$keys[6] => $this->getAppProTitle(), $keys[6] => $this->getAppTitle(),
$keys[7] => $this->getAppTasTitle(), $keys[7] => $this->getAppProTitle(),
$keys[8] => $this->getAppStatus(), $keys[8] => $this->getAppTasTitle(),
$keys[9] => $this->getDelIndex(), $keys[9] => $this->getAppStatus(),
$keys[10] => $this->getDelPreviousUsrUid(), $keys[10] => $this->getDelPreviousUsrUid(),
$keys[11] => $this->getDelPreviousUsrUsername(), $keys[11] => $this->getDelPreviousUsrUsername(),
$keys[12] => $this->getDelPreviousUsrFirstname(), $keys[12] => $this->getDelPreviousUsrFirstname(),
@@ -1316,6 +1360,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
$keys[18] => $this->getDelInitDate(), $keys[18] => $this->getDelInitDate(),
$keys[19] => $this->getDelDueDate(), $keys[19] => $this->getDelDueDate(),
$keys[20] => $this->getDelPriority(), $keys[20] => $this->getDelPriority(),
$keys[21] => $this->getDelThreadStatus(),
); );
return $result; return $result;
} }
@@ -1351,32 +1396,32 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
$this->setAppUid($value); $this->setAppUid($value);
break; break;
case 1: case 1:
$this->setDelIndex($value);
break;
case 2:
$this->setUsrUid($value); $this->setUsrUid($value);
break; break;
case 2: case 3:
$this->setTasUid($value); $this->setTasUid($value);
break; break;
case 3: case 4:
$this->setProUid($value); $this->setProUid($value);
break; break;
case 4: case 5:
$this->setAppNumber($value); $this->setAppNumber($value);
break; break;
case 5: case 6:
$this->setAppTitle($value); $this->setAppTitle($value);
break; break;
case 6: case 7:
$this->setAppProTitle($value); $this->setAppProTitle($value);
break; break;
case 7: case 8:
$this->setAppTasTitle($value); $this->setAppTasTitle($value);
break; break;
case 8:
$this->setAppStatus($value);
break;
case 9: case 9:
$this->setDelIndex($value); $this->setAppStatus($value);
break; break;
case 10: case 10:
$this->setDelPreviousUsrUid($value); $this->setDelPreviousUsrUid($value);
break; break;
@@ -1410,6 +1455,9 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
case 20: case 20:
$this->setDelPriority($value); $this->setDelPriority($value);
break; break;
case 21:
$this->setDelThreadStatus($value);
break;
} // switch() } // switch()
} }
@@ -1436,42 +1484,42 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
if (array_key_exists($keys[0], $arr)) { if (array_key_exists($keys[0], $arr)) {
$this->setAppUid($arr[$keys[0]]); $this->setAppUid($arr[$keys[0]]);
} }
if (array_key_exists($keys[1], $arr)) { if (array_key_exists($keys[1], $arr)) {
$this->setUsrUid($arr[$keys[1]]); $this->setDelIndex($arr[$keys[1]]);
} }
if (array_key_exists($keys[2], $arr)) { if (array_key_exists($keys[2], $arr)) {
$this->setTasUid($arr[$keys[2]]); $this->setUsrUid($arr[$keys[2]]);
} }
if (array_key_exists($keys[3], $arr)) { if (array_key_exists($keys[3], $arr)) {
$this->setProUid($arr[$keys[3]]); $this->setTasUid($arr[$keys[3]]);
} }
if (array_key_exists($keys[4], $arr)) { if (array_key_exists($keys[4], $arr)) {
$this->setAppNumber($arr[$keys[4]]); $this->setProUid($arr[$keys[4]]);
} }
if (array_key_exists($keys[5], $arr)) { if (array_key_exists($keys[5], $arr)) {
$this->setAppTitle($arr[$keys[5]]); $this->setAppNumber($arr[$keys[5]]);
} }
if (array_key_exists($keys[6], $arr)) { if (array_key_exists($keys[6], $arr)) {
$this->setAppProTitle($arr[$keys[6]]); $this->setAppTitle($arr[$keys[6]]);
} }
if (array_key_exists($keys[7], $arr)) { if (array_key_exists($keys[7], $arr)) {
$this->setAppTasTitle($arr[$keys[7]]); $this->setAppProTitle($arr[$keys[7]]);
} }
if (array_key_exists($keys[8], $arr)) { if (array_key_exists($keys[8], $arr)) {
$this->setAppStatus($arr[$keys[8]]); $this->setAppTasTitle($arr[$keys[8]]);
} }
if (array_key_exists($keys[9], $arr)) { if (array_key_exists($keys[9], $arr)) {
$this->setDelIndex($arr[$keys[9]]); $this->setAppStatus($arr[$keys[9]]);
} }
if (array_key_exists($keys[10], $arr)) { if (array_key_exists($keys[10], $arr)) {
$this->setDelPreviousUsrUid($arr[$keys[10]]); $this->setDelPreviousUsrUid($arr[$keys[10]]);
@@ -1516,6 +1564,10 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
if (array_key_exists($keys[20], $arr)) { if (array_key_exists($keys[20], $arr)) {
$this->setDelPriority($arr[$keys[20]]); $this->setDelPriority($arr[$keys[20]]);
} }
if (array_key_exists($keys[21], $arr)) {
$this->setDelThreadStatus($arr[$keys[21]]);
}
} }
@@ -1531,6 +1583,10 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
if ($this->isColumnModified(ListParticipatedLastPeer::APP_UID)) { if ($this->isColumnModified(ListParticipatedLastPeer::APP_UID)) {
$criteria->add(ListParticipatedLastPeer::APP_UID, $this->app_uid); $criteria->add(ListParticipatedLastPeer::APP_UID, $this->app_uid);
} }
if ($this->isColumnModified(ListParticipatedLastPeer::DEL_INDEX)) {
$criteria->add(ListParticipatedLastPeer::DEL_INDEX, $this->del_index);
}
if ($this->isColumnModified(ListParticipatedLastPeer::USR_UID)) { if ($this->isColumnModified(ListParticipatedLastPeer::USR_UID)) {
$criteria->add(ListParticipatedLastPeer::USR_UID, $this->usr_uid); $criteria->add(ListParticipatedLastPeer::USR_UID, $this->usr_uid);
@@ -1562,11 +1618,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
if ($this->isColumnModified(ListParticipatedLastPeer::APP_STATUS)) { if ($this->isColumnModified(ListParticipatedLastPeer::APP_STATUS)) {
$criteria->add(ListParticipatedLastPeer::APP_STATUS, $this->app_status); $criteria->add(ListParticipatedLastPeer::APP_STATUS, $this->app_status);
} }
if ($this->isColumnModified(ListParticipatedLastPeer::DEL_INDEX)) {
$criteria->add(ListParticipatedLastPeer::DEL_INDEX, $this->del_index);
}
if ($this->isColumnModified(ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID)) { if ($this->isColumnModified(ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID)) {
$criteria->add(ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID, $this->del_previous_usr_uid); $criteria->add(ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID, $this->del_previous_usr_uid);
@@ -1611,6 +1663,10 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
if ($this->isColumnModified(ListParticipatedLastPeer::DEL_PRIORITY)) { if ($this->isColumnModified(ListParticipatedLastPeer::DEL_PRIORITY)) {
$criteria->add(ListParticipatedLastPeer::DEL_PRIORITY, $this->del_priority); $criteria->add(ListParticipatedLastPeer::DEL_PRIORITY, $this->del_priority);
} }
if ($this->isColumnModified(ListParticipatedLastPeer::DEL_THREAD_STATUS)) {
$criteria->add(ListParticipatedLastPeer::DEL_THREAD_STATUS, $this->del_thread_status);
}
return $criteria; return $criteria;
@@ -1629,6 +1685,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
$criteria = new Criteria(ListParticipatedLastPeer::DATABASE_NAME); $criteria = new Criteria(ListParticipatedLastPeer::DATABASE_NAME);
$criteria->add(ListParticipatedLastPeer::APP_UID, $this->app_uid); $criteria->add(ListParticipatedLastPeer::APP_UID, $this->app_uid);
$criteria->add(ListParticipatedLastPeer::DEL_INDEX, $this->del_index);
$criteria->add(ListParticipatedLastPeer::USR_UID, $this->usr_uid); $criteria->add(ListParticipatedLastPeer::USR_UID, $this->usr_uid);
return $criteria; return $criteria;
@@ -1644,8 +1701,10 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
$pks = array(); $pks = array();
$pks[0] = $this->getAppUid(); $pks[0] = $this->getAppUid();
$pks[1] = $this->getDelIndex();
$pks[1] = $this->getUsrUid(); $pks[2] = $this->getUsrUid();
return $pks; return $pks;
} }
@@ -1660,8 +1719,10 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
{ {
$this->setAppUid($keys[0]); $this->setAppUid($keys[0]);
$this->setDelIndex($keys[1]);
$this->setUsrUid($keys[1]); $this->setUsrUid($keys[2]);
} }
@@ -1692,7 +1753,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
$copyObj->setAppStatus($this->app_status); $copyObj->setAppStatus($this->app_status);
$copyObj->setDelIndex($this->del_index); // $copyObj->setDelIndex($this->del_index);
$copyObj->setDelPreviousUsrUid($this->del_previous_usr_uid); $copyObj->setDelPreviousUsrUid($this->del_previous_usr_uid);
@@ -1715,11 +1776,15 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
$copyObj->setDelDueDate($this->del_due_date); $copyObj->setDelDueDate($this->del_due_date);
$copyObj->setDelPriority($this->del_priority); $copyObj->setDelPriority($this->del_priority);
$copyObj->setDelThreadStatus($this->del_thread_status);
$copyObj->setNew(true); $copyObj->setNew(true);
$copyObj->setAppUid(''); // this is a pkey column, so set to default value $copyObj->setAppUid(''); // this is a pkey column, so set to default value
$copyObj->setDelIndex(''); // this is a pkey column, so set to default value
$copyObj->setUsrUid(''); // this is a pkey column, so set to default value $copyObj->setUsrUid(''); // this is a pkey column, so set to default value

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

@@ -33,6 +33,9 @@ abstract class BaseListParticipatedLastPeer
/** the column name for the APP_UID field */ /** the column name for the APP_UID field */
const APP_UID = 'LIST_PARTICIPATED_LAST.APP_UID'; const APP_UID = 'LIST_PARTICIPATED_LAST.APP_UID';
/** the column name for the DEL_INDEX field */
const DEL_INDEX = 'LIST_PARTICIPATED_LAST.DEL_INDEX';
/** the column name for the USR_UID field */ /** the column name for the USR_UID field */
const USR_UID = 'LIST_PARTICIPATED_LAST.USR_UID'; const USR_UID = 'LIST_PARTICIPATED_LAST.USR_UID';
@@ -56,10 +59,7 @@ abstract class BaseListParticipatedLastPeer
const APP_TAS_TITLE = 'LIST_PARTICIPATED_LAST.APP_TAS_TITLE'; const APP_TAS_TITLE = 'LIST_PARTICIPATED_LAST.APP_TAS_TITLE';
/** the column name for the APP_STATUS field */ /** the column name for the APP_STATUS field */
const APP_STATUS = 'LIST_PARTICIPATED_LAST.APP_STATUS'; const APP_STATUS = 'LIST_PARTICIPATED_LAST.APP_STATUS';
/** the column name for the DEL_INDEX field */
const DEL_INDEX = 'LIST_PARTICIPATED_LAST.DEL_INDEX';
/** the column name for the DEL_PREVIOUS_USR_UID field */ /** the column name for the DEL_PREVIOUS_USR_UID field */
const DEL_PREVIOUS_USR_UID = 'LIST_PARTICIPATED_LAST.DEL_PREVIOUS_USR_UID'; const DEL_PREVIOUS_USR_UID = 'LIST_PARTICIPATED_LAST.DEL_PREVIOUS_USR_UID';
@@ -93,6 +93,9 @@ abstract class BaseListParticipatedLastPeer
/** the column name for the DEL_PRIORITY field */ /** the column name for the DEL_PRIORITY field */
const DEL_PRIORITY = 'LIST_PARTICIPATED_LAST.DEL_PRIORITY'; const DEL_PRIORITY = 'LIST_PARTICIPATED_LAST.DEL_PRIORITY';
/** the column name for the DEL_THREAD_STATUS field */
const DEL_THREAD_STATUS = 'LIST_PARTICIPATED_LAST.DEL_THREAD_STATUS';
/** The PHP to DB Name Mapping */ /** The PHP to DB Name Mapping */
private static $phpNameMap = null; private static $phpNameMap = null;
@@ -105,10 +108,10 @@ abstract class BaseListParticipatedLastPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/ */
private static $fieldNames = array ( private static $fieldNames = array (
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_PHPNAME => array ('AppUid', 'DelIndex', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppStatus', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', 'DelPriority', 'DelThreadStatus'),
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_COLNAME => array (ListParticipatedLastPeer::APP_UID, ListParticipatedLastPeer::DEL_INDEX, 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_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, ListParticipatedLastPeer::DEL_THREAD_STATUS, ),
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_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_STATUS', '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', 'DEL_THREAD_STATUS', ),
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, ) 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, )
); );
/** /**
@@ -118,10 +121,10 @@ abstract class BaseListParticipatedLastPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/ */
private static $fieldKeys = array ( private static $fieldKeys = array (
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_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 2, 'UsrUid' => 3, 'TasUid' => 4, 'ProUid' => 5, 'AppNumber' => 6, 'AppTitle' => 7, 'AppProTitle' => 8, 'AppTasTitle' => 9, 'AppStatus' => 9, 'DelPreviousUsrUid' => 10, 'DelPreviousUsrUsername' => 11, 'DelPreviousUsrFirstname' => 12, 'DelPreviousUsrLastname' => 13, 'DelCurrentUsrUsername' => 14, 'DelCurrentUsrFirstname' => 15, 'DelCurrentUsrLastname' => 16, 'DelDelegateDate' => 17, 'DelInitDate' => 18, 'DelDueDate' => 19, 'DelPriority' => 20, 'DelThreadStatus' => 21,),
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_COLNAME => array (ListParticipatedLastPeer::APP_UID => 0, ListParticipatedLastPeer::DEL_INDEX => 1, ListParticipatedLastPeer::USR_UID => 2, ListParticipatedLastPeer::TAS_UID => 3, ListParticipatedLastPeer::PRO_UID => 4, ListParticipatedLastPeer::APP_NUMBER => 5, ListParticipatedLastPeer::APP_TITLE => 6, ListParticipatedLastPeer::APP_PRO_TITLE => 7, ListParticipatedLastPeer::APP_TAS_TITLE => 8, ListParticipatedLastPeer::APP_STATUS => 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, ListParticipatedLastPeer::DEL_THREAD_STATUS => 21, ),
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_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_STATUS' => 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, 'DEL_THREAD_STATUS' => 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, ) 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, )
); );
/** /**
@@ -223,6 +226,8 @@ abstract class BaseListParticipatedLastPeer
{ {
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_UID); $criteria->addSelectColumn(ListParticipatedLastPeer::APP_UID);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_INDEX);
$criteria->addSelectColumn(ListParticipatedLastPeer::USR_UID); $criteria->addSelectColumn(ListParticipatedLastPeer::USR_UID);
@@ -238,9 +243,7 @@ abstract class BaseListParticipatedLastPeer
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_TAS_TITLE); $criteria->addSelectColumn(ListParticipatedLastPeer::APP_TAS_TITLE);
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_STATUS); $criteria->addSelectColumn(ListParticipatedLastPeer::APP_STATUS);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_INDEX);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID); $criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID);
@@ -263,6 +266,8 @@ abstract class BaseListParticipatedLastPeer
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_DUE_DATE); $criteria->addSelectColumn(ListParticipatedLastPeer::DEL_DUE_DATE);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PRIORITY); $criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PRIORITY);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_THREAD_STATUS);
} }
@@ -478,6 +483,9 @@ abstract class BaseListParticipatedLastPeer
$comparison = $criteria->getComparison(ListParticipatedLastPeer::APP_UID); $comparison = $criteria->getComparison(ListParticipatedLastPeer::APP_UID);
$selectCriteria->add(ListParticipatedLastPeer::APP_UID, $criteria->remove(ListParticipatedLastPeer::APP_UID), $comparison); $selectCriteria->add(ListParticipatedLastPeer::APP_UID, $criteria->remove(ListParticipatedLastPeer::APP_UID), $comparison);
$comparison = $criteria->getComparison(ListParticipatedLastPeer::DEL_INDEX);
$selectCriteria->add(ListParticipatedLastPeer::DEL_INDEX, $criteria->remove(ListParticipatedLastPeer::DEL_INDEX), $comparison);
$comparison = $criteria->getComparison(ListParticipatedLastPeer::USR_UID); $comparison = $criteria->getComparison(ListParticipatedLastPeer::USR_UID);
$selectCriteria->add(ListParticipatedLastPeer::USR_UID, $criteria->remove(ListParticipatedLastPeer::USR_UID), $comparison); $selectCriteria->add(ListParticipatedLastPeer::USR_UID, $criteria->remove(ListParticipatedLastPeer::USR_UID), $comparison);
@@ -555,10 +563,12 @@ abstract class BaseListParticipatedLastPeer
$vals[0][] = $value[0]; $vals[0][] = $value[0];
$vals[1][] = $value[1]; $vals[1][] = $value[1];
$vals[2][] = $value[2];
} }
$criteria->add(ListParticipatedLastPeer::APP_UID, $vals[0], Criteria::IN); $criteria->add(ListParticipatedLastPeer::APP_UID, $vals[0], Criteria::IN);
$criteria->add(ListParticipatedLastPeer::USR_UID, $vals[1], Criteria::IN); $criteria->add(ListParticipatedLastPeer::DEL_INDEX, $vals[1], Criteria::IN);
$criteria->add(ListParticipatedLastPeer::USR_UID, $vals[2], Criteria::IN);
} }
// Set the correct dbName // Set the correct dbName
@@ -624,13 +634,14 @@ abstract class BaseListParticipatedLastPeer
* @param Connection $con * @param Connection $con
* @return ListParticipatedLast * @return ListParticipatedLast
*/ */
public static function retrieveByPK($app_uid, $usr_uid, $con = null) public static function retrieveByPK($app_uid, $usr_uid, $del_index, $con = null)
{ {
if ($con === null) { if ($con === null) {
$con = Propel::getConnection(self::DATABASE_NAME); $con = Propel::getConnection(self::DATABASE_NAME);
} }
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->add(ListParticipatedLastPeer::APP_UID, $app_uid); $criteria->add(ListParticipatedLastPeer::APP_UID, $app_uid);
$criteria->add(ListParticipatedLastPeer::DEL_INDEX, $del_index);
$criteria->add(ListParticipatedLastPeer::USR_UID, $usr_uid); $criteria->add(ListParticipatedLastPeer::USR_UID, $usr_uid);
$v = ListParticipatedLastPeer::doSelect($criteria, $con); $v = ListParticipatedLastPeer::doSelect($criteria, $con);

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

File diff suppressed because it is too large Load Diff

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

@@ -2199,6 +2199,7 @@ CREATE TABLE `LIST_INBOX`
`TAS_UID` VARCHAR(32) default '' NOT NULL, `TAS_UID` VARCHAR(32) default '' NOT NULL,
`PRO_UID` VARCHAR(32) default '' NOT NULL, `PRO_UID` VARCHAR(32) default '' NOT NULL,
`APP_NUMBER` INTEGER default 0 NOT NULL, `APP_NUMBER` INTEGER default 0 NOT NULL,
`APP_STATUS` VARCHAR(32) default '' NOT NULL,
`APP_TITLE` VARCHAR(255) default '' NOT NULL, `APP_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_PRO_TITLE` VARCHAR(255) default '' NOT NULL, `APP_PRO_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_TAS_TITLE` VARCHAR(255) default '' NOT NULL, `APP_TAS_TITLE` VARCHAR(255) default '' NOT NULL,
@@ -2256,6 +2257,7 @@ DROP TABLE IF EXISTS `LIST_PARTICIPATED_LAST`;
CREATE TABLE `LIST_PARTICIPATED_LAST` CREATE TABLE `LIST_PARTICIPATED_LAST`
( (
`APP_UID` VARCHAR(32) default '' NOT NULL, `APP_UID` VARCHAR(32) default '' NOT NULL,
`DEL_INDEX` INTEGER default 0 NOT NULL,
`USR_UID` VARCHAR(32) default '' NOT NULL, `USR_UID` VARCHAR(32) default '' NOT NULL,
`TAS_UID` VARCHAR(32) default '' NOT NULL, `TAS_UID` VARCHAR(32) default '' NOT NULL,
`PRO_UID` VARCHAR(32) default '' NOT NULL, `PRO_UID` VARCHAR(32) default '' NOT NULL,
@@ -2264,7 +2266,6 @@ CREATE TABLE `LIST_PARTICIPATED_LAST`
`APP_PRO_TITLE` VARCHAR(255) default '' NOT NULL, `APP_PRO_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_TAS_TITLE` VARCHAR(255) default '' NOT NULL, `APP_TAS_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_STATUS` VARCHAR(20) default '0', `APP_STATUS` VARCHAR(20) default '0',
`DEL_INDEX` INTEGER default 0 NOT NULL,
`DEL_PREVIOUS_USR_UID` VARCHAR(32) default '', `DEL_PREVIOUS_USR_UID` VARCHAR(32) default '',
`DEL_PREVIOUS_USR_USERNAME` VARCHAR(100) default '', `DEL_PREVIOUS_USR_USERNAME` VARCHAR(100) default '',
`DEL_PREVIOUS_USR_FIRSTNAME` VARCHAR(50) default '', `DEL_PREVIOUS_USR_FIRSTNAME` VARCHAR(50) default '',
@@ -2276,7 +2277,8 @@ CREATE TABLE `LIST_PARTICIPATED_LAST`
`DEL_INIT_DATE` DATETIME, `DEL_INIT_DATE` DATETIME,
`DEL_DUE_DATE` DATETIME, `DEL_DUE_DATE` DATETIME,
`DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL, `DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL,
PRIMARY KEY (`APP_UID`,`USR_UID`) `DEL_THREAD_STATUS` VARCHAR(32) default 'OPEN' NOT NULL,
PRIMARY KEY (`APP_UID`,`DEL_INDEX`,`USR_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Participated last list'; )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Participated last list';
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
#-- LIST_COMPLETED #-- LIST_COMPLETED

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

@@ -37,7 +37,7 @@ switch ($action) {
case 'my-inbox': case 'my-inbox':
$urlProxy .= 'my-inbox'; $urlProxy .= 'my-inbox';
break; break;
case 'selfservice': case 'unassigned':
$urlProxy = 'proxyCasesList'; $urlProxy = 'proxyCasesList';
$action = 'unassigned'; $action = 'unassigned';
break; break;

46
workflow/engine/methods/cases/cases_Resume.php
View File

@@ -115,25 +115,41 @@ $objProc = new Process();
$aProc = $objProc->load( $Fields['PRO_UID'] ); $aProc = $objProc->load( $Fields['PRO_UID'] );
$Fields['PRO_TITLE'] = $aProc['PRO_TITLE']; $Fields['PRO_TITLE'] = $aProc['PRO_TITLE'];
$objTask = new Task();
//$aTask = $objTask->load( $Fields['TAS_UID'] );
//$Fields['TAS_TITLE'] = $aTask['TAS_TITLE'];
if (isset($_SESSION['ACTION']) && ($_SESSION['ACTION'] == 'jump')) {
$task = explode('-', $Fields['TAS_UID']); $objTask = new Task();
$Fields['TAS_TITLE'] = ''; $aTask = $objTask->load( $Fields['TAS_UID'] );
for( $i = 0; $i < sizeof($task)-1; $i ++ ) { $Fields['TAS_TITLE'] = $aTask['TAS_TITLE'];
$aTask = $objTask->load( $task[$i] );
$Fields['TAS_TITLE'][] = $aTask['TAS_TITLE']; $objUser = new Users();
}
$Fields['TAS_TITLE'] = implode(" - ", array_values($Fields['TAS_TITLE']));
} else {
$aTask = $objTask->load( $Fields['TAS_UID'] );
$Fields['TAS_TITLE'] = $aTask['TAS_TITLE'];
}
$oHeadPublisher = & headPublisher::getSingleton(); $oHeadPublisher = & headPublisher::getSingleton();
$oHeadPublisher->addScriptFile( '/jscore/cases/core/cases_Step.js' ); $oHeadPublisher->addScriptFile( '/jscore/cases/core/cases_Step.js' );
$G_PUBLISH = new Publisher(); $G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_Resume.xml', '', $Fields, '' ); $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_Resume.xml', '', $Fields, '' );
if($Fields['APP_STATUS'] != 'COMPLETED'){
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_Resume_Current_Task_Title.xml', '', $Fields, '' );
$objDel = new AppDelegation();
$parallel = $objDel->LoadParallel ($Fields['APP_UID']);
$FieldsPar = $Fields;
if(empty($parallel)){
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_Resume_Current_Task.xml', '', $Fields, '' );
}else{
foreach($parallel as $row){
$FieldsPar['TAS_UID'] = $row['TAS_UID'];
$aTask = $objTask->load( $row['TAS_UID'] );
$FieldsPar['TAS_TITLE'] = $aTask['TAS_TITLE'];
$FieldsPar['USR_UID'] = $row['USR_UID'];
$aUser = $objUser->loadDetails ($row['USR_UID']);
$FieldsPar['CURRENT_USER'] = $aUser['USR_FULLNAME'];
$FieldsPar['DEL_DELEGATE_DATE'] = $row['DEL_DELEGATE_DATE'];
$FieldsPar['DEL_INIT_DATE'] = $row['DEL_INIT_DATE'];
$FieldsPar['DEL_TASK_DUE_DATE'] = $row['DEL_TASK_DUE_DATE'];
$FieldsPar['DEL_FINISH_DATE'] = $row['DEL_FINISH_DATE'];
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_Resume_Current_Task.xml', '', $FieldsPar, '' );
}
}
}
G::RenderPage( 'publish', 'blank' ); G::RenderPage( 'publish', 'blank' );

2
workflow/engine/methods/cases/open.php
View File

@@ -91,10 +91,8 @@ while ($ds->next()) {
$row = $ds->getRow(); $row = $ds->getRow();
$bpmnProjects[] = $row['PRJ_UID']; $bpmnProjects[] = $row['PRJ_UID'];
} }
$oStep = new Step(); $oStep = new Step();
$oStep = $oStep->loadByProcessTaskPosition( $case['PRO_UID'], $case['TAS_UID'], 1 ); $oStep = $oStep->loadByProcessTaskPosition( $case['PRO_UID'], $case['TAS_UID'], 1 );
$oHeadPublisher->assign( 'uri', $script . $uri ); $oHeadPublisher->assign( 'uri', $script . $uri );
$oHeadPublisher->assign( '_APP_NUM', '#: ' . $case['APP_NUMBER'] ); $oHeadPublisher->assign( '_APP_NUM', '#: ' . $case['APP_NUMBER'] );
$oHeadPublisher->assign( '_PROJECT_TYPE', in_array($case['PRO_UID'], $bpmnProjects) ? 'bpmn' : 'classic' ); $oHeadPublisher->assign( '_PROJECT_TYPE', in_array($case['PRO_UID'], $bpmnProjects) ? 'bpmn' : 'classic' );

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

@@ -33,8 +33,17 @@ class Lists {
$filters['count'] = isset( $dataList['count'] ) ? $dataList['count'] : true; $filters['count'] = isset( $dataList['count'] ) ? $dataList['count'] : true;
$filters["category"] = isset( $dataList["category"] ) ? $dataList["category"] : ""; $filters["category"] = isset( $dataList["category"] ) ? $dataList["category"] : "";
if(empty($filters["category"]) && isset($_GET['category'])){
$filters["category"] = $_GET['category'];
}
$filters["process"] = isset( $dataList["process"] ) ? $dataList["process"] : ""; $filters["process"] = isset( $dataList["process"] ) ? $dataList["process"] : "";
if(empty($filters["process"]) && isset($_GET['process'])){
$filters["process"] = $_GET['process'];
}
$filters["search"] = isset( $dataList["search"] ) ? $dataList["search"] : ""; $filters["search"] = isset( $dataList["search"] ) ? $dataList["search"] : "";
if(empty($filters["search"]) && isset($_GET['search'])){
$filters["category"] = $_GET['search'];
}
$filters["filter"] = isset( $dataList["filter"] ) ? $dataList["filter"] : ""; $filters["filter"] = isset( $dataList["filter"] ) ? $dataList["filter"] : "";
$filters["dateFrom"] = (!empty( $dataList["dateFrom"] )) ? substr( $dataList["dateFrom"], 0, 10 ) : ""; $filters["dateFrom"] = (!empty( $dataList["dateFrom"] )) ? substr( $dataList["dateFrom"], 0, 10 ) : "";
$filters["dateTo"] = (!empty( $dataList["dateTo"] )) ? substr( $dataList["dateTo"], 0, 10 ) : ""; $filters["dateTo"] = (!empty( $dataList["dateTo"] )) ? substr( $dataList["dateTo"], 0, 10 ) : "";
@@ -86,8 +95,9 @@ class Lists {
// Validate filters // Validate filters
$filters["start"] = (int)$filters["start"]; $filters["start"] = (int)$filters["start"];
$filters["start"] = abs($filters["start"]); $filters["start"] = abs($filters["start"]);
error_log($filters["start"]);
if ($filters["start"] != 0) { if ($filters["start"] != 0) {
$filters["start"]--; $filters["start"]+1;
} }
$filters["limit"] = (int)$filters["limit"]; $filters["limit"] = (int)$filters["limit"];
@@ -162,11 +172,10 @@ class Lists {
//$value = array_change_key_case($value, CASE_LOWER); //$value = array_change_key_case($value, CASE_LOWER);
} }
} }
$response = array(); $response = array();
if ($filters["paged"]) { if ($filters["paged"]) {
$filtersData = array(); $filtersData = array();
$filtersData['start'] = $filters["start"]+1; $filtersData['start'] = $filters["start"];
$filtersData['limit'] = $filters["limit"]; $filtersData['limit'] = $filters["limit"];
$filtersData['sort'] = G::toLower($filters["sort"]); $filtersData['sort'] = G::toLower($filters["sort"]);
$filtersData['dir'] = G::toLower($filters["dir"]); $filtersData['dir'] = G::toLower($filters["dir"]);
@@ -177,11 +186,10 @@ class Lists {
$filtersData['date_to'] = $filters["dateTo"]; $filtersData['date_to'] = $filters["dateTo"];
$response['filters'] = $filtersData; $response['filters'] = $filtersData;
$response['data'] = $result; $response['data'] = $result;
$response['totalCount'] = $list->countTotal($userUid, $filters); $response['totalCount'] = $list->countTotal($userUid, $filtersData);
} else { } else {
$response = $result; $response = $result;
} }
return $response; return $response;
} }
} }

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

@@ -805,7 +805,7 @@ Ext.onReady ( function() {
sortInfo:{field: 'APP_CACHE_VIEW.APP_NUMBER', direction: "DESC"}, sortInfo:{field: 'APP_CACHE_VIEW.APP_NUMBER', direction: "DESC"},
listeners: { listeners: {
load: function(response){ load: function(response){
//console.log(response.reader.jsonData);
if (response.reader.jsonData.result === false) { if (response.reader.jsonData.result === false) {
PMExt.notify('ERROR', response.reader.jsonData.message); PMExt.notify('ERROR', response.reader.jsonData.message);
//PMExt.error //PMExt.error
@@ -2267,7 +2267,10 @@ var gridForm = new Ext.FormPanel({
comboCategory.setValue(""); comboCategory.setValue("");
comboProcess.setValue(""); comboProcess.setValue("");
comboStatus.setValue(""); comboStatus.setValue("");
comboUser.setValue(""); if(typeof(comboUser) != 'undefined'){
comboUser.setValue("");
}
comboAllUsers.setValue("CURRENT_USER"); comboAllUsers.setValue("CURRENT_USER");
// hidding the buttons for the reassign // hidding the buttons for the reassign

87
workflow/engine/xmlform/cases/cases_Resume.xml
View File

@@ -1,54 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<dynaForm name="cases_Resume" type="xmlform" width="550px" labelWidth="150px"> <dynaForm name="cases_Resume" type="xmlform" width="550px" labelWidth="150px">
<TITLE1 type="title"> <TITLE1 type="title">
<en><![CDATA[Case Properties]]></en> <en><![CDATA[Case Properties]]></en>
</TITLE1> </TITLE1>
<PRO_TITLE type="text" mode="view"> <PRO_TITLE type="text" mode="view">
<en><![CDATA[Process]]></en> <en><![CDATA[Process]]></en>
</PRO_TITLE> </PRO_TITLE>
<TITLE type="text" mode="view"> <TITLE type="text" mode="view">
<en><![CDATA[Case Title]]></en> <en><![CDATA[Case Title]]></en>
</TITLE> </TITLE>
<APP_NUMBER type="text" mode="view"> <APP_NUMBER type="text" mode="view">
<en><![CDATA[Case Number]]></en> <en><![CDATA[Case Number]]></en>
</APP_NUMBER> </APP_NUMBER>
<STATUS type="text" mode="view"> <STATUS type="text" mode="view">
<en><![CDATA[Case Status]]></en> <en><![CDATA[Case Status]]></en>
</STATUS> </STATUS>
<APP_UID type="text" mode="view"> <APP_UID type="text" mode="view">
<en><![CDATA[Case Uid]]></en> <en><![CDATA[Case Uid]]></en>
</APP_UID> </APP_UID>
<CREATOR type="text" mode="view"> <CREATOR type="text" mode="view">
<en><![CDATA[Creator]]></en> <en><![CDATA[Creator]]></en>
</CREATOR> </CREATOR>
<CREATE_DATE type="text" mode="view"> <CREATE_DATE type="text" mode="view">
<en><![CDATA[Create Date]]></en> <en><![CDATA[Create Date]]></en>
</CREATE_DATE> </CREATE_DATE>
<UPDATE_DATE type="text" mode="view"> <UPDATE_DATE type="text" mode="view">
<en><![CDATA[Last Update]]></en> <en><![CDATA[Last Update]]></en>
</UPDATE_DATE> </UPDATE_DATE>
<TITLE2 type="title"> <DESCRIPTION type="text" mode="view">
<en><![CDATA[Current Task Properties]]></en> <en><![CDATA[Case Description]]></en>
</TITLE2> </DESCRIPTION>
<TAS_TITLE type="text" mode="view"> </dynaForm>
<en><![CDATA[Task]]></en>
</TAS_TITLE>
<CURRENT_USER type="text" mode="view">
<en><![CDATA[Current User]]></en>
</CURRENT_USER>
<DEL_DELEGATE_DATE type="text" mode="view">
<en><![CDATA[Task Delegate Date]]></en>
</DEL_DELEGATE_DATE>
<DEL_INIT_DATE type="text" mode="view">
<en><![CDATA[Task Init Date]]></en>
</DEL_INIT_DATE>
<DEL_TASK_DUE_DATE type="text" mode="view">
<en><![CDATA[Task Due Date]]></en>
</DEL_TASK_DUE_DATE>
<DEL_FINISH_DATE type="text" mode="view">
<en><![CDATA[Finish Date]]></en>
</DEL_FINISH_DATE>
<DESCRIPTION type="text" mode="view">
<en><![CDATA[Case Description]]></en>
</DESCRIPTION>
</dynaForm>