From 48ec9849844834be97669e62a8cdb2c2d5ec1936 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 21 Dec 2021 15:56:23 +0100
Subject: [PATCH] Improve

---
 .../agenda/new-event/new-event.page.html      | 20 +++++++++++--------
 .../pages/agenda/new-event/new-event.page.ts  |  7 +++++--
 .../agenda/new-event/new-event.page.html      |  2 --
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html
index 53e6855e7..81d39f838 100644
--- a/src/app/pages/agenda/new-event/new-event.page.html
+++ b/src/app/pages/agenda/new-event/new-event.page.html
@@ -19,23 +19,27 @@
     </div>
 
 
-    <div class="container-div">
+    
+    <div class="container-div" *ngIf="loggeduser.Profile == 'MDGPR'">
       <div class="ion-item-class-2">
         <div class="ion-icon-class">
-          <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
+          <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
         </div>
-        <div class="ion-input-class" >
-          <ion-select  placeholder="Agenda"
-          interface="action-sheet"
-          Cancel-text="Cancelar" required>
-            <ion-select-option value="Reunião">MD</ion-select-option>
-            <ion-select-option value="Viagem">PR</ion-select-option>
+        <div class="ion-input-class" [class.input-error]="Form?.get('CalendarName')?.invalid  && validateFrom ">
+          <ion-select  placeholder="Selecione agenda*"
+          selectedText="{{postEvent.CalendarName}}"
+          [(ngModel)]="CalendarName"
+          interface="action-sheet" Cancel-text="Cancelar"
+          required>
+            <ion-select-option value="PR"> Calendário do Presidente da República</ion-select-option>
+            <ion-select-option value="MDGPR"> Meu calendário</ion-select-option>
           </ion-select>
         </div>
       </div>
     </div>
 
 
+
     <!-- <div *ngIf="Form && validateFrom" >
       <div *ngIf="Form.get('Subject').invalid " class="input-errror-message">
         <div *ngIf="Form.get('Subject').errors?.required">
diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts
index f15c6871c..e12eb9365 100644
--- a/src/app/pages/agenda/new-event/new-event.page.ts
+++ b/src/app/pages/agenda/new-event/new-event.page.ts
@@ -59,6 +59,7 @@ export class NewEventPage implements OnInit {
 
   loggeduser: LoginUserRespose;
   members:any;
+  CalendarName;
 
   constructor(
     private modalController: ModalController,
@@ -86,6 +87,8 @@ export class NewEventPage implements OnInit {
   }
 
   ngOnInit() {
+
+    this.CalendarName = this.loggeduser.Profile;
     this.selectedRecurringType = "-1";
     console.log(this.postEvent);
 
@@ -246,7 +249,7 @@ export class NewEventPage implements OnInit {
 
 
 
-      if(this.loggeduser.Profile == 'MDGPR') {
+      if(this.CalendarName == 'MDGPR') {
         console.log(this.loggeduser.Profile);
 
         console.log(this.postEvent);
@@ -255,7 +258,7 @@ export class NewEventPage implements OnInit {
         console.log(eventId);
 
       }
-      else if(this.loggeduser.Profile == 'PR'){
+      else if(this.CalendarName == 'PR'){
         console.log(this.loggeduser.Profile);
 
         eventId = await this.eventService.postEventPr(this.postEvent, this.postEvent.CalendarName).toPromise();
diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html
index 4942787db..d7e9a5d7f 100644
--- a/src/app/shared/agenda/new-event/new-event.page.html
+++ b/src/app/shared/agenda/new-event/new-event.page.html
@@ -29,8 +29,6 @@
       </div>
     </div>
 
-    {{ CalendarName }}
-
     <div class="container-div" *ngIf="loggeduser.Profile == 'MDGPR'">
       <div class="ion-item-class-2 d-flex">
         <div class="ion-icon-class">