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

Adicion de contadores de bandeja (y tiempo de acces token)

workflow/engine/classes/class.case.php

@@ -1065,7 +1065,7 @@ class Cases
               $Fields['DEL_INDEX'] = 1;
             }
             $inbox = new ListInbox();
-            $inbox->update($Fields);            
+            $inbox->update($Fields);
             /*----------------------------------********---------------------------------*/
 
             //Return
@@ -1175,7 +1175,26 @@ class Cases
             if ($this->appSolr != null) {
                 $this->appSolr->deleteApplicationSearchIndex($sAppUid);
             }
+            /*----------------------------------********---------------------------------*/
+            $criteria = new Criteria();
+            $criteria->addSelectColumn( ListInboxPeer::USR_UID );
+            $criteria->add( ListInboxPeer::APP_UID, $sAppUid, Criteria::EQUAL );
+            $dataset = ApplicationPeer::doSelectRS($criteria);
+            $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+            while($dataset->next()) {
+                $aRow = $dataset->getRow();
+                $users = new Users();
+                $users->refreshTotal($aRow['USR_UID'], 'remove', 'draft');
+                $users->refreshTotal($aRow['USR_UID'], 'remove', 'participated');
+            }
 
+            $oCriteria = new Criteria('workflow');
+            $oCriteria->add(ListInboxPeer::APP_UID, $sAppUid);
+            ListInboxPeer::doDelete($oCriteria);
+            $oCriteria = new Criteria('workflow');
+            $oCriteria->add(ListParticipatedLastPeer::APP_UID, $sAppUid);
+            ListParticipatedLastPeer::doDelete($oCriteria);
+            /*----------------------------------********---------------------------------*/
             return $result;
         } catch (exception $e) {
             throw ($e);
@@ -1237,6 +1256,12 @@ class Cases
             $appAssignSelfServiceValue = new AppAssignSelfServiceValue();
 
             $appAssignSelfServiceValue->remove($sAppUid, $iDelIndex);
+            /*----------------------------------********---------------------------------*/
+            $aFields = $oAppDel->toArray(BasePeer::TYPE_FIELDNAME);
+            $aFields['APP_STATUS'] = 'TO_DO';
+            $inbox = new ListInbox();
+            $inbox->update($aFields, true);
+            /*----------------------------------********---------------------------------*/
         } catch (exception $e) {
             throw ($e);
         }
@@ -1905,11 +1930,11 @@ class Cases
             $c->add(AppDelegationPeer::APP_UID, $sAppUid);
             $c->add(AppDelegationPeer::DEL_INDEX, $iDelIndex);
             $rowObj = AppDelegationPeer::doSelect($c);
