improve

src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html

@@ -9,7 +9,7 @@
     <div class="content d-flex flex-column" *ngIf="task">
       <div class="main-header">
         <div class="title-content width-100 d-flex justify-space-between">
-          <div class="font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
+          <div class="font-30 cursor-pointer" (click)="goBack()" >
             <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
             <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
           </div>

src/app/pages/gabinete-digital/gabinete-digital.page.html

@@ -272,7 +272,7 @@
                   <ion-icon  *ngIf="ThemeService.currentTheme == 'tribunal' && selectedElement != 'DiplomasAssinar' " src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>
                 </div>
                 <p class="text-center exp-card-title">Diplomas para Assinar</p>
-                <p class="text-center exp-card-content">{{ deplomasStore.diplomasListCount }} <span class="title1">Documentos</span></p>
+                <p class="text-center exp-card-content">{{ deplomasStore.diplomasParaAssinartCount }} <span class="title1">Documentos</span></p>
               </div>
             </div>
 

src/app/pages/gabinete-digital/gabinete-digital.page.ts

@@ -64,9 +64,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
   count_exp_pp: string;
   count_exp_pd: string;
   count_dip_apr: string;
-  count_dip_as_pr = 0
   count_dip_pv = 0;
-  count_dip_as = 0;
   count_de_pr = 0;
   count_ev_apr = 0;
   count_ev_md = 0;
@@ -542,7 +540,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
   get AllProcess() {
     return this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento)
     .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr)
-    .concat(this.deplomasStore.diplomasList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.despachoStore.list)
+    .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.despachoStore.list)
   }
 
   get getAllProcessCount() {
@@ -616,15 +614,10 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
       }
 
       despachosPr = despachospr.filter(data => data.workflowInstanceDataFields.Status == "Active");
-      
-      
-      this.count_de_pr = Object.keys(despachosPr).length;
-      this.despachoprstore.count = this.count_de_pr;
+ 
       this.despachoprstore.reset(despachosPr)
     } else if(this.loggeduser.Profile == 'PR') {
       despachosPr = despachospr.filter(data => data.activityInstanceName == "Concluir Despacho").filter(data => data.workflowInstanceDataFields.Status == "Active")
-      this.count_de_pr = Object.keys(despachosPr).length;
-      this.despachoprstore.count = this.count_de_pr;
       this.despachoprstore.reset(despachosPr)
     }
 
@@ -648,15 +641,13 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
     let diplomasValidar = despachospr.filter(data => data.activityInstanceName == "Revisar Diploma");
     this.count_dip_pv = Object.keys(diplomasValidar).length;
     this.deplomasStore.resetDiplomasReview(diplomasValidar)
-    this.deplomasStore.deplomasReviewCount = this.count_dip_pv
+
 
     let diplomasAssinar = despachospr.filter(data => data.activityInstanceName == "Assinar Diploma");
-    this.count_dip_as = Object.keys(diplomasAssinar).length;
 
-    this.deplomasStore.resetDiplomasList(diplomasAssinar)
+    this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar)
 
     let diplomasAssinados = despachospr.filter(data => data.activityInstanceName == "Diploma Assinado");
-    this.count_dip_as_pr = Object.keys(diplomasAssinados).length;
     this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados)
 
     this.processesbackend.GetToApprovedEvents('Agenda', 'true').subscribe(res => {

src/app/services/clear-store.service.ts

@@ -29,7 +29,10 @@ export class ClearStoreService {
     PedidosStore.resetparecer([])
     DespachosprStore.reset([])
     DeplomasStore.resetDiplomasAssinadoList([])
-    DeplomasStore.resetDiplomasList([])
+    DeplomasStore.resetDiplomaGerar([])
+    DeplomasStore.resetDiplomasAssinadoList([])
+    DeplomasStore.resetDiplomasReview([])
+    DeplomasStore.resetDiplomasParaAssinar([])
     DeplomasStore.resetDiplomasReview([])
     CalendarStore.delete()
     CalendarStore.ResetList([])

src/app/shared/gabinete-digital/all-processes/all-processes.page.ts

@@ -137,7 +137,7 @@ export class AllProcessesPage implements OnInit {
   get AllProcess() {
     return this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento)
     .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr)
-    .concat(this.deplomasStore.diplomasList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.despachoStore.list)
+    .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.despachoStore.list)
   }
 
   get getAllProcessCount() {

src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html

@@ -1,7 +1,7 @@
 <ion-header class="ion-no-border">
   <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
   <div class="title">
-    <div class="thetitle"><ion-label >Diplomas</ion-label></div>
+    <div class="thetitle"><ion-label >Diplomas para assinar</ion-label></div>
     <div class="theicon">
       <button title="Atualizar" class="btn-no-color" (click)="doRefresh()">
         <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
@@ -30,7 +30,7 @@
         (click)="viewExpedientDetail(task.SerialNumber)" -->
         <div
           class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
-          *ngFor = "let task of deplomasStore.diplomasAssinadoList"
+          *ngFor = "let task of deplomasStore.diplomasParaAssinarList"
           (click)="goToDiploma(task.SerialNumber)"
         >
           <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->

src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts

@@ -65,9 +65,9 @@ export class DiplomasAssinarPage implements OnInit {
     this.diplomasList = new Array();
     this.skeletonLoader = false
 
-    // let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma");
+    let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma");
 
-    diplomas.forEach(element => {
+    diplomasAssinar.forEach(element => {
       let task: customTask = this.customTaskPipe.transform(element)
       this.diplomasList.push(task);
     });
@@ -75,7 +75,7 @@ export class DiplomasAssinarPage implements OnInit {
     this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate')
 
 
-    this.deplomasStore.resetDiplomasList(this.diplomasList);
+    this.deplomasStore.resetDiplomasParaAssinar(this.diplomasList);
   }
 
 }

src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts

@@ -55,7 +55,9 @@ export class DiplomasGerarPage implements OnInit {
 
     this.skeletonLoader = false;
 
-    diplomas.forEach(element => {
+    let gerarDiploma =  diplomas.reverse().filter(data => data.activityInstanceName == "Gerar Diploma");
+
+    gerarDiploma.forEach(element => {
       let task: customTask = this.customTaskPipe.transform(element);
       this.diplomasList.push(task);
     });
@@ -63,7 +65,7 @@ export class DiplomasGerarPage implements OnInit {
     this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate')
 
 
-    this.deplomasStore.resetDiplomasList(this.diplomasList);
+    this.deplomasStore.resetDiplomaGerar(this.diplomasList);
   }
 
 

src/app/shared/gabinete-digital/diplomas/diplomas.page.html

@@ -23,11 +23,11 @@
 
   <div class="main-container width-100 overflow-y-auto height-100" [ngSwitch]="segment">
 
-    <div *ngIf="deplomasStore.diplomasList.length >= 1 && p.userPermission([p.permissionList.Gabinete.md_tasks])">
+    <div *ngIf="deplomasStore.diplomasReviewList.length >= 1 && p.userPermission([p.permissionList.Gabinete.md_tasks])">
       <ion-list *ngSwitchCase="'validar'">
         <div
           class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
-          *ngFor = "let task of deplomasStore.diplomasList"
+          *ngFor = "let task of deplomasStore.diplomasReviewList"
           (click)="goToDiploma(task.SerialNumber)"
         >
           <div class="item width-100">
@@ -97,13 +97,13 @@
     </div>
 
     <div
-      *ngIf="!skeletonLoader && deplomasStore.diplomasList.length == 0 && deplomasStore.diplomasAssinadoList.length == 0"
+      *ngIf="!skeletonLoader && deplomasStore.diplomasReviewList.length == 0 && deplomasStore.diplomasAssinadoList.length == 0"
       class="empty-list d-flex height-100 align-center justify-content-center"
     >
       <span>Lista vazia</span>
     </div>
 
-    <div *ngIf="skeletonLoader && deplomasStore.diplomasAssinadoList.length == 0 && skeletonLoader && deplomasStore.diplomasList.length == 0">
+    <div *ngIf="skeletonLoader && deplomasStore.diplomasAssinadoList.length == 0 && skeletonLoader && deplomasStore.diplomasReviewList.length == 0">
 
       <ion-list>
         <ion-item>

src/app/shared/gabinete-digital/diplomas/diplomas.page.ts

@@ -69,8 +69,8 @@ constructor(
     this.diplomasList = [];
     let diplomasList = [];
 
-    // let diplomasValidar = diplomas.filter(data => data.activityInstanceName == "Revisar Diploma");
-    
+    // let diplomasReview = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
+
     diplomas.forEach(element => {
 
       let task = this.pipeTask(element)
@@ -78,10 +78,11 @@ constructor(
     });
 
     this.diplomasList = this.sortService.sortDate(diplomasList, 'CreateDate')
-    this.deplomasStore.resetDiplomasList(this.diplomasList)
+    this.deplomasStore.resetDiplomasReview(this.diplomasList)
 
     let diplomasAssinadoList = []
     let diplomasAssinados = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
+
     diplomasAssinados.forEach(async element => {
 
       let task = this.pipeTask(element)

src/app/store/deplomas.service.ts

@@ -8,36 +8,45 @@ import { AES, enc, SHA1 }  from  'crypto-js'
 export class DeplomasService {
 
   private _diplomasAssinadoList  = []
-  private _diplomasList  = []
   private _diplomasReviewList = []
+  private _diplomasGerarList = []
+  private _diplomasParaAssinar = []
 
   private keyNameDiplomasAssinado: string;
-  private keyNameDiplomasList: string;
+  private keyNameDiplomasParaAssinar: string;
+  private keyNameDiplomasGerar: string;
+  private keyNameDiplomasReview: string;
 
   private _diplomasAssinadoListCount  = 0
-  private _diplomasListCount  = 0
   private _diplomasReviewCount = 0
+  private _diplomasGerarListCount = 0;
+  private _diplomasListCount = 0;
 
-  constructor() { 
+  constructor() {
     this.keyNameDiplomasAssinado = (SHA1(this.constructor.name+"diplomasAssinado")).toString()
-    this.keyNameDiplomasList = (SHA1(this.constructor.name+"diplomasList")).toString()
+    this.keyNameDiplomasReview = (SHA1(this.constructor.name+"diplomasReview")).toString()
+    this.keyNameDiplomasGerar = (SHA1(this.constructor.name+"diplomasGerar")).toString()
+    this.keyNameDiplomasParaAssinar = (SHA1(this.constructor.name+"diplomasParaAsinar")).toString()
 
+    setTimeout(() => {
 
-    setTimeout(()=>{
       let restoreDiplomasAssinado = localstoreService.get(this.keyNameDiplomasAssinado, {})
-      let restoreDiplomasList = localstoreService.get(this.keyNameDiplomasList, {})
-      let restoreDiplomasReviewList = localstoreService.get(this.keyNameDiplomasList, {})
+      let restoreDiplomasParaAssinar = localstoreService.get(this.keyNameDiplomasParaAssinar, {})
+      let restoreDiplomasReviewList = localstoreService.get(this.keyNameDiplomasReview, {})
+      let restoreDiplomasGerarList = localstoreService.get(this.keyNameDiplomasGerar, {})
 
       this._diplomasAssinadoList = restoreDiplomasAssinado.list || []
       this._diplomasAssinadoListCount = parseInt(restoreDiplomasAssinado.count)  || 0
 
-      this._diplomasList = restoreDiplomasList.list || []
-      this._diplomasListCount = parseInt(restoreDiplomasList.count) || 0
-
+      this._diplomasParaAssinar = restoreDiplomasParaAssinar.list || []
+      this._diplomasListCount = parseInt(restoreDiplomasParaAssinar.count) || 0
 
       this._diplomasReviewList = restoreDiplomasReviewList.list  || []
       this._diplomasReviewCount = parseInt(restoreDiplomasReviewList.count)  || 0
 
+      this._diplomasGerarList = restoreDiplomasGerarList.list  || []
+      this._diplomasGerarListCount = parseInt(restoreDiplomasGerarList.count)  || 0
+
     }, 10)
     
   }
@@ -60,23 +69,30 @@ export class DeplomasService {
     this.saveDiplomasAssinadoList()
   }
 
-  get diplomasListCount() {
+  get diplomasParaAssinartCount() {
     return this._diplomasListCount || 0
   }
 
-  set diplomasListCount(value) {
-    this._diplomasListCount = value
-    this.saveDiplomasList()
+  set diplomasParaAssinarCount(value) {
+    this._diplomasParaAssinar = value
+    this.saveDiplomasParaAssinar()
   }
 
-  get diplomasList() {
-    return this._diplomasList
+  // get list
+  get diplomasParaAssinarList() {
+    return this._diplomasParaAssinar
   }
 
+  // get list
   get diplomasAssinadoList() {
     return this._diplomasAssinadoList
   }
 
+  // get list
+  get diplomasReviewList() {
+    return this._diplomasReviewList
+  }
+
   resetDiplomasAssinadoList(value: any[]) {
     
     this._diplomasAssinadoListCount = value.length
@@ -84,11 +100,11 @@ export class DeplomasService {
     this.saveDiplomasAssinadoList()
   }
 
-  resetDiplomasList(value: any[]) {
+  resetDiplomasParaAssinar(value: any[]) {
     
     this._diplomasListCount = value.length
-    this._diplomasList = value
-    this.saveDiplomasList()
+    this._diplomasParaAssinar = value
+    this.saveDiplomasParaAssinar()
   }
 
   resetDiplomasReview(value: any[]) {
@@ -97,10 +113,18 @@ export class DeplomasService {
     this.saveDiplomasReviewList()
   }
 
+  resetDiplomaGerar(value: any[]) {
+
+    this._diplomasGerarListCount = value.length
+    this._diplomasGerarList = value
+
+    this.savetDiplomaGerar()
+  }
+
 
   private saveDiplomasReviewList () {
     setTimeout(()=>{ 
-      localstoreService.set(this.keyNameDiplomasList,{
+      localstoreService.set(this.keyNameDiplomasReview,{
         list: this._diplomasReviewList,
         count: this._diplomasReviewCount,
       })
@@ -117,15 +141,24 @@ export class DeplomasService {
     }, 10)    
   }
 
-  private saveDiplomasList () {
+  private saveDiplomasParaAssinar () {
     setTimeout(()=>{ 
-      localstoreService.set(this.keyNameDiplomasList,{
-        list: this._diplomasList,
+      localstoreService.set(this.keyNameDiplomasParaAssinar,{
+        list: this._diplomasParaAssinar,
         count: this._diplomasListCount,
       })
     }, 10)
   }
 
+  private savetDiplomaGerar() {
+    setTimeout(()=>{ 
+      localstoreService.set(this.keyNameDiplomasGerar,{
+        list: this._diplomasGerarList,
+        count: this._diplomasGerarListCount,
+      })
+    }, 10)
+  }
+
 }
 
 export let DeplomasStore = new DeplomasService()