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

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

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