fixed problem with zeitumstellung

lib/timeUtils.js

@@ -16,11 +16,25 @@ function transformTimeSpan(timeSpan) {
   return timeSpan;
 }
 
-function _cyclicInterval(from, until, interval, epochStart, epochEnd) {
+//function _cyclicInterval2(from, until, interval, epochStart, epochEnd) {
+//  if(from.getTime() >= until.getTime()) throw new Error("startDate cant be greater than endDate");
+//  var resultArray = [];
+//  for(var offset = 0; until.getTime() + offset < epochEnd.getTime(); offset += interval) {
+//    resultArray.push([new Date(from.getTime() + offset), new Date(until.getTime() + offset)]);
+//  }
+//  return resultArray;
+//}
+
+function _cyclicInterval(from, until, distanceDays, epochStart, epochEnd) {
   if(from.getTime() >= until.getTime()) throw new Error("startDate cant be greater than endDate");
   var resultArray = [];
-  for(var offset = 0; until.getTime() + offset < epochEnd.getTime(); offset += interval) {
-    resultArray.push([new Date(from.getTime() + offset), new Date(until.getTime() + offset)]);
+  from = new Date(from);
+  until = new Date(until);
+
+  while(until.getTime() <= epochEnd.getTime()) {
+    resultArray.push([new Date(from), new Date(until)]);
+    from.setDate(from.getDate() + distanceDays);
+    until.setDate(until.getDate() + distanceDays);
   }
   return resultArray;
 }
@@ -35,7 +49,7 @@ function _standard(day, timeFrom, timeUntil, startDate, endDate, distanceDays) {
   var date1 = new Date(startDate.getFullYear(), startDate.getMonth(),
       startDate.getDate() + dayDiff, timeUntil.h, timeUntil.m);
 
-  return _cyclicInterval(date0, date1, distanceDays * 24 * 3600000, startDate, endDate);
+  return _cyclicInterval(date0, date1, distanceDays, startDate, endDate);
 }
 
 function standardFromTillDay(daySpan, timeSpan, dateSpan, epochSpan, daysDistance) {
@@ -46,7 +60,6 @@ function standardFromTillDay(daySpan, timeSpan, dateSpan, epochSpan, daysDistanc
   var timeUntil = timeSpan[1];
   var epochStart = new Date(dateSpan[0]);
   var epochEnd = dateSpan[1];
-
   var firstDays = _standard(dayFrom, timeFrom, timeUntil, epochStart, epochEnd, daysDistance);
   var result = firstDays.slice();
 
@@ -62,6 +75,8 @@ function standardFromTillDay(daySpan, timeSpan, dateSpan, epochSpan, daysDistanc
   }
   result = sort(result);
   result = andOp(result, [epochSpan]);
+  console.log(timeSpan);
+  console.log(result);
   return result;
 }
 

serverTest/dataBaseQuery.js

 var mysql = require('mysql');
 var dateArray = require('../lib/dateArray');
 var dateView = require('../lib/dateView');
-var plz = 93047;
+var plz = 93161;
 
 var connection = mysql.createConnection({
   host: 'localhost',
@@ -18,7 +18,8 @@ module.exports.getData = function (now, cb) {
 //  console.log(epocheSpan);
 //  dateArray.setEpocheSpan(epocheSpan);
 
-  connection.query('SELECT name, elements FROM cms_zoo_item WHERE type in ("pos", "company") ORDER BY id LIMIT 100', function (err, rows) {
+//  connection.query('SELECT name, elements FROM cms_zoo_item WHERE type in ("pos", "company") ORDER BY id LIMIT 100', function (err, rows) {
+  connection.query('SELECT name, elements FROM cms_zoo_item WHERE id in (2650)', function (err, rows) {
     console.log(rows.length);
     var result = [];
     var cnt = 0;
@@ -33,7 +34,7 @@ module.exports.getData = function (now, cb) {
             console.log(name, err);
           }
           else if (dataObj && dataObj.intervals.length > 0) {
-
+            console.log(dataObj);
             cnt++;
             var view = dateView.getView(dataObj, now);
             var asString = dateView.asString(dataObj, now);