Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

src/app/shared/gabinete-digital/diplomas/diplomas.page.ts

@@ -2,10 +2,9 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angu
 import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
 import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
-import { formatDate } from '@angular/common';
 import { ModalController, NavParams } from '@ionic/angular';
 import { AlertService } from 'src/app/services/alert.service';
-import { DiplomaPage } from 'src/app/pages/gabinete-digital/diplomas/diploma/diploma.page';
+import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
 
 @Component({
   selector: 'app-diplomas',
@@ -33,7 +32,7 @@ constructor(
   ngOnInit() {
     this.router.events.forEach((event) => {
       if(event instanceof NavigationEnd && event.url == this.router.url) {
-        this.LoadList();
+        this.refreshing();
       }
     });
   }
@@ -51,123 +50,93 @@ constructor(
   }
 
   async LoadList(){
-    this.diplomasList = new Array();
-
-    console.log('OOOKAY');
+    this.diplomasList = [];
+    console.log(this.diplomasList);
     
     let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
     
-
-    console.log(diplomas);
     switch (this.segment) {
       case 'validar':
-        let diplomasValidar = diplomas.reverse().filter(data => data.activityInstanceName == "Revisar Diploma");
+        let diplomasValidar = diplomas.filter(data => data.activityInstanceName == "Revisar Diploma");
         console.log(diplomasValidar);
-        diplomasValidar.forEach(element => {
-          let DocId = element.workflowInstanceDataFields.FolderID;
-          let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
-          this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
-            this.totalDocs = res.DocumentsTotal;
-            console.log(res.DocumentsTotal);
-            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();
+        
+          diplomasValidar.forEach(async element => {
+            let DocId = element.workflowInstanceDataFields.FolderID;
+            let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
+            this.totalDocs = await this.getTotalDocs(DocId);
 
-        let task = {
-            "SerialNumber": element.serialNumber,
-            "Folio": element.workflowInstanceDataFields.Subject,
-            "Senders": element.originator.email,
-            "CreateDate": taskDate,
-            "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-            "Remetente": element.workflowInstanceDataFields.Remetente,
-            "DocumentsQty": 0,
-            "DocId": element.workflowInstanceDataFields.DispatchDocID,
-            "FolderID": element.workflowInstanceDataFields.FolderID,
-            "WorkflowName": element.workflowDisplayName,
-            "activityInstanceName": element.activityInstanceName,
-        }
-            this.diplomasList.push(task);
-          },
-          (error)=>{
             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": 0,
-            "DocId": element.workflowInstanceDataFields.DispatchDocID,
-            "FolderID": element.workflowInstanceDataFields.FolderID,
-            "WorkflowName": element.workflowDisplayName,
-            "activityInstanceName": element.activityInstanceName,
-        }
+            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": this.totalDocs,
+                "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+                "WorkflowName": element.workflowDisplayName,
+                "activityInstanceName": element.activityInstanceName,
+            }
             this.diplomasList.push(task);
+            this.diplomasList = removeDuplicate(this.diplomasList);
+            this.diplomasList = this.sortArrayISODate(this.diplomasList).reverse();
+            
           });
-        });
-        this.showLoader = false;
+          this.showLoader = false;
         break;
       case 'assinados':
-        console.log(this.segment);
         this.diplomasList = new Array();
         let diplomasAssinados = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
-        console.log(diplomasAssinados);
-        diplomasAssinados.forEach(element => {
+        diplomasAssinados.forEach(async element => {
           let DocId = element.workflowInstanceDataFields.FolderID;
           let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
-          this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
-            this.totalDocs = res.DocumentsTotal;
-            console.log(res.DocumentsTotal);
+          this.totalDocs = await this.getTotalDocs(DocId);
 
-            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 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 = {
+          let task = {
               "SerialNumber": element.serialNumber,
               "Folio": element.workflowInstanceDataFields.Subject,
               "Senders": element.workflowInstanceDataFields.Sender,
               "CreateDate": taskDate,
               "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
               "Remetente": element.workflowInstanceDataFields.Remetente,
-              "DocumentsQty": 0,
-              "DocId": element.workflowInstanceDataFields.DispatchDocID,
-              "FolderID": element.workflowInstanceDataFields.FolderID,
+              "DocumentsQty": this.totalDocs,
+              "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
               "WorkflowName": element.workflowDisplayName,
               "activityInstanceName": element.activityInstanceName,
-            }
-            this.diplomasList.push(task);
-          },
-          (error)=> {
-            
-            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": 0,
-              "DocId": element.workflowInstanceDataFields.DispatchDocID,
-              "FolderID": element.workflowInstanceDataFields.FolderID,
-              "WorkflowName": element.workflowDisplayName,
-              "activityInstanceName": element.activityInstanceName,
-            }
-            this.diplomasList.push(task);
-          });
+          }
+          this.diplomasList.push(task);
+          this.diplomasList = removeDuplicate(this.diplomasList);
+          this.diplomasList = this.sortArrayISODate(this.diplomasList).reverse();
+           
         });
         this.showLoader = false;
         break;
     }
   }