-            G::LoadClass('dates');
+            $user = '';
-            $oDates = new dates();
             foreach ($rowObj as $appDel) {
                 $appDel->setDelThreadStatus('CLOSED');
                 $appDel->setDelFinishDate('now');
+                $user = $appDel->getUsrUid();
                 if ($appDel->Validate()) {
                     $appDel->Save();
                 } else {
@@ -1926,7 +1951,7 @@ class Cases
             $data['DEL_THREAD_STATUS'] = 'CLOSED';
             $data['APP_UID']   = $sAppUid;
             $data['DEL_INDEX'] = $iDelIndex;
-            $data['USR_UID']   = $appDel->getUsrUid();
+            $data['USR_UID']   = $user;
             $listParticipatedLast = new ListParticipatedLast();
             $listParticipatedLast->refresh($data);
             /*----------------------------------********---------------------------------*/
@@ -1981,7 +2006,7 @@ class Cases
      * @return Fields
      */
 
-    public function startCase($sTasUid, $sUsrUid, $isSubprocess = false)
+    public function startCase($sTasUid, $sUsrUid, $isSubprocess = false, $dataPreviusApplication = array())
     {
         if ($sTasUid != '') {
             try {
@@ -2045,11 +2070,12 @@ class Cases
                 $Fields['USR_UID'] = $sUsrUid;
                 $Fields['DEL_INDEX'] = $iDelIndex;
                 $Fields['APP_STATUS'] = 'TO_DO';
+                $Fields['DEL_DELEGATE_DATE'] = $Fields['APP_INIT_DATE'];
                 if(!$isSubprocess){
                     $Fields['APP_STATUS'] = 'DRAFT';
                 }
                 $inbox = new ListInbox();
-                $inbox->newRow($Fields, $sUsrUid);
+                $inbox->newRow($Fields, $sUsrUid, $isSubprocess, $dataPreviusApplication);
                 /*----------------------------------********---------------------------------*/
             } catch (exception $e) {
                 throw ($e);
@@ -4041,8 +4067,9 @@ class Cases
         $this->getExecuteTriggerProcess($sApplicationUID, "UNPAUSE");
 
         /*----------------------------------********---------------------------------*/
+        $aData = array_merge($aFieldsDel, $aData);
         $oListPaused = new ListPaused();
-        $oListPaused->remove($sApplicationUID, $iDelegation, true);
+        $oListPaused->remove($sApplicationUID, $iDelegation, $aData);
         /*----------------------------------********---------------------------------*/
     }
 
@@ -4254,6 +4281,27 @@ class Cases
             $this->appSolr->updateApplicationSearchIndex($sApplicationUID);
         }
 
+        /*----------------------------------********---------------------------------*/
+        $oCriteria = new Criteria('workflow');
+        $oCriteria->add(ListParticipatedLastPeer::APP_UID, $aData['APP_UID']);
+        $oCriteria->add(ListParticipatedLastPeer::USR_UID, $sUserUID);
+        $oCriteria->add(ListParticipatedLastPeer::DEL_INDEX, $iDelegation);
+        ListParticipatedLastPeer::doDelete($oCriteria);
+        $users = new Users();
+        $users->refreshTotal($sUserUID, 'remove', 'participated');
+
+        $aFieldsDel = array_merge($aData, $aFieldsDel);
+        $aFieldsDel['USR_UID'] = $newUserUID;
+        $inbox = new ListInbox();
+        $inbox->newRow($aFieldsDel, $sUserUID);
+        $users = new Users();
+        if ($aFields['APP_STATUS'] == 'DRAFT') {
+            $users->refreshTotal($sUserUID, 'remove', 'draft');
+        } else if ($iDelegation == 2) {
+            $users->refreshTotal($sUserUID, 'add', 'draft');
+            $users->refreshTotal($sUserUID, 'remove', 'inbox');
+        }
+        /*----------------------------------********---------------------------------*/
         $this->getExecuteTriggerProcess($sApplicationUID, 'REASSIGNED');
         return true;
     }
@@ -6646,7 +6694,6 @@ class Cases
             }
         }
 
-        require_once 'classes/model/Users.php';
         $c = new Criteria('workflow');
         $c->addSelectColumn(UsersPeer::USR_UID);
         $c->addSelectColumn(UsersPeer::USR_USERNAME);

workflow/engine/classes/class.derivation.php

@@ -748,14 +748,13 @@ class Derivation
             //SETS THE APP_PROC_CODE
             //if (isset($nextDel['TAS_DEF_PROC_CODE']))
             //$appFields['APP_PROC_CODE'] = $nextDel['TAS_DEF_PROC_CODE'];
-
             /*----------------------------------********---------------------------------*/
             if (!empty($iNewDelIndex) && empty($aSP)) {
                 $oAppDel = AppDelegationPeer::retrieveByPK( $appFields['APP_UID'], $iNewDelIndex );
                 $aFields = $oAppDel->toArray( BasePeer::TYPE_FIELDNAME );
                 $aFields['APP_STATUS'] = $currentDelegation['APP_STATUS'];
                 $inbox = new ListInbox();
-                $inbox->newRow($aFields, $nextDel['USR_UID']);
+                $inbox->newRow($aFields, $appFields['CURRENT_USER_UID'], false, array(), ($nextDel['TAS_ASSIGN_TYPE'] == 'SELF_SERVICE' ? true : false));
             }
             /*----------------------------------********---------------------------------*/
             unset( $aSP );
