diff --git a/src/app/models/event.model.ts b/src/app/models/event.model.ts index dfa36d7d0..fb1e5b581 100644 --- a/src/app/models/event.model.ts +++ b/src/app/models/event.model.ts @@ -33,10 +33,6 @@ export class Event{ EventRecurrence: EventRecurrence; Name?: string Attachments?: Attachment[]; - - /* public Event(){ - this.EventRecurrence = new EventRecurrence(); - } */ } diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html index 1c7c50fc6..6056f6b6a 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.html +++ b/src/app/shared/agenda/edit-event/edit-event.page.html @@ -55,7 +55,6 @@ - 123123
@@ -214,13 +213,41 @@
- +
+ +
+
+
+ +
+
+ + + +
+
+
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index fdef4a5bd..f4c28947b 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -31,7 +31,9 @@ export class EditEventPage implements OnInit { eventAttendees: EventPerson[]; // minDate: string; loadedEventAttachments: Attachment[]=[]; - recurringTypes: any; + recurringTypes = []; + selectedRecurringType: any; + public dateControlOccurrence = new FormControl(moment("DD MM YYYY hh")); public date: any; @@ -107,6 +109,7 @@ export class EditEventPage implements OnInit { ngOnInit() { this.dateControlOccurrence = new FormControl(moment(this.postEvent.EventRecurrence.LastOccurrence)); + if(!this.restoreTemporaryData()) { // clear