Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
opening-hours
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
regionalkauf
opening-hours
Commits
4f6027b9
Commit
4f6027b9
authored
Nov 20, 2014
by
Johannes Bill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
empty end date handling fixed
parent
ede699b4
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
4 deletions
+15
-4
dateArray.js
lib/dateArray.js
+15
-4
No files found.
lib/dateArray.js
View file @
4f6027b9
...
...
@@ -218,14 +218,25 @@ function wrapper(_epochSpan) {
var
start
=
parseDate
(
data
[
"opening_day_from"
]);
var
end
=
parseDate
(
data
[
"opening_day_to"
]);
if
(
!
start
||
!
end
)
{
if
(
!
start
)
{
return
[
epochSpan
];
}
var
newYear
=
(
end
[
1
]
<
start
[
1
])?
1
:
0
;
var
startDate
,
endDate
;
var
startDate
=
new
Date
(
startYear
,
start
[
1
]
-
1
,
start
[
0
]);
var
endDate
=
new
Date
(
startYear
+
newYear
,
end
[
1
]
-
1
,
end
[
0
]
+
1
);
if
(
!
end
)
{
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
])
{
startDate
=
new
Date
(
startYear
+
1
,
start
[
1
]
-
1
,
start
[
0
]);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment