diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 37fef08c8..33ef353a7 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -42,9 +42,6 @@ import { Storage } from '@ionic/storage';
 import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe';
 import { SessionStore } from 'src/app/store/session.service';
 
-
-
-
 @Component({
   selector: 'app-gabinete-digital',
   templateUrl: './gabinete-digital.page.html',
@@ -539,201 +536,160 @@ export class GabineteDigitalPage implements OnInit {
 
   async LoadCounts() {
 
-    (async () =>{
-      if(!this.loadProcess['expedientes']) {
-        try {
-          this.loadProcess['expedientes'] = true
+    let expedientes;
+    this.showLoader = true
 
-          await this.ExpedienteService.getList()
-          let expedientes: any = await this.processesbackend.GetTaskListExpediente(false).toPromise();
-          expedientes = expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active")
-          expedientes = expedientes.filter((item) => {
-            return item.activityInstanceName != 'Retificar Expediente'
-          });
-          expedientes = expedientes.map((element) => this.expedienteTaskPipe.transform(element));
-      
-          this.expedientegbstore.count = expedientes.length;
-          this.expedientegbstore.reset(expedientes);
-  
-          delete this.loadProcess['expedientes']
-          this.loadCount = true
-        } catch(error) {
-          this.loadCount = true
-          delete this.loadProcess['expedientes']
-        }
-      } 
-    })();
-
-
-    (async () =>{
+    try {
+      expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise()
+      this.loadCount = true;
+      this.showLoader = false;
+    } catch(error) {
+      this.showLoader = false
+      this.loadCount = true;
+    }
     
-      if(!this.loadProcess['despachos']) {
-        try {
-          this.loadProcess['despachos'] = true
-  
-          let despachos = await this.despachoRule.getList({ updateStore: true })
-          if (despachos) {
-            this.despachoStore.reset(despachos)
-          }
-  
-          delete this.loadProcess['despachos']
-        } catch(error) {
-          delete this.loadProcess['despachos']
-        }
-      } 
-  
-    })();
+    expedientes = (expedientes || [] ).filter(data => data.workflowInstanceDataFields.Status == "Active")
 
-    (async() => {
+    expedientes = expedientes.filter((item) => {
+      return item.activityInstanceName != 'Retificar Expediente'
+    });
 
-      if(!this.loadProcess['parecerespareceresPr']) {
-        try {
-          this.loadProcess['parecerespareceresPr'] = true
-          
-          let allParecer = await this.ParecerService.GetTasksList();
-          this.pedidosstore.countparecer = Object.keys(allParecer).length;
-          
-          this.pedidosstore.resetparecer(allParecer);    
-  
-          delete this.loadProcess['parecerespareceresPr']
-        } catch(error) {
-          delete this.loadProcess['parecerespareceresPr']
-        }
+    expedientes = expedientes.map((element) => this.expedienteTaskPipe.transform(element));
+    
+    this.expedientegbstore.count = expedientes.length;
+    this.expedientegbstore.reset(expedientes);
+
+
+    let despachos = await this.despachoRule.getList({ updateStore: true })
+    if (despachos) {
+      this.despachoStore.reset(despachos)
+    }
+
+
+    let pareceres = await this.processesbackend.GetTasksList("Pedido de Parecer", false).toPromise();
+    let pareceresPr = await this.processesbackend.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
+
+    let allParecer = pareceres.concat(pareceresPr);
+
+    this.pedidosstore.countparecer = Object.keys(allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
+    
+    this.pedidosstore.resetparecer(allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active").map((element) => {
+      return {
+        "SerialNumber": element.serialNumber,
+        "Folio": element.workflowInstanceDataFields.Subject,
+        "Senders": element.workflowInstanceDataFields.Sender,
+        "CreateDate": new Date(element.taskStartDate),
+        "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+        "Remetente": element.workflowInstanceDataFields.Remetente,
+        "DocumentsQty": element.totalDocuments,
+        "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+        "WorkflowName": element.workflowDisplayName,
+        "activityInstanceName": element.activityInstanceName,
       }
-  
-    })();
+    }));    
+
+    let deferimentos = await this.processesbackend.GetTasksList("Pedido de Deferimento", false).toPromise();
+    this.pedidosstore.countdeferimento = Object.keys(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active")).length
+
+    this.pedidosstore.resetdeferimento(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active").map((element) => {
+      return {
+        "SerialNumber": element.serialNumber,
+        "Folio": element.workflowInstanceDataFields.Subject,
+        "Senders": element.workflowInstanceDataFields.Sender,
+        "CreateDate": new Date(element.taskStartDate),
+        "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+        "Remetente": element.workflowInstanceDataFields.Remetente,
+        "DocumentsQty": element.totalDocuments,
+        "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+        "WorkflowName": element.workflowDisplayName,
+        "activityInstanceName": element.activityInstanceName,
+      }
+    }));
 
 
-    (async()=>{
-      if(!this.loadProcess['deferimentos']) {
-        try {
-          this.loadProcess['deferimentos'] = true
-  
-          let deferimentos = await this.DeferimentosServiceService.getList()
-          this.pedidosstore.countdeferimento = Object.keys(deferimentos).length;
-          this.pedidosstore.resetdeferimento(deferimentos);
-  
-          delete this.loadProcess['deferimentos']
-        } catch(error) {
-          delete this.loadProcess['deferimentos']
-        }
-      } 
-  
-    })();
+    let pendentes = await this.processesbackend.GetPendingTasks(false).toPromise();
+    this.pendentesstore.count = Object.keys(pendentes).length;
 
+    pendentes = pendentes.map((element)=> this.customTaskPipe.transform(element))
 
-    (async()=>{
-      if(!this.loadProcess['despachos']) {
-        try {
-          this.loadProcess['despachos'] = true
-  
-          let despachos = await this.despachoRule.getList({ updateStore: true })
-          if (despachos) {
-            this.despachoStore.reset(despachos)
-          }
-  
-          delete this.loadProcess['despachos']
-        } catch(error) {
-          delete this.loadProcess['despachos']
-        }
-      } 
-    })();
+    this.pendentesstore.reset(pendentes);
 
-
-    (async() => {
-      // let pendentes
-      if(!this.loadProcess['pendentes']) {
-        try {
-          this.loadProcess['pendentes'] = true
+    let depachoAPI: any  = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise();
   
-          let pendentes = await this.PendentesService.getList()
+
+    if(this.loggeduser.Profile != 'PR') {
       
-          this.pendentesstore.reset(pendentes);
-  
-          delete this.loadProcess['pendentes']
-        } catch(error) {
-          delete this.loadProcess['pendentes']
-        }
-      } 
-    })();
+      let depacho = depachoAPI.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
+      depacho = depacho.filter(data => data.workflowInstanceDataFields.Status == "Active");
 
-
-    (async()=>{
-      if(!this.loadProcess['despachosPr']) {
-        try {
-          let depachoAPI: any = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise();
-          if(this.loggeduser.Profile != 'PR') {
+      depacho = depacho.map((e)=> this.customTaskPipe.transform(e))
+ 
+      this.despachoprstore.reset(depacho)
+    } else if(this.loggeduser.Profile == 'PR') {
       
-            let depacho = await this.DespachoPRService.getList(depachoAPI)
-            this.despachoprstore.reset(depacho)
+      let depacho = depachoAPI.filter(data => data.activityInstanceName == "Concluir Despacho").filter(data => data.workflowInstanceDataFields.Status == "Active")
+      depacho = depacho.map((e)=> this.customTaskPipe.transform(e))
+      this.despachoprstore.reset(depacho)
+    }
 
-          } else if(this.loggeduser.Profile == 'PR') {
-      
-            let depacho = await this.DespachoPRService.getList(depachoAPI)
-            this.despachoprstore.reset(depacho)
+    let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
+    let mdEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
+    let eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
+    
+    eventsMDGPRList = eventsMDGPRList.filter((item) => item.activityInstanceName != 'Editar Evento')
 
-            this.deplomasStore.resetDiplomasReview(
-              await this.DeplomasServiceService.getListReview(depachoAPI)
-            )
-        
-            let diplomasAssinar = await this.DeplomasServiceService.getListAssinar(depachoAPI)
-            this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar)
-        
-            let diplomasAssinados = await this.DeplomasServiceService.getListAssinados(depachoAPI)
-            this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados)
-          }
-  
-          delete this.loadProcess['despachosPr']
-        } catch(error) {
-          delete this.loadProcess['despachosPr']
-        }
-      } 
-  
-    })();
+    this.eventoaprovacaostore.countMd = eventsMDGPRList.length
+    this.eventoaprovacaostore.resetmd(eventsMDGPRList);
+
+    let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR', false).toPromise();
+    let prEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal PR', false).toPromise();
+    let eventsPRList = prEventsOficial.concat(prEventsPessoal);
+    eventsPRList = eventsPRList.filter((item) => item.activityInstanceName != 'Editar Evento')
+
+    this.eventoaprovacaostore.countPr = eventsPRList.length
+    this.eventoaprovacaostore.resetpr(eventsPRList);
+
+    let diplomasValidar = depachoAPI.filter(data => data.activityInstanceName == "Revisar Diploma");
+
+    diplomasValidar = diplomasValidar.filter(data => data.activityInstanceName != "Tarefa de Despacho");
 
 
-    (async() => {
-      if(!this.loadProcess['EventosMD']) {
-        try {
-          this.loadProcess['EventosMD'] = true
+    this.deplomasStore.resetDiplomasReview(diplomasValidar.map((element)=> {
 
-          let eventsMDGPRList = await this.AproveEventService.GetTasksListEventosMD()
-  
-          this.eventoaprovacaostore.countMd = eventsMDGPRList.length
-          this.eventoaprovacaostore.resetmd(eventsMDGPRList);
-          
-          delete this.loadProcess['EventosMD']
-        } catch(error) {
-          delete this.loadProcess['EventosMD']
-        }
-      } 
-  
-    })();
+      let date = new Date(element.taskStartDate);
+      date.setMonth(date.getMonth() + 1);
+      let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+
+      return {
+        "SerialNumber": element.serialNumber,
+        "Folio": element.workflowInstanceDataFields.Subject,
+        "Senders": element.workflowInstanceDataFields.Sender,
+        "CreateDate": taskDate,
+        "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+        "Remetente": element.workflowInstanceDataFields.Remetente,
+        "DocumentsQty": element.totalDocuments,
+        "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+        "WorkflowName": element.workflowDisplayName,
+        "activityInstanceName": element.activityInstanceName,
+        "Status": element.workflowInstanceDataFields.Status,
+      }
+    }))
 
 
-    (async()=>{
-      if(!this.loadProcess['EventosPR']) {
-        try {
-          this.loadProcess['EventosPR'] = true
-  
+    let diplomasAssinar = depachoAPI.filter(data => data.activityInstanceName == "Assinar Diploma");
 
-          let eventsPRList = await this.AproveEventService.GetTasksListEventosPR()
-      
-          this.eventoaprovacaostore.countPr = eventsPRList.length
-          this.eventoaprovacaostore.resetpr(eventsPRList);
-  
-          delete this.loadProcess['EventosPR']
-        } catch(error) {
-          delete this.loadProcess['EventosPR']
-        }
-      } 
-  
-    })();
+    this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar)
 
