Merge branch 'develop' of https://bitbucket.org/equilibriumito/gabinete-digital-fo into develop

package.json

@@ -38,7 +38,7 @@
     "@awesome-cordova-plugins/multiple-document-picker": "^5.40.0",
     "@byteowls/capacitor-filesharer": "^3.0.0",
     "@capacitor-community/camera-preview": "^1.2.1",
-    "@capacitor/android": "3.3.3",
+    "@capacitor/android": "3.6.0",
     "@capacitor/app": "^1.0.5",
     "@capacitor/browser": "1.0.6",
     "@capacitor/camera": "^1.2.0",
@@ -110,7 +110,7 @@
     "capacitor-voice-recorder": "^2.0.0",
     "capacitor2-file-picker": "^1.0.0",
     "ci": "^2.1.1",
-    "cordova": "^10.0.0",
+    "cordova": "^11.0.0",
     "cordova-plugin-crop": "^0.4.0",
     "cordova-plugin-dbcopy": "git+https://github.com/an-rahulpandey/cordova-plugin-dbcopy.git",
     "cordova-plugin-document-viewer": "^1.0.0",
@@ -129,11 +129,11 @@
     "dotenv": "^10.0.0",
     "duration": "^0.2.2",
     "faker": "^5.5.3",
-    "firebase": "^9.3.0",
+    "firebase": "^9.8.4",
     "g": "^2.0.1",
     "global": "^4.4.0",
     "hammerjs": "^2.0.8",
-    "http-server": "^0.12.3",
+    "http-server": "^14.1.1",
     "i": "^0.3.7",
     "ionic-angular": "^3.9.10",
     "ionic-image-loader": "^6.3.3",
@@ -145,7 +145,7 @@
     "jest-puppeteer": "^5.0.4",
     "jetifier": "^1.6.8",
     "lite-server": "^2.6.1",
-    "moment": "^2.29.1",
+    "moment": "^2.29.3",
     "ng-lazyload-image": "^9.1.2",
     "ng2-pdf-viewer": "^3.0.8",
     "ngx-cookie-service": "^12.0.3",
@@ -156,11 +156,11 @@
     "ngx-socket-io": "^3.2.0",
     "pdfjs": "^2.4.6",
     "pdfjs-dist": "^2.9.359",
-    "puppeteer": "^10.1.0",
+    "puppeteer": "^15.1.1",
     "rocket.chat.realtime.api.rxjs": "^2.1.1",
     "rxjs": "~6.6.3",
     "rxjs-compat": "^6.6.7",
-    "sharp": "^0.29.1",
+    "sharp": "^0.30.7",
     "socket.io-client": "^2.3.0",
     "ts-jest": "^27.0.3",
     "tslib": "^2.0.0",
@@ -176,15 +176,15 @@
     "@angular/compiler-cli": "^12.1.2",
     "@angular/language-service": "^12.1.2",
     "@capacitor/cli": "^3.3.2",
-    "@ionic/angular-toolkit": "^4.0.0",
+    "@ionic/angular-toolkit": "^6.1.0",
     "@ionic/lab": "3.1.7",
     "@types/jasmine": "~3.6.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/jest": "^26.0.24",
     "@types/node": "^12.11.1",
-    "codelyzer": "^6.0.0",
+    "codelyzer": "^0.0.28",
     "com-sarriaroman-photoviewer": "^1.2.5",
-    "cordova-android": "^5.0.0",
+    "cordova-android": "^10.1.2",
     "cordova-android-support-gradle-release": "^3.0.1",
     "cordova-browser": "^6.0.0",
     "cordova-plugin-androidx": "^3.0.0",
@@ -204,7 +204,7 @@
     "jasmine-spec-reporter": "~5.0.0",
     "jest": "^27.0.6",
     "jest-preset-angular": "^9.0.4",
-    "karma": "~6.3.4",
+    "karma": "^6.3.20",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage-istanbul-reporter": "~3.0.2",
     "karma-jasmine": "~4.0.0",

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

@@ -81,80 +81,6 @@ export class DiplomasPage implements OnInit, OnDestroy {
 
   }
 
-  /* async loadDiplomas(){
-    
-
-    this.activatedRoute.data.subscribe(data => {
-      
-
-      switch (this.segment) {
-        case 'validar':
-
-          let diplomasValidar = data['diplomas'].filter(data => data.activityInstanceName == "Revisar Diploma");
-          diplomasValidar.forEach(async element => {
-            let DocId = element.workflowInstanceDataFields.FolderID;
-            let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
-
-            let res = await this.processes.GetDocumentDetails(DocId, '361').toPromise();
-
-            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": res.DocumentsTotal,
-                "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
-                "WorkflowName": element.workflowDisplayName,
-                "activityInstanceName": element.activityInstanceName,
-            }
-            this.diplomasList.push(task);
-            this.diplomasList = removeDuplicate( this.diplomasList)
-
-          });
-          this.showLoader = false;
-          break;
-
-        case 'assinados':
-          //this.diplomasList = new Array();
-          let diplomasAssinados = data.diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
-          diplomasAssinados.forEach(async element => {
-            let DocId = element.workflowInstanceDataFields.FolderID;
-            let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
-
-            let res = await this.processes.GetDocumentDetails(DocId, '361').toPromise();
-
-            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": this.totalDocs,
-                "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
-                "WorkflowName": element.workflowDisplayName,
-                "activityInstanceName": element.activityInstanceName,
-            }
-            this.diplomasList.push(task);
-            this.diplomasList = removeDuplicate( this.diplomasList)
-
-          });
-          this.showLoader = false;
-          break;
-      }
-    });
-  } */
-
   async getTotalDocs(DocId: any) {
     let res = await this.processes.GetDocumentDetails(DocId, '361').toPromise();
     

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

@@ -545,6 +545,7 @@ export class GabineteDigitalPage implements OnInit {
   async LoadCounts() {
 
     let expedientes;
+    this.showLoader = true
 
     try {
       expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise();
@@ -618,6 +619,8 @@ export class GabineteDigitalPage implements OnInit {
     this.count_total_pending = Object.keys(pendentes).length;
     this.pendentesstore.count = this.count_total_pending;
 
+    pendentes = pendentes.map((element)=> this.customTaskPipe.transform(element))
+
     this.pendentesstore.reset(pendentes);
 
     let depachoAPI: any  = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise();
@@ -657,7 +660,30 @@ export class GabineteDigitalPage implements OnInit {
 
     let diplomasValidar = depachoAPI.filter(data => data.activityInstanceName == "Revisar Diploma");
     this.count_dip_pv = Object.keys(diplomasValidar).length;
-    this.deplomasStore.resetDiplomasReview(diplomasValidar)
+
+    diplomasValidar = diplomasValidar.filter(data => data.activityInstanceName != "Tarefa de Despacho");
+
+
+    this.deplomasStore.resetDiplomasReview(diplomasValidar.map((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();
+
+      return {
+        "SerialNumber": element.serialNumber,
+        "Folio": element.workflowInstanceDataFields.Subject,
+        "Senders": element.workflowInstanceDataFields.Sender,
+        "CreateDate": taskDate,
+        "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+        "Remetente": element.workflowInstanceDataFields.Remetente,
+        "DocumentsQty": element.totalDocuments,
+        "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+        "WorkflowName": element.workflowDisplayName,
+        "activityInstanceName": element.activityInstanceName,
+        "Status": element.workflowInstanceDataFields.Status,
+      }
+    }))
 
 
     let diplomasAssinar = depachoAPI.filter(data => data.activityInstanceName == "Assinar Diploma");

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

@@ -77,7 +77,10 @@ export class DiplomasPage implements OnInit {
       diplomasList.push(task);
     });
 
+    diplomasList = diplomasList.filter(data => data.activityInstanceName != "Tarefa de Despacho");
+
     this.diplomasList = this.sortService.sortDate(diplomasList, 'CreateDate')
+    
     this.deplomasStore.resetDiplomasReview(this.diplomasList)
 
     let diplomasAssinadoList = []

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

@@ -55,8 +55,9 @@ export class PendentesPage implements OnInit {
 
   async LoadList(){
     this.skeletonLoader = true;
-    this.processes.GetPendingTasks(false).subscribe(async res => {
+    this.processes.GetPendingTasks(false).subscribe(async (pendentes) => {
-    let pendentes = await this.processes.GetPendingTasks(false).toPromise();
+      this.skeletonLoader = false;
+
       let pendentesList = [];
 
       pendentes.forEach(element => {
@@ -72,12 +73,13 @@ export class PendentesPage implements OnInit {
       this.storage.set('pendente-list',pendentesList).then(() => {
         
       })
-    this.skeletonLoader = false;
+    
     }, (error) => {
       if(error.status == 0){
         this.getFromDb();
       }
     })
+
 }
 
 getFromDb() {