+  async getTotalDocs(DocId:any){
+    let res = await this.processes.GetDocumentDetails(DocId, '361').toPromise();
+    console.log(res.DocumentsTotal);
+    return res.DocumentsTotal;
+  }
+  sortArrayISODate(myArray: any) {
+    return myArray.sort(function(a, b) {
+      return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
+    });
+  }
+
+  async refreshing() {
+    setTimeout(() => {
+      this.LoadList();
+    }, 1500);
+  }
 
   doRefresh() {
     this.LoadList();

src/app/shared/popover/deploma-options/deploma-options.page.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { AnimationController, ModalController, PopoverController } from '@ionic/angular';
+import { AnimationController, ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
 import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
 import { ProcessesService } from 'src/app/services/processes.service';
@@ -26,19 +26,14 @@ export class DeplomaOptionsPage implements OnInit {
     private modalController: ModalController,
     private activatedRoute: ActivatedRoute,
     private processes: ProcessesService,
-    private animationController: AnimationController,
+    private navParams: NavParams,
     private toastService: ToastService,
     private router: Router,) { 
-      this.activatedRoute.queryParams.subscribe(params => {
-        if(params["serialNumber"]) {
-          this.serialnumber = params["serialNumber"];
-          console.log(params["serialNumber"]);
-        }
-      });
-
+      this.serialnumber = this.navParams.get('serialNumber');
     }
 
   ngOnInit() {
+    console.log(this.serialnumber);
   }
 
 

src/app/shared/popover/despachos-options/despachos-options.page.ts

@@ -63,8 +63,6 @@ export class DespachosOptionsPage implements OnInit {
   }
 
   sendExpedienteToPending(){
-    console.log(this.task.SerialNumber);
-    
     this.popoverController.dismiss();
     this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
       console.log(res);

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

@@ -46,7 +46,7 @@ export class OptsExpedientePage implements OnInit {
   }
 
   close(){
-    if( window.innerWidth <= 1024){
+    if( window.innerWidth < 801){
       this.popoverController.dismiss();
     }
     else{
@@ -69,13 +69,22 @@ export class OptsExpedientePage implements OnInit {
       }
     }
     else{
-      this.activatedRoute.paramMap.subscribe(params => {
+      window.history.back();
+      
+      /* this.activatedRoute.paramMap.subscribe(params => {
+        console.log('YES');
+        console.log(params);
+        
+        
         switch (params["params"].caller) {
           case 'events':
+            console.log('here-1');
+            
             this.router.navigate(['/home',params["params"].caller]);
             break;
       
           case 'gabinete-digital':
+            console.log('here0');
             let navigationExtras: NavigationExtras = {
               queryParams: {
                 "expedientes": true,
@@ -83,13 +92,15 @@ export class OptsExpedientePage implements OnInit {
             }
             if( window.innerWidth < 801) {
               this.router.navigate(['/home/gabinete-digital/expediente']);
+              console.log('here');
+              
             } else {
               this.router.navigate(['/home/gabinete-digital'], navigationExtras);
             }
             break;
           
         }
-      });
+      }); */
     }
   }
 

src/app/shared/popover/request-options/request-options.page.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { AnimationController, ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
 import { DarParecerPage } from 'src/app/modals/dar-parecer/dar-parecer.page';
@@ -30,7 +30,8 @@ export class RequestOptionsPage implements OnInit {
     private processes: ProcessesService,
     private activatedRoute: ActivatedRoute,
     private animationController: AnimationController,
-    private toastService: ToastService
+    private toastService: ToastService,
+    private router: Router,
   ) { 
     this.task = this.navParams.get('task');
     this.fulltask = this.navParams.get('fulltask');
@@ -61,12 +62,13 @@ export class RequestOptionsPage implements OnInit {
   }
 
   close(){
-    if( window.innerWidth <= 1024){
-      this.popoverController.dismiss();
+    if( window.innerWidth < 801){
+      this.popoverController.dismiss(); 
     }
     else{
       this.modalController.dismiss();
     }
+    this.router.navigate(['/home/gabinete-digital/pedidos']);
   }
 
   sendExpedienteToPending(){