diff --git a/src/components/calendar/calendar.component.ts b/src/components/calendar/calendar.component.ts
index 79ecf10..6772489 100644
--- a/src/components/calendar/calendar.component.ts
+++ b/src/components/calendar/calendar.component.ts
@@ -28,20 +28,9 @@ export class CalendarComponent {
private modalCtrl: ModalController,
private alertCtrl: AlertController,
private calendarService: CalendarService) {
+
let events =this.eventSource;
- this.eventCalendarList =
- this.calendarService.getEventsCalendarList()
- .snapshotChanges()
- .map(
- changes => {
- return changes.map(c => {
- return({
- key: c.payload.key,
- ...c.payload.val()
- })
- })
- })
-
+ this.eventCalendarList = this.calendarService.getEventsCalendarList();
this.eventCalendarList.subscribe(
(res) => {
res.map(event => {
diff --git a/src/components/calendar/calendar.service.ts b/src/components/calendar/calendar.service.ts
index f1e3b53..d680489 100644
--- a/src/components/calendar/calendar.service.ts
+++ b/src/components/calendar/calendar.service.ts
@@ -56,7 +56,16 @@ export class CalendarService {
}
getEventsCalendarList() {
- return this.eventCalendarListRef;
+ return this.eventCalendarListRef.snapshotChanges()
+ .map(
+ changes => {
+ return changes.map(c => {
+ return({
+ key: c.payload.key,
+ ...c.payload.val()
+ })
+ })
+ });
}
// updateEventCalendar(eventData: EventCalendar) {
diff --git a/src/pages/home/home.html b/src/pages/home/home.html
index 332fbeb..a10de78 100644
--- a/src/pages/home/home.html
+++ b/src/pages/home/home.html
@@ -1,15 +1,27 @@
-
+
- Home
+ Home
+
+
+
+
+
+
+
+ {{event?.title}}
+
+
diff --git a/src/pages/home/home.ts b/src/pages/home/home.ts
index a0478a0..431cc6a 100644
--- a/src/pages/home/home.ts
+++ b/src/pages/home/home.ts
@@ -1,3 +1,4 @@
+import { CalendarService } from './../../components/calendar/calendar.service';
import { Component } from '@angular/core';
import { NavController, IonicPage } from 'ionic-angular';
@@ -7,8 +8,19 @@ import { NavController, IonicPage } from 'ionic-angular';
templateUrl: 'home.html'
})
export class HomePage {
- constructor(public navCtrl: NavController) {
- }
+ private events;
+ private error;
+ private test = "hello world";
+ constructor(public navCtrl: NavController, private calendarService: CalendarService) {
+ }
+ getEventsFromCalendar() {
+ this.calendarService.getEventsCalendarList().subscribe(
+ (res) => {
+ this.error = JSON.stringify(res);
+ this.events = res;
+ }
+ );
+ }
}