@@ -863,7 +862,7 @@ class Derivation
         if (isset( $aSP )) {
             //Create the new case in the sub-process
             // set the initial date to null the time its created
-            $aNewCase = $this->case->startCase( $aSP['TAS_UID'], $aSP['USR_UID'], true );
+            $aNewCase = $this->case->startCase( $aSP['TAS_UID'], $aSP['USR_UID'], true, $appFields);
             //Copy case variables to sub-process case
             $aFields = unserialize( $aSP['SP_VARIABLES_OUT'] );
             $aNewFields = array ();

workflow/engine/classes/model/ListCanceled.php

@@ -103,6 +103,10 @@ class ListCanceled extends BaseListCanceled {
         $oListInbox = new ListInbox();
         $oListInbox->removeAll($data['APP_UID']);
 
+        $users = new Users();
+        $users->refreshTotal($data['USR_UID'], 'removed', 'inbox');
+        $users->refreshTotal($data['USR_UID'], 'add', 'canceled');
+
         $con = Propel::getConnection( ListCanceledPeer::DATABASE_NAME );
         try {
             $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );

workflow/engine/classes/model/ListCompleted.php

@@ -94,6 +94,14 @@ class ListCompleted extends BaseListCompleted
         $criteriaSet->add(ListParticipatedLastPeer::APP_STATUS, 'COMPLETED');
         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 );
         try {
             $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );

workflow/engine/classes/model/ListInbox.php

@@ -23,7 +23,7 @@ class ListInbox extends BaseListInbox
      * @return type
      *
      */
-    public function create($data)
+    public function create($data, $isSelfService = false)
     {
         $con = Propel::getConnection( ListInboxPeer::DATABASE_NAME );
         try {
@@ -48,12 +48,27 @@ class ListInbox extends BaseListInbox
             $listMyInbox->refresh($data);
 
             // remove and create participated last
-            $listParticipatedLast = new ListParticipatedLast();
+            if (!$isSelfService) {
-            $listParticipatedLast->remove($data['APP_UID'], $data['USR_UID']);
+                $listParticipatedLast = new ListParticipatedLast();
-            $listParticipatedLast = new ListParticipatedLast();
+                $listParticipatedLast->remove($data['APP_UID'], $data['USR_UID']);
-            $listParticipatedLast->create($data);        
+                $listParticipatedLast = new ListParticipatedLast();
-            $listParticipatedLast = new ListParticipatedLast();
+                $listParticipatedLast->create($data);
-            $listParticipatedLast->refresh($data);
+                $listParticipatedLast = new ListParticipatedLast();
+                $listParticipatedLast->refresh($data);
+            } else {
+                $data['USR_UID'] = $data['DEL_PREVIOUS_USR_UID'];
+                $data['DEL_CURRENT_USR_LASTNAME'] = '';
+                $data['DEL_CURRENT_USR_USERNAME'] = '';
+                $data['DEL_CURRENT_USR_FIRSTNAME'] = '';
+
+                $listParticipatedLast = new ListParticipatedLast();
+                $listParticipatedLast->refresh($data, $isSelfService);
+                $data['USR_UID'] = 'SELF_SERVICES';
+                $listParticipatedLast = new ListParticipatedLast();
+                $listParticipatedLast->create($data);
+                $listParticipatedLast = new ListParticipatedLast();
+                $listParticipatedLast->refresh($data, $isSelfService);
+            }
 
             return $result;
         } catch(Exception $e) {
@@ -69,8 +84,31 @@ class ListInbox extends BaseListInbox
      * @return type
      * @throws type
      */
-    public function update($data)
+    public function update($data, $isSelfService = false)
     {
+        if ($isSelfService) {
+            $users = new Users();
+            $users->refreshTotal($data['USR_UID'], 'add', 'inbox');
+
+            $listParticipatedLast = new ListParticipatedLast();
+            $listParticipatedLast->remove($data['APP_UID'], $data['USR_UID']);
+
+            //Update - WHERE
+            $criteriaWhere = new Criteria("workflow");
+            $criteriaWhere->add(ListParticipatedLastPeer::APP_UID, $data["APP_UID"], Criteria::EQUAL);
+            $criteriaWhere->add(ListParticipatedLastPeer::USR_UID, 'SELF_SERVICES', Criteria::EQUAL);
+            $criteriaWhere->add(ListParticipatedLastPeer::DEL_INDEX, $data["DEL_INDEX"], Criteria::EQUAL);
+
+            //Update - SET
+            $criteriaSet = new Criteria("workflow");
+            $criteriaSet->add(ListParticipatedLastPeer::USR_UID, $data['USR_UID']);
+            BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow"));
+
+            $listParticipatedLast = new ListParticipatedLast();
+            $listParticipatedLast->refresh($data);
+            $users = new Users();
+            $users->refreshTotal($data['USR_UID'], 'add', 'participated');
+        }
         $con = Propel::getConnection( ListInboxPeer::DATABASE_NAME );
         try {
             $con->begin();
@@ -141,7 +179,7 @@ class ListInbox extends BaseListInbox
         }
     }
 
-    public function newRow ($data, $delPreviusUsrUid)
+    public function newRow ($data, $delPreviusUsrUid, $isInitSubprocess = false, $dataPreviusApplication = array(), $isSelfService = false)
     {
         $data['DEL_PREVIOUS_USR_UID'] = $delPreviusUsrUid;
         if (isset($data['DEL_TASK_DUE_DATE'])) {
@@ -211,7 +249,53 @@ class ListInbox extends BaseListInbox
             $data['DEL_PREVIOUS_USR_LASTNAME']  = $aRow['USR_LASTNAME'];
         }
 
-        self::create($data);
+        $users = new Users();
+        $criteria = new Criteria();
+        $criteria->addSelectColumn(SubApplicationPeer::DEL_INDEX_PARENT);
+        $criteria->add( SubApplicationPeer::APP_PARENT, $data['APP_UID'], Criteria::EQUAL );
+        $dataset = SubApplicationPeer::doSelectRS($criteria);
+        $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+        if ($dataset->next()) {
+            $aSub = $dataset->getRow();
+            if ($aSub['DEL_INDEX_PARENT'] == $data['DEL_PREVIOUS'] && !$isSelfService) {
+                $users->refreshTotal($data['USR_UID'], 'add', 'inbox');
+                self::create($data, $isSelfService);
+                return 1;
+            }
+        }
+
+        if (!$isInitSubprocess) {
+            if ($data['APP_STATUS'] == 'DRAFT') {
+                $users->refreshTotal($data['USR_UID'], 'add', 'draft');
+            } else {
+                $oRow = ApplicationPeer::retrieveByPK($data['APP_UID']);
+                $aFields = $oRow->toArray( BasePeer::TYPE_FIELDNAME );
+                if ($data['DEL_INDEX'] == 2 || $aFields['APP_STATUS'] == 'DRAFT') {
+                    $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');
+                    } else {
+                        $users->refreshTotal($delPreviusUsrUid, 'remove', 'draft');
+                    }
+                } else {
+                    $users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox');
+                }
+                if (!$isSelfService) {
+                    $users->refreshTotal($data['USR_UID'], 'add', 'inbox');
+                }
+            }
+        } else {
+            $users->refreshTotal($data['USR_UID'], 'add', 'inbox');
+            if ($dataPreviusApplication['APP_STATUS'] == 'DRAFT') {
+                $users->refreshTotal($dataPreviusApplication['CURRENT_USER_UID'], 'remove', 'draft');
+            } else {
+                $users->refreshTotal($dataPreviusApplication['CURRENT_USER_UID'], 'remove', 'inbox');
+            }
+        }
+        self::create($data, $isSelfService);
     }
 
     public function loadFilters (&$criteria, $filters)

workflow/engine/classes/model/ListParticipatedLast.php

@@ -26,19 +26,6 @@ class ListParticipatedLast extends BaseListParticipatedLast
      */
     public function create($data)
     { 
-        $criteria = new Criteria();
-        $criteria->addSelectColumn(UsersPeer::USR_USERNAME);
-        $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
-        $criteria->addSelectColumn(UsersPeer::USR_LASTNAME);
-        $criteria->add( UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL );
-        $dataset = UsersPeer::doSelectRS($criteria);
-        $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-        $dataset->next();
-        $aRow = $dataset->getRow();
-        $data['DEL_CURRENT_USR_USERNAME']  = $aRow['USR_USERNAME'];
-        $data['DEL_CURRENT_USR_FIRSTNAME'] = $aRow['USR_FIRSTNAME'];
-        $data['DEL_CURRENT_USR_LASTNAME']  = $aRow['USR_LASTNAME'];
-
         $criteria = new Criteria();
         $criteria->addSelectColumn(ApplicationPeer::APP_STATUS);
         $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
@@ -48,6 +35,24 @@ class ListParticipatedLast extends BaseListParticipatedLast
         $aRow = $dataset->getRow();
         $data['APP_STATUS']  = $aRow['APP_STATUS'];
 
+        if ($data['USR_UID'] != 'SELF_SERVICES') {
+            $criteria = new Criteria();
+            $criteria->addSelectColumn(UsersPeer::USR_USERNAME);
+            $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
+            $criteria->addSelectColumn(UsersPeer::USR_LASTNAME);
+            $criteria->add( UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL );
+            $dataset = UsersPeer::doSelectRS($criteria);
+            $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+            $dataset->next();
+            $aRow = $dataset->getRow();
+            $data['DEL_CURRENT_USR_USERNAME']  = $aRow['USR_USERNAME'];
+            $data['DEL_CURRENT_USR_FIRSTNAME'] = $aRow['USR_FIRSTNAME'];
+            $data['DEL_CURRENT_USR_LASTNAME']  = $aRow['USR_LASTNAME'];
+
+            $users = new Users();
+            $users->refreshTotal($data['USR_UID'], 'add', 'participated');
+        }
+
         $con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME );
         try {
             $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
@@ -102,24 +107,32 @@ class ListParticipatedLast extends BaseListParticipatedLast
      * @throws type
      *
      */
-    public function refresh ($data)
+    public function refresh ($data, $isSelfService = false)
     {   
         $data['APP_STATUS'] = (empty($data['APP_STATUS'])) ? 'TO_DO' : $data['APP_STATUS'];
-        $criteria = new Criteria();
+        if (!$isSelfService) {
-        $criteria->addSelectColumn(UsersPeer::USR_USERNAME);
+            $criteria = new Criteria();
-        $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
+            $criteria->addSelectColumn(UsersPeer::USR_USERNAME);
-        $criteria->addSelectColumn(UsersPeer::USR_LASTNAME);
+            $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
-        $criteria->add( UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL );
+            $criteria->addSelectColumn(UsersPeer::USR_LASTNAME);
-        $dataset = UsersPeer::doSelectRS($criteria);
+            $criteria->add( UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL );
-        $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+            $dataset = UsersPeer::doSelectRS($criteria);
-        $dataset->next();
+            $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-        $aRow = $dataset->getRow();
+            $dataset->next();
-        
+            $aRow = $dataset->getRow();
-        $data['DEL_CURRENT_USR_UID'] = $data['USR_UID'];
+
-        $data['DEL_CURRENT_USR_USERNAME']  = $aRow['USR_USERNAME'];
+            //Update - WHERE
-        $data['DEL_CURRENT_USR_FIRSTNAME'] = $aRow['USR_FIRSTNAME'];
+            $criteriaWhere = new Criteria("workflow");
-        $data['DEL_CURRENT_USR_LASTNAME']  = $aRow['USR_LASTNAME']; 
+            $criteriaWhere->add(ListParticipatedLastPeer::APP_UID, $data["APP_UID"], Criteria::EQUAL);
-        $this->update($data);        
+            //Update - SET
+            $criteriaSet = new Criteria("workflow");
+            $criteriaSet->add(ListParticipatedLastPeer::DEL_CURRENT_USR_USERNAME, $aRow['USR_USERNAME']);
+            $criteriaSet->add(ListParticipatedLastPeer::DEL_CURRENT_USR_FIRSTNAME, $aRow['USR_FIRSTNAME']);
+            $criteriaSet->add(ListParticipatedLastPeer::DEL_CURRENT_USR_LASTNAME, $aRow['USR_LASTNAME']);
+            BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow"));
+
+        }
+        $this->update($data);
         
     }
     /**
@@ -132,6 +145,11 @@ class ListParticipatedLast extends BaseListParticipatedLast
      */
     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 );
         try {
             $this->setAppUid($app_uid);

workflow/engine/classes/model/ListPaused.php

@@ -118,6 +118,14 @@ class ListPaused extends BaseListPaused {
         $oListInbox = new ListInbox();
         $oListInbox->remove($data['APP_UID'], $data['DEL_INDEX']);
 
+        $users = new Users();
+        if ($data['APP_STATUS'] == 'DRAFT') {
+            $users->refreshTotal($data['USR_UID'], 'removed', 'draft');
+        } else {
+            $users->refreshTotal($data['USR_UID'], 'removed', 'inbox');
+        }
+        $users->refreshTotal($data['USR_UID'], 'add', 'paused');
+
         $con = Propel::getConnection( ListPausedPeer::DATABASE_NAME );
         try {
             $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
@@ -172,8 +180,20 @@ class ListPaused extends BaseListPaused {
      * @throws type
      *
      */
-    public function remove ($app_uid, $del_index)
+    public function remove ($app_uid, $del_index, $data_inbox)
     {
+        $users = new Users();
+        $users->refreshTotal($data_inbox['USR_UID'], 'removed', 'paused');
+
+        $oRow = ApplicationPeer::retrieveByPK($app_uid);
+        $aFields = $oRow->toArray( BasePeer::TYPE_FIELDNAME );
+        $data_inbox['APP_STATUS'] = $aFields['APP_STATUS'];
+        if ($data_inbox['APP_STATUS'] == 'TO_DO') {
+            $users->refreshTotal($data_inbox['USR_UID'], 'add', 'inbox');
+        }
+        $listInbox = new ListInbox();
+        $listInbox->newRow($data_inbox, $data_inbox['USR_UID']);
+
         $con = Propel::getConnection( ListPausedPeer::DATABASE_NAME );
         try {
             $this->setAppUid($app_uid);

workflow/engine/methods/cases/casesList_Ajax.php

@@ -216,6 +216,7 @@ if ($actionAjax == "getUsersToReassign") {
     G::LoadClass( 'tasks' );
     $task = new Task();
     $tasks = $task->load($_SESSION['TASK']);
+    $result = new stdclass();
     $result->data = $case->getUsersToReassign( $_SESSION['TASK'], $_SESSION['USER_LOGGED'], $tasks['PRO_UID'] );
     print G::json_encode( $result );
 }
@@ -240,6 +241,7 @@ if ($actionAjax == 'reassignCase') {
         //print_r($caseData);
         $data['APP_NUMBER'] = $caseData['APP_NUMBER'];
         $data['USER'] = $userData['USR_LASTNAME'] . ' ' . $userData['USR_FIRSTNAME']; //TODO change with the farmated username from environment conf
+        $result = new stdclass();
         $result->status = 0;
         $result->msg = G::LoadTranslation( 'ID_REASSIGNMENT_SUCCESS', SYS_LANG, $data );
     } catch (Exception $e) {

workflow/engine/methods/cases/main_init.php

@@ -80,9 +80,49 @@ if ($oServerConf->isRtl( SYS_LANG )) {
     $regionTreePanel = 'west';
     $regionDebug = 'east';
 }
+
+$urlProxy = 'casesMenuLoader?action=getAllCounters&r=';
+/*----------------------------------********---------------------------------*/
+$urlProxy = '/api/1.0/' . SYS_SYS . '/system/counters-lists?r=';
+$clientId = 'x-pm-local-client';
+$client = getClientCredentials($clientId);
+$authCode = getAuthorizationCode($client);
+$debug = false; //System::isDebugMode();
+
+$loader = Maveriks\Util\ClassLoader::getInstance();
+$loader->add(PATH_TRUNK . 'vendor/bshaffer/oauth2-server-php/src/', "OAuth2");
+
+$request = array(
+    'grant_type' => 'authorization_code',
+    'code' => $authCode
+);
+$server = array(
+    'REQUEST_METHOD' => 'POST'
+);
+$headers = array(
+    "PHP_AUTH_USER" => $client['CLIENT_ID'],
+    "PHP_AUTH_PW" => $client['CLIENT_SECRET'],
+    "Content-Type" => "multipart/form-data;",
+    "Authorization" => "Basic " . base64_encode($client['CLIENT_ID'] . ":" . $client['CLIENT_SECRET'])
+);
+
+$request = new \OAuth2\Request(array(), $request, array(), array(), array(), $server, null, $headers);
+$oauthServer = new \ProcessMaker\Services\OAuth2\Server();
+$response = $oauthServer->postToken($request, true);
+
+$clientToken = $response->getParameters();
+$clientToken["client_id"] = $client['CLIENT_ID'];
+$clientToken["client_secret"] = $client['CLIENT_SECRET'];
+/*----------------------------------********---------------------------------*/
+
+
 $oHeadPublisher->assign( 'regionTreePanel', $regionTreePanel );
 $oHeadPublisher->assign( 'regionDebug', $regionDebug );
 $oHeadPublisher->assign( "defaultOption", $defaultOption ); //User menu permissions
+$oHeadPublisher->assign( 'urlProxy', $urlProxy ); //sending the urlProxy to make
+/*----------------------------------********---------------------------------*/
+$oHeadPublisher->assign( 'credentials', $clientToken );
+/*----------------------------------********---------------------------------*/
 $oHeadPublisher->assign( "_nodeId", isset( $confDefaultOption ) ? $confDefaultOption : "PM_USERS" ); //User menu permissions
 $oHeadPublisher->assign( "FORMATS", $conf->getFormats() );
 
@@ -90,3 +130,41 @@ $_SESSION["current_ux"] = "NORMAL";
 
 G::RenderPage( "publish", "extJs" );
 
+
+/*----------------------------------********---------------------------------*/
+function getClientCredentials($clientId)
+{
+    $oauthQuery = new ProcessMaker\Services\OAuth2\PmPdo(getDsn());
+    return $oauthQuery->getClientDetails($clientId);
+}
+
+function getDsn()
+{
+    list($host, $port) = strpos(DB_HOST, ':') !== false ? explode(':', DB_HOST) : array(DB_HOST, '');
+    $port = empty($port) ? '' : ";port=$port";
+    $dsn = DB_ADAPTER.':host='.$host.';dbname='.DB_NAME.$port;
+
+    return array('dsn' => $dsn, 'username' => DB_USER, 'password' => DB_PASS);
+}
+
+
+function getAuthorizationCode($client)
+{
+    \ProcessMaker\Services\OAuth2\Server::setDatabaseSource(getDsn());
+    \ProcessMaker\Services\OAuth2\Server::setPmClientId($client['CLIENT_ID']);
+
+    $oauthServer = new \ProcessMaker\Services\OAuth2\Server();
+    $userId = $_SESSION['USER_LOGGED'];
+    $authorize = true;
+    $_GET = array_merge($_GET, array(
+        'response_type' => 'code',
+        'client_id' => $client['CLIENT_ID'],
+        'scope' => implode(' ', $oauthServer->getScope())
+    ));
+
+    $response = $oauthServer->postAuthorize($authorize, $userId, true);
+    $code = substr($response->getHttpHeader('Location'), strpos($response->getHttpHeader('Location'), 'code=')+5, 40);
+
+    return $code;
+}
+/*----------------------------------********---------------------------------*/

workflow/engine/src/ProcessMaker/BusinessModel/Lists.php

@@ -1,6 +1,8 @@
 <?php
 namespace ProcessMaker\BusinessModel;
 use \G;
+use \Criteria;
+use \UsersPeer;
 
 /**
  * @author Brayan Pereyra (Cochalo) <brayan@colosa.com>
@@ -180,4 +182,45 @@ class Lists {
         }
         return $response;
     }
+
+    /**
+     * Get counters for lists
+     *
+     * @access public
+     * @param array $userId, User Uid
+     * @return array
+     *
+     * @author Brayan Pereyra (Cochalo) <brayan@colosa.com>
+     * @copyright Colosa - Bolivia
+     */
+    public function getCounters($userId)
+    {
+        $criteria = new Criteria();
+        $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->add( UsersPeer::USR_UID, $userId, Criteria::EQUAL );
+        $dataset = UsersPeer::doSelectRS($criteria);
+        $dataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
+        $dataset->next();
+        $aRow = $dataset->getRow();
+
+        $oAppCache = new \AppCacheView();
+        $totalUnassigned = $oAppCache->getListCounters('selfservice', $userId, false);
+
+        $response = array(
+            array('count' => $aRow['USR_TOTAL_INBOX'],          'item' => 'CASES_INBOX'),
+            array('count' => $aRow['USR_TOTAL_DRAFT'],          'item' => 'CASES_DRAFT'),
+            array('count' => $aRow['USR_TOTAL_CANCELLED'],      'item' => 'CASES_CANCELLED'),
+            array('count' => $aRow['USR_TOTAL_PARTICIPATED'],   'item' => 'CASES_SENT'),
+            array('count' => $aRow['USR_TOTAL_PAUSED'],         'item' => 'CASES_PAUSED'),
+            array('count' => $aRow['USR_TOTAL_COMPLETED'],      'item' => 'CASES_COMPLETED'),
+            array('count' => $totalUnassigned,                  'item' => 'CASES_SELFSERVICE')
+        );
+
+        return $response;
+    }
 }

workflow/engine/src/ProcessMaker/Services/Api/System.php

@@ -29,5 +29,27 @@ class System extends Api
             throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
         }
     }
+
+    /**
+     * Get count for all lists
+     *
+     * @return array
+     *
+     * @author Brayan Pereyra (Cochalo) <brayan@colosa.com>
+     * @copyright Colosa - Bolivia
+     *
+     * @url GET /counters-lists
+     */
+    public function doGetCountersLists()
+    {
+        try {
+            $userId   = $this->getUserId();
+            $lists    = new \ProcessMaker\BusinessModel\Lists();
+            $response = $lists->getCounters($userId);
+            return $response;
+        } catch (\Exception $e) {
+            throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
+        }
+    }
 }
 

workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php

@@ -57,7 +57,7 @@ class Server implements iAuthenticate
         }
 
         // Pass a storage object or array of storage objects to the OAuth2 server class
-        $this->server = new \OAuth2\Server($this->storage, array('allow_implicit' => true));
+        $this->server = new \OAuth2\Server($this->storage, array('allow_implicit' => true, 'access_lifetime' => 86400));
 
         $this->server->setConfig('enforce_state', false);
 

workflow/engine/templates/cases/main.js

@@ -573,7 +573,14 @@ function updateCasesTree() {
     ReloadTreeMenuItemDetail({item:currentSelectedTreeMenuItem});
   }
   Ext.Ajax.request({
-    url: 'casesMenuLoader?action=getAllCounters&r='+Math.random(),
+    url: urlProxy + Math.random(),
+    /*----------------------------------********---------------------------------*/
+    headers: {
+      'Content-Type': 'application/json',
+      'Authorization': 'Bearer ' + credentials.access_token
+    },
+    method: 'GET',
+    /*----------------------------------********---------------------------------*/
     success: function(response){
       result = Ext.util.JSON.decode(response.responseText);