diff --git a/src/app/pages/agenda/agenda.module.ts b/src/app/pages/agenda/agenda.module.ts index 7aec81219..f0e7dabda 100644 --- a/src/app/pages/agenda/agenda.module.ts +++ b/src/app/pages/agenda/agenda.module.ts @@ -26,6 +26,7 @@ registerLocaleData(localeDe); import { CalendarModule, DateAdapter } from 'angular-calendar'; import { adapterFactory } from 'angular-calendar/date-adapters/date-fns'; +import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page'; @NgModule({ imports: [ CommonModule, @@ -50,6 +51,10 @@ import { adapterFactory } from 'angular-calendar/date-adapters/date-fns'; ApproveEventComponent, AttendeesPage, AttendeeModalPage, + EventsToApprovePage, + ], + entryComponents: [ + EventsToApprovePage, ], schemas: [CUSTOM_ELEMENTS_SCHEMA], providers: [ diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index d7f17b430..7bc05ecb3 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -368,9 +368,17 @@ (approveEventDismiss) = "approveEventDismiss($event)" (cloneAllmobileComponent)="viewEventDetailDismiss($event)" > - + +
- +
- - diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 211d1c35f..41549e644 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -70,7 +70,7 @@
- +
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index e195887c3..e6d2c8bbb 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -83,7 +83,7 @@ export class GabineteDigitalPage implements OnInit { } ngOnInit() { //Initialize profile as mdgpr - this.profile = "mdgpr"; + this.profile = "MDGPR"; this.LoadCounts(); /* this.eventService.getAllMdEvents.subscribe(res=>{ console.log(res); @@ -138,17 +138,17 @@ this.processesbackend.GetActionsList().subscribe(res=>{ this.alertService.presentAlert('Funcionalidade em desenvolvimento'); } - openEventsToApprovePage(segment:any){ + openEventsToApprovePage(profile:any){ this.closeAllDesktopComponents(); if( window.innerWidth <= 1024){ - this.openEventsToApproveList(segment); + this.openEventsToApproveList(profile); } else{ this.showEventsToApprove = true; } } - async openEventsToApproveList(segment:any){ + async openEventsToApproveList(profile:any){ this.closeAllDesktopComponent(); @@ -164,7 +164,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{ const modal = await this.modalController.create({ component: EventListPage, componentProps:{ - segment: segment, + segment: profile, }, cssClass: classs, backdropDismiss: false diff --git a/src/app/shared/agenda/event-list/event-list.component.html b/src/app/shared/agenda/event-list/event-list.component.html index 4eba898ba..833d84d2a 100644 --- a/src/app/shared/agenda/event-list/event-list.component.html +++ b/src/app/shared/agenda/event-list/event-list.component.html @@ -1,7 +1,7 @@
- +
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html index 08fb441e7..77933ac48 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html @@ -2,7 +2,7 @@
- + Seu calendário @@ -17,7 +17,7 @@ -
+
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts index c07018dd9..93c3b1d1c 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts @@ -23,7 +23,7 @@ export class EventsToApprovePage implements OnInit { categories: string[]; serialnumber:string; - @Input() segment:string; + @Input() profile:string; constructor( private processes:ProcessesService, @@ -35,9 +35,8 @@ S ngOnInit() { //this.segment = this.navParams.get('segment'); /* console.log(this.navParams.get('md')); */ - console.log(this.segment); + console.log(this.profile); this.LoadToApproveEvents(); - this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == this.router.url) {