From 44d881b2eb6acd70622d8017652f561749e3f013 Mon Sep 17 00:00:00 2001
From: Amitosh Swain Mahapatra <amitosh.swain@gmail.com>
Date: Jun 17 2018 16:41:00 +0000
Subject: [PATCH 1/2] Locale aware date-time display


---

diff --git a/src/pages/calendar/calendar.html b/src/pages/calendar/calendar.html
index 90390a7..064747e 100644
--- a/src/pages/calendar/calendar.html
+++ b/src/pages/calendar/calendar.html
@@ -31,8 +31,8 @@
         </ion-card-content>
         <ion-row center>
           <ion-col width-67 padding>
-            <p>{{ meeting.displayTime.dateString }}</p>
-            <p>{{ meeting.displayTime.timeString }}</p>
+            <p><ion-icon name="calendar"></ion-icon> {{ meeting.time.toLocaleDateString() }}</p>
+            <p><ion-icon name="time"></ion-icon> {{ meeting.time.toLocaleTimeString() }}</p>
           </ion-col>
           <ion-col width-33 padding>
             <button ion-button id="add_button" small tappable (click)="addToCalendar(meeting)">
diff --git a/src/providers/fedo-cal/fedo-cal.ts b/src/providers/fedo-cal/fedo-cal.ts
index 9a9909c..2754457 100644
--- a/src/providers/fedo-cal/fedo-cal.ts
+++ b/src/providers/fedo-cal/fedo-cal.ts
@@ -23,15 +23,6 @@ const ENDPOINT = chooseEndpoint('/fedocal', 'https://apps.fedoraproject.org/cale
  */
 const CALENDAR_STORAGE_KEY = 'fedocal__calendars';
 
-/**
- * Date format for display
- */
-const DATE_FORMAT = 'dddd, MMMM Do YYYY';
-
-/**
- * Time format for display
- */
-const TIME_FORMAT = 'h:mm A z';
 
 /**
  * Convert calendar name from API to a value suitable for display
@@ -152,22 +143,6 @@ export interface Meeting {
    * Meeting end time
    */
   timeEnd: Date,
-
-  /**
-   * Start time formatted for display
-   */
-  displayTime: {
-    dateString: string,
-    timeString: string,
-  },
-
-  /**
-   * End time formatted for display
-   */
-  displayTimeEnd: {
-    dateString: string,
-    timeString: string,
-  }
 }
 
 /**
@@ -245,23 +220,14 @@ export class FedoCalService {
     return this.http.get(`${ENDPOINT}/meetings/`, { params: { calendar: calendar.realName } })
       .pipe(
         map((data: any) => data.meetings.map(m => {
-          const mTime = dateToMoment(m.meeting_date, m.meeting_time_start, m.meeting_timezone);
-          const mTimeEnd = 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,
             description: m.meeting_information,
-            time: mTime.toDate(),
-            timeEnd: mTimeEnd.toDate(),
-            displayTime: {
-              // Format momentjs object to the defined format for display
-              dateString: mTime.format(DATE_FORMAT),
-              timeString: mTime.format(TIME_FORMAT)
-            },
-            displayTimeEnd: {
-              dateString: mTimeEnd.format(DATE_FORMAT),
-              timeString: mTimeEnd.format(TIME_FORMAT),
-            },
+            time: mTime,
+            timeEnd: mTimeEnd,
             location: m.meeting_location,
           };
         }))

From 389be77c5ebc0b73b8c147d656e0d0db7a5412c0 Mon Sep 17 00:00:00 2001
From: Amitosh Swain Mahapatra <amitosh.swain@gmail.com>
Date: Jun 17 2018 16:41:46 +0000
Subject: [PATCH 2/2] Parse date & time from FedoCal correctly


---

diff --git a/package-lock.json b/package-lock.json
index 4b7df84..8a371ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3733,13 +3733,11 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -3756,8 +3754,7 @@
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "console-control-strings": {
           "version": "1.1.0",
@@ -3886,7 +3883,6 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5724,7 +5720,8 @@
     "lodash": {
       "version": "4.17.5",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz",
-      "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw=="
+      "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==",
+      "dev": true
     },
     "lodash-es": {
       "version": "4.17.10",
@@ -6310,19 +6307,6 @@
         }
       }
     },
-    "moment": {
-      "version": "2.20.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz",
-      "integrity": "sha512-Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg=="
-    },
-    "moment-timezone": {
-      "version": "0.5.14",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.14.tgz",
-      "integrity": "sha1-TrOP+VOLgBCLpGekWPPtQmjM/LE=",
-      "requires": {
-        "moment": ">= 2.9.0"
-      }
-    },
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
diff --git a/package.json b/package.json
index b3b8ac5..dbb47bb 100644
--- a/package.json
+++ b/package.json
@@ -61,10 +61,7 @@
     "ionic-angular": "3.9.2",
     "ionic-plugin-keyboard": "^2.2.1",
     "ionicons": "^3.0.0",
-    "lodash": "^4.14.0",
     "lodash-es": "^4.17.10",
-    "moment": "^2.14.1",
-    "moment-timezone": "^0.5.5",
     "query-string": "^4.2.2",
     "reflect-metadata": "^0.1.3",
     "rxjs": "5.5.2",
diff --git a/src/providers/fedo-cal/fedo-cal.ts b/src/providers/fedo-cal/fedo-cal.ts
index 2754457..eb9219d 100644
--- a/src/providers/fedo-cal/fedo-cal.ts
+++ b/src/providers/fedo-cal/fedo-cal.ts
@@ -1,8 +1,4 @@
 import { Injectable } from '@angular/core';
-
-import * as _ from 'lodash';
-import * as moment from 'moment-timezone';
-
 import { HttpClient } from '@angular/common/http';
 import { Storage } from '@ionic/storage';
 import { Observable } from 'rxjs/Observable';
@@ -10,6 +6,7 @@ import { fromPromise } from 'rxjs/observable/fromPromise';
 import { merge } from 'rxjs/observable/merge';
 import { tap, map } from 'rxjs/operators';
 import { chooseEndpoint, defaultValue } from '../../utils';
+import { startCase } from 'lodash-es';
 
 /**
  * FedoCal API endpoint
@@ -39,7 +36,7 @@ function calendarNameToDisplayName(name: string): string {
     case 'fesco':
       return 'FESCo';
     default:
-      return /^[A-Z][^\d-]*.*$/.test(name) ? name : _.startCase(name);
+      return /^[A-Z][^\d-]*.*$/.test(name) ? name : startCase(name);
   }
 }
 
@@ -54,19 +51,6 @@ function getCalendarStorageKey(calendar: Calendar): string {
 }
 
 /**
- * Convert a date consisting of date, time and timezone as different strings to
- * a single momentjs date
- *
- * @param date     Date string
- * @param time     Time string
- * @param timezone Timezone identifier
- */
-function dateToMoment(date: string, time: string, timezone: string) {
-  const m = moment.tz(`${date} ${time}`, timezone).tz('UTC');
-  return m;
-}
-
-/**
  * A calendar on FedoCal
  *
  * Calendars are assoicated with a group / SIG / or event. They contain a number
@@ -220,8 +204,10 @@ export class FedoCalService {
     return this.http.get(`${ENDPOINT}/meetings/`, { params: { calendar: calendar.realName } })
       .pipe(
         map((data: any) => data.meetings.map(m => {
-          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();
+          // FedoCal splits an ISO8601 string and sends us the date and time,
+          // combine them together
+          const mTime = new Date(`${m.meeting_date}T${m.meeting_time_start}Z`);
+          const mTimeEnd = new Date(`${m.meeting_date_end}T${m.meeting_time_end}Z`);
 
           return {
             name: m.meeting_name,