Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Alsijil
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-Alsijil
Merge requests
!185
Fix queries for dates with generate_list_of_all_register_objects
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Fix queries for dates with generate_list_of_all_register_objects
fix/date-bugs
into
master
Overview
0
Commits
1
Pipelines
1
Changes
1
Merged
Jonathan Weth
requested to merge
fix/date-bugs
into
master
3 years ago
Overview
0
Commits
1
Pipelines
1
Changes
1
Expand
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
e77bf9f4
1 commit,
3 years ago
1 file
+
4
−
2
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
aleksis/apps/alsijil/util/alsijil_helpers.py
+
4
−
2
Options
@@ -168,8 +168,9 @@ def _generate_dicts_for_lesson_periods(
"""
Generate a list of dicts for use with ``RegisterObjectTable``.
"""
if
not
holiday_days
:
holiday_days
=
[]
date_start
=
lesson_periods
.
first
().
lesson
.
validity
.
date_start
date_end
=
lesson_periods
.
last
().
lesson
.
validity
.
date_end
lesson_periods
=
list
(
lesson_periods
)
date_start
=
lesson_periods
[
0
].
lesson
.
validity
.
date_start
date_end
=
lesson_periods
[
-
1
].
lesson
.
validity
.
date_end
if
(
filter_dict
[
"
filter_date
"
]
and
filter_dict
.
get
(
"
date_start
"
)
>
date_start
@@ -288,6 +289,7 @@ def _generate_dicts_for_events_and_extra_lessons(
period
=
f
"
{
register_object
.
period
.
period
}
.
"
period_sort
=
register_object
.
period
.
period
else
:
register_object
.
annotate_day
(
register_object
.
date_end
)
day
=
(
f
"
{
date_format
(
register_object
.
date_start
)
}
"
f
"
–
{
date_format
(
register_object
.
date_end
)
}
"
Loading