From 2336e6b83ff33edc9b2b4c8a558399e03b59c8dc Mon Sep 17 00:00:00 2001
From: Peter Maquiran <petermaquiran29@gmail.com>
Date: Wed, 24 Feb 2021 10:08:50 +0100
Subject: [PATCH] Improve generic components

---
 src/app/pages/agenda/agenda.page.html         |  7 ++--
 src/app/pages/agenda/agenda.page.scss         | 24 ++++++++++++++
 src/app/pages/agenda/agenda.page.ts           | 33 ++++++++++---------
 .../agenda/new-event/new-event.component.html |  2 +-
 .../agenda/new-event/new-event.component.ts   | 15 +++++----
 .../agenda/view-event/view-event.page.html    |  7 ++--
 6 files changed, 59 insertions(+), 29 deletions(-)

diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index b783d6e49..b92b202a7 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -286,8 +286,8 @@
     <div class="event-details  bg-blue ">
       
       <!-- New -->
-      <app-new-event *ngIf="mobileComponent.showAddNewEvent"
-        style="height: 100%;display: flex;flex-wrap: wrap;"
+      <app-new-event  *ngIf="mobileComponent.showAddNewEvent"
+
 
         [profile]="profile"
         [selectedSegment]=segment
@@ -296,8 +296,7 @@
         
       ></app-new-event>
       <!-- Edit -->
-      <app-edit-event *ngIf="mobileComponent.showEditEvent"
-        style="height: 100%;display: flex;flex-wrap: wrap;"
+      <app-edit-event  *ngIf="mobileComponent.showEditEvent"
         
         [profile]="profile"
         [selectedSegment]="segment"
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss
index 99fbb4e53..2de779489 100644
--- a/src/app/pages/agenda/agenda.page.scss
+++ b/src/app/pages/agenda/agenda.page.scss
@@ -543,4 +543,28 @@ td.monthview-primary-with-event {
   .event-details{
     display: block;
   }
+}
+
+
+
+
+
+app-view-event{
+  height: 100%;
+  display: flex;
+  flex-wrap: wrap-reverse;
+  flex-direction: column;
+}
+
+app-edit-even{
+  height: 100%;
+  display: flex;
+  flex-wrap: wrap;
+}
+
+app-new-event{
+  height: 100%;
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: column;
 }
\ No newline at end of file
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index 3a5307da6..76b47267b 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -628,22 +628,25 @@ export class AgendaPage implements OnInit {
 
   openAddEventDismiss(data){
     this.cloneAllmobileComponent();
-    
-    let postEvent: Event = data;
-    if (postEvent.Subject != null)
-    {
-      this.eventSource.push({
-        title: postEvent.Subject,
-        startTime: new Date(postEvent.StartDate),
-        endTime: new Date(postEvent.EndDate),
-        allDay: false,
-        event: postEvent
-      });
-      this.myCal.update();
-      this.myCal.loadEvents();
-      this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
+
+    if(data.type == 'save'){
+      let postEvent: Event = data;
+      if (postEvent.Subject != null)
+      {
+        this.eventSource.push({
+          title: postEvent.Subject,
+          startTime: new Date(postEvent.StartDate),
+          endTime: new Date(postEvent.EndDate),
+          allDay: false,
+          event: postEvent
+        });
+        this.myCal.update();
+        this.myCal.loadEvents();
+        this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
+      }
+      this.mobileComponent.showAddNewEvent = false;
     }
-    this.mobileComponent.showAddNewEvent = false;
+
   }
 
   async viewEventDetail(eventId:any) {
diff --git a/src/app/shared/agenda/new-event/new-event.component.html b/src/app/shared/agenda/new-event/new-event.component.html
index 98d05e4ef..25bf81aa3 100644
--- a/src/app/shared/agenda/new-event/new-event.component.html
+++ b/src/app/shared/agenda/new-event/new-event.component.html
@@ -3,7 +3,7 @@
     <div class="main-header">
       <div class="title-content">
         <div class="middle">
-          <ion-label class="title">Novo Evento1</ion-label>
+          <ion-label class="title">Novo Evento</ion-label>
         </div>
       </div>
     </div>
diff --git a/src/app/shared/agenda/new-event/new-event.component.ts b/src/app/shared/agenda/new-event/new-event.component.ts
index 9fea4813e..ee8bd1f5d 100644
--- a/src/app/shared/agenda/new-event/new-event.component.ts
+++ b/src/app/shared/agenda/new-event/new-event.component.ts
@@ -90,13 +90,13 @@ export class NewEventPage implements OnInit {
     }
   }
   close(){
-    this.modalController.dismiss();
+    this.onAddEvent.emit({
+      type:'close',
+      data: this.postEvent
+    });
   }
   save(){
-    console.log(this.postEvent);
-    console.log(this.profile);
-    
-    
+        
     if(this.profile=='mdgpr'){
       this.eventService.postEventMd(this.postEvent, this.postEvent.CalendarName).subscribe();
     }
@@ -104,7 +104,10 @@ export class NewEventPage implements OnInit {
       this.eventService.postEventPr(this.postEvent, this.postEvent.CalendarName).subscribe();
     }
     
-    this.onAddEvent.emit(this.postEvent);
+    this.onAddEvent.emit({
+      type:'save',
+      data: this.postEvent
+    });
   }
 
   async openAttendees()
diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html
index 9caa1d5e5..835c8736e 100644
--- a/src/app/shared/agenda/view-event/view-event.page.html
+++ b/src/app/shared/agenda/view-event/view-event.page.html
@@ -1,4 +1,4 @@
-
+<ion-header  class="ion-no-border">
   <ion-toolbar class="header-toolbar">
     <div class="main-header">
       <div class="title-content">
@@ -15,9 +15,9 @@
       </div>
     </div>
   </ion-toolbar>
+</ion-header>
 
-
-
+<ion-content>
   <div class="main-content">
     <div class="upper-content">
       <div class="content-location">
@@ -67,3 +67,4 @@
       </ion-list>
     </div>
   </div>    
+</ion-content>
\ No newline at end of file