-
+
@@ -35,7 +35,7 @@
-
+
@@ -144,7 +144,7 @@ -
+
+ +
+
+
+ Adicionar participant. +
+
+
+
-
+
@@ -218,7 +227,7 @@
-
+
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 a3bf1ec21..49e632fce 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -94,7 +94,7 @@ export class NewEventPage implements OnInit { @ViewChild('inicio') inicio: any; @ViewChild('picker1') picker1: any; - Form: any = {} + Form: FormGroup; validateFrom = false @@ -125,11 +125,8 @@ export class NewEventPage implements OnInit { private modalController: ModalController, private eventService: EventsService, private attachmentsService: AttachmentsService, - private animationController: AnimationController, private toastService: ToastService, private userService: AuthService, - private http: HttpClient, - private zone: NgZone, private dateAdapter: DateAdapter, // private translate: TranslateService ) { @@ -237,7 +234,7 @@ export class NewEventPage implements OnInit { this.Form = new FormGroup({ Subject: new FormControl(this.postEvent.Subject, [ Validators.required, - Validators.minLength(4) + // Validators.minLength(4) ]), Location: new FormControl(this.postEvent.Location, [ Validators.required, @@ -255,16 +252,13 @@ export class NewEventPage implements OnInit { IsRecurring: new FormControl(this.postEvent.IsRecurring, [ Validators.required ]), - participantes: new FormControl(this.participantes, [ + participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [ Validators.required ]), }) } - get participantes() { - return this.taskParticipantsCc.concat(this.taskParticipants) - } openInicio() { let input: any = document.querySelector('#new-inicio') @@ -327,10 +321,10 @@ export class NewEventPage implements OnInit { async save() { + this.injectValidation() this.runValidation() - - // dont runt this function - // if (!this.Form.valid) return false + + if(this.Form.invalid) return false this.getDatepickerData() diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index edb71b1cd..c4882f5a6 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -123,8 +123,6 @@ export class EditEventToApproveComponent implements OnInit { private toastService: ToastService, ) { // Edit event to approve - alert('nice!!___') - this.serialNumber = this.navParams.get('serialNumber'); this.isEventEdited = false; diff --git a/src/app/shared/headers/header-no-search/profile/profile.page.html b/src/app/shared/headers/header-no-search/profile/profile.page.html index 025607064..0d6d6415b 100644 --- a/src/app/shared/headers/header-no-search/profile/profile.page.html +++ b/src/app/shared/headers/header-no-search/profile/profile.page.html @@ -24,7 +24,7 @@
-