Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
concrexit
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
70
Issues
70
List
Boards
Labels
Service Desk
Milestones
Merge Requests
10
Merge Requests
10
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
thalia
concrexit
Commits
ac63b147
Verified
Commit
ac63b147
authored
Jul 19, 2019
by
Sébastiaan Versteeg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More fixes
parent
f7b66943
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
19 deletions
+18
-19
website/education/urls.py
website/education/urls.py
+1
-1
website/events/static/events/js/listview.js
website/events/static/events/js/listview.js
+2
-1
website/utils/snippets.py
website/utils/snippets.py
+15
-17
No files found.
website/education/urls.py
View file @
ac63b147
...
...
@@ -23,7 +23,7 @@ urlpatterns = [
name
=
"submit-summary"
),
path
(
''
,
CourseDetailView
.
as_view
(),
name
=
"course"
),
])),
path
(
'exam/<int:pk>/'
,
ExamDetailView
.
as_view
,
name
=
"exam"
),
path
(
'exam/<int:pk>/'
,
ExamDetailView
.
as_view
()
,
name
=
"exam"
),
path
(
'summary/(<int:pk>/'
,
SummaryDetailView
.
as_view
(),
name
=
"summary"
),
path
(
'exam/upload/'
,
ExamCreateView
.
as_view
(),
...
...
website/events/static/events/js/listview.js
View file @
ac63b147
...
...
@@ -38,7 +38,8 @@ class ListView extends FullCalendar.View {
month
:
'
long
'
,
weekday
:
'
long
'
,
year
:
'
numeric
'
,
hour12
:
false
,
timeZone
:
'
UTC
'
,
hour12
:
locale
!==
'
nl
'
,
});
const
eventCard
=
document
.
createElement
(
'
div
'
);
...
...
website/utils/snippets.py
View file @
ac63b147
...
...
@@ -66,26 +66,24 @@ def _extract_date(param):
def
extract_date_range
(
request
,
allow_empty
=
False
):
"""Extract a date range from an arbitrary string"""
default_value
=
''
if
allow_empty
:
default_value
=
None
default_value
=
None
start
=
request
.
query_params
.
get
(
'start'
,
default_value
)
if
start
:
start
=
dateparse
.
parse_datetime
(
start
)
if
not
timezone
.
is_aware
(
start
):
start
=
timezone
.
make_aware
(
start
)
if
not
start
and
not
allow_empty
:
raise
ParseError
(
detail
=
'start query parameter invalid'
)
if
start
or
not
allow_empty
:
try
:
start
=
dateparse
.
parse_datetime
(
start
)
if
not
timezone
.
is_aware
(
start
):
start
=
timezone
.
make_aware
(
start
)
except
(
ValueError
,
AttributeError
,
TypeError
)
as
e
:
raise
ParseError
(
detail
=
'start query parameter invalid'
)
from
e
end
=
request
.
query_params
.
get
(
'end'
,
default_value
)
if
end
:
end
=
dateparse
.
parse_datetime
(
end
)
if
not
timezone
.
is_aware
(
end
):
end
=
timezone
.
make_aware
(
end
)
if
not
end
and
not
allow_empty
:
raise
ParseError
(
detail
=
'end query parameter invalid'
)
if
end
or
not
allow_empty
:
try
:
end
=
dateparse
.
parse_datetime
(
end
)
if
not
timezone
.
is_aware
(
end
):
end
=
timezone
.
make_aware
(
end
)
except
(
ValueError
,
AttributeError
,
TypeError
)
as
e
:
raise
ParseError
(
detail
=
'end query parameter invalid'
)
from
e
return
start
,
end
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