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

src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts

@@ -185,11 +185,11 @@ export class ApproveEventModalPage implements OnInit {
     
   }
 
-  async badRequest() {
+  async badRequest(message?: string) {
     const modal = await this.modalController.create({
       component: BadRequestComponent,
-      componentProps: {
+       componentProps: {
-        message: 'hello',
+        message: message || 'Processo não efetuado' ,
       },
       cssClass: 'modal modal-desktop'
     });
@@ -198,6 +198,6 @@ export class ApproveEventModalPage implements OnInit {
     
     setTimeout(()=>{
       modal.dismiss()
-    },1000)
+    },3000)
   }
 }

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

@@ -476,11 +476,11 @@ export class DespachoPrPage implements OnInit {
     
   }
 
-  async badRequest() {
+  async badRequest(message?: string) {
     const modal = await this.modalController.create({
       component: BadRequestComponent,
        componentProps: {
-        message: 'hello',
+        message: message || 'Processo não efetuado' ,
       },
       cssClass: 'modal modal-desktop'
     });
@@ -489,6 +489,6 @@ export class DespachoPrPage implements OnInit {
     
     setTimeout(()=>{
       modal.dismiss()
-    },1000)
+    },3000)
   }
 }

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

@@ -94,18 +94,18 @@ export class DespachosPrPage implements OnInit {
     console.log(data);
     // this.openExpedientDetail.emit(data);
   }
-  
-   async LoadList(){
-     this.despachoList = new Array();
-     
-     this.loading = true;
 
-     let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
+  async LoadList() {
-     
+    this.despachoList = new Array();
-     console.log(result);
+    
+    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) => {
+    await result.forEach( (element, index) => {
-       
+      
       let task = {
         "SerialNumber": element.serialNumber,
         "Folio": element.workflowInstanceDataFields.Subject,
@@ -120,31 +120,31 @@ export class DespachosPrPage implements OnInit {
         "Status": element.workflowInstanceDataFields.Status,
         "activityInstanceName": element.activityInstanceName,
       }
-       
+      
       this.despachoList.push(task)
-       
+      
-     });
+    });
   
-     this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
+    this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
   
-     this.despachoList.forEach( (element, index) => {
+    this.despachoList.forEach( (element, index) => {
       // let aplicationId = element.workflowInstanceDataFields.SourceSecFsID;
       let FolderID = element['FolderID'];
   
-       this.processes.GetDocumentDetails(FolderID, '361').subscribe(res=>{
+      this.processes.GetDocumentDetails(FolderID, '361').subscribe(res=>{
         element.DocumentsQty = res.DocumentsTotal
-       })
+      })
   
-     });
+    });
 
-     this.loading = false;
+    this.loading = false;
+
+  }
   
-   }
+    sortArrayISODate(myArray: any) {
-  
+      return myArray.sort(function(a, b) {
-    sortArrayISODate(myArray: any){
+        return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
-        return myArray.sort(function(a, b) {
+      });
-          return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
-        });
     }
     
   doRefresh(event) {

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

@@ -435,11 +435,11 @@ export class DespachoPage implements OnInit {
     
   }
 
-  async badRequest() {
+  async badRequest(message?: string) {
     const modal = await this.modalController.create({
       component: BadRequestComponent,
        componentProps: {
-        message: 'hello',
+        message: message || 'Processo não efetuado' ,
       },
       cssClass: 'modal modal-desktop'
     });
@@ -448,6 +448,6 @@ export class DespachoPage implements OnInit {
     
     setTimeout(()=>{
       modal.dismiss()
-    },1000)
+    },3000)
   }
 }

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

@@ -180,11 +180,11 @@ export class DiplomaAssinarPage implements OnInit {
     
   }
 
-  async badRequest() {
+  async badRequest(message?: string) {
     const modal = await this.modalController.create({
       component: BadRequestComponent,
        componentProps: {
-        message: 'hello',
+        message: message || 'Processo não efetuado' ,
       },
       cssClass: 'modal modal-desktop'
     });
@@ -193,7 +193,7 @@ export class DiplomaAssinarPage implements OnInit {
     
     setTimeout(()=>{
       modal.dismiss()
-    }, 3000)
+    },3000)
   }
 
 }

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

@@ -262,11 +262,11 @@ export class DiplomaPage implements OnInit {
     
   }
 
-  async badRequest() {
+  async badRequest(message?: string) {
     const modal = await this.modalController.create({
       component: BadRequestComponent,
        componentProps: {
-        message: 'hello',
+        message: message || 'Processo não efetuado' ,
       },
       cssClass: 'modal modal-desktop'
     });
@@ -275,7 +275,7 @@ export class DiplomaPage implements OnInit {
     
     setTimeout(()=>{
       modal.dismiss()
-    }, 3000)
+    },3000)
   }
 
 }

src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts

@@ -224,11 +224,11 @@ export class ApproveEventModalPage implements OnInit {
     
   }
 
-  async badRequest() {
+  async badRequest(message?: string) {
     const modal = await this.modalController.create({
       component: BadRequestComponent,
        componentProps: {
-        message: 'hello',
+        message: message || 'Processo não efetuado' ,
       },
       cssClass: 'modal modal-desktop'
     });
@@ -237,7 +237,7 @@ export class ApproveEventModalPage implements OnInit {
     
     setTimeout(()=>{
       modal.dismiss()
-    },1000)
+    },3000)
   }
   
 }

src/app/shared/agenda/approve-event/approve-event.component.ts

@@ -243,11 +243,11 @@ export class ApproveEventComponent implements OnInit {
     
   }
 
-  async badRequest() {
+  async badRequest(message?: string) {
     const modal = await this.modalController.create({
       component: BadRequestComponent,
        componentProps: {
-        message: 'hello',
+        message: message || 'Processo não efetuado' ,
       },
       cssClass: 'modal modal-desktop'
     });
@@ -256,6 +256,6 @@ export class ApproveEventComponent implements OnInit {
     
     setTimeout(()=>{
       modal.dismiss()
-    },1000)
+    },3000)
   }
 }

src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts

@@ -424,11 +424,11 @@ export class EditEventToApproveComponent implements OnInit {
     
   }
 
-  async badRequest() {
+  async badRequest(message?: string) {
     const modal = await this.modalController.create({
       component: BadRequestComponent,
        componentProps: {
-        message: 'hello',
+        message: message || 'Processo não efetuado' ,
       },
       cssClass: 'modal modal-desktop'
     });
@@ -437,7 +437,7 @@ export class EditEventToApproveComponent implements OnInit {
     
     setTimeout(()=>{
       modal.dismiss()
-    },1000)
+    },3000)
   }
 
 }