save

src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html

@@ -19,6 +19,6 @@
 <ion-footer>
   <div class="buttons width-100">
     <button class="btn-cancel cursor-pointer" shape="round" (click)="close()">Cancelar</button>
-    <button class="btn-ok cursor-pointer" shape="round" (click)="save()">Gravar</button>
+    <button class="btn-ok cursor-pointer" shape="round" (click)="save()">Enviar</button>
   </div>
 </ion-footer>

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html

@@ -138,7 +138,7 @@
       </app-empty-container>
       <app-attendee-modal
       *ngIf="showAttendees"
-        class="d-flex flex-column height-100"
+        class="d-flex flex-column height-100 hide-footer"
         [adding]="adding"
         [taskParticipants]="taskParticipants"
         [taskParticipantsCc]="taskParticipantsCc"

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts

@@ -180,10 +180,10 @@ export class ExpedientTaskModalPage implements OnInit {
       }
     });
 
-    this.dispatchFolder.SubjectTypes = this.selectedTypes;
-
     docs.Attachments = DocumentToSave;
 
+    this.dispatchFolder.SubjectTypes = this.selectedTypes;
+
     if(this.taskParticipants.length > 0) {
       switch (this.taskType) {
         case '0':

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

@@ -43,7 +43,7 @@
             </div>
       
             <p class="text-center exp-card-title ">Pendentes</p>
-            <p class="text-center exp-card-content"><span class="number">{{this.count_desp_pending + count_def_pending + count_par_pending}} </span> <span class="title1">Documentos</span></p>
+            <p class="text-center exp-card-content"><span class="number">{{count_total_pending}} </span> <span class="title1">Documentos</span></p>
           </div>
 
           <div [class.active]="selectedElement == 'Dispatches'" class="exp-card d-flex flex-column justify-center" (click)="openDespachosPage(); selectedElement='Dispatches'">

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

@@ -37,6 +37,7 @@ export class GabineteDigitalPage implements OnInit {
   count_de_pr = 0;
   count_ev_pr=0;
   count_ev_md=0;
+  count_total_pending = 0;
 
   selectedElement = "";
 
@@ -149,32 +150,24 @@ export class GabineteDigitalPage implements OnInit {
     this.showExpedientDetail = false;
   }
 
-  LoadCounts() {
+  async LoadCounts() {
     this.showLoader = true;
-    this.processesbackend.GetTasksList("Expediente", false).subscribe(res =>{
-      this.showLoader = false;
-      this.count_exp_dailywork = Object.keys(res).length;
-      console.log(res);
-      
-    });
-    this.processesbackend.GetTasksList("Despacho", false).subscribe(res =>{
-      this.showLoader = false;
-      this.count_desp_dailywork = Object.keys(res).length;
-      let pendingList = res.filter(data => data.workflowInstanceDataFields.Status == "Pending");
-      this.count_desp_pending = Object.keys(pendingList).length;
-    });
-    this.processesbackend.GetTasksList("Pedido de Parecer", false).subscribe(res =>{
-      this.showLoader = false;
-      this.count_par_dailywork = Object.keys(res).length;
-      let pendingList = res.filter(data => data.workflowInstanceDataFields.Status == "Pending");
-      this.count_par_pending = Object.keys(pendingList).length;
-    });
-    this.processesbackend.GetTasksList("Pedido de Deferimento", false).subscribe(res =>{
-      this.showLoader = false;
-      this.count_def_dailywork = Object.keys(res).length;
-      let pendingList = res.filter(data => data.workflowInstanceDataFields.Status == "Pending");
-      this.count_def_pending = Object.keys(pendingList).length;
-    });
+
+    let expedientes = await this.processesbackend.GetTasksList("Expediente", false).toPromise();
+    this.count_exp_dailywork = Object.keys(expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
+
+    let despachos = await this.processesbackend.GetTasksList("Despacho", false).toPromise();
+    this.count_desp_dailywork = Object.keys(despachos).length;
+
+    let pareceres = await this.processesbackend.GetTasksList("Pedido de Parecer", false).toPromise();
+    this.count_par_dailywork = Object.keys(pareceres).length;
+
+    let deferimentos = await this.processesbackend.GetTasksList("Pedido de Deferimento", false).toPromise();
+    this.count_def_dailywork = Object.keys(deferimentos).length;
+
+    let pendentes = despachos.concat(pareceres, deferimentos, expedientes).reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending");
+    this.count_total_pending = Object.keys(pendentes).length;
+  
     this.processesbackend.GetTasksList("Despacho do PR", false).subscribe(res =>{
       this.showLoader = false;
       this.count_de_pr = Object.keys(res).length;

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

@@ -82,7 +82,7 @@
         <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
       </div>
       <div class="buttons" *ngIf="task.WorkflowName == 'Pedido de Parecer'">
-        <button (click)="openDarParecer()" class="btn-cancel" shape="round" >Dar o meu Parecer</button>
+        <button (click)="openDarParecer(task)" class="btn-cancel" shape="round" >Dar o meu Parecer</button>
         <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
         <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
       </div>

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

@@ -97,6 +97,7 @@ export class PedidoPage implements OnInit {
           "DocId": res.workflowInstanceDataFields.ParecerDocId,
           "WorkflowName": res.workflowDisplayName,
           "DeadlineType": res.workflowInstanceDataFields.DeadlineType,
+          "ProcessInstanceID": res.workflowInstanceDataFields.InstanceID,
         }
       }
       else if(res.workflowDisplayName == 'Pedido de Deferimento'){
@@ -113,6 +114,7 @@ export class PedidoPage implements OnInit {
           "DocId": res.workflowInstanceDataFields.DocIdDeferimento,
           "WorkflowName": res.workflowDisplayName,
           "DeadlineType": res.workflowInstanceDataFields.DeadlineType,
+          "ProcessInstanceID": res.workflowInstanceDataFields.InstanceID,
         }
       }
 
@@ -338,7 +340,8 @@ export class PedidoPage implements OnInit {
     const modal = await this.modalController.create({
       component: DarParecerPage,
       componentProps: {
-        task: this.task,
+        serialNumber: this.task.SerialNumber,
+        ProcessInstanceID: this.task.ProcessInstanceID,
       },
       cssClass: classs,
       backdropDismiss: false

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

@@ -59,7 +59,7 @@ export class PendentesPage implements OnInit {
     this.openExpedientDetail.emit(data);
   }
  
-  LoadList(){
+  async LoadList(){
       this.processes.GetTasksList("Despacho", false).subscribe(despachos => {
         //ParecerList
         this.processes.GetTasksList("Pedido de Parecer", false).subscribe(pareceres => {