fixed holidays bug

lib/dateArray.js

@@ -54,8 +54,8 @@ function wrapper(_epochSpan) {
       var holidayIntervals = holidays.map(function (date) {
         return tmUtils.singleDay(date);
       });
-      holidayIntervals = tmUtils.andOp(holidayIntervals, [epochSpan]);
       tmUtils.sort(holidayIntervals);
+      holidayIntervals = tmUtils.andOp(holidayIntervals, [epochSpan]);
 
       try {
         var ret = {holidays: holidays};

serverTest/dataBaseQuery.js

@@ -8,7 +8,7 @@ var connection = mysql.createConnection({
   host: 'localhost',
   user: 'root',
   password: 'bla',
-  database: 'dev_regionalkauf_cms'
+  database: 'regionalkauf'
 });
 
 connection.connect();
@@ -20,7 +20,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, type, elements FROM cms_zoo_item WHERE id in (1793)', function (err, rows) {
+  connection.query('SELECT name, type, elements FROM cms_zoo_item WHERE id in (1749)', function (err, rows) {
     console.error(err);
     console.log(rows.length);
     var result = [];