diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 236c85eaa..ef10ad7f5 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -36,8 +36,8 @@ - - + + diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index fcc8bbe48..240ee011b 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -19,16 +19,18 @@ import { DAYS_OF_WEEK, } from 'angular-calendar'; import { CustomDateFormatter } from './custom-date-formatter.provider'; +import { ApproveEventModalPage } from './approve-event-modal/approve-event-modal.page'; +import { EventListPage } from '../gabinete-digital/event-list/event-list.page'; @Component({ selector: 'app-agenda', templateUrl: './agenda.page.html', styleUrls: ['./agenda.page.scss'], providers: [ - /* { + { provide: CalendarDateFormatter, useClass: CustomDateFormatter, - }, */ + }, ], }) export class AgendaPage implements OnInit { @@ -216,8 +218,10 @@ export class AgendaPage implements OnInit { // Show information of the event for timeline eventClicked({ event }: { event: CalendarEvent }): void { console.log('Event clicked', event); + this.eventSelectedDate = event.start; - this.router.navigate(["/home/agenda", event.id, 'agenda']); + this.viewEventDetail(event.id); + /* this.router.navigate(["/home/agenda", event.id, 'agenda']); */ } //Show information of the event @@ -536,6 +540,18 @@ export class AgendaPage implements OnInit { }); } + async viewEventsToApprove(){ + const modal = await this.modalCtrl.create({ + component: EventListPage, + componentProps:{ + }, + cssClass: 'modal', + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss(); + } + } 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 2244d20fa..45faa3d00 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -37,7 +37,7 @@
-