diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 6d3035652..f3a6069eb 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -191,6 +191,9 @@ export class AgendaPage implements OnInit { }, 1000) + + window['year'] = this.changeYear + } ngOnInit() { @@ -738,6 +741,31 @@ export class AgendaPage implements OnInit { } + changeYear = (year) => { + const a = this.calendar.currentDate + this.calendar.currentDate = new Date(`${year}-${a.getMonth()}-${a.getDay()}`); + + try { + this.myCal.update(); + this.myCal.loadEvents(); + } catch(e) {} + + this.updateEventListBox() + + } + + changeMonth = (month) => { + const a = this.calendar.currentDate + this.calendar.currentDate = new Date(`${a.getFullYear()}-${month}-${a.getDay()}`); + + try { + this.myCal.update(); + this.myCal.loadEvents(); + } catch(e) {} + + this.updateEventListBox() + } + get viewEventMonth () { return this.viewDate.getMonth() diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html index 35ea31958..2d91d5205 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html @@ -40,7 +40,6 @@
- .. {{ cc | json }} ..
Com conhecimento
diff --git a/src/app/services/ageanda/list-box.service.ts b/src/app/services/ageanda/list-box.service.ts index dc8a988b1..04066f1da 100644 --- a/src/app/services/ageanda/list-box.service.ts +++ b/src/app/services/ageanda/list-box.service.ts @@ -156,7 +156,8 @@ export class ListBoxService { push(event: any, selectedDate: Date) { - return new Date(event.start).getMonth() == selectedDate.getMonth() + return new Date(event.start).getMonth() == selectedDate.getMonth() && + new Date(event.start).getFullYear() == selectedDate.getFullYear() } encapsulation(eventsList:EventListStore[], profile): CustomCalendarEvent[] {