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 2c727befa..f15c6871c 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -180,7 +180,10 @@ export class NewEventPage implements OnInit { runValidation() { - this.validateFrom = true + this.validateFrom = true; + if(new Date(this.postEvent.StartDate).getTime() > new Date(this.postEvent.EndDate).getTime()){ + this.toastService._badRequest("A data de fim não pode ser inferior a data de início do evento") + } } @@ -316,14 +319,14 @@ export class NewEventPage implements OnInit { const newAttendees: EventPerson[] = data['taskParticipants']; const newAttendeesCC: EventPerson[] = data['taskParticipantsCc']; - + if(newAttendees.length) { this.setIntervenient(newAttendees); } if(newAttendeesCC) { this.setIntervenientCC(newAttendeesCC); } - + } } diff --git a/src/app/services/functions/file.service.ts b/src/app/services/functions/file.service.ts index 00883b376..087e77394 100644 --- a/src/app/services/functions/file.service.ts +++ b/src/app/services/functions/file.service.ts @@ -54,7 +54,6 @@ export class FileService { ) { } uploadFile(formData:any){ - alert('OIEE') //const geturl = environment.apiURL + 'Tasks/DelegateTask'; const geturl = environment.apiURL + 'lakefs/UploadFiles'; diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index 0385d53b5..c68ad489f 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -44,7 +44,6 @@ export class ProcessesService { } uploadFile(formData:any){ - alert('OIEE') //const geturl = environment.apiURL + 'Tasks/DelegateTask'; const geturl = environment.apiURL + 'lakefs/UploadFiles'; 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 dc4d542b1..e615df6a8 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -218,7 +218,10 @@ export class NewEventPage implements OnInit { } runValidation() { - this.validateFrom = true + this.validateFrom = true; + if(new Date(this.postEvent.StartDate).getTime() > new Date(this.postEvent.EndDate).getTime()){ + this.toastService._badRequest("A data de fim não pode ser inferior a data de início do evento") + } } injectValidation() { @@ -227,7 +230,7 @@ export class NewEventPage implements OnInit { const str: any = this.postEvent.EventRecurrence.Type.toString() this.postEvent.EventRecurrence.Type = str } - + this.Form = new FormGroup({ Subject: new FormControl(this.postEvent.Subject, [ Validators.required, @@ -255,8 +258,8 @@ export class NewEventPage implements OnInit { Date: new FormControl( new Date(this.postEvent.StartDate).getTime() < new Date(this.postEvent.EndDate).getTime() ? 'ok': null,[ Validators.required ]), - }) + } diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html index 9c73ae1d4..086fa5332 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -148,11 +148,11 @@ - + diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index f837907fe..d1afd2f27 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -122,11 +122,11 @@ - +