From 7c2a2152e9f0b7233c7f0aa6472dfe6f0d27c9cb Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 25 Aug 2021 08:51:52 +0100
Subject: [PATCH] add counting

---
 src/app/OtherService/document-counter.service.ts    |  8 ++++----
 src/app/home/home.page.html                         |  4 ++--
 src/app/home/home.page.ts                           |  4 ++--
 .../gabinete-digital/gabinete-digital.page.html     |  2 +-
 .../pages/gabinete-digital/gabinete-digital.page.ts | 13 ++++++++++++-
 src/app/store/despacho-store.service.ts             |  2 +-
 src/app/store/despachospr-store.service.ts          |  2 +-
 src/app/store/eventoaprovacao-store.service.ts      | 11 ++++++-----
 src/app/store/expedientegd-store.service.ts         |  2 +-
 src/app/store/expedientepr-store.service.ts         |  2 +-
 src/app/store/pedidos-store.service.ts              |  4 ++--
 src/app/store/pendestes-store.service.ts            |  3 +--
 12 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/src/app/OtherService/document-counter.service.ts b/src/app/OtherService/document-counter.service.ts
index a2b8c2059..93a91d208 100644
--- a/src/app/OtherService/document-counter.service.ts
+++ b/src/app/OtherService/document-counter.service.ts
@@ -25,15 +25,15 @@ export class DocumentCounterService {
   constructor() { }
 
   // falta a contagem dos deplomas
-  get mdTotalDocument() {
+  get mdTotalDocument(): number {
     return this.despachoStore.count + this.expedienteGbStore.count + this.pedidosStore.countdeferimento
     + this.pedidosStore.countparecer + this.expedientePrStore.count + this.despachoPrStore.count + this.pendentesStore.count
-    + this.eventoAprovacaoStore.count + this.deplomasStore.diplomasListCount + this.deplomasStore.countDiplomasListCount
+    + this.eventoAprovacaoStore.count + this.deplomasStore.diplomasListCount + this.deplomasStore.countDiplomasAssinadoListCount + this.deplomasStore.deplomasReviewCount
   }
 
-  get prTotalDocument() {
+  get prTotalDocument(): number {
     return this.despachoStore.count + this.expedienteGbStore.count + this.pedidosStore.countdeferimento
     + this.pedidosStore.countparecer + this.expedientePrStore.count + this.despachoPrStore.count + this.pendentesStore.count
-    + this.eventoAprovacaoStore.count + this.deplomasStore.diplomasListCount + this.deplomasStore.countDiplomasListCount
+    + this.eventoAprovacaoStore.count + this.deplomasStore.diplomasListCount + this.deplomasStore.countDiplomasAssinadoListCount + this.deplomasStore.deplomasReviewCount
   }
 }
diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html
index 1eb5d189e..55a31a0c0 100644
--- a/src/app/home/home.page.html
+++ b/src/app/home/home.page.html
@@ -15,8 +15,8 @@
     <ion-tab-button tab="gabinete-digital">
       <!-- <ion-icon name="file-tray-stacked"></ion-icon> -->
       <ion-icon class="nav-icon" src="assets/images/icons-nav-gabinete-inactive.svg"></ion-icon>
-      <ion-badge color="danger" *ngIf="p.userRole(['MDGPR'])" >{{ totalDocumentStore.count }}</ion-badge>
-      <ion-badge color="danger" *ngIf="p.userRole(['PR'])" >{{ totalDocumentStore.count }}</ion-badge>
+      <ion-badge color="danger" *ngIf="!p.userRole(['PR'])" >{{ documentCounterService.mdTotalDocument }}</ion-badge>
+      <ion-badge color="danger" *ngIf="p.userRole(['PR'])" >{{ documentCounterService.prTotalDocument }}</ion-badge>
       <ion-label>Gabinete</ion-label>
     </ion-tab-button>
     <ion-tab-button tab="publications">
diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index cef00976b..070babc46 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -73,9 +73,9 @@ export class HomePage implements OnInit {
     private notificatinsservice: NotificationsService,
     private platform: Platform,
     private activeroute: ActivatedRoute,
-    public documentCounterService: DocumentCounterService,
     // private network: NetworkService,
-    public p: PermissionService) {
+    public p: PermissionService,
+    public documentCounterService: DocumentCounterService) {
 
     this.router.events.subscribe((val) => {
       document.querySelectorAll('ion-modal').forEach((e: any) => e.remove())
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 4d406fe15..0f3d1709e 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -103,7 +103,7 @@
                 <ion-icon  src="assets/images/icons-agenda.svg"></ion-icon>
               </div>
               <p class="text-center exp-card-title ">Eventos para Aprovação</p>
-              <p class="text-center exp-card-content">{{eventoaprovacaostore.count}} <span class="title1">Documentos</span></p>
+              <p class="text-center exp-card-content">{{eventoaprovacaostore.countMd + eventoaprovacaostore.countPr}} <span class="title1">Documentos</span></p>
             </div>
 
             <div [class.active]="selectedElement == 'Correspondence'" (click)="openExpedientListPage(); selectedElement='Correspondence'" class="exp-card d-flex flex-column justify-center" *ngIf="loggeduser.Profile == 'MDGPR'">
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 373732873..c971df302 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -501,6 +501,18 @@ export class GabineteDigitalPage implements OnInit, DoCheck  {
         break;
     }
 
+
+    let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
+    let mdEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
+    const eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
+    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();
+    const eventsPRList = prEventsOficial.concat(prEventsPessoal);
+    this.eventoaprovacaostore.resetpr(eventsPRList);
+
+
     let diplomasValidar = despachospr.filter(data => data.activityInstanceName == "Revisar Diploma");
     this.count_dip_pv = Object.keys(diplomasValidar).length;
     this.deplomasStore.resetDiplomasReview(diplomasValidar)
@@ -518,7 +530,6 @@ export class GabineteDigitalPage implements OnInit, DoCheck  {
     this.processesbackend.GetToApprovedEvents('Agenda','true').subscribe(res=>{
       this.count_ev_apr = res;
     });
-    this.eventoaprovacaostore.count;
 
     this.showLoader = false;
 
diff --git a/src/app/store/despacho-store.service.ts b/src/app/store/despacho-store.service.ts
index 9282a06fd..8633dfe9f 100644
--- a/src/app/store/despacho-store.service.ts
+++ b/src/app/store/despacho-store.service.ts
@@ -31,7 +31,7 @@ export class DespachoStoreService {
   }
 
   get count() {
-    return this._count
+    return this._count || 0
   }
   
   set count(value: number) {
diff --git a/src/app/store/despachospr-store.service.ts b/src/app/store/despachospr-store.service.ts
index 09a345fb6..24e50fadb 100644
--- a/src/app/store/despachospr-store.service.ts
+++ b/src/app/store/despachospr-store.service.ts
@@ -30,7 +30,7 @@ get list() {
   return this._list || []
 }
 
-get count() { return this._count }
+get count() { return this._count  || 0 }
 set count(value: number) {
   this._count = value
   this.save()
diff --git a/src/app/store/eventoaprovacao-store.service.ts b/src/app/store/eventoaprovacao-store.service.ts
index c8745e4b8..494300f69 100644
--- a/src/app/store/eventoaprovacao-store.service.ts
+++ b/src/app/store/eventoaprovacao-store.service.ts
@@ -39,17 +39,17 @@ export class EventoaprovacaoStoreService {
   get listpr() { return this._listPr }
   get listmd() { return this._listMd }
   
-  get count() { return this._count }
+  get count() { return this._count  || 0 }
   set count(value: number) {
     this._count = value
   }
 
-  get countPr() { return this._countPr }
-  set countPr (value) {
+  get countPr() { return this._countPr  || 0 }
+  set countPr (value: number) {
     this._countPr = value
   }
 
-  get countMd() { return this._countMd }
+  get countMd() { return this._countMd  || 0 }
   set countMd (value) {
     this._countMd = value
   }
@@ -72,7 +72,7 @@ export class EventoaprovacaoStoreService {
   }
 
   private saveMd() {
-    setTimeout(()=>{ 
+    setTimeout(()=>{
       localstoreService.set(this.keyNamemd,{
         lisMd: this._listMd,
         countListMd: this._countMd
@@ -80,6 +80,7 @@ export class EventoaprovacaoStoreService {
     }, 10)
     
   }
+
   private savePr() {
     setTimeout(()=>{ 
       localstoreService.set(this.keyNamepr,{
diff --git a/src/app/store/expedientegd-store.service.ts b/src/app/store/expedientegd-store.service.ts
index c139f8096..c4f03fd18 100644
--- a/src/app/store/expedientegd-store.service.ts
+++ b/src/app/store/expedientegd-store.service.ts
@@ -29,7 +29,7 @@ export class ExpedientegdStoreService {
     return this._list
   }
   get count() {
-    return this._count
+    return this._count  || 0
   }
   set count(value: number) {
     this._count = value
diff --git a/src/app/store/expedientepr-store.service.ts b/src/app/store/expedientepr-store.service.ts
index 860730f03..5fd2c0fb2 100644
--- a/src/app/store/expedientepr-store.service.ts
+++ b/src/app/store/expedientepr-store.service.ts
@@ -26,7 +26,7 @@ export class ExpedienteprStoreService {
 
   get list() { return this._list || [] }
 
-  get count() { return this._count }
+  get count() { return this._count  || 0 }
   set count(value: number) {
     this._count = value
     this.save()
diff --git a/src/app/store/pedidos-store.service.ts b/src/app/store/pedidos-store.service.ts
index d9225cd3c..0357446a7 100644
--- a/src/app/store/pedidos-store.service.ts
+++ b/src/app/store/pedidos-store.service.ts
@@ -42,7 +42,7 @@ export class PedidosStoreService {
   }
 
   get countparecer() {
-    return this._countparecer
+    return this._countparecer || 0
   }
   set countparecer(value: number) {
     this._countparecer = value
@@ -50,7 +50,7 @@ export class PedidosStoreService {
   }
 
   get countdeferimento() {
-    return this._countDeferiemnto
+    return this._countDeferiemnto || 0
   }
   set countdeferimento(value: number ) {
     this._countDeferiemnto = value
diff --git a/src/app/store/pendestes-store.service.ts b/src/app/store/pendestes-store.service.ts
index 0603f80b3..89d06bc7c 100644
--- a/src/app/store/pendestes-store.service.ts
+++ b/src/app/store/pendestes-store.service.ts
@@ -31,8 +31,7 @@ export class PendestesStoreService {
   }
 
   get count() {
-    return this._count
-    this.save()
+    return this._count  || 0
   }
   set count(value) {
     this._count = value