From 25b1524738c9758bcc9e9d53d1032e55f8f13dce Mon Sep 17 00:00:00 2001
From: Abhishek Sharma <hello.abhishek@outlook.com>
Date: Jul 04 2018 16:30:38 +0000
Subject: fix type of meeting time


---

diff --git a/src/pages/calendar/calendar.html b/src/pages/calendar/calendar.html
index 2a0f711..120765b 100644
--- a/src/pages/calendar/calendar.html
+++ b/src/pages/calendar/calendar.html
@@ -32,15 +32,15 @@
       <ion-card *ngFor="let meeting of meetings">
         <ion-row>
           <ion-col col-3 class="date" text-center>
-            <p class="month">{{meeting.display.meetingMonth}}</p>
-            <p class="day">{{meeting.display.meetingDate}} </p>
+            <p class="month">{{meeting.time.toLocaleDateString([], { month: 'short' })}}</p>
+            <p class="day">{{meeting.time.toLocaleDateString([], { day: '2-digit' })}} </p>
           </ion-col>
           <ion-col col-8 class="details">
             <ion-card-header class="body-title">{{meeting.name}}</ion-card-header>
             <ion-card-content>
               <p class="time">
                 <img src="./assets/img/clock.svg">
-                <span [innerHTML]="meeting.display.startTime + ' - ' + meeting.display.endTime"></span>
+                <span [innerHTML]="meeting.time.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' }) + ' - ' + meeting.timeEnd.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })"></span>
               </p>
               <p class="add">
                 <img src="./assets/img/calendar.svg">
diff --git a/src/providers/fedo-cal/fedo-cal.ts b/src/providers/fedo-cal/fedo-cal.ts
index fe0d5d5..f9baabb 100644
--- a/src/providers/fedo-cal/fedo-cal.ts
+++ b/src/providers/fedo-cal/fedo-cal.ts
@@ -126,16 +126,6 @@ export interface Meeting {
    * Meeting end time
    */
   timeEnd: Date,
-
-  /**
-   * Display Meeting date and time in readable format
-   */
-  display: {
-    startTime: string,
-    endTime: string,
-    meetingMonth: string,
-    meetingDate: string
-  }
 }
 
 /**
@@ -221,8 +211,8 @@ export class FedoCalService {
     return this.http.get(`${ENDPOINT}/meetings/`, { params: { calendar: calendar.realName, [type]: todaysDate } })
       .pipe(
         map((data: any) => data.meetings.map(m => {
-          const mTime: Date = dateToMoment(m.meeting_date, m.meeting_time_start, m.meeting_timezone);
-          const mTimeEnd: Date = dateToMoment(m.meeting_date_end, m.meeting_time_stop, m.meeting_timezone);
+          const mTime: Date = dateToMoment(m.meeting_date, m.meeting_time_start, m.meeting_timezone).toDate();
+          const mTimeEnd: Date = dateToMoment(m.meeting_date_end, m.meeting_time_stop, m.meeting_timezone).toDate();
 
           return {
             name: m.meeting_name,
@@ -230,12 +220,6 @@ export class FedoCalService {
             time: mTime,
             timeEnd: mTimeEnd,
             location: m.meeting_location,
-            display: {
-              startTime: mTime.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' }),
-              endTime: mTimeEnd.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' }),
-              meetingMonth: mTime.toLocaleDateString([], { month: 'short' }),
-              meetingDate: mTime.toLocaleDateString([], { day: '2-digit' })
-            }
           };
         }))
       );