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

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

@@ -431,7 +431,7 @@ export class DespachoPage implements OnInit {
       return this.animationController.create()
         .addElement(baseEl)
         .easing('ease-out')
-        .duration(500)
+        .duration(7000)
         .addAnimation([backdropAnimation, wrapperAnimation]);
     }
 
@@ -474,7 +474,7 @@ export class DespachoPage implements OnInit {
       return this.animationController.create()
         .addElement(baseEl)
         .easing('ease-out')
-        .duration(500)
+        .duration(7000)
         .addAnimation([backdropAnimation, wrapperAnimation]);
     }
 

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

@@ -31,7 +31,7 @@
         <div class="content-details">
           <ion-label>
             <p>{{customDate}}</p>
-            <p>das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
+            <p>das12 {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
             <p *ngIf="!loadedEvent.workflowInstanceDataFields.IsRecurring">(Não se repete)</p>
             <p *ngIf="loadedEvent.workflowInstanceDataFields.IsRecurring">Repete</p>
           </ion-label>

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

@@ -11,6 +11,7 @@ import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page';
 import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
 import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
+import { ToastService } from 'src/app/services/toast.service';
 
 @Component({
   selector: 'app-approve-event',
@@ -46,7 +47,8 @@ export class ApproveEventPage implements OnInit {
     private menu: MenuController,
     private alertService: AlertService,
     private iab: InAppBrowser,
-    private animationController: AnimationController
+    private animationController: AnimationController,
+    private toastService: ToastService,
   ) { 
     this.activatedRoute.queryParams.subscribe(params => {
       if(params["serialNumber"]) {
@@ -61,17 +63,7 @@ export class ApproveEventPage implements OnInit {
   }
 
   goBack() {
-    let navigationExtras: NavigationExtras = {
-      queryParams: {
-        "eventos": true,
-      }
-    };
-    if( window.innerWidth < 801) {
-      this.router.navigate(['/home/gabinete-digital/event-list']);
-    } 
-    else {
-      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-    }
+    window.history.back();
   }
 
   async getTask(){
@@ -91,9 +83,10 @@ export class ApproveEventPage implements OnInit {
     console.log(body);
 
     try {  
-      await this.processes.PostTaskAction(body).toPromise()
-      this.successMessage()
-      this.goBack();
+      //await this.processes.PostTaskAction(body).toPromise()
+      //this.successMessage()
+      this.toastService.successMessage('Evento rejeitado!');
+      //this.goBack();
     } catch (error) {
       this.badRequest()
     }
@@ -116,13 +109,13 @@ export class ApproveEventPage implements OnInit {
   }
 
   async rejectTask(serialNumber:string){
-  
     let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
     console.log(body);
 
     try {    
       this.processes.PostTaskAction(body).toPromise();
-      await this.successMessage('Processo rejeitado');
+      //await this.successMessage('Processo rejeitado');
+      await this.toastService.successMessage('Processo rejeitado');
       this.goBack();
     } catch (error) {
       this.badRequest()

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

@@ -2,7 +2,7 @@
   <app-header></app-header>
 </ion-header>
 <ion-content>
-  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
     <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
      <ion-refresher-content>
     </ion-refresher-content>

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

@@ -37,7 +37,7 @@ export class EventListPage implements OnInit {
 
     this.router.events.forEach((event) => {
       if(event instanceof NavigationEnd && event.url == this.router.url) {
-        this.LoadToApproveEvents();
+        this.doRefresh();
       }
     });
 
@@ -96,11 +96,10 @@ export class EventListPage implements OnInit {
 
 
 
-  doRefresh(event) {
+  doRefresh() {
     this.LoadToApproveEvents();
     console.log('refresh');
     setTimeout(() => {
-       event.target.complete();
      }, 2000);
   }
   close(){