fixed problem with seasonal hours

lib/dateArray.js

@@ -155,22 +155,16 @@ function wrapper(_epochSpan) {
     }
   }
 
-  function parseDate(date, year, addOneDay) {
+  function parseDate(date) {
     if (date.length == 0) {
       return null;
     }
 
-    var _year;
     var split = date.split(".");
-    var month = parseInt(split[1]) - 1;
-    var day = parseInt(split[0]) + (addOneDay ? 1 : 0);
-    if (split.length === 3) {
-      _year = parseInt(split[2]);
-    }
-    if (!_year)
-      _year = year;
+    var month = parseInt(split[1]);
+    var day = parseInt(split[0]);
 
-    return new Date(_year, month, day);
+    return [day, month];
   }
 
   function getHolidays(data) {
@@ -221,16 +215,33 @@ function wrapper(_epochSpan) {
   }
 
   function getDateSpan(data) {
+    var start = parseDate(data["opening_day_from"]);
+    var end = parseDate(data["opening_day_to"]);
+
+    if(!start || !end) {
+      return [epochSpan];
+    }
 
-    var startDate = parseDate(data["opening_day_from"], year);
-    var endDate = parseDate(data["opening_day_to"], year, true);
+    var newYear = 0;
+    if(end[1] < start[1]) {
+      newYear = 1;
+      var temp = start;
+      start = end;
+      end = temp;
+    }
 
-    if (!startDate)
-      startDate = epochSpan[0];
-    if (!endDate)
-      endDate = epochSpan[1];
+    var startDate = new Date(startYear, start[1] - 1, start[0]);
+    var endDate = new Date(startYear + newYear, end[1] - 1, end[0] + 1);
+
+    if(endDate < epochSpan[0]) {
+      startDate = new Date(startYear + 1, start[1] - 1, start[0]);
+      endDate = new Date(startYear + 1 + newYear, end[1] - 1, end[0] + 1);
+    }
+    else if(startDate > epochSpan[1]) {
+      startDate = new Date(startYear - 1, start[1] - 1, start[0]);
+      endDate = new Date(startYear - 1 + newYear, end[1] - 1, end[0] + 1);
+    }
 
-    //TODO: jahreswechsel beruecksichtigen
     return [startDate, endDate];
   }
 

lib/holidays.js

@@ -11,7 +11,7 @@ var fixedHolidays = {
   815: "1508",
   103: "0310",
   131: "3110",
-  111: "1101",
+  111: "0111",
   121: "2412",
   122: "2512",
   123: "2612"

serverTest/dataBaseQuery.js

@@ -19,7 +19,7 @@ module.exports.getData = function (now, cb) {
 //  dateArray.setEpocheSpan(epocheSpan);
 
 //  connection.query('SELECT name, elements FROM cms_zoo_item WHERE type in ("pos", "company") ORDER BY id', function (err, rows) {
-  connection.query('SELECT name, elements FROM cms_zoo_item WHERE id in (2513)', function (err, rows) {
+  connection.query('SELECT name, elements FROM cms_zoo_item WHERE id in (2927)', function (err, rows) {
     console.error(err);
     console.log(rows.length);
     var result = [];