Skip to content

O
opening-hours
Commit c6d7dd88 authored by Johannes Bill's avatar Johannes Bill
Browse files
Options

bugfixing

parent 875c19cd
Hide whitespace changes
Inline Side-by-side
Showing with 263 additions and 381 deletions
holidays.js
View file @ c6d7dd88
function Holidays(year) { function Holidays(year) {
/* var mapping = { /* var mapping = {
0: "Alle", 0: "Alle",
101: "Neujahrstag", 101: "Neujahrstag",
106: "Hl. drei Koenige", 106: "Hl. drei Koenige",
301: "Karfreitag", 301: "Karfreitag",
302: "Ostersonntag", 302: "Ostersonntag",
303: "Ostermontag", 303: "Ostermontag",
501: "Tag der Arbeit", 501: "Tag der Arbeit",
502: "Himmelfahrt", 502: "Himmelfahrt",
601: "Pfingstsonntag", 601: "Pfingstsonntag",
602: "Pfingstmontag", 602: "Pfingstmontag",
808: "Augsburger Friedensfest", 808: "Augsburger Friedensfest",
815: "Mariae Himmelfahrt", 815: "Mariae Himmelfahrt",
103: "Tag der Deutschen Einheit", 103: "Tag der Deutschen Einheit",
131: "Reformationstag", 131: "Reformationstag",
111: "Allerheiligen", 111: "Allerheiligen",
121: "Heilig Abend", 121: "Heilig Abend",
122: "Erster Weihnachtstag", 122: "Erster Weihnachtstag",
123: "Zweiter Weihnachtstag"};*/ 123: "Zweiter Weihnachtstag"};*/
var fixedHolidays = { var fixedHolidays = {
101: "0101", 101: "0101",
...@@ -50,8 +50,8 @@ function Holidays(year) { ...@@ -50,8 +50,8 @@ function Holidays(year) {
var result = object || {}; var result = object || {};
for(var key in fixedHolidays) { for(var key in fixedHolidays) {
var dateString = fixedHolidays[key]; var dateString = fixedHolidays[key];
var date = parseInt(dateString.slice(0,2)); var date = parseInt(dateString.slice(0, 2));
var month = parseInt(dateString.slice(2,4)); var month = parseInt(dateString.slice(2, 4));
result[key] = new Date(year, month - 1, date); result[key] = new Date(year, month - 1, date);
} }
return result; return result;
...@@ -68,10 +68,18 @@ function Holidays(year) { ...@@ -68,10 +68,18 @@ function Holidays(year) {
} }
var holidays = getFixedHolidays(fixedHolidays); var holidays = getFixedHolidays(fixedHolidays);
var holidays = getVariableHolidaysMap(variableOffsets, holidays); holidays = getVariableHolidaysMap(variableOffsets, holidays);
this.getHoliday = function(id) { this.getHoliday = function(id) {
if(id == 0) {
var result = [];
for(var key in holidays) {
result.push(holidays[key]);
}
return result;
}
if(id in holidays) if(id in holidays)
return holidays[id]; return [holidays[id]];
console.error("invalid holiday id " + id); console.error("invalid holiday id " + id);
return null; return null;
} }
...@@ -79,6 +87,5 @@ function Holidays(year) { ...@@ -79,6 +87,5 @@ function Holidays(year) {
} }
var holidays = new Holidays(2014); var holidays = new Holidays(2014);
console.log(holidays.getHoliday(2));
module.exports = Holidays; module.exports = Holidays;
\ No newline at end of file
jsonInput.js
View file @ c6d7dd88
var tmUtils = require('./timeUtils'); var tmUtils = require('./timeUtils');
var Holidays = require('./holidays');
var now = new Date(); var now = new Date();
var holidaysGetter = new Holidays(now.getFullYear());
var includeString = "810a6deb-46f2-4fa8-b779-bb5c2a6b5577"; var includeString = "810a6deb-46f2-4fa8-b779-bb5c2a6b5577";
var excludeString = "bb74c170-b06f-4d2b-ab88-2f6bf9ce8068"; var excludeString = "bb74c170-b06f-4d2b-ab88-2f6bf9ce8068";
var _epochStart = new Date(); var _epochStart = new Date();
_epochStart.setDate(_epochStart.getDate() - 14); _epochStart.setDate(_epochStart.getDate() - 14);
var _epochEnd = new Date(_epochStart.getTime() + 31 * 24 * 3600000); var _epochEnd = new Date(_epochStart.getTime() + 60 * 24 * 3600000);
var epocheSpan = [_epochStart, _epochEnd]; var epocheSpan = [_epochStart, _epochEnd];
...@@ -14,19 +16,15 @@ function calculateOpeningHours(json) { ...@@ -14,19 +16,15 @@ function calculateOpeningHours(json) {
var jsonIncl = json[includeString]; var jsonIncl = json[includeString];
var jsonExcl = json[excludeString]; var jsonExcl = json[excludeString];
var resultIncl = getIntervals(jsonIncl); var resultIncl = getIntervals(jsonIncl);
var resultExcl = getIntervals(jsonExcl); var resultExcl = getIntervals(jsonExcl);
var result = tmUtils.andNotOperator(resultIncl, resultExcl); var result = tmUtils.andNotOperator(resultIncl, resultExcl);
console.log(result); console.log(result);
} }
function getHolidays(data) {
}
function getIntervals(json) { function getIntervals(json) {
var result = []; var result = [];
var holidays = []; var holidays = [];
...@@ -35,7 +33,7 @@ function getIntervals(json) { ...@@ -35,7 +33,7 @@ function getIntervals(json) {
if(x) if(x)
result.push(x); result.push(x);
else { else {
x = getHolidays(json[key]) x = getHolidays(json[key]);
if(x) if(x)
holidays.push(x); holidays.push(x);
} }
...@@ -44,7 +42,8 @@ function getIntervals(json) { ...@@ -44,7 +42,8 @@ function getIntervals(json) {
} }
function getDaySpan(dayoption) { function getDaySpan(data) {
var dayoption = parseInt(data["dayoption"]["0"]);
if(dayoption < 7) return [dayoption, dayoption]; if(dayoption < 7) return [dayoption, dayoption];
switch(dayoption) { switch(dayoption) {
case 7: case 7:
...@@ -56,7 +55,7 @@ function getDaySpan(dayoption) { ...@@ -56,7 +55,7 @@ function getDaySpan(dayoption) {
case 10: case 10:
return [1, 6]; return [1, 6];
default: default:
throw "Invalid day option"; console.error("Invalid day option");
} }
} }
...@@ -75,22 +74,51 @@ function parseDate(date, addOneDay) { ...@@ -75,22 +74,51 @@ function parseDate(date, addOneDay) {
var year = now.getFullYear(); var year = now.getFullYear();
var split = date.split("."); var split = date.split(".");
var month = parseInt(split[1]) - 1; var month = parseInt(split[1]) - 1;
var day = parseInt(split[0]) + addOneDay ? 1 : 0; var day = parseInt(split[0]) + (addOneDay ? 1 : 0);
return new Date(year, month, day); return new Date(year, month, day);
} }
function getHolidays(data) {
function getOpeningHours(data) {
var option = data["option"]["0"]; var option = data["option"]["0"];
if(option != "holiday") {
console.error("data is no holiday");
console.error(data);
return null;
}
var dayoption = parseInt(data["dayoption"]["0"]); var timeSpan = getTimeSpan(data);
var daySpan = getDaySpan(dayoption); var holidayId =data["holidayoption"][0];
var days = holidaysGetter.getHoliday(holidayId);
var intervals = days.map(function(date) {
return tmUtils.singleDay(date, timeSpan);
});
return intervals;
}
function getDateSpan(data) {
var startDate = parseDate(data["opening_day_from"]) || _epochStart; var startDate = parseDate(data["opening_day_from"]) || _epochStart;
var endDate = parseDate(data["opening_day_to"], true) || _epochEnd; var endDate = parseDate(data["opening_day_to"], true) || _epochEnd;
var dateSpan = [startDate, endDate]; return [startDate, endDate];
}
function getTimeSpan(data) {
return [parseTime(data["opening_from"]), parseTime(data["opening_to"])];
}
function getOption(data) {
return data["option"][0];
}
function getOpeningHours(data) {
var option = getOption(data);
var daySpan = getDaySpan(data);
var dateSpan = getDateSpan(data);
var timeSpan = getTimeSpan(data);
var timeSpan = [parseTime(data["opening_from"]), parseTime(data["opening_to"])];
var result = {type: 0};
switch(option) { switch(option) {
case "default": case "default":
return tmUtils.standardFromTillDay(daySpan, timeSpan, epocheSpan, 7); return tmUtils.standardFromTillDay(daySpan, timeSpan, epocheSpan, 7);
...@@ -101,7 +129,6 @@ function getOpeningHours(data) { ...@@ -101,7 +129,6 @@ function getOpeningHours(data) {
var noInMonth; var noInMonth;
if(repeatOption <= 4) noInMonth = repeatOption; if(repeatOption <= 4) noInMonth = repeatOption;
else if(repeatOption == 30) noInMonth = -1; else if(repeatOption == 30) noInMonth = -1;
if(noInMonth) if(noInMonth)
return tmUtils.cyclicFromTillDay(daySpan, noInMonth, timeSpan, dateSpan, epocheSpan); return tmUtils.cyclicFromTillDay(daySpan, noInMonth, timeSpan, dateSpan, epocheSpan);
...@@ -113,9 +140,21 @@ function getOpeningHours(data) { ...@@ -113,9 +140,21 @@ function getOpeningHours(data) {
default: default:
console.error("invalid repeatoption"); console.error("invalid repeatoption");
} }
} }
}
function getOpeningHoursDefault(data) {
var daySpan = getDaySpan(data);
var timeSpan = getTimeSpan(data);
return tmUtils.standardFromTillDay(daySpan, timeSpan, epocheSpan, 7);
}
function getOpeningHoursSeason(data) {
var daySpan = getDaySpan(data);
var timeSpan = getTimeSpan(data);
var dateSpan = getDateSpan(data);
return tmUtils.standardFromTillDay(daySpan, timeSpan, dateSpan, 7);
} }
calculateOpeningHours(require('./testData/testHof.json')); calculateOpeningHours(require('./testData/testHof.json'));
\ No newline at end of file
test.js
View file @ c6d7dd88
...@@ -17,16 +17,18 @@ console.log("epochEnd ", _epochEnd); ...@@ -17,16 +17,18 @@ console.log("epochEnd ", _epochEnd);
//console.log(workday); //console.log(workday);
var t1 = tmUtils.cyclicFromTillDay(1, 1, 1, {h: 9, m: 0}, {h: 0, m: 0}, _epochStart, _epochEnd); var t1 = tmUtils.cyclicFromTillDay([1, 1], 1, [{h: 9, m: 0}, {h: 0, m: 0}], [_epochStart, _epochEnd]);
var t2 = tmUtils.cyclicFromTillDay(2, 2, 1, {h: 0, m: 0}, {h: 18, m: 29}, _epochStart, _epochEnd); var t2 = tmUtils.cyclicFromTillDay([2, 2], 1, [{h: 0, m: 0}, {h: 18, m: 29}], [_epochStart, _epochEnd]);
t1 = tmUtils.standardFromTillDay(3,3, {h: 21, m: 0}, {h: 0, m: 0}, _epochStart, _epochEnd, 7); t1 = tmUtils.standardFromTillDay([3,3], [{h: 21, m: 0}, {h: 0, m: 0}], [_epochStart, _epochEnd], 7);
t2 = tmUtils.standardFromTillDay(4,4, {h: 0, m: 0}, {h: 18, m: 0}, _epochStart, _epochEnd, 7); t2 = tmUtils.standardFromTillDay([4,4], [{h: 0, m: 0}, {h: 18, m: 0}], [_epochStart, _epochEnd], 7);
console.log(t1); console.log(t1);
console.log(t2); console.log(t2);
var t = tmUtils.orOperator([t1, t2, tmUtils.singleDay(new Date())]); var singleDay = tmUtils.singleDay(new Date());
console.log(singleDay);
var t = tmUtils.orOperator([t1, t2, singleDay]);
console.log(t); console.log(t);
console.log(tmUtils.mergeOverlaps(t)); console.log(tmUtils.mergeOverlaps(t));
//console.log(tmUtils.orOperator([t,t2])); console.log(tmUtils.orOperator([t,t2]));
\ No newline at end of file \ No newline at end of file
testData/testHof.json
View file @ c6d7dd88
{ {
"f86608fb-16aa-4c70-9d57-0b5cac1a9618": { "f86608fb-16aa-4c70-9d57-0b5cac1a9618": {
}, },
"4ae7b6cb-07e8-4184-a00b-9db001f55bd3": { "4ae7b6cb-07e8-4184-a00b-9db001f55bd3": {
"0": { "0": {
"value": "" "value": ""
} }
}, },
"f64563c6-c102-4836-a5f7-8f9246fcceef": { "f64563c6-c102-4836-a5f7-8f9246fcceef": {
"option": { "option": {
"0": "direktvermarkter-mit-geschaeft", "0": "direktvermarkter-mit-geschaeft",
"1": "premium" "1": "premium"
}, },
"select": "1" "select": "1"
}, },
"f62d066f-bf0d-42e2-a7ae-6f926fbb49d7": { "f62d066f-bf0d-42e2-a7ae-6f926fbb49d7": {
"0": { "0": {
"value": "" "value": ""
} }
}, },
"915f382b-51fc-48ba-93e0-152040f8f0e4": { "915f382b-51fc-48ba-93e0-152040f8f0e4": {
"0": { "0": {
"value": "" "value": ""
} }
}, },
"1b99ac64-7879-4802-80d9-0de99613efc9": { "1b99ac64-7879-4802-80d9-0de99613efc9": {
"option": { "option": {
"0": "premium" "0": "premium"
}, },
"check": "1" "check": "1"
}, },
"8cf3f417-4d1c-4795-87de-42124dcb2c20": { "8cf3f417-4d1c-4795-87de-42124dcb2c20": {
"option": { "option": {
"0": "premium" "0": "premium"
}, },
"select": "1" "select": "1"
}, },
"f118eeff-e254-4155-8e23-8149cb8b5eea": { "f118eeff-e254-4155-8e23-8149cb8b5eea": {
"0": { "0": {
"value": "Testhof" "value": "Testhof"
} }
}, },
"dbc68015-df76-42ed-a033-503b87e35685": { "dbc68015-df76-42ed-a033-503b87e35685": {
"check": "1" "check": "1"
}, },
"0b13b5c0-bec6-445c-bdf2-e201ba0d43e4": { "0b13b5c0-bec6-445c-bdf2-e201ba0d43e4": {
"file": "", "file": "",
"title": "", "title": "",
"link": "", "link": "",
...@@ -54,12 +54,12 @@ ...@@ -54,12 +54,12 @@
"spotlight_effect": "", "spotlight_effect": "",
"caption": "" "caption": ""
}, },
"17709bb7-acf7-4ef5-8b26-4ed4fe63f8c9": { "17709bb7-acf7-4ef5-8b26-4ed4fe63f8c9": {
"0": { "0": {
"value": "" "value": ""
} }
}, },
"3d305054-e356-4c09-8f4c-7795433a4589": { "3d305054-e356-4c09-8f4c-7795433a4589": {
"file": "", "file": "",
"title": "", "title": "",
"link": "", "link": "",
...@@ -69,356 +69,176 @@ ...@@ -69,356 +69,176 @@
"spotlight_effect": "", "spotlight_effect": "",
"caption": "" "caption": ""
}, },
"e8c1fdc9-50e0-4a9b-994a-f48f738dac64": { "e8c1fdc9-50e0-4a9b-994a-f48f738dac64": {
}, },
"ed9cdd4c-ae8b-4ecb-bca7-e12a5153bc02": { "ed9cdd4c-ae8b-4ecb-bca7-e12a5153bc02": {
"0": { "0": {
"value": "Testen auf dem Testhof" "value": "Testen auf dem Testhof"
} }
}, },
"514ccde0-0a79-4594-8b72-b906ee4cede9": { "514ccde0-0a79-4594-8b72-b906ee4cede9": {
"0": { "0": {
"opening_day": "", "opening_day": "",
"opening_from": "", "opening_from": "",
"opening_to": "" "opening_to": ""
} }
}, },
"810a6deb-46f2-4fa8-b779-bb5c2a6b5577": { "810a6deb-46f2-4fa8-b779-bb5c2a6b5577": {
"0": { "0": {
"option": { "option": {
"0": "default" "0": "default"
}, },
"dayoption": { "dayoption": {
"0": "1" "0": "1"
}, },
"repeatoption": { "repeatoption": {
"0": "" "0": ""
}, },
"holidayoption": { "holidayoption": {
"0": "" "0": ""
}, },
"opening_day_from": "", "opening_day_from": "",
"opening_day_to": "", "opening_day_to": "",
"opening_from": "9:00", "opening_from": "09:00",
"opening_to": "18:00" "opening_to": "18:00"
}, },
"1": { "1": {
"option": { "option": {
"0": "default" "0": "default"
}, },
"dayoption": { "dayoption": {
"0": "2" "0": "2"
}, },
"repeatoption": { "repeatoption": {
"0": "" "0": ""
}, },
"holidayoption": { "holidayoption": {
"0": "" "0": ""
}, },
"opening_day_from": "", "opening_day_from": "",
"opening_day_to": "", "opening_day_to": "",
"opening_from": "9:00", "opening_from": "9:00",
"opening_to": "12:00"
},
"2": {
"option": {
"0": "default"
},
"dayoption": {
"0": "2"
},
"repeatoption": {
"0": ""
},
"holidayoption": {
"0": ""
},
"opening_day_from": "",
"opening_day_to": "",
"opening_from": "13:00",
"opening_to": "18:00" "opening_to": "18:00"
}, },
"3": { "2": {
"option": { "option": {
"0": "default"
},
"dayoption": {
"0": "8"
},
"repeatoption": {
"0": ""
},
"holidayoption": {
"0": ""
},
"opening_day_from": "",
"opening_day_to": "",
"opening_from": "9:00",
"opening_to": "18:00"
},
"4": {
"option": {
"0": "repeatable" "0": "repeatable"
}, },
"dayoption": { "dayoption": {
"0": "3" "0": "9"
},
"repeatoption": {
"0": "3"
}, },
"holidayoption": { "repeatoption": {
"0": "" "0": "1"
},
"opening_day_from": "",
"opening_day_to": "",
"opening_from": "9:00",
"opening_to": "18:00"
},
"5": {
"option": {
"0": "repeatable"
},
"dayoption": {
"0": "4"
},
"repeatoption": {
"0": "14"
},
"holidayoption": {
"0": ""
},
"opening_day_from": "04.01",
"opening_day_to": "",
"opening_from": "9:00",
"opening_to": "18:00"
},
"6": {
"option": {
"0": "season"
},
"dayoption": {
"0": "5"
},
"repeatoption": {
"0": ""
}, },
"holidayoption": { "holidayoption": {
"0": "" "0": ""
}, },
"opening_day_from": "25.05", "opening_day_from": "21.05",
"opening_day_to": "30.11", "opening_day_to": "21.06",
"opening_from": "9:00", "opening_from": "9:00",
"opening_to": "18:00" "opening_to": "18:00"
}, },
"7": { "3": {
"option": { "option": {
"0": "holiday" "0": "holiday"
}, },
"dayoption": { "dayoption": {
"0": "1" "0": "1"
}, },
"repeatoption": { "repeatoption": {
"0": "" "0": ""
}, },
"holidayoption": { "holidayoption": {
"0": "0" "0": "602"
}, },
"opening_day_from": "", "opening_day_from": "",
"opening_day_to": "", "opening_day_to": "",
"opening_from": "9:00", "opening_from": "13:00",
"opening_to": "18:00" "opening_to": "15:00"
} }
}, },
"bb74c170-b06f-4d2b-ab88-2f6bf9ce8068": { "bb74c170-b06f-4d2b-ab88-2f6bf9ce8068": {
"0": { "0": {
"option": { "option": {
"0": "repeatable"
},
"dayoption": {
"0": "1"
},
"repeatoption": {
"0": "3"
},
"holidayoption": {
"0": ""
},
"opening_day_from": "01.01",
"opening_day_to": "",
"opening_from": "",
"opening_to": ""
},
"1": {
"option": {
"0": "season"
},
"dayoption": {
"0": "8"
},
"repeatoption": {
"0": ""
},
"holidayoption": {
"0": ""
},
"opening_day_from": "01.01",
"opening_day_to": "01.02",
"opening_from": "",
"opening_to": ""
},
"2": {
"option": {
"0": "holiday"
},
"dayoption": {
"0": "0"
},
"repeatoption": {
"0": ""
},
"holidayoption": {
"0": "121"
},
"opening_day_from": "01.01",
"opening_day_to": "",
"opening_from": "",
"opening_to": ""
},
"3": {
"option": {
"0": "holiday"
},
"dayoption": {
"0": "0"
},
"repeatoption": {
"0": ""
},
"holidayoption": {
"0": "122"
},
"opening_day_from": "01.01",
"opening_day_to": "",
"opening_from": "",
"opening_to": ""
},
"4": {
"option": {
"0": "holiday"
},
"dayoption": {
"0": "0"
},
"repeatoption": {
"0": ""
},
"holidayoption": {
"0": "123"
},
"opening_day_from": "01.01",
"opening_day_to": "",
"opening_from": "",
"opening_to": ""
},
"5": {
"option": {
"0": "default" "0": "default"
}, },
"dayoption": { "dayoption": {
"0": "0" "0": "2"
}, },
"repeatoption": { "repeatoption": {
"0": "" "0": "3"
}, },
"holidayoption": { "holidayoption": {
"0": "" "0": ""
}, },
"opening_day_from": "01.01", "opening_day_from": "01.01",
"opening_day_to": "", "opening_day_to": "",
"opening_from": "", "opening_from": "10:00",
"opening_to": "" "opening_to": "14:30"
},
"6": {
"option": {
"0": "vacation"
},
"dayoption": {
"0": "0"
},
"repeatoption": {
"0": ""
},
"holidayoption": {
"0": ""
},
"opening_day_from": "01.10",
"opening_day_to": "09.10",
"opening_from": "",
"opening_to": ""
} }
}, },
"7ac7d682-2862-443b-83bd-8a3cf837ad8e": { "7ac7d682-2862-443b-83bd-8a3cf837ad8e": {
"option": { "option": {
"0": "0" "0": "0"
} }
}, },
"6b3b589d-8060-4193-92b9-ce430d96cfdd": { "6b3b589d-8060-4193-92b9-ce430d96cfdd": {
"0": { "0": {
"value": "Immer und t\u00e4glich ge\u00f6ffnet, au\u00dfer es ist niemand da." "value": "Immer und t\u00e4glich ge\u00f6ffnet, au\u00dfer es ist niemand da."
} }
}, },
"65359d5a-faca-46b8-8644-767d382d8b9b": { "65359d5a-faca-46b8-8644-767d382d8b9b": {
"option": { "option": {
"0": "hinweis" "0": "hinweis"
}, },
"check": "1" "check": "1"
}, },
"533ea2dd-e37d-4add-aa73-ad8419040c22": { "533ea2dd-e37d-4add-aa73-ad8419040c22": {
"0": { "0": {
"value": "Immer und t\u00e4glich ge\u00f6ffnet, au\u00dfer es ist niemand da." "value": "Immer und t\u00e4glich ge\u00f6ffnet, au\u00dfer es ist niemand da."
} }
}, },
"6d9ab971-f969-499b-bb6b-9b87b601a961": { "6d9ab971-f969-499b-bb6b-9b87b601a961": {
"check": "1" "check": "1"
}, },
"f67464f3-4475-46a9-a262-11c8a777865d": { "f67464f3-4475-46a9-a262-11c8a777865d": {
"0": { "0": {
"value": "Regoistart GmbH" "value": "Regoistart GmbH"
} }
}, },
"1d0a9c64-78d4-4767-8617-c8a3a66fc770": { "1d0a9c64-78d4-4767-8617-c8a3a66fc770": {
"0": { "0": {
"value": "" "value": ""
} }
}, },
"05192b86-fc84-43cb-81d3-ab804086a873": { "05192b86-fc84-43cb-81d3-ab804086a873": {
"0": { "0": {
"value": "" "value": ""
} }
}, },
"d230a60f-0016-4180-b83a-13e4fd938328": { "d230a60f-0016-4180-b83a-13e4fd938328": {
"0": { "0": {
"value": "regionalkauf.com" "value": "regionalkauf.com"
} }
}, },
"c70daef6-ffee-40ef-ba29-3d0065a5aaf5": { "c70daef6-ffee-40ef-ba29-3d0065a5aaf5": {
}, },
"a77f06fc-1561-453c-a429-8dd05cdc29f5": { "a77f06fc-1561-453c-a429-8dd05cdc29f5": {
"0": { "0": {
"value": "<p>Bienenhonig, Met, Propolis, Bl\u00fctenpollen. sm\u00f6rrebr\u00f6d, smoerrebroed roemtoemtoemt\u00f6m.<\/p>" "value": "<p>Bienenhonig, Met, Propolis, Bl\u00fctenpollen. sm\u00f6rrebr\u00f6d, smoerrebroed roemtoemtoemt\u00f6m.<\/p>"
} }
}, },
"1a85a7a6-2aba-4480-925b-6b97d311ee6c": { "1a85a7a6-2aba-4480-925b-6b97d311ee6c": {
"0": { "0": {
"value": "<p>Bienenhonig, Met, Propolis, Bl\u00fctenpollen. supercalafragalisticexpialadoshus, s\u00fcpercalafragalisticexpialad\u00f6shus<\/p>" "value": "<p>Bienenhonig, Met, Propolis, Bl\u00fctenpollen. supercalafragalisticexpialadoshus, s\u00fcpercalafragalisticexpialad\u00f6shus<\/p>"
} }
}, },
"efd91873-dce0-48fd-b40e-5bc0e9599f3e": { "efd91873-dce0-48fd-b40e-5bc0e9599f3e": {
}, },
"9ca9fc28-03f8-472d-b49f-8e2513cc8740": { "9ca9fc28-03f8-472d-b49f-8e2513cc8740": {
"file": "images\/regionalkaufapp\/unternehmen\/logo_basis.png", "file": "images\/regionalkaufapp\/unternehmen\/logo_basis.png",
"title": "", "title": "",
"link": "", "link": "",
...@@ -430,7 +250,7 @@ ...@@ -430,7 +250,7 @@
"width": 144, "width": 144,
"height": 145 "height": 145
}, },
"ffcc1c50-8dbd-4115-b463-b43bdcd44a57": { "ffcc1c50-8dbd-4115-b463-b43bdcd44a57": {
"file": "images\/regionalkaufapp\/unternehmen\/logo_basis.png", "file": "images\/regionalkaufapp\/unternehmen\/logo_basis.png",
"title": "", "title": "",
"link": "", "link": "",
...@@ -442,84 +262,84 @@ ...@@ -442,84 +262,84 @@
"width": 144, "width": 144,
"height": 145 "height": 145
}, },
"e8f08959-19ff-4cfa-ba37-bc42414eeb45": { "e8f08959-19ff-4cfa-ba37-bc42414eeb45": {
"value": "\/allgemein", "value": "\/allgemein",
"title": "Die Bilder sind in Vorbereitung." "title": "Die Bilder sind in Vorbereitung."
}, },
"051452fe-692b-4ce2-8567-7dc4d0343fee": { "051452fe-692b-4ce2-8567-7dc4d0343fee": {
"url": "", "url": "",
"width": "640", "width": "640",
"height": "360", "height": "360",
"autoplay": "0" "autoplay": "0"
}, },
"b68108e0-e49b-420d-97ec-d7c88af2b01a": { "b68108e0-e49b-420d-97ec-d7c88af2b01a": {
"file": "", "file": "",
"hits": "0", "hits": "0",
"download_limit": "", "download_limit": "",
"size": 0 "size": 0
}, },
"92fda174-119b-4ee7-b14c-98c7f65224de": { "92fda174-119b-4ee7-b14c-98c7f65224de": {
}, },
"4339a108-f907-4661-9aab-d6f3f00e736e": { "4339a108-f907-4661-9aab-d6f3f00e736e": {
"0": { "0": {
"value": "Dr.Theobald-Schrems-Stra\u00dfe 4" "value": "Dr.Theobald-Schrems-Stra\u00dfe 4"
} }
}, },
"ea0666d7-51e3-4e52-8617-25e3ad61f8b8": { "ea0666d7-51e3-4e52-8617-25e3ad61f8b8": {
"0": { "0": {
"value": "93055" "value": "93055"
} }
}, },
"90a18889-884b-4d53-a302-4e6e4595efa0": { "90a18889-884b-4d53-a302-4e6e4595efa0": {
"0": { "0": {
"value": "Regensburg" "value": "Regensburg"
} }
}, },
"160bd40a-3e0e-48de-b6cd-56cdcc9db892": { "160bd40a-3e0e-48de-b6cd-56cdcc9db892": {
"location": "49.0146337, 12.111873899999978" "location": "49.0146337, 12.111873899999978"
}, },
"9ff517f0-d029-4e85-a411-fdb2bbae3b8c": { "9ff517f0-d029-4e85-a411-fdb2bbae3b8c": {
"location": "49.0146337, 12.111873899999978" "location": "49.0146337, 12.111873899999978"
}, },
"33bfd53b-1f42-4628-bb3d-461cacecdd84": { "33bfd53b-1f42-4628-bb3d-461cacecdd84": {
"0": { "0": {
"value": "12.111873899999978, 49.0146337" "value": "12.111873899999978, 49.0146337"
} }
}, },
"7516ee89-8702-4675-806b-58fe5bc56305": { "7516ee89-8702-4675-806b-58fe5bc56305": {
}, },
"b870164b-fe78-45b0-b840-8ebceb9b9cb6": { "b870164b-fe78-45b0-b840-8ebceb9b9cb6": {
"0": { "0": {
"value": "0941 56959760" "value": "0941 56959760"
} }
}, },
"272860a4-9ba0-4303-b2d3-77abb8d6fd42": { "272860a4-9ba0-4303-b2d3-77abb8d6fd42": {
"0": { "0": {
"value": "0941 56959768" "value": "0941 56959768"
} }
}, },
"5dcfa5ab-3769-4c5e-8cd2-1ac91643be70": { "5dcfa5ab-3769-4c5e-8cd2-1ac91643be70": {
"0": { "0": {
"value": "0941 56959768" "value": "0941 56959768"
} }
}, },
"8a91aab2-7862-4a04-bd28-07f1ff4acce5": { "8a91aab2-7862-4a04-bd28-07f1ff4acce5": {
"0": { "0": {
"value": "0941 56959769" "value": "0941 56959769"
} }
}, },
"3f15b5e4-0dea-4114-a870-1106b85248de": { "3f15b5e4-0dea-4114-a870-1106b85248de": {
"0": { "0": {
"value": "mb@regiostart.com", "value": "mb@regiostart.com",
"text": "", "text": "",
"subject": "", "subject": "",
"body": "" "body": ""
} }
}, },
"0b3d983e-b2fa-4728-afa0-a0b640fa34dc": { "0b3d983e-b2fa-4728-afa0-a0b640fa34dc": {
"0": { "0": {
"value": "http:\/\/regiostart.com", "value": "http:\/\/regiostart.com",
"text": "", "text": "",
"target": "1", "target": "1",
...@@ -527,45 +347,45 @@ ...@@ -527,45 +347,45 @@
"rel": "" "rel": ""
} }
}, },
"b7628b63-d551-4b14-ac70-27cf0c6e95fc": { "b7628b63-d551-4b14-ac70-27cf0c6e95fc": {
"0": { "0": {
"value": "http:\/\/myreg.io\/g" "value": "http:\/\/myreg.io\/g"
} }
}, },
"2081965c-c781-4ae1-99c3-54b959145cfe": { "2081965c-c781-4ae1-99c3-54b959145cfe": {
"value": "1" "value": "1"
}, },
"8eeeb531-0dc3-415a-8f4a-c7f88d1ac627": { "8eeeb531-0dc3-415a-8f4a-c7f88d1ac627": {
"value": "1" "value": "1"
}, },
"9bd1d374-6a54-4054-be1e-87839eb24fb6": { "9bd1d374-6a54-4054-be1e-87839eb24fb6": {
}, },
"7056f1d2-5253-40b6-8efd-d289b10a8c69": { "7056f1d2-5253-40b6-8efd-d289b10a8c69": {
"item": { "item": {
"0": "2423" "0": "2423"
} }
}, },
"6eaab8b7-b4f5-4d3c-8193-db3542aec0a5": { "6eaab8b7-b4f5-4d3c-8193-db3542aec0a5": {
}, },
"c59ac5ce-2011-44b9-846f-e9cb73857b33": { "c59ac5ce-2011-44b9-846f-e9cb73857b33": {
}, },
"e2221aa5-853b-4a8c-aeb1-53a97efa6995": { "e2221aa5-853b-4a8c-aeb1-53a97efa6995": {
}, },
"9eeb4b7d-f289-4137-91ea-5275bb3376a7": { "9eeb4b7d-f289-4137-91ea-5275bb3376a7": {
}, },
"23685df7-81bb-4c25-a14a-18e2c42a4caf": { "23685df7-81bb-4c25-a14a-18e2c42a4caf": {
}, },
"cf6dd846-5774-47aa-8ca7-c1623c06e130": { "cf6dd846-5774-47aa-8ca7-c1623c06e130": {
"votes": "1", "votes": "1",
"value": "5.0000" "value": "5.0000"
}, },
"cffd7b0a-317a-4cf9-852e-65fd31526a53": { "cffd7b0a-317a-4cf9-852e-65fd31526a53": {
"votes": "1" "votes": "1"
} }
} }
\ No newline at end of file
timeUtils.js
View file @ c6d7dd88
...@@ -86,45 +86,48 @@ function cyclic(day, noInMonth, timeFrom, timeUntil, epochStart, epochEnd) { ...@@ -86,45 +86,48 @@ function cyclic(day, noInMonth, timeFrom, timeUntil, epochStart, epochEnd) {
} }
function cyclicFromTillDay(daySpan, noInMonth, timeSpan, dateSpan, epochSpan) { function cyclicFromTillDay(daySpan, noInMonth, timeSpan, dateSpan, epochSpan) {
if(!epochSpan)
epochSpan = dateSpan;
timeSpan = transformTimeSpan(timeSpan); timeSpan = transformTimeSpan(timeSpan);
var dayFrom = daySpan[0]; var dayFrom = daySpan[0];
var dayTill = daySpan[1]; var dayTill = daySpan[1];
var timeFrom = timeSpan[0]; var timeFrom = timeSpan[0];
var timeUntil = timeSpan[1]; var timeUntil = timeSpan[1];
var epochStart = dateSpan[0]; var startDate = dateSpan[0];
var epochEnd = dateSpan[1]; var endDate = dateSpan[1];
//limit dateSpan to epochSpan, to reduce costs //limit dateSpan to epochSpan, to reduce costs
if(epochEnd > epochSpan[1]) epochEnd = epochSpan[1]; if(endDate > epochSpan[1]) endDate = epochSpan[1];
if(epochStart < epochSpan[0]) { if(startDate < epochSpan[0]) {
var t = epochSpan[0]; var t = epochSpan[0];
//substract 1 month to cover special cases //substract 1 month to cover special cases
epochStart = new Date(t.getFullYear(), t.getMonth() - 1, t.getDate()) startDate = new Date(t.getFullYear(), t.getMonth() - 1, t.getDate())
} }
var result = []; var result = [];
epochStart = new Date(epochStart); startDate = new Date(startDate);
while(true) { while(true) {
var startDate = _getNextNoInMonthOccurence(dayFrom, epochStart, noInMonth); var date0 = _getNextNoInMonthOccurence(dayFrom, startDate, noInMonth);
startDate.setHours(timeFrom.h); date0.setHours(timeFrom.h);
startDate.setMinutes(timeFrom.m); date0.setMinutes(timeFrom.m);
var endDate = new Date(startDate); var date1 = new Date(date0);
endDate.setHours(timeUntil.h); date1.setHours(timeUntil.h);
endDate.setMinutes(timeUntil.m); date1.setMinutes(timeUntil.m);
if(endDate > epochEnd) if(date1 > endDate)
break; break;
else { else {
result.push([startDate, endDate]); result.push([date0, date1]);
epochStart = new Date(endDate); startDate = new Date(date1);
epochStart.setDate(epochStart.getDate() + 1); startDate.setDate(startDate.getDate() + 1);
for(var offset = 1; offset <= dayTill - dayFrom; offset++) { for(var offset = 1; offset <= dayTill - dayFrom; offset++) {
startDate = new Date(startDate); date0 = new Date(date0);
endDate = new Date(endDate); date1 = new Date(date1);
startDate.setDate(startDate.getDate() + 1); date0.setDate(date0.getDate() + 1);
endDate.setDate(endDate.getDate() + 1); date1.setDate(date1.getDate() + 1);
if(endDate <= epochEnd) if(date1 <= endDate)
result.push([startDate, endDate]); result.push([date0, date1]);
else break; else break;
} }
} }
...@@ -191,6 +194,7 @@ function _getNextNoInMonthOccurence(day, startDate, noInMonth) { ...@@ -191,6 +194,7 @@ function _getNextNoInMonthOccurence(day, startDate, noInMonth) {
function singleDay(date, timeSpan) { function singleDay(date, timeSpan) {
var startDate, endDate; var startDate, endDate;
if(timeSpan) { if(timeSpan) {
transformTimeSpan(timeSpan);
startDate = new Date(date.getFullYear(), date.getMonth(), date.getDate(), timeSpan[0].h, timeSpan[0].m); startDate = new Date(date.getFullYear(), date.getMonth(), date.getDate(), timeSpan[0].h, timeSpan[0].m);
endDate = new Date(date.getFullYear(), date.getMonth(), date.getDate(), timeSpan[1].h, timeSpan[1].m); endDate = new Date(date.getFullYear(), date.getMonth(), date.getDate(), timeSpan[1].h, timeSpan[1].m);
} }
...@@ -204,6 +208,16 @@ function singleDay(date, timeSpan) { ...@@ -204,6 +208,16 @@ function singleDay(date, timeSpan) {
]; ];
} }
function dateSpan(dateSpan) {
var d0 = dateSpan[0];
var d1 = dateSpan[1];
var startDate = new Date(d0.getFullYear(), d0.getMonth(), d0.getDay());
var endDate = new Date(d1.getFullYear(), d1.getMonth(), d1.getDay() + 1);
return [
[startDate, endDate]
];
}
function orOperator(intervals) { function orOperator(intervals) {
var result = []; var result = [];
for(var i = 0; i < intervals.length; i++) { for(var i = 0; i < intervals.length; i++) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment