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 6cb7d1180..14e5c9210 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 @@ -14,6 +14,8 @@ import { SearchPage } from 'src/app/pages/search/search.page'; import { SearchDocument } from 'src/app/models/search-document'; import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; +import { User } from 'src/app/models/user.model'; +import { AuthService } from 'src/app/services/auth.service'; @Component({ selector: 'app-book-meeting-modal', @@ -40,6 +42,7 @@ export class BookMeetingModalPage implements OnInit { formLocationSatus: boolean = false; showAttendees= false; + loggeduser: User; constructor( private modalController: ModalController, @@ -48,7 +51,9 @@ export class BookMeetingModalPage implements OnInit { private processes:ProcessesService, private attachmentsService: AttachmentsService, private calendarService: EventsService, + authService: AuthService, ) { + this.loggeduser = authService.ValidatedUser; this.task = this.navParams.get('task'); this.postData = new Event(); this.eventBody = { BodyType : "1", Text : ""}; @@ -120,7 +125,16 @@ export class BookMeetingModalPage implements OnInit { if(this.task.FsId == '8') { try { - await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise() + switch (this.loggeduser.Profile) { + case 'MDGPR': + await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise(); + break; + + case 'PR': + await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "pr",this.task.SerialNumber, this.task.FsId).toPromise() + break; + } + this.distartExpedientModal(); this.successMessage('Reunião criada') } catch (error) { @@ -131,7 +145,15 @@ export class BookMeetingModalPage implements OnInit { } else if(this.task.FsId == '361') { try { - await this.calendarService.createTaskEvent(this.task.FolderId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise() + switch (this.loggeduser.Profile) { + case 'MDGPR': + await this.calendarService.createTaskEvent(this.task.FolderId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise(); + break; + + case 'PR': + await this.calendarService.createTaskEvent(this.task.FolderId, this.postData, "pr",this.task.SerialNumber, this.task.FsId).toPromise(); + break; + } this.successMessage('Reunião criada') this.close(); } catch (error) { diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html index b9f8afed9..cc8ec2d05 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -79,7 +79,7 @@
- + @@ -88,7 +88,7 @@
- + @@ -114,7 +114,7 @@ - + diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index 64279458e..046111776 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -20,6 +20,8 @@ import { DarParecerPage } from 'src/app/modals/dar-parecer/dar-parecer.page'; import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page'; import { RequestOptionsPage } from 'src/app/shared/popover/request-options/request-options.page'; +import { AuthService } from 'src/app/services/auth.service'; +import { User } from 'src/app/models/user.model'; @Component({ selector: 'app-pedido', @@ -40,6 +42,7 @@ export class PedidoPage implements OnInit { profile: string; intervenientes: any; cc: any; + loggeduser: User; constructor(private activatedRoute: ActivatedRoute, private processes: ProcessesService, @@ -50,13 +53,15 @@ export class PedidoPage implements OnInit { private router: Router, private modalController: ModalController, private alertService: AlertService, - public popoverController: PopoverController) { - this.activatedRoute.queryParams.subscribe(params => { - if(params["serialNumber"]) { - this.serialnumber = params["serialNumber"]; - // console.log(params["serialNumber"]); - } - }); + public popoverController: PopoverController, + authService: AuthService) { + this.loggeduser = authService.ValidatedUser; + this.activatedRoute.queryParams.subscribe(params => { + if(params["serialNumber"]) { + this.serialnumber = params["serialNumber"]; + // console.log(params["serialNumber"]); + } + }); } ngOnInit() {