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 a958c4bd8..0228acc0b 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -93,6 +93,7 @@ export class EditEventPage implements OnInit { } this.getAttachments(this.postEvent.EventId); + } ngOnInit() { 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 828d40013..0ee91705b 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -19,7 +19,7 @@ -
+
@@ -46,7 +46,7 @@
-
+
@@ -75,13 +75,13 @@
-
+
@@ -102,14 +102,14 @@
-
+
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 81d99c9e5..a9e11a2b2 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -74,6 +74,10 @@ export class NewEventPage implements OnInit { this.selectedSegment = this.navParams.get('segment'); this.selectedDate = this.navParams.get('eventSelectedDate'); + + + this.postEvent.StartDate = new Date() + this.postEvent.EndDate = (new Date(new Date().getTime() + 15 * 60000)) } ngOnInit() { diff --git a/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts b/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts index c04711f56..31522b26a 100644 --- a/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts +++ b/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts @@ -44,14 +44,22 @@ export class EventDetailModalPage implements OnInit { this.loadedEvent = new Event(); this.loadedEvent.Body = new EventBody(); } + ngOnInit() { this.loadEvent(); this.loadAttachments(); this.ionicForm = this.formBuilder.group({ subject: ['', [Validators.required]] }) + + // this.setDefaultTime() } + // setDefaultTime() { + // this.loadedEvent.StartDate = new Date() + // this.loadedEvent.EndDate = (new Date(new Date().getTime() + 15 * 60000)) + // } + get errorControl() { return this.ionicForm.controls; } diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index cfd5ebc8d..c3eb314df 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -151,6 +151,12 @@ export class BookMeetingModalPage implements OnInit { this.adding = "intervenient"; console.log(this.task); this.getAttachments(); + this.setDefaultTime() + } + + setDefaultTime() { + this.postData.StartDate = new Date() + this.postData.EndDate = (new Date(new Date().getTime() + 15 * 60000)) } getAttachments(){ diff --git a/src/app/pages/publications/edit-action/edit-action.page.ts b/src/app/pages/publications/edit-action/edit-action.page.ts index ec7440581..c7a045f19 100644 --- a/src/app/pages/publications/edit-action/edit-action.page.ts +++ b/src/app/pages/publications/edit-action/edit-action.page.ts @@ -22,7 +22,7 @@ export class EditActionPage implements OnInit { public showSeconds = false; public touchUi = false; public enableMeridian = false; - public minDate: any; + public minDate = new Date().toISOString().slice(0,10) public maxDate: any; public stepHour = 1; public stepMinute = 5; diff --git a/src/app/pages/publications/new-action/new-action.page.ts b/src/app/pages/publications/new-action/new-action.page.ts index a6d583e4e..8f38b1032 100644 --- a/src/app/pages/publications/new-action/new-action.page.ts +++ b/src/app/pages/publications/new-action/new-action.page.ts @@ -81,6 +81,12 @@ export class NewActionPage implements OnInit { ngOnInit() { this.segment = "Viagem"; + this.setDefaultTime() + } + + setDefaultTime() { + this.folder.DateBegin = new Date().toISOString() + this.folder.DateEnd = (new Date(new Date().getTime() + 15 * 60000)).toISOString() } segmentChanged(ev: any) { diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html index 05d9ca357..46daecaf0 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html @@ -102,7 +102,7 @@