diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php index b75956a07..0935f0df0 100755 --- a/workflow/engine/classes/class.case.php +++ b/workflow/engine/classes/class.case.php @@ -4232,9 +4232,6 @@ class Cases throw new Exception(G::LoadTranslation('ID_THREAD_STATUS_DOES_NOT_EXIST_FOR_THE_APPLICATION.', [$appUID])); } - $users = new Users(); - $rowUsers = $users->load($userUID); - //Application $rowApplication['APP_STATUS'] = 'TO_DO'; $rowApplication['APP_UPDATE_DATE'] = date('Y-m-d H:i:s'); @@ -4282,7 +4279,6 @@ class Cases $resultSetListCanceled->next(); $rowListCanceled = $resultSetListCanceled->getRow(); ListCanceledPeer::doDelete($criteriaListCanceled); - $usrTotalCancelled = $rowUsers['USR_TOTAL_CANCELLED'] - 1; //ListInbox $rowListCanceled['DEL_PREVIOUS_USR_USERNAME'] = $rowListCanceled['DEL_CURRENT_USR_USERNAME']; @@ -4298,14 +4294,6 @@ class Cases unset($rowListCanceled['APP_CANCELED_DATE']); $listInbox = new ListInbox(); $listInbox->create($rowListCanceled); - $usrTotalInbox = $rowUsers['USR_TOTAL_INBOX'] + 1; - - //Users - $users->update([ - 'USR_UID' => $userUID, - 'USR_TOTAL_INBOX' => $usrTotalInbox, - 'USR_TOTAL_CANCELLED' => $usrTotalCancelled - ]); //ListParticipatedLast $criteriaListParticipatedLast = new Criteria("workflow"); diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php index 96ef90356..df091196b 100755 --- a/workflow/engine/classes/class.wsTools.php +++ b/workflow/engine/classes/class.wsTools.php @@ -1997,20 +1997,6 @@ class workspaceTools $list->doDeleteAll(); } - //Update //User - $criteriaSet = new Criteria("workflow"); - $criteriaSet->add(UsersPeer::USR_TOTAL_INBOX, 0); - $criteriaSet->add(UsersPeer::USR_TOTAL_DRAFT, 0); - $criteriaSet->add(UsersPeer::USR_TOTAL_CANCELLED, 0); - $criteriaSet->add(UsersPeer::USR_TOTAL_PARTICIPATED, 0); - $criteriaSet->add(UsersPeer::USR_TOTAL_PAUSED, 0); - $criteriaSet->add(UsersPeer::USR_TOTAL_COMPLETED, 0); - $criteriaSet->add(UsersPeer::USR_TOTAL_UNASSIGNED, 0); - - $criteriaWhere = new Criteria("workflow"); - $criteriaWhere->add(UsersPeer::USR_UID, null, Criteria::ISNOTNULL); - - BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow")); $this->regenerateListCompleted($lang); $this->regenerateListCanceled($lang); $this->regenerateListMyInbox(); // this list require no translation diff --git a/workflow/engine/methods/users/users_Ajax.php b/workflow/engine/methods/users/users_Ajax.php index ec7c8cb3e..3972ab74d 100644 --- a/workflow/engine/methods/users/users_Ajax.php +++ b/workflow/engine/methods/users/users_Ajax.php @@ -440,7 +440,6 @@ try { $oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME); $oCriteria->addSelectColumn(UsersPeer::USR_EMAIL); $oCriteria->addSelectColumn(UsersPeer::USR_ROLE); - $oCriteria->addSelectColumn(UsersPeer::USR_TOTAL_PARTICIPATED); $oCriteria->addSelectColumn(UsersPeer::USR_DUE_DATE); $oCriteria->addSelectColumn(UsersPeer::USR_STATUS); $oCriteria->addSelectColumn(UsersPeer::USR_UX); @@ -482,6 +481,8 @@ try { $uxList = adminProxy::getUxTypesList(); $oRoles = new Roles(); + $oParticipated = new ListParticipatedLast(); + $oAppCache = new AppCacheView(); $rows = Array(); $uRole = Array(); while ($oDataset->next()) { @@ -490,15 +491,23 @@ try { try { $uRole = $oRoles->loadByCode($row['USR_ROLE']); } catch (exception $oError) { - $uRole['ROL_NAME'] = G::loadTranslation( 'ID_DELETED' ); + $uRole['ROL_NAME'] = G::loadTranslation('ID_DELETED'); } - + /*----------------------------------********---------------------------------*/ + if (true) { + $total = $oParticipated->getCountList($row['USR_UID']); + } else { + /*----------------------------------********---------------------------------*/ + $total = $oAppCache->getListCounters('sent', $row['USR_UID'], false); + /*----------------------------------********---------------------------------*/ + } + /*----------------------------------********---------------------------------*/ $row['USR_ROLE_ID'] = $row['USR_ROLE']; $row['USR_ROLE'] = isset($uRole['ROL_NAME']) ? ($uRole['ROL_NAME'] != '' ? $uRole['ROL_NAME'] : $uRole['ROL_CODE']) : $uRole['ROL_CODE']; $row['DUE_DATE_OK'] = (date('Y-m-d') > date('Y-m-d', strtotime($row['USR_DUE_DATE']))) ? 0 : 1; $row['LAST_LOGIN'] = isset($aLogin[$row['USR_UID']]) ? \ProcessMaker\Util\DateTime::convertUtcToTimeZone($aLogin[$row['USR_UID']]) : ''; - $row['TOTAL_CASES'] = isset($row['USR_TOTAL_PARTICIPATED']) ? $row['USR_TOTAL_PARTICIPATED'] : 0; + $row['TOTAL_CASES'] = $total; $row['DEP_TITLE'] = isset($aDepart[$row['USR_UID']]) ? $aDepart[$row['USR_UID']] : ''; $row['USR_UX'] = isset($uxList[$row['USR_UX']]) ? $uxList[$row['USR_UX']] : $uxList['NORMAL']; $row['USR_AUTH_SOURCE'] = isset($aAuthSources[$row['USR_UID']]) ? $aAuthSources[$row['USR_UID']] : 'ProcessMaker (MYSQL)'; diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/User.php b/workflow/engine/src/ProcessMaker/BusinessModel/User.php index bd22db0e1..26dcc333b 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/User.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/User.php @@ -452,13 +452,6 @@ class User $arrayResult[$this->getFieldNameByFormatFieldName('USR_COST_BY_HOUR')] = $record['USR_COST_BY_HOUR']; $arrayResult[$this->getFieldNameByFormatFieldName('USR_UNIT_COST')] = $record['USR_UNIT_COST']; /*----------------------------------********---------------------------------*/ - $arrayResult[$this->getFieldNameByFormatFieldName('USR_TOTAL_INBOX')] = $record['USR_TOTAL_INBOX']; - $arrayResult[$this->getFieldNameByFormatFieldName('USR_TOTAL_DRAFT')] = $record['USR_TOTAL_DRAFT']; - $arrayResult[$this->getFieldNameByFormatFieldName('USR_TOTAL_CANCELLED')] = $record['USR_TOTAL_CANCELLED']; - $arrayResult[$this->getFieldNameByFormatFieldName('USR_TOTAL_PARTICIPATED')] = $record['USR_TOTAL_PARTICIPATED']; - $arrayResult[$this->getFieldNameByFormatFieldName('USR_TOTAL_PAUSED')] = $record['USR_TOTAL_PAUSED']; - $arrayResult[$this->getFieldNameByFormatFieldName('USR_TOTAL_COMPLETED')] = $record['USR_TOTAL_COMPLETED']; - $arrayResult[$this->getFieldNameByFormatFieldName('USR_TOTAL_UNASSIGNED')] = $record['USR_TOTAL_UNASSIGNED']; $arrayResult[$this->getFieldNameByFormatFieldName('USR_PHOTO_PATH')] = $pathPhotoUser; if (isset($_SESSION['__SYSTEM_UTC_TIME_ZONE__']) && $_SESSION['__SYSTEM_UTC_TIME_ZONE__']) { @@ -512,13 +505,6 @@ class User $criteria->addSelectColumn(\UsersPeer::USR_COST_BY_HOUR); $criteria->addSelectColumn(\UsersPeer::USR_UNIT_COST); /*----------------------------------********---------------------------------*/ - $criteria->addSelectColumn(\UsersPeer::USR_TOTAL_INBOX); - $criteria->addSelectColumn(\UsersPeer::USR_TOTAL_DRAFT); - $criteria->addSelectColumn(\UsersPeer::USR_TOTAL_CANCELLED); - $criteria->addSelectColumn(\UsersPeer::USR_TOTAL_PARTICIPATED); - $criteria->addSelectColumn(\UsersPeer::USR_TOTAL_PAUSED); - $criteria->addSelectColumn(\UsersPeer::USR_TOTAL_COMPLETED); - $criteria->addSelectColumn(\UsersPeer::USR_TOTAL_UNASSIGNED); $criteria->addSelectColumn(\UsersPeer::USR_TIME_ZONE); //Return