save

package-lock.json

@@ -2167,6 +2167,11 @@
       "resolved": "https://registry.npmjs.org/@capacitor/ios/-/ios-3.3.0.tgz",
       "integrity": "sha512-KImT4hVoQJuAfe01wUYiMLnutMu7PxVCv4c8HVWiW+OuyyOua3lC8wQ5gAauGDugAo6mdM7fVva5a0Vtyhnbdg=="
     },
+    "@capacitor/push-notifications": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@capacitor/push-notifications/-/push-notifications-1.0.7.tgz",
+      "integrity": "sha512-vbvAptFq5cI6xKYYWMb7tsWvA88/PTG4v6ptxN0Ygtc1fQ4l/AzONQiYqdtFpbBhF2fML2kXQ/5eSAfn8HY9aw=="
+    },
     "@cnakazawa/watch": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",

package.json

@@ -37,6 +37,7 @@
     "@capacitor/filesystem": "^1.0.6",
     "@capacitor/haptics": "^1.1.3",
     "@capacitor/ios": "3.3.0",
+    "@capacitor/push-notifications": "^1.0.7",
     "@fortawesome/angular-fontawesome": "^0.9.0",
     "@fortawesome/fontawesome-free": "^5.15.3",
     "@fortawesome/fontawesome-svg-core": "^1.2.35",

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

@@ -104,7 +104,7 @@
         <button *ngIf="!p.userRole(['PR'])" (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documentos</button>
         <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
         <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" full class="btn-cancel" shape="round"  >Enviar para pendentes</button>
-        <button (click)="openNewGroupPage()" class="btn-cancel" shape="round" >Inicair Conversa</button>
+        <button (click)="openNewGroupPage()" class="btn-cancel" shape="round" >Iniciar Conversa</button>
         <div class="solid"></div>
       </div>
     </div>
@@ -118,8 +118,10 @@
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
         <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
         <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+         <button (click)="openNewGroupPage()" class="btn-cancel" shape="round" >Iniciar Conversa</button>
         <div hidden class="solid"></div>
         <button hidden class="btn-cancel" shape="round" >Delegar</button>
+
       </div>
 
     </div>

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

@@ -34,8 +34,8 @@
 
       <ion-list>
         <div
-          class="expediente ion-no-padding ion-no-margin cursor-pointer" 
+          class="expediente ion-no-padding ion-no-margin cursor-pointer"
-          *ngFor = "let task of listToPresent"
+          *ngFor = "let task of expedientegbstore.list"
           (click)="goToExpediente(task.SerialNumber)"
         >
         <div class="item width-100">
@@ -67,13 +67,13 @@
       </ion-list>
 
       <div
-        *ngIf="!skeletonLoader && listToPresent.length == 0 && listToPresent.length == 0"
+      *ngIf="!skeletonLoader && expedientegbstore.list.length == 0 && expedientegbstore.list.length == 0"
         class="empty-list d-flex height-100 align-center justify-content-center"
       >
         <span>Lista vazia</span>
       </div>
 
-      <div *ngIf="skeletonLoader && listToPresent.length == 0">
+      <div *ngIf="skeletonLoader && expedientegbstore.list.length == 0">
 
         <ion-list>
           <ion-item>

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

@@ -25,7 +25,8 @@ export class ExpedientePage implements OnInit {
   taskslist = [];
   serialNumber: string;
 
-  expedienteGdStore = ExpedienteGdStore
+  //expedienteGdStore = ExpedienteGdStore;
+  expedientegbstore = ExpedienteGdStore
   expedienteTaskPipe = new ExpedienteTaskPipe()
   onlinecheck: boolean;
 
@@ -63,38 +64,23 @@ export class ExpedientePage implements OnInit {
 
   }
 
-  async LoadList() {
+  LoadList() {
 
-    this.processes.GetTaskListExpediente(false).subscribe(async res => {
+    this.skeletonLoader = true
-      this.skeletonLoader = true
 
-      try {
+    this.processes.GetTaskListExpediente(false).subscribe(result => {
-        const expediente: object[] = await this.processes.GetTaskListExpediente(false).toPromise()
+      this.taskslist = [];
-        const result = expediente
+      this.skeletonLoader = false
 
-        this.taskslist = new Array();
+      let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
-        let res = result.reverse().filter((data: any) => data.workflowInstanceDataFields.Status == "Active");
+      res.forEach(element => {
+        let task = this.expedienteTaskPipe.transform(element)
+        this.taskslist.push(task);
 
-        res.forEach((element: any) => {
+      });
-
-          let task = this.expedienteTaskPipe.transform(element)
-          this.taskslist.push(task);
-          this.sqliteservice.addProcess(task);
-        });
-
-        this.listToPresent = this.taskslist
-        console.log('expediente list', this.listToPresent)
-
-      } catch (error) {
-        this.toastService.badRequest('Processo não encontrado')
-        this.goBack()
-      } finally {
-        this.skeletonLoader = false;
-      }
-    }, (error) => {
-      this.getEventsFromLocalDb();
-    })
 
+      this.expedientegbstore.reset(this.taskslist);
+    });
   }
 
   async refreshing() {

src/app/shared/popover/opts-expediente/opts-expediente.page.html

@@ -14,6 +14,7 @@
         <button (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Mandar para Revisão</button>
         <button class="btn-cancel desk" shape="round">Outras opções </button>
         <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+        <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
       </div>
       <div class="flex-grow-1">
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
@@ -22,18 +23,21 @@
         <button *ngIf="!p.userRole(['PR'])" (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documentos</button>
         <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
         <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" full class="btn-cancel" shape="round"  >Enviar para pendentes</button>
+        <button (click)="openNewGroupPage()" class="btn-cancel" shape="round" >Iniciar Conversa</button>
       </div>
     </div>
     <div *ngIf="task && p.userRole(['PR'])" class="d-flex width-100">
       <div class="flex-grow-1">
-        <button (click)="openExpedientActionsModal('0', fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
+        <button (click)="openExpedientActionsModal('0', fulltask)" class="btn-cancel" shape="round" >11Efetuar Despacho</button>
+        <button (click)="openExpedientActionsModal('0', fulltask)" class="btn-cancel" shape="round" >11Efetuar Despacho</button>
         <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
         <div class="solid"></div>
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
         <button (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button>
-        <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+        <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes11</button>
         <div hidden class="solid"></div>
         <button hidden class="btn-cancel" shape="round" >Delegar</button>
+        <button (click)="openNewGroupPage()" class="btn-cancel" shape="round" >Iniciar Conversa</button>
       </div>
     </div>
 

src/app/shared/popover/opts-expediente/opts-expediente.page.ts

@@ -66,6 +66,10 @@ export class OptsExpedientePage implements OnInit {
     };
   }
 
+  openNewGroupPage(){
+
+  }
+
   close() {
     if( window.innerWidth < 801) {
       this.popoverController.dismiss();