Skip to content
Snippets Groups Projects
Commit 94f25b95 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Navigation arrows, comments, better presentation of week days, add navigation... 

Navigation arrows, comments, better presentation of week days, add navigation items of smart plan to print mode, remove some margins, remove django material imports in header, add media dir to .gitignore
parent b9da0796
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
biscuit/apps/chronos/templates/timetable/plan.html
+ 58
− 58
View file @ 94f25b95
{% include 'partials/header.html' %}
<script type="text/javascript">
{% if smart %}
var week = {{ selected_week }};
function goToCalendarWeek(cw) {
window.location.href = "{% url "timetable_smart_plan" raw_type id "smart" %}/{{ selected_year }}/" + cw;
}
function onCalendarWeekChanged() {
goToCalendarWeek($("#calendar-week").val());
goToCalendarWeek($("#calendar-week").val(), {{ selected_year }});
}
function weekBefore() {
if (week > 1) {
goToCalendarWeek(week - 1)
}
}
function weekNext() {
if (week < 52) {
goToCalendarWeek(week + 1);
}
}
$(document).ready(function () {
$("#calendar-week").change(onCalendarWeekChanged);
$("#week-before").click(weekBefore);
$("#week-next").click(weekNext);
});
{% endif %}
</script>
<main>
<div class="row">
<div class="row no-margin">
<div class="col s12 m6 l8 xl9">
<h3>
Stundenplan <i>{{ el }}</i>
......@@ -22,7 +37,7 @@
</div>
<div class=" col s12 m6 l4 xl3 right align-right">
<div class=" col s12 m6 l4 xl3 right align-right no-print">
<a class="waves-effect waves-teal btn-flat btn-flat-medium right" id="print">
<i class="material-icons center">print</i>
</a>
......@@ -30,89 +45,74 @@
</div>
<div class="row">
{% if smart %}
{# Show if smart #}
{# Toggle button to regular and smart plan badge #}
<div class="col s12 m6">
<p class="left" style="margin: 0;"><span
class="badge new primary-color left-align">SMART PLAN</span>
</p>&nbsp;
<a class="waves-effect waves-light btn" href="{% url "timetable_plan" raw_type id %}">
<a class="waves-effect waves-light btn-flat no-print" href="{% url "timetable_plan" raw_type id %}">
<i class="material-icons left">slideshow</i>
Regelplan anzeigen
</a>
</div>
<div class="input-field col s12 m6 right">
<select id="calendar-week">
{% for week in weeks %}
<option value="{{ week.calendar_week }}" {% if week.calendar_week == selected_week %}
selected {% endif %}>
KW {{ week.calendar_week }}
({{ week.first_day|date:"j. F Y" }}–{{ week.last_day|date:"j. F Y" }})
</option>
{% endfor %}
</select>
{# Week select #}
<div class="col s12 m6 right ">
<div class="col s3 no-print">
<a class="waves-effect waves-teal btn-flat btn-flat-medium right" id="week-before">
<i class="material-icons center">navigate_before</i>
</a>
</div>
<div class="input-field col s6 no-margin">
<select id="calendar-week">
{% for week in weeks %}
<option value="{{ week.calendar_week }}" {% if week.calendar_week == selected_week %}
selected {% endif %}> KW {{ week.calendar_week }} ({{ week.first_day|date:"j.n.Y" }}–{{ week.last_day|date:"j.n.Y" }})
</option>
{% endfor %}
</select>
</div>
<div class="col s3 no-print">
<a class="waves-effect waves-teal btn-flat btn-flat-medium left" id="week-next">
<i class="material-icons center">navigate_next</i>
</a>
</div>
</div>
{% else %}
<a class="waves-effect waves-light btn"
{# Show if regular #}
<a class="waves-effect waves-light btn-flat no-print"
href="{% url "timetable_smart_plan" raw_type id "smart" %}">
<i class="material-icons left">slideshow</i>
SMART PLAN
SMART PLAN ANZEIGEN
</a>
{% endif %}
</div>
<div class="timetable-plan">
{# Week days #}
<div class="row">
<div class="col s2">
</div>
<div class="col s2">
<div class="card timetable-title-card">
<div class="card-content">
<span class="card-title">
Montag
</span>
</div>
</div>
</div>
<div class="col s2">
<div class="card timetable-title-card">
<div class="card-content">
<span class="card-title">
Dienstag
</span>
</div>
</div>
</div>
<div class="col s2">
<div class="card timetable-title-card">
<div class="card-content">
<span class="card-title">
Mittwoch
</span>
</div>
</div>
</div>
<div class="col s2">
<div class="card timetable-title-card">
<div class="card-content">
<span class="card-title">
Donnerstag
</span>
</div>
</div>
</div>
<div class="col s2">
<div class="card timetable-title-card">
<div class="card-content">
{% for week_day in week_days %}
<div class="col s2">
<div class="card timetable-title-card">
<div class="card-content">
<span class="card-title">
Freitag
{{ week_day }}
</span>
</div>
</div>
</div>
</div>
{% endfor %}
</div>
{# Lessons #}
{% for row, time in plan %}
<div class="row">
<div class="col s2">
......
biscuit/apps/chronos/views.py
+ 3
− 1
View file @ 94f25b95
......@@ -6,6 +6,7 @@ from django.http import Http404, FileResponse
from django.shortcuts import render
from django.utils import timezone
from schoolapps.settings import WEEK_DAYS
from timetable.pdf import generate_class_tex, generate_pdf
from untisconnect.plan import get_plan, TYPE_TEACHER, TYPE_CLASS, TYPE_ROOM, parse_lesson_times
......@@ -110,7 +111,8 @@ def plan(request, plan_type, plan_id, smart="", year=timezone.datetime.now().yea
"times": parse_lesson_times(),
"weeks": get_calendar_weeks(year=year),
"selected_week": calendar_week,
"selected_year": year
"selected_year": year,
"week_days": WEEK_DAYS
}
return render(request, 'timetable/plan.html', context)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment