From 8ced295f64b8fa5006505a55ab6ad1fbbd52d9f2 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 6 Apr 2021 09:26:31 +0100
Subject: [PATCH] save

---
 .../agenda/edit-event/edit-event.page.html    |  2 +-
 .../agenda/view-event/view-event.page.ts      |  3 +-
 .../edit-event/app-edit-event-home.page.html  |  2 +-
 src/app/pages/events/events-routing.module.ts | 67 ++++++++++---------
 .../approve-event-modal.page.html             |  2 +-
 .../approve-event/approve-event.page.html     |  4 +-
 .../gabinete-digital/gabinete-digital.page.ts |  2 +-
 .../approve-event.component.html              |  2 +-
 .../approve-event/approve-event.component.ts  | 10 ++-
 .../edit-event/edit-event.component.html      |  2 +-
 .../event-list/event-list.component.html      |  2 +-
 .../events-to-approve.page.ts                 |  8 ++-
 12 files changed, 57 insertions(+), 49 deletions(-)

diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html
index 5065380c9..f9a4550c0 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.html
+++ b/src/app/pages/agenda/edit-event/edit-event.page.html
@@ -6,7 +6,7 @@
         <ion-header>
         <div class="title-content">
           <div class="middle">
-            <ion-label class="title">Editar Evento</ion-label>
+            <ion-label class="title">Editar Evento com divisão</ion-label>
           </div>
         </div>
       </ion-header>
diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts
index e2d3845ee..f45837924 100644
--- a/src/app/pages/agenda/view-event/view-event.page.ts
+++ b/src/app/pages/agenda/view-event/view-event.page.ts
@@ -8,7 +8,6 @@ import { EventsService } from 'src/app/services/events.service';
 import { Event } from '../../../models/event.model';
 import { EditEventPage } from '../edit-event/edit-event.page';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
-import { EventEditPage } from '../../events/edit-event/edit-event.component';
 import { ProcessesService } from 'src/app/services/processes.service';
 
 @Component({
@@ -115,7 +114,7 @@ export class ViewEventPage implements OnInit {
     }
 
     const modal = await this.modalController.create({
-      component: EventEditPage,
+      component: EditEventPage,
       componentProps: {
         eventId: this.loadedEvent.EventId,
         profile: this.profile,
diff --git a/src/app/pages/events/edit-event/app-edit-event-home.page.html b/src/app/pages/events/edit-event/app-edit-event-home.page.html
index 95d9fe4c5..860adfe23 100644
--- a/src/app/pages/events/edit-event/app-edit-event-home.page.html
+++ b/src/app/pages/events/edit-event/app-edit-event-home.page.html
@@ -3,7 +3,7 @@
     <ion-buttons slot="start">
       <ion-back-button defaultHref="{{ backURL }}"></ion-back-button>
     </ion-buttons>
-    <ion-title class="header-title">Visualizar Evento</ion-title>
+    <ion-title class="header-title">21Visualizar Evento</ion-title>
     <ion-buttons slot="end">
       <button (click)="deleteConfirm()" class="ion-icon-delete">
         <ion-icon name="trash"></ion-icon>
diff --git a/src/app/pages/events/events-routing.module.ts b/src/app/pages/events/events-routing.module.ts
index 64b25a029..0839cc0ea 100644
--- a/src/app/pages/events/events-routing.module.ts
+++ b/src/app/pages/events/events-routing.module.ts
@@ -1,37 +1,38 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-import { EventsPage } from './events.page';
-
-const routes: Routes = [
-  {
-    path: '',
-    component: EventsPage
-  },
-  {
-    path: 'event-detail',
-    loadChildren: () => import('./event-detail/event-detail.module').then( m => m.EventDetailPageModule)
-  },
-  {
-    path: 'attachments',
-    loadChildren: () => import('./attachments/attachments.module').then( m => m.AttachmentsPageModule)
-  },
-  {
-    path: 'attendees',
-    loadChildren: () => import('./attendees/attendees.module').then( m => m.AttendeesPageModule)
-  },
-  {
-    path: 'attendee-modal',
-    loadChildren: () => import('./attendee-modal/attendee-modal.module').then( m => m.AttendeeModalPageModule)
-  },
  {
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { EventsPage } from './events.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: EventsPage
+  },
+  {
+    path: 'event-detail',
+    loadChildren: () => import('./event-detail/event-detail.module').then( m => m.EventDetailPageModule)
+  },
+  {
+    path: 'attachments',
+    loadChildren: () => import('./attachments/attachments.module').then( m => m.AttachmentsPageModule)
+  },
+  {
+    path: 'attendees',
+    loadChildren: () => import('./attendees/attendees.module').then( m => m.AttendeesPageModule)
+  },
+  {
+    path: 'attendee-modal',
+    loadChildren: () => import('./attendee-modal/attendee-modal.module').then( m => m.AttendeeModalPageModule)
+  },
+  {
     path: 'event-detail-modal',
     loadChildren: () => import('./event-detail-modal/event-detail-modal.module').then( m => m.EventDetailModalPageModule)
   }
 
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class EventsPageRoutingModule {}
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class EventsPageRoutingModule {}
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
index 65598f61e..b589d9ab9 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
+++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
@@ -25,7 +25,7 @@
       </ion-item>
       <ion-item (click)="emendTask(loadedEvent.serialNumber)">
         <ion-icon name="create-outline"></ion-icon>
-        <ion-label>Emendar</ion-label>
+        <ion-label>Emendar1</ion-label>
       </ion-item>
       <ion-item (click)="rejectTask(loadedEvent.serialNumber)">
         <ion-icon name="close-sharp"></ion-icon>
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 23aa99595..8140b1fae 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
@@ -25,7 +25,7 @@
       </ion-item>
       <ion-item (click)="emendTask(loadedEvent.serialNumber)">
         <ion-icon name="create-outline"></ion-icon>
-        <ion-label>Emendar</ion-label>
+        <ion-label>Emendar1</ion-label>
       </ion-item>
       <ion-item (click)="rejectTask(loadedEvent.serialNumber)">
         <ion-icon name="close-sharp"></ion-icon>
@@ -93,7 +93,7 @@
       </ion-menu-button>
       </p>
       <p>
-        <ion-button class="button-approve" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</ion-button>
+        <ion-button class="button-approve" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar1</ion-button>
       </p>
     </ion-item>
     <ion-item hidden>
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 61dd1cfc3..692d35783 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -163,7 +163,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{
     this.closeAllDesktopComponent();
 
     let classs;
-    if( window.innerWidth <= 1024){
+    if( window.innerWidth <= 800){
       classs = 'modal'
     } else  {
       classs = 'gabinete-digital-mobile-modal-to-Desktop'
diff --git a/src/app/shared/agenda/approve-event/approve-event.component.html b/src/app/shared/agenda/approve-event/approve-event.component.html
index 8f9862116..47f43beaa 100644
--- a/src/app/shared/agenda/approve-event/approve-event.component.html
+++ b/src/app/shared/agenda/approve-event/approve-event.component.html
@@ -21,7 +21,7 @@
     <ion-list>
       <ion-item (click)="approveTask(loadedEvent.serialNumber)">
         <ion-icon name="checkmark-sharp"></ion-icon>
-        <ion-label>Aprovar</ion-label>
+        <ion-label>Aprovar3</ion-label>
       </ion-item>
       <ion-item (click)="emendTask(loadedEvent.serialNumber)">
         <ion-icon name="create-outline"></ion-icon>
diff --git a/src/app/shared/agenda/approve-event/approve-event.component.ts b/src/app/shared/agenda/approve-event/approve-event.component.ts
index d581aead1..b67787367 100644
--- a/src/app/shared/agenda/approve-event/approve-event.component.ts
+++ b/src/app/shared/agenda/approve-event/approve-event.component.ts
@@ -71,8 +71,12 @@ export class ApproveEventComponent implements OnInit {
     })
   }
   approveTask(serialNumber:string){
-
-    this.approveEventDismiss.emit({ 
+    let body = { "serialNumber": serialNumber, "action": "Aprovar" }
+    console.log(body);
+    this.processes.PostTaskAction(body);
+    this.alertService.presentAlert('Operação realizada com sucesso!');
+    this.modalController.dismiss(serialNumber);
+    /* this.approveEventDismiss.emit({ 
       "serialNumber": serialNumber,
       "action": "Aprovar", 
       "saveData": {
@@ -80,7 +84,7 @@ export class ApproveEventComponent implements OnInit {
         today: this.today,
         customDate: this.customDate
       }
-    });
+    }); */
   }
 
   emendTask(serialNumber:string){
diff --git a/src/app/shared/agenda/edit-event/edit-event.component.html b/src/app/shared/agenda/edit-event/edit-event.component.html
index 8f5e704f3..5475e1375 100644
--- a/src/app/shared/agenda/edit-event/edit-event.component.html
+++ b/src/app/shared/agenda/edit-event/edit-event.component.html
@@ -3,7 +3,7 @@
     <div class="main-header">
       <div class="title-content">
         <div class="middle">
-          <ion-label class="title">Editar Evento</ion-label>
+          <ion-label class="title">2Editar Evento</ion-label>
         </div>
       </div>
     </div>
diff --git a/src/app/shared/agenda/event-list/event-list.component.html b/src/app/shared/agenda/event-list/event-list.component.html
index 4eba898ba..8101f01fb 100644
--- a/src/app/shared/agenda/event-list/event-list.component.html
+++ b/src/app/shared/agenda/event-list/event-list.component.html
@@ -49,7 +49,7 @@
            <ion-item
              class=" ion-no-padding width-100"
              *ngFor="let event of eventsPRList"
-             (click)="openApproveModal(event.serialNumber)">
+             (click)="openApproveModal(event.serialNumber, event)">
              <div class="item event-pr-{{event.workflowInstanceDataFields.Agenda}} width-100">
                  <div class="approve-event-time">
                    <p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
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 93c3b1d1c..89dfbc49c 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
@@ -67,7 +67,7 @@ S
   }
   async openApproveModal(eventSerialNumber){
     let classs;
-    if( window.innerWidth <= 1024){
+    if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
     } else  {
       classs = 'modal modal-desktop showAsideOptions'
@@ -81,7 +81,11 @@ S
       cssClass: classs,
     });
     await modal.present();
-    modal.onDidDismiss();
+    modal.onDidDismiss().then((res) => {
+      console.log(res['data']);
+      
+      this.LoadToApproveEvents();
+    });
   }
 
   doRefresh(event) {