2 files changed, 35 insertions, 11 deletions

diff --git a/modules-available/locationinfo/frontend/doorsign.html b/modules-available/locationinfo/frontend/doorsign.html
index 97504284..8acdb07b 100755
--- a/modules-available/locationinfo/frontend/doorsign.html
+++ b/modules-available/locationinfo/frontend/doorsign.html
@@ -58,6 +58,14 @@ optional:
 			justify-content: space-between;
 		}
 
+		.pull-left {
+			float: left;
+		}
+
+		.clearfix {
+			clear: both;
+		}
+
 		.col {
 			padding: 0 4px;
 			color: white;
@@ -67,6 +75,8 @@ optional:
 		}
 
 		.col-square {
+			order: 1000;
+			float: right;
 			width: 46pt;
 			width: 4vw;
 			height: 46pt;
@@ -147,6 +157,7 @@ optional:
 
 		.center {
 			text-align: center;
+			margin: auto;
 		}
 
 		.room-layout {
@@ -439,7 +450,15 @@ optional:
 					return;
 				}
 
-				var time = new Date(result.time);
+				var time = false;
+				var p = result.time.split('-');
+				if (p.length === 6) {
+					time = new Date(p[0], p[1], p[2], p[3], p[4], p[5]);
+					console.log(time);
+				}
+				if (time === false || isNaN(time.getTime()) || time.getYear() < 2010) {
+					time = new Date(result.time);
+				}
 				if (isNaN(time.getTime()) || time.getYear() < 2010) {
 					time = new Date();
 				}
@@ -587,7 +606,7 @@ optional:
 			$("body").append($loc);
 
 			room.$.container = $loc;
-			room.$.locationName = $('<div>').addClass('col').addClass('header-font');
+			room.$.locationName = $('<div>').addClass('col').addClass('header-font').addClass('pull-left');
 			room.$.currentEvent = $("<span>").addClass('nowrap');
 			room.$.currentRemain = $("<span>").addClass('nowrap').addClass('timer');
 			room.$.seatsCounter = $('<span>').addClass('seats-counter');
@@ -595,10 +614,11 @@ optional:
 
 			var $header = $('<div>').addClass('row').addClass('count-' + roomIds.length);
 			$header.append(room.$.locationName);
-			$header.append($('<div>').addClass('col header-font center').append(room.$.currentEvent).append(' ').append(room.$.currentRemain));
 			$header.append(room.$.seatsBackground);
+			$header.append($('<div>').addClass('col header-font center').append(room.$.currentEvent).append(' ').append(room.$.currentRemain));
 			room.$.header = $header;
 			$loc.append($header);
+			$header.append('<div class="clearfix">');
 
 			if (room.name !== null) {
 				room.$.locationName.text(room.name);
@@ -941,6 +961,9 @@ optional:
 			console.log("Error: Calendar data was empty or malformed.");
 			return;
 		}
+		if (json.length === 0) {
+			console.log("Notice: Calendar already empty from server");
+		}
 		var now = MyDate().getTime();
 		json = json.filter(function (el) {
 			if (!el.title || !el.start || !el.end) return false;
diff --git a/modules-available/locationinfo/frontend/jquery-week-calendar/jquery.weekcalendar.js b/modules-available/locationinfo/frontend/jquery-week-calendar/jquery.weekcalendar.js
index 63ea1ecd..e84b9057 100755
--- a/modules-available/locationinfo/frontend/jquery-week-calendar/jquery.weekcalendar.js
+++ b/modules-available/locationinfo/frontend/jquery-week-calendar/jquery.weekcalendar.js
@@ -43,7 +43,7 @@ function MyDate() {
 
     return {
       options: {
-        date: MyDate(),
+        date: MyDate,
         timeFormat: null,
         dateFormat: 'M d, Y',
         alwaysDisplayTimeMinutes: true,
@@ -1441,6 +1441,7 @@ function MyDate() {
         $.each(eventsToRender, function(i, calEvent) {
           // render a multi day event as various event :
           // thanks to http://github.com/fbeauchamp/jquery-week-calendar
+          if (!calEvent || !calEvent.start || !calEvent.end) return;
           var initialStart = new Date(calEvent.start);
           var initialEnd = new Date(calEvent.end);
           var maxHour = self.options.businessHours.limitDisplay ? self.options.businessHours.end : 24;
@@ -2023,9 +2024,6 @@ function MyDate() {
        * Clean specific event
        */
       _cleanEvent: function(event) {
-          if (event.date) {
-            event.start = event.date;
-          }
           event.start = this._cleanDate(event.start);
           event.end = this._cleanDate(event.end);
           if (!event.end) {
@@ -2205,10 +2203,13 @@ function MyDate() {
             }
 
             // this is a human readable date
-            return Date.parse(d) || new Date(d);
+            if (d[d.length - 1] !== 'Z') d += 'Z';
+            var o = new Date(d);
+            o.setTime(o.getTime() + (o.getTimezoneOffset() * 60 * 1000));
+            return o;
           }
 
-          if (typeof d == 'number') {
+          if (typeof d === 'number') {
             return new Date(d);
           }
 
@@ -2223,12 +2224,12 @@ function MyDate() {
         var returnStr = '';
         for (var i = 0; i < format.length; i++) {
           var curChar = format.charAt(i);
-          if (i != 0 && format.charAt(i - 1) == '\\') {
+          if (i !== 0 && format.charAt(i - 1) === '\\') {
             returnStr += curChar;
           }
           else if (this._replaceChars[curChar]) {
             returnStr += this._replaceChars[curChar](date, this);
-          } else if (curChar != '\\') {
+          } else if (curChar !== '\\') {
             returnStr += curChar;
           }
         }