mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-20 21:35:50 +00:00
Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into feature/calendar
This commit is contained in:
@@ -19,6 +19,8 @@ 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',
|
||||
@@ -129,7 +131,6 @@ export class AgendaPage implements OnInit {
|
||||
private router: Router,
|
||||
private alertCrontroller: AlertService
|
||||
) {
|
||||
|
||||
this.timelineDate = formatDate(new Date,'dd MMMM yyyy', 'pt');
|
||||
|
||||
setTimeout(()=>{
|
||||
@@ -238,8 +239,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
|
||||
@@ -589,6 +592,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();
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user