From 2cb0d9fda7b5efe4c02417f70a8c4d0e9cd0db79 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 16 Jul 2021 23:16:55 +0100
Subject: [PATCH] Fix

---
 .../agenda/edit-event/edit-event.page.html    |  2 +-
 .../agenda/edit-event/edit-event.page.ts      | 53 +++++++++----------
 .../shared/agenda/new-event/new-event.page.ts |  2 +-
 3 files changed, 27 insertions(+), 30 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 86e653e63..792637f13 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.html
+++ b/src/app/pages/agenda/edit-event/edit-event.page.html
@@ -157,7 +157,7 @@
               <div class="ion-icon-class">
                 <ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
               </div>
-              <div class="ion-input-class" [class.input-error]="Form?.get('Categories')?.invalid  && validateFrom ">
+              <div class="ion-input-class">
                 <ion-select  placeholder="Selecione a repetição*"
                 [(ngModel)]="selectedRecurringType"
                 (ngModelChange)="onSelectedRecurringChanged($event)"
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts
index 7111e01c6..88c42e969 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.ts
+++ b/src/app/pages/agenda/edit-event/edit-event.page.ts
@@ -46,8 +46,6 @@ export class EditEventPage implements OnInit {
   adding: "intervenient" | "CC" = "intervenient";
 
 
-
-
   showAttendees = false;
 
   constructor(
@@ -168,7 +166,7 @@ export class EditEventPage implements OnInit {
       IsRecurring: new FormControl(this.postEvent.IsRecurring, [
         Validators.required
       ]),
-      Date: new FormControl(new Date(this.postEvent.StartDate).toLocaleString() < new Date(this.postEvent.EndDate).toLocaleString()? 'ok': null,[
+      Date: new FormControl(new Date(this.postEvent.StartDate).getTime() < new Date(this.postEvent.EndDate).getTime()? 'ok': null,[
         Validators.required
       ]),
 
@@ -191,34 +189,33 @@ export class EditEventPage implements OnInit {
     }
 
     this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc)
-    try{
-      console.log(this.postEvent);
-      this.postEvent.EventRecurrence.Type = this.selectedRecurringType;
+  
+    this.postEvent.EventRecurrence.Type = this.selectedRecurringType;
 
-      this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
-        if(this.initCalendarName != this.postEvent.CalendarName){
-          let body = {
-            "EventId": this.postEvent.EventId,
-            "CalendarDestinationName": this.postEvent.CalendarName,
-        }
-        try {
-          await this.eventsService.changeAgenda(body).toPromise();
-        } catch (error) {}
+    this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
+      if(this.initCalendarName != this.postEvent.CalendarName){
+        let body = {
+          "EventId": this.postEvent.EventId,
+          "CalendarDestinationName": this.postEvent.CalendarName,
+      }
+      try {
+        await this.eventsService.changeAgenda(body).toPromise();
+      } catch (error) {}
+      finally {
+        this.goBack();
+      }
+        
+      }
+      this.toastService.successMessage();
 
-        }
-        this.toastService.successMessage();
-
-      }, error => {
-        this.toastService.badRequest()
-      });
-
-      this.isEventEdited = true;
-      this.goBack();
-      this.modalController.dismiss(this.isEventEdited);
-
-    } catch (error) {
+    }, error => {
       this.toastService.badRequest()
-    }
+    });
+
+    this.isEventEdited = true;
+    
+    this.modalController.dismiss(this.isEventEdited);
+
 
     this.saveDocument()
   }
diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts
index 0b96aaf7a..bce185484 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -251,7 +251,7 @@ export class NewEventPage implements OnInit {
       participantes: new FormControl(this.taskParticipants, [
         Validators.required
       ]),
-      Date: new FormControl(this.postEvent.StartDate.toLocaleString() < this.postEvent.EndDate.toLocaleString() ? 'ok': null,[
+      Date: new FormControl(this.postEvent.StartDate.getTime() < this.postEvent.EndDate.getTime() ? 'ok': null,[
         Validators.required
       ]),