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
93fa0398
Commit
93fa0398
authored
5 years ago
by
Jonathan Weth
Committed by
root
5 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #307 from Katharineum/bugfix/mobile-plan
Bugfix/mobile plan
parents
6c5ea78d
193b3f8c
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
biscuit/apps/chronos/templates/timetable/plan.html
+4
-0
4 additions, 0 deletions
biscuit/apps/chronos/templates/timetable/plan.html
biscuit/apps/chronos/views.py
+2
-2
2 additions, 2 deletions
biscuit/apps/chronos/views.py
with
6 additions
and
2 deletions
biscuit/apps/chronos/templates/timetable/plan.html
+
4
−
0
View file @
93fa0398
...
...
@@ -200,6 +200,10 @@
<span
class=
"card-title"
>
{{ day.0.0 }}
</span>
{% if day.1 %}
<span
class=
"badge new blue center-align holiday-badge"
>
{{ day.1.0 }}
</span>
{% endif %}
</div>
</div>
{% for row, time in plan|deepcopy %}
...
...
This diff is collapsed.
Click to expand it.
biscuit/apps/chronos/views.py
+
2
−
2
View file @
93fa0398
...
...
@@ -198,8 +198,8 @@ def plan(request, plan_type, plan_id, regular="", year=None, calendar_week=None)
"
weeks
"
:
get_calendar_weeks
(
year
=
year
),
"
selected_week
"
:
calendar_week
,
"
selected_year
"
:
year
,
"
short_week_days
"
:
zip
(
SHORT_WEEK_DAYS
,
holidays
),
"
long_week_days
"
:
zip
(
LONG_WEEK_DAYS
,
holidays
),
"
short_week_days
"
:
zip
(
SHORT_WEEK_DAYS
,
holidays
)
if
smart
else
zip
(
SHORT_WEEK_DAYS
)
,
"
long_week_days
"
:
zip
(
LONG_WEEK_DAYS
,
holidays
)
if
smart
else
zip
(
LONG_WEEK_DAYS
)
,
"
holidays
"
:
holidays
,
"
hints
"
:
hints
,
"
hints_b
"
:
hints_b
,
...
...
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