Commit 4f6027b9 authored by Johannes Bill's avatar Johannes Bill

empty end date handling fixed

parent ede699b4
...@@ -218,14 +218,25 @@ function wrapper(_epochSpan) { ...@@ -218,14 +218,25 @@ function wrapper(_epochSpan) {
var start = parseDate(data["opening_day_from"]); var start = parseDate(data["opening_day_from"]);
var end = parseDate(data["opening_day_to"]); var end = parseDate(data["opening_day_to"]);
if(!start || !end) { if(!start) {
return [epochSpan]; return [epochSpan];
} }
var newYear = (end[1] < start[1])?1:0; var startDate, endDate;
var startDate = new Date(startYear, start[1] - 1, start[0]); if(!end) {
var endDate = new Date(startYear + newYear, end[1] - 1, end[0] + 1); startDate = new Date(startYear, start[1] - 1, start[0]);
endDate = new Date(startYear + 2, start[1] - 1, start[0]);
}
else {
var newYear = 0;
if(end[1] < start[1]) newYear = 1;
else if(end[1] == start[1] && end[0] < start[0]) newYear = 1;
startDate = new Date(startYear, start[1] - 1, start[0]);
endDate = new Date(startYear + newYear, end[1] - 1, end[0] + 1);
}
if(endDate < epochSpan[0]) { if(endDate < epochSpan[0]) {
startDate = new Date(startYear + 1, start[1] - 1, start[0]); startDate = new Date(startYear + 1, start[1] - 1, start[0]);
......
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