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 857f0b406..7f978618c 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -123,7 +123,7 @@ minuteValues="0,15,30,45" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" min="2021" - max="2022" + max="2025" > @@ -144,7 +144,7 @@ minuteValues="0,15,30,45" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" min="2021" - max="2022" + max="2025" > 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 cc79a31c1..30e841b56 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -77,7 +77,6 @@
- {{ postEvent.Categories[0] }}
Campo obrigatório.
@@ -117,15 +116,15 @@
-
+
@@ -138,15 +137,16 @@
-
+
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 b3490dfba..e02c6e206 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -14,7 +14,6 @@ import { AttendeesPageModal } from '../../events/attendees/attendees.page'; import { SearchPage } from '../../search/search.page'; import { ThemePalette } from '@angular/material/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; -import * as moment from 'moment'; @Component({ @@ -31,7 +30,7 @@ export class NewEventPage implements OnInit { public showSeconds = false; public touchUi = false; public enableMeridian = false; - public minDate = new Date(); + public minDate = new Date().toISOString().slice(0,10) public endMinDate = new Date(new Date().getTime() + 15 * 60000); public stepHour = 1; public stepMinute = 5; @@ -146,6 +145,15 @@ export class NewEventPage implements OnInit { this.validateFrom = true } + + get dateValid() { + if (window.innerWidth <= 800) { + return this.postEvent.StartDate < this.postEvent.EndDate? ['ok']: [] + } else { + return ['ok'] + } + } + injectValidation() { this.Form = new FormGroup({ @@ -159,6 +167,9 @@ export class NewEventPage implements OnInit { CalendarName: new FormControl(this.postEvent.CalendarName, [ Validators.required ]), + Date: new FormControl(this.dateValid, [ + Validators.required + ]), Categories: new FormControl(this.postEvent.Categories[0], [ Validators.required ]), diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html index 714f59e17..535832bdb 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html @@ -83,7 +83,7 @@
-
+
@@ -122,7 +122,7 @@
-
+
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 13ca787db..b8df83005 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 @@ -55,6 +55,7 @@ export class BookMeetingModalPage implements OnInit { public touchUi = false; public enableMeridian = false; public minDate = new Date(); + public ionicMinDate = new Date().toISOString().slice(0,10) // curent timestamp + 15 minutes public endMinDate = new Date(new Date().getTime() + 15 * 60000); @@ -172,6 +173,14 @@ export class BookMeetingModalPage implements OnInit { this.validateFrom = true } + get dateValid() { + if (window.innerWidth <= 800) { + return this.postData.StartDate < this.postData.EndDate? ['ok']: [] + } else { + return ['ok'] + } + } + injectValidation() { this.Form = new FormGroup({ @@ -184,7 +193,10 @@ export class BookMeetingModalPage implements OnInit { ]), CalendarName: new FormControl(this.postData.CalendarName, [ Validators.required - ]) + ]), + Date: new FormControl(this.dateValid, [ + Validators.required + ]), // participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [ // Validators.required // ]), @@ -195,8 +207,11 @@ export class BookMeetingModalPage implements OnInit { async saveTask(){ - this.injectValidation() - this.runValidation() + if(this.loggeduser.Profile == 'MDGPR') { + this.injectValidation() + this.runValidation() + } + if(this.Form.invalid) return false diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index 7563a0b3a..5660f3d45 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -57,7 +57,7 @@ interface="action-sheet" Cancel-text="Cancelar" required - class="d-md-none" + class="d-block d-md-none" > Normal (4 dias para a execução da tarefa) Urgente (2 dias para a execução da tarefa) @@ -96,7 +96,7 @@
+ class="ion-no-border ion-no-padding ion-no-margin d-block d-md-none"> { console.log(res); this.subjectTypes = res; @@ -196,7 +196,7 @@ export class ExpedientTaskModalPage implements OnInit { ]), Priority: new FormControl(this.postData.Priority, [ Validators.required, - ]) + ]), // CalendarName: new FormControl(this.postEvent.CalendarName, [ // Validators.required // ]), @@ -215,8 +215,10 @@ export class ExpedientTaskModalPage implements OnInit { async saveTask(){ - this.injectValidation() - this.runValidation() + if(this.loggeduser.Profile == 'MDGPR') { + this.injectValidation() + this.runValidation() + } if(this.Form.invalid) return false diff --git a/src/app/pages/publications/new-action/new-action.page.html b/src/app/pages/publications/new-action/new-action.page.html index 1b6d8c16a..c0c33141f 100644 --- a/src/app/pages/publications/new-action/new-action.page.html +++ b/src/app/pages/publications/new-action/new-action.page.html @@ -35,7 +35,7 @@ minuteValues="0,15,30,45" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" min="2018" - max="2022"> + max="2025">
@@ -54,7 +54,7 @@ minuteValues="0,15,30,45" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" min="2018" - max="2022"> + max="2025">
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 ade072d39..740177c72 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 @@ -107,7 +107,7 @@ minuteValues="0,15,30,45" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" min="2018" - max="2022" + max="2025" > @@ -145,7 +145,7 @@ minuteValues="0,15,30,45" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" min="2018" - max="2022" + max="2025" > diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html index a3a2551a3..a8f44e586 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html @@ -120,7 +120,7 @@ minuteValues="0,15,30,45" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" min="2018" - max="2022" + max="2025" > diff --git a/src/app/shared/publication/edit-action/edit-action.page.html b/src/app/shared/publication/edit-action/edit-action.page.html index 21ceb8f32..ecf256aaa 100644 --- a/src/app/shared/publication/edit-action/edit-action.page.html +++ b/src/app/shared/publication/edit-action/edit-action.page.html @@ -37,7 +37,7 @@ minuteValues="0,15,30,45" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" min="2018" - max="2022"> + max="2025">
diff --git a/src/app/shared/publication/new-action/new-action.page.html b/src/app/shared/publication/new-action/new-action.page.html index 40e9946b8..415ef17d5 100644 --- a/src/app/shared/publication/new-action/new-action.page.html +++ b/src/app/shared/publication/new-action/new-action.page.html @@ -37,7 +37,7 @@ minuteValues="0,15,30,45" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" min="2018" - max="2022"> + max="2025">
@@ -57,7 +57,7 @@ minuteValues="0,15,30,45" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" min="2018" - max="2022"> + max="2025">