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 b9d79ab33..6d53d4669 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 @@ -50,6 +50,28 @@ --> +
+
+
+ +
+
+ + + + + +
Calendário de {{calendars}}
+
{{calendars}}
+
+ +
+
+ +
+
+
+
@@ -61,7 +83,9 @@ [(ngModel)]="postData.CalendarName" placeholder="Selecione repetição" interface="action-sheet" - Cancel-text="Cancelar" required> + Cancel-text="Cancelar" required + (selectionChange)="changeAgenda()" + > Oficial Pessoal diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts index 6a0d130a9..56a0bb27f 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts @@ -90,6 +90,9 @@ export class DocumentSetUpMeetingPage implements OnInit { docs:any[] = []; eventPipe = new EventPipe() + CalendarName; + CalendarNameShow = true + CalendarNamesOptions constructor( private modalController: ModalController, @@ -99,7 +102,8 @@ export class DocumentSetUpMeetingPage implements OnInit { private toastService: ToastService, private calendarService: EventsService, private eventService: EventService, - public ThemeService: ThemeService + public ThemeService: ThemeService, + public _eventService: EventsService, ) { this.loggeduser = authService.ValidatedUser; this.document = this.navParams.get('document') @@ -165,6 +169,33 @@ export class DocumentSetUpMeetingPage implements OnInit { }) } + changeAgenda() { + + this.CalendarNameShow = false + + setTimeout(() => { + + this.CalendarNameShow = true + + if(this._eventService.calendarNamesType[this.CalendarName]?.['Oficial'] && this._eventService.calendarNamesType[this.CalendarName]?.['Pessoal']) { + + this.CalendarNamesOptions = ['Oficial', 'Pessoal'] + + } else if (this._eventService.calendarNamesType[this.CalendarName]?.['Oficial']) { + this.CalendarNamesOptions = ['Oficial'] + this.postData.CalendarName = 'Oficial' + + } else if (this._eventService.calendarNamesType[this.CalendarName]?.['Pessoal']) { + this.CalendarNamesOptions = ['Pessoal'] + this.postData.CalendarName = 'Pessoal' + + } else { + this.CalendarNamesOptions = ['Oficial', 'Pessoal'] + } + }, 50) + + } + async saveTask() { if(this.loggeduser.Profile == 'MDGPR') { @@ -175,7 +206,7 @@ export class DocumentSetUpMeetingPage implements OnInit { let Attendees = this.taskParticipants.concat(this.taskParticipantsCc); - if(this.document.Documents){ + if(this.document.Documents) { this.document.Documents.forEach((e)=> { this.docs.push({ ApplicationId: e.ApplicationId || e.ApplicationType, diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts index b4061d4ec..e6852b302 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts @@ -2,12 +2,9 @@ import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular'; import { Event } from 'src/app/models/event.model'; -import { AlertService } from 'src/app/services/alert.service'; -import { AttachmentsService } from 'src/app/services/attachments.service'; import { ProcessesService } from 'src/app/services/processes.service'; import { EmendMessageModalPage } from 'src/app/pages/agenda/emend-message-modal/emend-message-modal.page'; import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popover/event-actions-popover.page'; -import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page'; import { ToastService } from 'src/app/services/toast.service'; import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts index 6f48f676d..6c36d15cc 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -193,8 +193,8 @@ export class ApproveEventPage implements OnInit { } } else{ - - } + this.toastService._badRequest('É necessário adicionar uma nota'); + } }); }