+    let diplomasAssinados = depachoAPI.filter(data => data.activityInstanceName == "Diploma Assinado");
+    this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados)
+
+
+    this.loadCount = true
   }
 
   doRefresh(event) {
 
+
     this.LoadCounts();
 
     if (event) {
diff --git a/version/git-version.ts b/version/git-version.ts
index 47c179b31..7aae9aee4 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "88d948c5e",
-  "SHA": "88d948c5e07c1cc622bc277725dd8dfb3d9721fd",
+  "shortSHA": "e5b7032a1",
+  "SHA": "e5b7032a1859f872c287f4525d821444f035e3fc",
   "branch": "develop_bitOut-fix",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Fri Dec 30 10:57:21 2022 +0100'",
-  "lastCommitMessage": "clear storage on build",
-  "lastCommitNumber": "4594",
+  "lastCommitTime": "'Fri Dec 30 14:31:19 2022 +0100'",
+  "lastCommitMessage": "improve",
+  "lastCommitNumber": "4595",
   "change": "",
-  "changeStatus": "On branch develop_bitOut-fix\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/guards/login.guard.ts\n\tmodified:   src/app/home/home.page.ts\n\tmodified:   src/app/home/nice.worker.js\n\tmodified:   src/app/modals/profile/profile.page.ts\n\tmodified:   src/app/pages/agenda/agenda.page.ts\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified:   src/app/pages/login/login.page.ts\n\tmodified:   src/app/services/auth.service.ts\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.ts",
+  "changeStatus": "On branch develop_bitOut-fix\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file