save

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

@@ -6,7 +6,7 @@
   <div class="main-header">
     <app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
     <div class="thetitle">
-      <ion-label *ngIf="loggeduser.Profile =='MDGPR'" >Despachos Presidenciais</ion-label>
+      <ion-label *ngIf="loggeduser.Profile =='MDGPR'" >Despachos Presidenciais !!</ion-label>
       <ion-label *ngIf="loggeduser.Profile =='PR'" >Despachos</ion-label>
     </div>
     <div class="theicon">
@@ -36,7 +36,7 @@
               (click)="goToDespachoPr(task.SerialNumber)"
               >
               <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
-                <div class="item width-100" *ngIf="task.Status == 'Active'">
+                <div class="item width-100">
                   <div class="exp-top-detail">
                     <div class="exp-date">
                       <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>

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

@@ -64,8 +64,6 @@ export class DespachosPrPage implements OnInit {
   ngOnInit() {
     //Inicializar segment
     this.segment = "despachos";
-    this.LoadList();
-
     this.router.events.forEach((event) => {
       if(event instanceof NavigationEnd && event.url == this.router.url) {
         this.LoadList();
@@ -97,15 +95,26 @@ export class DespachosPrPage implements OnInit {
   }
 
   async LoadList() {
+
     this.despachoList = new Array();
   
     this.loading = true;
   
     let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
-    
     console.log(result);
     
-    await result.forEach( (element, index) => {
+    let despachosPr;
+    switch (this.loggeduser.Profile) {
+      case 'MDGPR':
+        despachosPr = result.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
+        break;
+      case 'PR':
+        despachosPr = result.reverse().filter(data => data.activityInstanceName == "Concluir Despacho");
+        break;
+    }
+    console.log(despachosPr);
+    
+    despachosPr.forEach( (element, index) => {
        
       let date = new Date(element.taskStartDate);
           date.setMonth(date.getMonth() + 1);
@@ -124,9 +133,10 @@ export class DespachosPrPage implements OnInit {
               "activityInstanceName": element.activityInstanceName,
           }
   
-      this.despachoList.push(task)
+      this.despachoList.push(task);
-      
+      console.log(this.despachoList);
     });
+    console.log(this.despachoList);
   
     this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
   

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

@@ -139,9 +139,9 @@
             <p class="text-center exp-card-title">Diplomas para Assinar</p>
             <p class="text-center exp-card-content">{{count_dip_as}} <span class="title1">Documentos</span></p>
           </div>
-        </div>
           
         </div>
+      </div>
 
       <!-- Aside right -->
       <div class="aside-content d-none flex-column height-100">

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

@@ -378,24 +378,21 @@ export class PedidoPage implements OnInit {
       backdropDismiss: true
     });
     
+  
     await modal.present();
   
     modal.onDidDismiss().then(res => {
-
-
       const DocumentToSave = res.data.documents.map((e) => {
         return {
           ApplicationId: e.ApplicationType,
           SourceId: e.Id,
         }
       });
-  
       let docs = {
         ProcessInstanceID: "",
         Attachments: DocumentToSave,
       }
 
-
       if(res.data){
         if(actionName == 'Solicitar Reapreciação') {
 

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

@@ -56,6 +56,9 @@
                     <div class="exp-remetente">
                       <ion-label>{{task.Remetente}}</ion-label>
                     </div>
+                    <div class="exp-workflow">
+                      <span class="label">{{task.activityInstanceName}}</span>
+                    </div>
                     <div class="exp-icon">
                       <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
                       <label></label>
@@ -87,7 +90,7 @@
                       <ion-label>{{task.Remetente}}</ion-label>
                     </div>
                     <div class="exp-workflow">
-                      <span class="label">{{task.WorkflowName}}</span>
+                      <span class="label">{{task.activityInstanceName}}</span>
                     </div>
                     <div class="exp-icon">
                       <ion-menu-button style="width: 35px; height: 41px;" autoHide="false">

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

@@ -98,16 +98,19 @@ export class PedidosPage implements OnInit {
     this.openExpedientDetail.emit(data);
   }
 
-  LoadList(){
+  async LoadList(){
     if(this.segment == 'parecer'){
       this.taskType = "Pedido de Parecer";
-      this.processes.GetTasksList("Pedido de Parecer", false).subscribe(result => {
+
-        this.taskslist = result;
+      let parecer = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise();
-        console.log(result);
+      let parecerPr = await this.processes.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
+
+      let allParecer = parecer.concat(parecerPr).reverse();
+      console.log(allParecer);
 
       this.parecerList = new Array();
-        let res = result.reverse();
+
-        res.forEach(element => {
+       allParecer.forEach(element => {
 
         let date = new Date(element.taskStartDate);
         date.setMonth(date.getMonth() + 1);
@@ -129,7 +132,6 @@ export class PedidosPage implements OnInit {
       });
       console.log(this.parecerList);
         
-      });
     }
     else if(this.segment == 'deferimento') {
       this.taskType = "Pedido de Deferimento";
@@ -141,7 +143,6 @@ export class PedidosPage implements OnInit {
         this.deferimentoList = new Array();
         let res = result.reverse();
         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();