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

Merged in cochalo/processmaker/LISTS (pull request #1622)

Browse Source 
Quitando guardado de contadores para listados
This commit is contained in:
Julio Cesar Laura Avendaño
2015-03-09 08:49:44 -04:00
parent 4762d14554 6520dba83d
commit d9cccaed76
3 changed files with 1 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
workflow/engine/classes/model/ListCompleted.php
View File

@@ -93,14 +93,7 @@ class ListCompleted extends BaseListCompleted
$criteriaSet = new Criteria("workflow"); $criteriaSet = new Criteria("workflow");
$criteriaSet->add(ListParticipatedLastPeer::APP_STATUS, 'COMPLETED'); $criteriaSet->add(ListParticipatedLastPeer::APP_STATUS, 'COMPLETED');
BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow")); BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow"));
$users = new Users();
$users->refreshTotal($data['USR_UID'], 'add', 'completed');
if ($data['DEL_PREVIOUS'] != 0) {
$users->refreshTotal($data['USR_UID'], 'remove', 'inbox');
} else {
$users->refreshTotal($data['USR_UID'], 'remove', 'draft');
}
$con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME ); $con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME );
try { try {
$this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );

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

@@ -143,7 +143,6 @@ class ListInbox extends BaseListInbox
public function newRow ($data, $delPreviusUsrUid) public function newRow ($data, $delPreviusUsrUid)
{ {
$users = new Users();
$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,36 +211,6 @@ class ListInbox extends BaseListInbox
$data['DEL_PREVIOUS_USR_LASTNAME'] = $aRow['USR_LASTNAME']; $data['DEL_PREVIOUS_USR_LASTNAME'] = $aRow['USR_LASTNAME'];
} }
if ($data['APP_STATUS'] == 'DRAFT') {
$users->refreshTotal($data['USR_UID'], 'add', 'draft');
} else {
$criteria = new Criteria();
$criteria->addSelectColumn(SubApplicationPeer::APP_UID);
$criteria->add( SubApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
$dataset = SubApplicationPeer::doSelectRS($criteria);
if ($dataset->next()) {
$users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox');
$users->refreshTotal($data['USR_UID'], 'add', 'inbox');
} else if ($data['DEL_INDEX'] == 2) {
$users->refreshTotal($delPreviusUsrUid, 'remove', 'draft');
$users->refreshTotal($data['USR_UID'], 'add', 'inbox');
} else {
$users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox');
$users->refreshTotal($data['USR_UID'], 'add', 'inbox');
}
/*
if ($data['DEL_INDEX'] == 1) {
$users->refreshTotal($data['USR_UID'], 'add', 'draft');
} elseif ($data['DEL_INDEX'] == 2) {
$users->refreshTotal($delPreviusUsrUid, 'remove', 'draft');
$users->refreshTotal($data['USR_UID'], 'add', 'inbox');
} else {
$users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox');
$users->refreshTotal($data['USR_UID'], 'add', 'inbox');
}*/
}
self::create($data); self::create($data);
} }

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

@@ -48,9 +48,6 @@ class ListParticipatedLast extends BaseListParticipatedLast
$aRow = $dataset->getRow(); $aRow = $dataset->getRow();
$data['APP_STATUS'] = $aRow['APP_STATUS']; $data['APP_STATUS'] = $aRow['APP_STATUS'];
$users = new Users();
$users->refreshTotal($data['USR_UID'], 'add', 'participated');
$con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME );
try { try {
$this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
if ($this->validate()) { if ($this->validate()) {
@@ -134,11 +131,6 @@ class ListParticipatedLast extends BaseListParticipatedLast
*/ */
public function remove ($app_uid, $usr_uid) public function remove ($app_uid, $usr_uid)
{ {
$existField = ListParticipatedLastPeer::retrieveByPK($app_uid, $usr_uid);
if (! is_null( $existField )) {
$users = new Users();
$users->refreshTotal($usr_uid, 'removed', 'participated');
}
$con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME ); $con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME );
try { try {
$this->setAppUid($app_uid); $this->setAppUid($app_uid);