diff --git a/src/app/modals/add-note/add-note.page.html b/src/app/modals/add-note/add-note.page.html index a54e31142..0a42824e7 100644 --- a/src/app/modals/add-note/add-note.page.html +++ b/src/app/modals/add-note/add-note.page.html @@ -5,7 +5,7 @@
- +
diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index bb0937295..14ecffe29 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -16,7 +16,7 @@
- +
diff --git a/src/app/modals/dar-parecer/dar-parecer.page.html b/src/app/modals/dar-parecer/dar-parecer.page.html index ef09db6fb..1d904b15d 100644 --- a/src/app/modals/dar-parecer/dar-parecer.page.html +++ b/src/app/modals/dar-parecer/dar-parecer.page.html @@ -10,7 +10,7 @@
- +
diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html index f05b9ba00..324cf958c 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html @@ -20,9 +20,9 @@
-
- Campo obrigatório. -
+
O campo deve ter pelo menos 4 caracteres.
@@ -43,7 +43,7 @@
O campo deve ter pelo menos 4 caracteres.
@@ -46,7 +46,7 @@
- Campo obrigatório. +
O campo deve ter pelo menos 4 caracteres. @@ -80,7 +80,7 @@
{{ postEvent.Category }}
- Campo obrigatório. +
@@ -118,7 +118,7 @@
{{ postEvent.Category}}
- Campo obrigatório. +
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 dc5a0382d..483d67e23 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -81,7 +81,7 @@ 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 dd91b625f..a02ff9b33 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 @@ -17,7 +17,7 @@
- Campo obrigatório. +
O campo deve ter pelo menos 4 caracteres. @@ -41,7 +41,7 @@
Agenda do {{calendars}}
Minha agenda
--> - +
Agenda do PR
Agenda do MD
Agenda do {{calendars.Fullname}}
@@ -74,9 +74,9 @@
- + - Calendário {{ calendars }} + Agenda {{ calendars }} 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 5b47f7d17..f7e0292f9 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 @@ -107,7 +107,7 @@ export class BookMeetingModalPage implements OnInit { loggeduser: LoginUserRespose; emptyTextDescription = "Sem intervenientes selecionados"; - CalendarName = '' + CalendarName CalendarOwnerName = '' sessionStore = SessionStore; @@ -140,12 +140,12 @@ export class BookMeetingModalPage implements OnInit { this.postData.Category = 'Reunião' - if(!this.CalendarOwnerName) { + if(!this.CalendarName) { if(this.eventService.calendarNamesAry.includes('Meu calendario')) { - this.CalendarOwnerName = 'Meu calendario'; + this.CalendarName = 'Meu calendario'; console.log(this.eventService.calendarNamesAry) } else { - this.CalendarOwnerName = this.eventService.calendarNamesAry[0] + this.CalendarName = this.eventService.calendarNamesAry[0] } } @@ -160,6 +160,7 @@ export class BookMeetingModalPage implements OnInit { } ngOnInit() { + console.log('TEsTEROLE',this.eventService.calendarNamesAry) this.adding = "intervenient"; this.getAttachments(); this.setDefaultTime() @@ -179,17 +180,17 @@ export class BookMeetingModalPage implements OnInit { setTimeout(() => { - if(this.calendarService.calendarNamesType[this.CalendarOwnerName]?.['Oficial'] && this.calendarService.calendarNamesType[this.CalendarOwnerName]?.['Pessoal']) { + if(this.calendarService.calendarNamesType[this.CalendarName]?.['Oficial'] && this.calendarService.calendarNamesType[this.CalendarName]?.['Pessoal']) { this.CalendarNamesOptions = ['Oficial', 'Pessoal'] - } else if (this.calendarService.calendarNamesType[this.CalendarOwnerName]?.['Oficial']) { + } else if (this.calendarService.calendarNamesType[this.CalendarName]?.['Oficial']) { this.CalendarNamesOptions = ['Oficial'] - this.CalendarName = 'Oficial' - } else if (this.calendarService.calendarNamesType[this.CalendarOwnerName]?.['Pessoal']) { + this.postData.CalendarName = 'Oficial' + } else if (this.calendarService.calendarNamesType[this.CalendarName]?.['Pessoal']) { this.CalendarNamesOptions = ['Pessoal'] - this.CalendarName = 'Pessoal' + this.postData.CalendarName = 'Pessoal' } else { this.CalendarNamesOptions = ['Oficial', 'Pessoal'] 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 9818523ca..4a463baea 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 @@ -15,7 +15,7 @@
- Campo obrigatório. +
O campo deve ter pelo menos 4 caracteres. @@ -32,7 +32,7 @@
- +
@@ -40,7 +40,7 @@