From cb658bfa1f7a970996cb70154a6bdee8a5cfae89 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 9 Jun 2021 10:01:45 +0100
Subject: [PATCH 1/2] save

---
 .../despachos/despacho/despacho.page.ts       |  4 +-
 .../event-list/event-list.page.html           |  2 +-
 .../event-list/event-list.page.ts             |  5 +-
 src/app/pages/login/login.page.scss           |  9 +-
 src/app/services/alert.service.ts             |  7 +-
 src/app/services/toast.service.ts             | 96 ++++++++++++++++++-
 .../events-to-approve.page.ts                 |  5 -
 .../popover/bad-request/bad-request.page.html |  2 -
 8 files changed, 112 insertions(+), 18 deletions(-)

diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
index 9f325ca6d..28b95e615 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+++ b/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]);
     }
 
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html
index 4997ca3eb..d540dd5eb 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.html
+++ b/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>
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
index cc7d94f67..0ef45e5b3 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts
+++ b/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(){
diff --git a/src/app/pages/login/login.page.scss b/src/app/pages/login/login.page.scss
index 34de572c3..17037bc06 100644
--- a/src/app/pages/login/login.page.scss
+++ b/src/app/pages/login/login.page.scss
@@ -41,7 +41,8 @@ ion-item{
     --background: transparent;
 }
 .form{
-    width: 400px;
+    width: 300px;
+    margin: auto;
     overflow: auto;
 }
 .form-label{
@@ -159,4 +160,10 @@ ion-item{
         bottom: 0 !important;
         text-align: center;
     }
+}
+
+@media only screen and (min-width: 1024px){
+    .form{
+        width: 400px;
+    }
 }
\ No newline at end of file
diff --git a/src/app/services/alert.service.ts b/src/app/services/alert.service.ts
index 9952f17e2..1e9a09ba9 100644
--- a/src/app/services/alert.service.ts
+++ b/src/app/services/alert.service.ts
@@ -1,12 +1,15 @@
 import { Injectable } from '@angular/core';
-import { AlertController } from '@ionic/angular';
+import { AlertController, AnimationController } from '@ionic/angular';
 
 @Injectable({
   providedIn: 'root'
 })
 export class AlertService {
 
-  constructor(public alertController: AlertController) { }
+  constructor(
+    public alertController: AlertController,
+    private animationController: AnimationController,
+    ) { }
 
   async presentAlert(message:string) {
     const alert = await this.alertController.create({
diff --git a/src/app/services/toast.service.ts b/src/app/services/toast.service.ts
index 584d9738f..60305a958 100644
--- a/src/app/services/toast.service.ts
+++ b/src/app/services/toast.service.ts
@@ -1,12 +1,18 @@
 import { Injectable } from '@angular/core';
-import { ToastController } from '@ionic/angular';
+import { AnimationController, ModalController, ToastController } from '@ionic/angular';
+import { BadRequestPage } from '../shared/popover/bad-request/bad-request.page';
+import { SuccessMessagePage } from '../shared/popover/success-message/success-message.page';
 
 @Injectable({
   providedIn: 'root'
 })
 export class ToastService {
 
-  constructor(public toastController: ToastController) { }
+  constructor(
+    public toastController: ToastController,
+    private animationController: AnimationController,
+    private modalController: ModalController,
+    ) { }
 
   async presentToast(infoMessage: string) {
     const toast = await this.toastController.create({
@@ -16,4 +22,90 @@ export class ToastService {
     toast.present();
   }
 
+  async successMessage(message?: string) {
+    
+    const enterAnimation = (baseEl: any) => {
+      const backdropAnimation = this.animationController.create()
+        .addElement(baseEl.querySelector('ion-backdrop')!)
+        .fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
+
+      const wrapperAnimation = this.animationController.create()
+        .addElement(baseEl.querySelector('.modal-wrapper')!)
+        .keyframes([
+          { offset: 0, opacity: '1', right: '-100%' },
+          { offset: 1, opacity: '1', right: '0px' }
+        ]);
+
+      return this.animationController.create()
+        .addElement(baseEl)
+        .easing('ease-out')
+        .duration(7000)
+        .addAnimation([backdropAnimation, wrapperAnimation]);
+    }
+
+    const leaveAnimation = (baseEl: any) => {
+      return enterAnimation(baseEl).direction('reverse');
+    }
+ 
+
+    const modal = await this.modalController.create({
+      enterAnimation,
+      leaveAnimation,
+      component: SuccessMessagePage,
+       componentProps: {
+        message: message || 'Processo efetuado' ,
+      },
+      cssClass: 'notification-modal'
+    });
+
+    modal.present()
+    
+    setTimeout(()=>{
+      modal.dismiss()
+    },3000)
+    
+  }
+
+  async badRequest(message?: string) {
+    const enterAnimation = (baseEl: any) => {
+      const backdropAnimation = this.animationController.create()
+        .addElement(baseEl.querySelector('ion-backdrop')!)
+        .fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
+
+      const wrapperAnimation = this.animationController.create()
+        .addElement(baseEl.querySelector('.modal-wrapper')!)
+        .keyframes([
+          { offset: 0, opacity: '1', right: '-100%' },
+          { offset: 1, opacity: '1', right: '0px' }
+        ]);
+
+      return this.animationController.create()
+        .addElement(baseEl)
+        .easing('ease-out')
+        .duration(7000)
+        .addAnimation([backdropAnimation, wrapperAnimation]);
+    }
+
+    const leaveAnimation = (baseEl: any) => {
+      return enterAnimation(baseEl).direction('reverse');
+    }
+ 
+
+    const modal = await this.modalController.create({
+      enterAnimation,
+      leaveAnimation,
+      component: BadRequestPage,
+       componentProps: {
+        message: message || 'Processo efetuado' ,
+      },
+      cssClass: 'notification-modal'
+    });
+
+    modal.present()
+    
+    setTimeout(()=>{
+      modal.dismiss()
+    },3000)
+  }
+
 }
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
index b0a7f8e2d..1c71cf2a9 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
@@ -119,11 +119,6 @@ export class EventsToApprovePage implements OnInit {
     });
   } */
 
-  lis(){
-    console.log('Teste');
-    
-  }
-
   doRefresh() {
     console.log('Refresh Events');
     
diff --git a/src/app/shared/popover/bad-request/bad-request.page.html b/src/app/shared/popover/bad-request/bad-request.page.html
index 7ed6ca583..9922f668c 100644
--- a/src/app/shared/popover/bad-request/bad-request.page.html
+++ b/src/app/shared/popover/bad-request/bad-request.page.html
@@ -4,6 +4,4 @@
     <ion-icon slot="end" class="title-icon pr-10" src="/assets/images/notification-error.svg"></ion-icon> 
     {{ message }}
   </p>
-  
-  
 </div>

From e5f7c05acdefa5323c4a341fec5a3e778f09d451 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 9 Jun 2021 10:45:19 +0100
Subject: [PATCH 2/2] save

---
 .../approve-event/approve-event.page.html     |  2 +-
 .../approve-event/approve-event.page.ts       | 27 +++++++----------
 src/app/services/toast.service.ts             |  4 +--
 .../approve-event/approve-event.page.html     | 29 +------------------
 4 files changed, 14 insertions(+), 48 deletions(-)

diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
index 142865d25..92f0fd0ce 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
+++ b/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>
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
index 559075eae..41e20eb7a 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+++ b/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()
diff --git a/src/app/services/toast.service.ts b/src/app/services/toast.service.ts
index 60305a958..1ca515558 100644
--- a/src/app/services/toast.service.ts
+++ b/src/app/services/toast.service.ts
@@ -39,7 +39,7 @@ export class ToastService {
       return this.animationController.create()
         .addElement(baseEl)
         .easing('ease-out')
-        .duration(7000)
+        .duration(500)
         .addAnimation([backdropAnimation, wrapperAnimation]);
     }
 
@@ -62,7 +62,7 @@ export class ToastService {
     
     setTimeout(()=>{
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html
index 1015447c2..f0eba1f3d 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.html
+++ b/src/app/shared/agenda/approve-event/approve-event.page.html
@@ -11,33 +11,6 @@
     </div>
   </div>
 </ion-header> -->
-<ion-menu autoHide="false" side="end" content-id="main-content">
-  <ion-header>
-    <ion-toolbar translucent>
-      <ion-title>Ações</ion-title>
-    </ion-toolbar>
-  </ion-header>
-  <ion-content>
-    <ion-list>
-      <ion-item (click)="approveTask(loadedEvent.serialNumber)">
-        <ion-icon name="checkmark-sharp"></ion-icon>
-        <ion-label>Aprovar</ion-label>
-      </ion-item>
-      <ion-item (click)="emendTask(loadedEvent.serialNumber)">
-        <ion-icon name="create-outline"></ion-icon>
-        <ion-label>Adicionar Nota</ion-label>
-      </ion-item>
-      <ion-item (click)="rejectTask(loadedEvent.serialNumber)">
-        <ion-icon name="close-sharp"></ion-icon>
-        <ion-label>Rejeitar</ion-label>
-      </ion-item>
-      <ion-item (click)="editar(loadedEvent.serialNumber)">
-        <ion-icon name="close-sharp"></ion-icon>
-        <ion-label>Editar</ion-label>
-      </ion-item>
-    </ion-list>
-  </ion-content>
-</ion-menu>
 
 <ion-content id="main-content">
   <div class="main-content d-flex height-100">
@@ -47,7 +20,7 @@
           <ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
         </div>
         <div class="header-title flex-grow-1 cursor-pointer">
-          <label>{{loadedEvent.workflowInstanceDataFields.Subject}} 11 </label>
+          <label>12{{loadedEvent.workflowInstanceDataFields.Subject}} 11 </label>
         </div>
         <div  (click)="editar(loadedEvent.serialNumber)" class="header-icon-right display-none-{{showAside}}">
           <ion-icon src="assets/images/icons-edit.svg"></ion-icon>