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,36 +95,48 @@ 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);
+          date.setMonth(date.getMonth() + 1);
-        let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+          let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
   
-        let task = {
+          let task = {
-            "SerialNumber": element.serialNumber,
+              "SerialNumber": element.serialNumber,
-            "Folio": element.workflowInstanceDataFields.Subject,
+              "Folio": element.workflowInstanceDataFields.Subject,
-            "Senders": element.workflowInstanceDataFields.Sender,
+              "Senders": element.workflowInstanceDataFields.Sender,
-            "CreateDate": taskDate,
+              "CreateDate": taskDate,
-            "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+              "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-            "Remetente": element.workflowInstanceDataFields.Remetente,
+              "Remetente": element.workflowInstanceDataFields.Remetente,
-            "DocumentsQty": 0,
+              "DocumentsQty": 0,
-            "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+              "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
-            "WorkflowName": element.workflowDisplayName,
+              "WorkflowName": element.workflowDisplayName,
-            "activityInstanceName": element.activityInstanceName,
+              "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()
   
@@ -142,7 +152,7 @@ export class DespachosPrPage implements OnInit {
   
     this.loading = false;
   
-  }
+   }
   
     sortArrayISODate(myArray: any) {
       return myArray.sort(function(a, b) {

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

@@ -139,8 +139,8 @@
             <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 -->

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,22 +98,25 @@ 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;
-        console.log(result);
 
-        this.parecerList = new Array();
+      let parecer = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise();
-        let res = result.reverse();
+      let parecerPr = await this.processes.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
-        res.forEach(element => {
 
-          let date = new Date(element.taskStartDate);
+      let allParecer = parecer.concat(parecerPr).reverse();
-          date.setMonth(date.getMonth() + 1);
+      console.log(allParecer);
-          let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
 
-          let task = {
+      this.parecerList = new Array();
+
+       allParecer.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 = {
             "SerialNumber": element.serialNumber,
             "Folio": element.workflowInstanceDataFields.Subject,
             "Senders": element.originator.email,
@@ -124,14 +127,13 @@ export class PedidosPage implements OnInit {
             "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
             "WorkflowName": element.workflowDisplayName,
             "activityInstanceName": element.activityInstanceName,
-          }
+        }
-          this.parecerList.push(task);
+        this.parecerList.push(task);
-        });
-        console.log(this.parecerList);
-        
       });
+      console.log(this.parecerList);
+        
     }
-    else if(this.segment == 'deferimento'){
+    else if(this.segment == 'deferimento') {
       this.taskType = "Pedido de Deferimento";
       this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
         this.taskslist = result;
@@ -141,12 +143,11 @@ 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);
+        date.setMonth(date.getMonth() + 1);
-          let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+        let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
 
-          let task = {
+        let task = {
             "SerialNumber": element.serialNumber,
             "Folio": element.workflowInstanceDataFields.Subject,
             "Senders": element.workflowInstanceDataFields.Sender,
@@ -157,7 +158,7 @@ export class PedidosPage implements OnInit {
             "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
             "WorkflowName": element.workflowDisplayName,
             "activityInstanceName": element.activityInstanceName,
-          }
+        }
           this.deferimentoList.push(task);
         });
         console.log(this.deferimentoList);