From 8a177bea47925108ad8495da387abd355a840ca0 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 26 Jan 2016 07:20:02 -0500
Subject: [PATCH] (js) Fix date parsing on Safari

---
 .../js/Preferences/Preferences.service.js                 | 1 +
 .../js/Scheduler/sgDraggableCalendarBlock.directive.js    | 8 +++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/UI/WebServerResources/js/Preferences/Preferences.service.js b/UI/WebServerResources/js/Preferences/Preferences.service.js
index 9cb0a4802..1e9cd849f 100644
--- a/UI/WebServerResources/js/Preferences/Preferences.service.js
+++ b/UI/WebServerResources/js/Preferences/Preferences.service.js
@@ -65,6 +65,7 @@
 
       angular.extend(_this.defaults, data);
 
+      // Configure date locale
       angular.extend(Preferences.$mdDateLocaleProvider, data.locale);
       Preferences.$mdDateLocaleProvider.firstDayOfWeek = parseInt(data.SOGoFirstDayOfWeek);
       Preferences.$mdDateLocaleProvider.weekNumberFormatter = function(weekNumber) {
diff --git a/UI/WebServerResources/js/Scheduler/sgDraggableCalendarBlock.directive.js b/UI/WebServerResources/js/Scheduler/sgDraggableCalendarBlock.directive.js
index e0b4792df..51898e090 100644
--- a/UI/WebServerResources/js/Scheduler/sgDraggableCalendarBlock.directive.js
+++ b/UI/WebServerResources/js/Scheduler/sgDraggableCalendarBlock.directive.js
@@ -12,8 +12,8 @@
 
    <div class="sg-draggable-calendar-block"/>
   */
-  sgDraggableCalendarBlock.$inject = ['$rootScope', '$timeout', '$log', 'Calendar', 'CalendarSettings', 'Component'];
-  function sgDraggableCalendarBlock($rootScope, $timeout, $log, Calendar, CalendarSettings, Component) {
+  sgDraggableCalendarBlock.$inject = ['$rootScope', '$timeout', '$log', 'Preferences', 'Calendar', 'CalendarSettings', 'Component'];
+  function sgDraggableCalendarBlock($rootScope, $timeout, $log, Preferences, Calendar, CalendarSettings, Component) {
     return {
       restrict: 'CA',
       require: '^sgCalendarDay',
@@ -127,9 +127,7 @@
         }
         else {
           // Create new component from dragging
-          startDate = new Date(calendarDayCtrl.dayString.substring(0,10) +
-                               ' ' +
-                               calendarDayCtrl.dayString.substring(11,16));
+          startDate = calendarDayCtrl.dayString.parseDate(Preferences.$mdDateLocaleProvider, '%Y-%m-%e');
           newData = {
             type: 'appointment',
             pid: calendarData? calendarData.pid : Calendar.$defaultCalendar(),