From 1e168102aac6ab9372cbfe37d56e5391a0349169 Mon Sep 17 00:00:00 2001
From: "Paula V. Quispe" <paula.quispe@colosa.com>
Date: Fri, 6 Nov 2015 15:42:21 -0400
Subject: [PATCH] PM-3927

---
 workflow/engine/classes/class.case.php          | 14 ++++++++++----
 workflow/engine/classes/class.derivation.php    |  6 +++---
 workflow/engine/classes/model/ListCompleted.php |  4 ++--
 workflow/engine/classes/model/ListInbox.php     |  6 +++---
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php
index 705b834be..e1d4d50b0 100755
--- a/workflow/engine/classes/class.case.php
+++ b/workflow/engine/classes/class.case.php
@@ -1993,10 +1993,16 @@ class Cases
                     throw (new PropelException('The row cannot be created!', new PropelException($msg)));
                 }
                 $taskNext = TaskPeer::retrieveByPK($appDel->getTasUid());
-                if($taskNext->getTasType() == 'NORMAL' && $oApplication->getAppStatus() == "DRAFT"){
-                    $sUserUid = $appDel->getUsrUid();
-                    $users = new Users();
-                    $users->refreshTotal($sUserUid, "remove", "draft");
+                if($taskNext->getTasType() == 'NORMAL'){
+                    if($oApplication->getAppStatus() == "DRAFT"){
+                      $sUserUid = $appDel->getUsrUid();
+                      $users = new Users();
+                      $users->refreshTotal($sUserUid, "remove", "draft");
+                    }else{
+                      $sUserUid = $appDel->getUsrUid();
+                      $users = new Users();
+                      $users->refreshTotal($sUserUid, "remove", "inbox");
+                    }
                 }
             }
             /*----------------------------------********---------------------------------*/
diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php
index 5dff449cf..0b911f184 100755
--- a/workflow/engine/classes/class.derivation.php
+++ b/workflow/engine/classes/class.derivation.php
@@ -655,7 +655,7 @@ class Derivation
                 if ($application->getAppStatus() == "DRAFT") {
                     //$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "draft");
                 } else {
-                    $user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "inbox");
+                    //$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "inbox");
                 }
             } else {
                 if ($arrayNextDelegationData["TAS_UID"] != "-1") {
@@ -685,7 +685,7 @@ class Derivation
                                 if ($application->getAppStatus() == "DRAFT") {
                                     //$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "draft");
                                 } else {
-                                    $user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "inbox");
+                                    //$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "inbox");
                                 }
                             }
                         }
@@ -696,7 +696,7 @@ class Derivation
                             if ($application->getAppStatus() == "DRAFT") {
                                 //$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "draft");
                             } else {
-                                $user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "inbox");
+                                //$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "inbox");
                             }
                         }
                     }
diff --git a/workflow/engine/classes/model/ListCompleted.php b/workflow/engine/classes/model/ListCompleted.php
index aa61cb61b..6ae2d1177 100644
--- a/workflow/engine/classes/model/ListCompleted.php
+++ b/workflow/engine/classes/model/ListCompleted.php
@@ -116,7 +116,7 @@ class ListCompleted extends BaseListCompleted
             $dataset->next();
             $aRow = $dataset->getRow();
             if ($aRow['TAS_TYPE'] != 'SUBPROCESS') {
-                $users->refreshTotal($data['USR_UID'], 'remove', 'inbox');
+                //$users->refreshTotal($data['USR_UID'], 'remove', 'inbox');
             }
         } else {
             $criteria = new Criteria();
@@ -125,7 +125,7 @@ class ListCompleted extends BaseListCompleted
             $dataset = SubApplicationPeer::doSelectRS($criteria);
             $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             if ($dataset->next()) {
-                $users->refreshTotal($data['USR_UID'], 'remove', 'inbox');
+                //$users->refreshTotal($data['USR_UID'], 'remove', 'inbox');
             } else {
                 //$users->refreshTotal($data['USR_UID'], 'remove', 'draft');
             }
diff --git a/workflow/engine/classes/model/ListInbox.php b/workflow/engine/classes/model/ListInbox.php
index ff90ce64e..0b784e9ec 100644
--- a/workflow/engine/classes/model/ListInbox.php
+++ b/workflow/engine/classes/model/ListInbox.php
@@ -324,12 +324,12 @@ class ListInbox extends BaseListInbox
                         $criteria->add( SubApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
                         $dataset = SubApplicationPeer::doSelectRS($criteria);
                         if ($dataset->next()) {
-                            $users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox');
+                            //$users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox');
                         } else {
                             //$users->refreshTotal($delPreviusUsrUid, 'remove', 'draft');
                         }
                     } else {
-                        $users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox');
+                        //$users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox');
                     }
                 }
                 if (!$isSelfService) {
@@ -343,7 +343,7 @@ class ListInbox extends BaseListInbox
             if ($dataPreviusApplication['APP_STATUS'] == 'DRAFT') {
                 //$users->refreshTotal($dataPreviusApplication['CURRENT_USER_UID'], 'remove', 'draft');
             } else {
-                $users->refreshTotal($dataPreviusApplication['CURRENT_USER_UID'], 'remove', 'inbox');
+                //$users->refreshTotal($dataPreviusApplication['CURRENT_USER_UID'], 'remove', 'inbox');
             }
         }
         self::create($data, $isSelfService);