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
068d3452
You need to sign in or sign up before continuing.
Commit
068d3452
authored
5 years ago
by
Nik | Klampfradler
Browse files
Options
Downloads
Patches
Plain Diff
Add view and url for lessons day view. Advances
#11
,
#12
.
parent
c995a868
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
biscuit/apps/chronos/urls.py
+2
-0
2 additions, 0 deletions
biscuit/apps/chronos/urls.py
biscuit/apps/chronos/util.py
+4
-0
4 additions, 0 deletions
biscuit/apps/chronos/util.py
biscuit/apps/chronos/views.py
+27
-1
27 additions, 1 deletion
biscuit/apps/chronos/views.py
with
33 additions
and
1 deletion
biscuit/apps/chronos/urls.py
+
2
−
0
View file @
068d3452
...
...
@@ -5,4 +5,6 @@ from . import views
urlpatterns
=
[
path
(
'
timetable
'
,
views
.
timetable
,
name
=
'
timetable
'
),
path
(
'
lessons
'
,
views
.
lessons_day
,
name
=
'
lessons_day
'
),
path
(
'
lessons/<when>
'
,
views
.
lessons_day
,
name
=
'
lessons_day_by_date
'
)
]
This diff is collapsed.
Click to expand it.
biscuit/apps/chronos/util.py
+
4
−
0
View file @
068d3452
...
...
@@ -30,3 +30,7 @@ def current_lesson_periods(when: Optional[datetime] = None) -> models.query.Quer
period__weekday
=
now
.
isoweekday
(),
period__time_start__lte
=
now
.
time
(),
period__time_end__gte
=
now
.
time
())
def
week_weekday_from_date
(
when
:
date
)
->
Sequence
[
int
,
int
]:
return
(
int
(
when
.
strftime
(
'
%V
'
)),
int
(
when
.
strftime
(
'
%u
'
)))
This diff is collapsed.
Click to expand it.
biscuit/apps/chronos/views.py
+
27
−
1
View file @
068d3452
from
collections
import
OrderedDict
from
datetime
import
date
,
timedelta
from
django.contrib.auth.decorators
import
login_required
from
django.db.models
import
Max
,
Min
...
...
@@ -12,7 +13,7 @@ from biscuit.core.models import Group, Person
from
.forms
import
SelectForm
from
.models
import
LessonPeriod
,
TimePeriod
,
Room
from
.util
import
current_week
from
.util
import
current_week
,
week_weekday_from_date
@login_required
...
...
@@ -78,3 +79,28 @@ def timetable(request: HttpRequest) -> HttpResponse:
context
[
'
select_form
'
]
=
select_form
return
render
(
request
,
'
chronos/tt_week.html
'
,
context
)
@login_required
def
lessons_day
(
request
:
HttpRequest
,
when
:
Optional
[
str
]
=
None
)
->
HttpResponse
:
context
=
{}
if
when
:
day
=
datetime
.
strptime
(
when
,
'
%Y-%m-%d
'
).
date
()
else
:
day
=
date
.
today
()
week
,
weekday
=
week_weekday_from_date
(
day
)
lesson_periods
=
LessonPeriod
.
objects
.
filter
(
lesson__date_start__lte
=
day
,
lesson__date_end__gte
=
day
,
period__weekday
=
weekday
).
all
()
context
[
'
day
'
]
=
day
context
[
'
day_prev
'
]
=
day
+
timedelta
(
days
=-
1
)
context
[
'
day_next
'
]
=
day
+
timedelta
(
days
=
1
)
context
[
'
week
'
]
=
week
context
[
'
lesson_periods
'
]
=
lesson_periods
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