Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Chronos
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-App-Chronos
Commits
0709de40
Verified
Commit
0709de40
authored
5 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Adapt URL schema of lessons_day to the generally used schema for dates
parent
7c410adb
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!31
Biscuit merge. Closes #53.
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/apps/chronos/urls.py
+1
-1
1 addition, 1 deletion
aleksis/apps/chronos/urls.py
aleksis/apps/chronos/views.py
+14
-14
14 additions, 14 deletions
aleksis/apps/chronos/views.py
with
15 additions
and
15 deletions
aleksis/apps/chronos/urls.py
+
1
−
1
View file @
0709de40
...
...
@@ -10,7 +10,7 @@ urlpatterns = [
path
(
"
timetable/<str:type_>/<int:pk>/<int:year>/<int:week>/
"
,
views
.
timetable
,
name
=
"
timetable_by_week
"
),
path
(
"
timetable/<str:type_>/<int:pk>/<str:regular>/
"
,
views
.
timetable
,
name
=
"
timetable_regular
"
),
path
(
"
lessons/
"
,
views
.
lessons_day
,
name
=
"
lessons_day
"
),
path
(
"
lessons/<
when
>/
"
,
views
.
lessons_day
,
name
=
"
lessons_day_by_date
"
),
path
(
"
lessons/<
int:year>/<int:month>/<int:day
>/
"
,
views
.
lessons_day
,
name
=
"
lessons_day_by_date
"
),
path
(
"
lessons/<int:id_>/<int:week>/substition/
"
,
views
.
edit_substitution
,
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/chronos/views.py
+
14
−
14
View file @
0709de40
...
...
@@ -211,33 +211,33 @@ def timetable(
@login_required
def
lessons_day
(
request
:
HttpRequest
,
when
:
Optional
[
str
]
=
None
)
->
HttpResponse
:
def
lessons_day
(
request
:
HttpRequest
,
year
:
Optional
[
int
]
=
None
,
month
:
Optional
[
int
]
=
None
,
day
:
Optional
[
int
]
=
None
,
)
->
HttpResponse
:
context
=
{}
if
when
:
day
=
datetime
.
strptime
(
when
,
"
%Y-%m-%d
"
).
date
()
if
day
:
wanted_day
=
timezone
.
datetime
(
year
=
year
,
month
=
month
,
day
=
day
).
date
()
wanted_day
=
get_next_relevant_day
(
wanted_day
)
else
:
day
=
date
.
today
(
)
wanted_day
=
get_next_relevant_day
(
timezone
.
now
().
date
(),
datetime
.
now
().
time
()
)
# Get lessons
lesson_periods
=
LessonPeriod
.
objects
.
on_day
(
day
)
lesson_periods
=
LessonPeriod
.
objects
.
on_day
(
wanted_
day
)
# Build table
lessons_table
=
LessonsTable
(
lesson_periods
.
all
())
RequestConfig
(
request
).
configure
(
lessons_table
)
context
[
"
lessons_table
"
]
=
lessons_table
context
[
"
day
"
]
=
day
context
[
"
day
"
]
=
wanted_
day
context
[
"
lesson_periods
"
]
=
lesson_periods
day_prev
=
day
-
timedelta
(
days
=
1
)
day_next
=
day
+
timedelta
(
days
=
1
)
context
[
"
url_prev
"
]
=
reverse
(
"
lessons_day_by_date
"
,
args
=
[
day_prev
.
strftime
(
"
%Y-%m-%d
"
)]
)
context
[
"
url_next
"
]
=
reverse
(
"
lessons_day_by_date
"
,
args
=
[
day_next
.
strftime
(
"
%Y-%m-%d
"
)]
context
[
"
url_prev
"
],
context
[
"
url_next
"
]
=
get_prev_next_by_day
(
wanted_day
,
"
lessons_day_by_date
"
)
return
render
(
request
,
"
chronos/lessons_day.html
"
,
context
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment