Improve local storage and fix expediente task strature

src/app/pages/events/events.page.html

@@ -11,8 +11,8 @@
     <p *ngIf="totalEvent!=1"class="event-number p-small ion-text-center"> <strong>{{totalEvent}}</strong> eventos agendados para hoje</p>
   </ion-label>
   <div class="next-meeting">
-    <div class="meeting-time">{{currentHoursMinutes | date: 'HH:mm'}}</div>
-    <div *ngIf="currentEvent" class="meeting-description"> "{{currentEvent}}"</div>
+    <div class="meeting-time" *ngIf="currentHoursMinutes">{{currentHoursMinutes | date: 'HH:mm'}}</div>
+    <div class="meeting-description" *ngIf="currentEvent"> "{{currentEvent}}"</div>
   </div>
 
 </ion-header>
@@ -94,7 +94,7 @@
         </div>
         <div class="content">
           <ion-list>
-            <ion-item class="cursor-pointer" lines="none" *ngFor = "let task of expedienteStorage.list"
+            <ion-item class="cursor-pointer" lines="none" *ngFor = "let task of expedienteGdStore.list"
             (click)="goToExpediente(task.serialNumber)">
             <div class="item-exp d-flex">
               <div class="schedule-date">
@@ -102,8 +102,8 @@
                 <div class="time-start">{{task.taskStartDate | date: 'HH:mm'}}</div>
               </div>
               <div class="schedule-details pointer">
-                <div class="description">{{ task.workflowInstanceDataFields.Subject }}</div>
-                <div class="location">{{ task.workflowInstanceDataFields.Sender }}</div>
+                <div class="description">{{ task.Subject }}</div>
+                <div class="location">{{ task.Senders }}</div>
               </div>
             </div>
             </ion-item>

src/app/pages/events/events.page.ts

@@ -13,8 +13,9 @@ import { ProcessesService } from '../../services/processes.service';
 import { DailyWorkTask } from '../../models/dailyworktask.model';
 import { User } from 'src/app/models/user.model';
 import { ToDayEventStorage  } from 'src/app/store/to-day-event-storage.service';
-import { ExpedienteStorage } from 'src/app/store/expediente-storage-service.service';
 import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx';
+import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe';
+import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service';
 
 @Component({
   selector: 'app-events',
@@ -62,15 +63,16 @@ export class EventsPage implements OnInit {
 
   // shared data
   toDayEventStorage = ToDayEventStorage
-  expedienteStorage = ExpedienteStorage
+  expedienteGdStore = ExpedienteGdStore
+  
+  expedienteTaskPipe = new ExpedienteTaskPipe()
 
   @Output() openExpedientListPage:EventEmitter<any> = new EventEmitter<any>();
 
   loggeduser: User;
 
   existingScreenOrientation: string;
-  pdfSrc = "https://vadimdez.github.io/ng2-pdf-viewer/assets/pdf-test.pdf";
-  
+
   constructor(
     private eventService: EventsService,
     private router: Router,
@@ -330,21 +332,13 @@ export class EventsPage implements OnInit {
   }
 
   LoadList() {
-    switch (this.loggeduser.Profile) {
-      case 'MDGPR':
-        this.processes.GetTasksList("Expediente", false).subscribe(result => {
-          console.log(result);
-          this.expedienteStorage.reset(result)
-        });
-        break;
-      case 'PR':
-        this.processes.GetTasksList("Expediente", false).subscribe(result => {
-          this.expedienteStorage.reset(result)
-        });
-        break;
-      default:
-        break;
-    }
+    this.processes.GetTaskListExpediente(false).subscribe(result => {
+      console.log("Expediente", result);
+
+      const ExpedienteTask = result.map( e=> this.expedienteTaskPipe.transform(e))
+
+      this.expedienteGdStore.reset(ExpedienteTask)
+    });
   }
 
   sortArrayISODate(myArray: any){

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

@@ -26,14 +26,14 @@
           refreshingText="A actualizar...">
         </ion-refresher-content>
     </ion-refresher>
-    
+
     <div >
       <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
       <div class="height-100">
         <ion-list>
           <div
             class="expediente ion-no-padding ion-no-margin cursor-pointer"  
-            *ngFor = "let task of despachospagestore.list; let i = index"
+            *ngFor = "let task of despachoStore.list; let i = index"
             (click)="GoToDespacho(task.SerialNumber)"
           >
             <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
@@ -68,13 +68,13 @@
     </div>
 
     <div 
-      *ngIf="!skeletonLoader && despachospagestore.list.length == 0 && despachospagestore.list.length == 0" 
+      *ngIf="!skeletonLoader && despachoStore.list.length == 0" 
       class="empty-list d-flex height-100 align-center justify-content-center"
     >
       <span>Lista vazia</span>
     </div>
 
-    <div *ngIf="skeletonLoader && despachospagestore.list.length == 0">
+    <div *ngIf="skeletonLoader && despachoStore.list.length == 0">
     
       <ion-list>
         <ion-item>

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

@@ -6,7 +6,8 @@ import { ModalController } from '@ionic/angular';
 import { AlertService } from 'src/app/services/alert.service';
 import { AuthService } from 'src/app/services/auth.service';
 import { NavigationStart, Router } from '@angular/router';
-import { DespachoPageStore } from 'src/app/store/despachos-page-store.service';
+import { DespachoService } from 'src/app/Rules/despacho.service';
+import { DespachoStore } from 'src/app/store/despacho-store.service';
 
 @Component({
   selector: 'app-despachos',
@@ -36,8 +37,7 @@ export class DespachosPage implements OnInit {
   loadedAttachments:any;
   dicIndex = 0;
   inicial = false
-  skeletonLoader = true
-  despachospagestore = DespachoPageStore;
+  despachoStore = DespachoStore;
 
   constructor (
     private processes:ProcessesService,
@@ -45,6 +45,7 @@ export class DespachosPage implements OnInit {
     private alertService: AlertService,
     private authService: AuthService,
     private router: Router,
+    private despachoRule: DespachoService
     ) {
       this.profile = 'mdgpr';
     }
@@ -80,52 +81,17 @@ export class DespachosPage implements OnInit {
     this.LoadList();
   }
 
-
-  openExpedientDetailPage(data) {
-    this.openExpedientDetail.emit(data);
-  }
-
   async LoadList() {
 
-    this.skeletonLoader = true
-
-    let result = await this.processes.GetTasksList("Despacho", false).toPromise();
-    //let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)");
-    this.despachoList = []
-
-    this.skeletonLoader = false
-
-    await result.filter(data => data.workflowInstanceDataFields.Status == "Active").forEach( (element, index) => {
-
-      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();
-
-        let task = {
-          "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.DispatchDocId,
-          "WorkflowName": element.workflowDisplayName,
-          "activityInstanceName": element.activityInstanceName,
-        }
-      this.despachoList.push(task)
-    });
-    this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
-    this.despachospagestore.reset(this.despachoList);
-
+    this.despachoList = await this.despachoRule.getList({updateStore: true})
   }
 
-  sortArrayISODate(myArray: any) {
-    return myArray.sort(function(a, b) {
-      return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
-    });
+  get skeletonLoader(): boolean {
+    return this.despachoRule.LoaderService.loading
   }
 
+
+
   doRefresh(event) {
     this.LoadList();
 

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

@@ -34,13 +34,13 @@
       <ion-list>
         <div
           class="expediente ion-no-padding ion-no-margin cursor-pointer" 
-          *ngFor = "let task of expedienteStorage.list"
+          *ngFor = "let task of expedienteGdStore.list"
           (click)="goToExpediente(task.SerialNumber)"
         >
         <div class="item width-100">
           <div class="exp-top-detail">
             <div class="subject">
-              <ion-label>{{ task.Folio }}</ion-label>
+              <ion-label>{{ task.Subject }}</ion-label>
             </div>
             <div class="exp-icon">
               <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
@@ -65,13 +65,13 @@
       </ion-list>
 
       <div 
-        *ngIf="!skeletonLoader && expedienteStorage.list.length == 0 && expedienteStorage.list.length == 0" 
+        *ngIf="!skeletonLoader && expedienteGdStore.list.length == 0 && expedienteGdStore.list.length == 0" 
         class="empty-list d-flex height-100 align-center justify-content-center"
       >
         <span>Lista vazia</span>
       </div>
 
-      <div *ngIf="skeletonLoader && expedienteStorage.list.length == 0">
+      <div *ngIf="skeletonLoader && expedienteGdStore.list.length == 0">
 
         <ion-list>
           <ion-item>

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

@@ -1,9 +1,9 @@
 import { Component, OnInit } from '@angular/core';
 import { NavigationStart, Router } from '@angular/router';
-import { DailyWorkTask } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ToastService } from 'src/app/services/toast.service';
-import { ExpedienteStorage } from 'src/app/store/expediente-storage-service.service';
+import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service';
+import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe';
 
 @Component({
   selector: 'app-expediente',
@@ -17,17 +17,17 @@ export class ExpedientePage implements OnInit {
   //profile:string;
   showLoader:boolean;
 
-  taskslist:DailyWorkTask[] = [];
+  taskslist = [];
   serialNumber:string;
 
-  expedienteStorage = ExpedienteStorage
+  expedienteGdStore = ExpedienteGdStore
+  expedienteTaskPipe = new ExpedienteTaskPipe()
   
   constructor(
     private processes:ProcessesService,
     private router: Router,
     private toastService: ToastService
-    ) {
-    }
+  ) {}
 
   ngOnInit() {
 
@@ -52,39 +52,25 @@ export class ExpedientePage implements OnInit {
     this.skeletonLoader = true
 
     try {
-      const expediente: object[] = await this.processes.GetTasksList("Expediente", false).toPromise()
-  
+      const expediente: object[] = await this.processes.GetTaskListExpediente(false).toPromise()
       const result = expediente
       
       this.taskslist = new Array();
       let res = result.reverse().filter((data: any) => data.workflowInstanceDataFields.Status == "Active");
 
       res.forEach((element: any) => {
-        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();
-        let task: DailyWorkTask = {
-          "SerialNumber": element.serialNumber,
-          "Folio": element.workflowInstanceDataFields.Subject,
-          "Senders": element.workflowInstanceDataFields.Sender,
-          "CreateDate": taskDate,
-          "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-          "Remetente": element.workflowInstanceDataFields.Remetente,
-          "DocumentsQty": element.totalDocuments,
-          "WorkflowName": element.workflowDisplayName,
-          "activityInstanceName": element.activityInstanceName,
-          "Status": element.workflowInstanceDataFields.Status,
-        }
+
+        let task =  this.expedienteTaskPipe.transform(element)
         this.taskslist.push(task);
       });
       
-      console.log(this.taskslist);
-      this.expedienteStorage.reset(this.taskslist);
-      this.skeletonLoader = false;
+      this.expedienteGdStore.reset(this.taskslist);
 
     } catch (error) {
       this.toastService.badRequest('Processo não encontrado')
       this.goBack()
+    } finally {
+      this.skeletonLoader = false;
     }
 
   }

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

@@ -30,7 +30,7 @@
       <ion-list>
         <div
           class="expediente ion-no-padding ion-no-margin cursor-pointer"  
-          *ngFor = "let task of expedienteprstore.list"
+          *ngFor = "let task of expedienteGdStore.list"
           (click)="goToExpediente(task.SerialNumber)"
         >
           <div class="item width-100">
@@ -62,14 +62,14 @@
     </div>
 
     <div 
-      *ngIf="!skeletonLoader && expedienteprstore.list.length == 0 && expedienteprstore.list.length == 0" 
+      *ngIf="!skeletonLoader && expedienteGdStore.list.length == 0 && expedienteGdStore.list.length == 0" 
       class="empty-list d-flex height-100 align-center justify-content-center"
     >
       <span>Lista vazia</span>
     </div>
     
     <!-- Skeleton loader -->
-    <div *ngIf="skeletonLoader && expedienteprstore.list.length == 0">
+    <div *ngIf="skeletonLoader && expedienteGdStore.list.length == 0">
     
       <ion-list>
         <ion-item>

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

@@ -8,8 +8,9 @@ import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/
 import { AlertService } from 'src/app/services/alert.service';
 import { User } from 'src/app/models/user.model';
 import { AuthService } from 'src/app/services/auth.service';
-import { ExpedienteprStore } from 'src/app/store/expedientepr-store.service';
 import { Location } from '@angular/common'
+import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service';
+import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe';
 
 @Component({
   selector: 'app-expedientes-pr',
@@ -20,7 +21,7 @@ export class ExpedientesPrPage implements OnInit {
 
   @ViewChild(CalendarComponent) myCal: CalendarComponent;
 
-  taskslist:DailyWorkTask[] = [];
+  taskslist= [];
   serialNumber:string;
   showLoader:boolean;
 
@@ -28,7 +29,8 @@ export class ExpedientesPrPage implements OnInit {
   @Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
 
   skeletonLoader = true
-  expedienteprstore = ExpedienteprStore;
+  expedienteGdStore = ExpedienteGdStore;
+  expedienteTaskPipe = new ExpedienteTaskPipe()
 
   constructor(
     private processes:ProcessesService,
@@ -64,32 +66,18 @@ export class ExpedientesPrPage implements OnInit {
   LoadList() {
     this.skeletonLoader = true
     
-    this.processes.GetTasksList("Expediente", false).subscribe(result => {
+    this.processes.GetTaskListExpediente(false).subscribe(result => {
       console.log(result);
       this.skeletonLoader = false
       this.showLoader =false
       this.taskslist = new Array();
       let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
       res.forEach(element => {
-        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();
-        let task: DailyWorkTask = {
-          "SerialNumber": element.serialNumber,
-          "Folio": element.workflowInstanceDataFields.Subject,
-          "Senders": element.workflowInstanceDataFields.Sender,
-          "CreateDate": taskDate,
-          "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-          "Remetente": element.workflowInstanceDataFields.Remetente,
-          "DocumentsQty": element.totalDocuments,
-          "WorkflowName": element.workflowDisplayName,
-          "activityInstanceName": element.activityInstanceName,
-          "Status": element.workflowInstanceDataFields.Status,
-          }
-          this.taskslist.push(task);
-        });
+        let task = this.expedienteTaskPipe.transform(element)
+        this.taskslist.push(task);
+      });
       console.log(this.taskslist);
-      this.expedienteprstore.reset(this.taskslist);
+      this.expedienteGdStore.reset(this.taskslist);
       this.skeletonLoader = false
     })
   }

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

@@ -1,6 +1,5 @@
 import { Component, DoCheck, OnInit, ViewChild } from '@angular/core';
 import { ProcessesService } from 'src/app/services/processes.service';
-import { AlertService } from 'src/app/services/alert.service';
 import { ModalController } from '@ionic/angular';
 import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
 import { AuthService } from 'src/app/services/auth.service';
@@ -13,7 +12,6 @@ import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.servic
 import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service';
 import { PendentesStore } from 'src/app/store/pendestes-store.service';
 import { PedidosStore } from 'src/app/store/pedidos-store.service';
-import { ExpedienteprStore } from 'src/app/store/expedientepr-store.service';
 import { DespachosprStore } from 'src/app/store/despachospr-store.service';
 import { PermissionService } from 'src/app/OtherService/permission.service';
 import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
@@ -21,6 +19,8 @@ import { WaitForDomService } from 'src/app/services/dom/wait-for-dom.service';
 import { TotalDocumentStore } from 'src/app/store/total-document.service';
 import { DeplomasStore } from 'src/app/store/deplomas.service';
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
+import { NotificationsService } from 'src/app/services/notifications.service';
+import { DespachoService } from 'src/app/Rules/despacho.service';
 
 @Component({
   selector: 'app-gabinete-digital',
@@ -116,7 +116,9 @@ export class GabineteDigitalPage implements OnInit, DoCheck  {
     private router: Router,
     authService: AuthService,
     public p: PermissionService,
-    public waitForDomService: WaitForDomService
+    public waitForDomService: WaitForDomService,
+    private notificationsService: NotificationsService,
+    private despachoRule: DespachoService
     ) {
 
       this.loggeduser = authService.ValidatedUser;
@@ -450,19 +452,15 @@ export class GabineteDigitalPage implements OnInit, DoCheck  {
     this.showLoader = true;
 
     let allPreocesses_ = await this.processesbackend.GetTasksList("", false).toPromise();
-    this.count_all_processes = Object.keys(allPreocesses_).length;
+    let count_all_processes = Object.keys(allPreocesses_).length;
+    this.totalDocumentStore.resetCount(count_all_processes)
 
-    let expedientes = await this.processesbackend.GetTasksList("Expediente", false).toPromise();
+    let expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise();
     expedientes = expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active")
-    this.count_exp_dailywork = Object.keys(expedientes).length;
-    this.expedientegbstore.count = this.count_exp_dailywork;
     this.expedientegbstore.reset(expedientes)
 
 
-    let despachos = await this.processesbackend.GetTasksList("Despacho", false).toPromise();
-    despachos = despachos.filter(data => data.workflowInstanceDataFields.Status == "Active")
-    this.count_desp_dailywork = Object.keys(despachos).length;
-    this.despachoStore.count = this.count_desp_dailywork
+    let despachos = await this.despachoRule.getList({updateStore: true})
     this.despachoStore.reset(despachos)
 
     let pareceres = await this.processesbackend.GetTasksList("Pedido de Parecer", false).toPromise();