diff --git a/aleksis/apps/alsijil/templates/alsijil/lesson.html b/aleksis/apps/alsijil/templates/alsijil/lesson.html
index 82f85bf751b6960e1f20a35b3b3b9402eb78d54b..7614a51c13db64e484a17d0c39e037f745b41d47 100644
--- a/aleksis/apps/alsijil/templates/alsijil/lesson.html
+++ b/aleksis/apps/alsijil/templates/alsijil/lesson.html
@@ -6,14 +6,14 @@
{% block extra_head %}
{{ block.super }}
- <link rel="stylesheet" href="{% static 'css/alsijil/lesson.css' %}" />
+ <link rel="stylesheet" href="{% static 'css/alsijil/lesson.css' %}"/>
{% endblock %}
{% block page_title %}
- {{ day }} -
+ {{ day }}, {% blocktrans with period=lesson_period.period.period %}{{ period }}. period{% endblocktrans %} –
{% for group in lesson_period.get_groups.all %}
- <span>{{ group.short_name }}</span>,
+ <span>{{ group.name }}</span>,
{% endfor %}
{{ lesson_period.get_subject.name }},
@@ -25,54 +25,102 @@
{% block content %}
<form method="post">
+ <div class="row">
+ <div class="col s12">
+ {% include "core/save_button.html" %}
+ </div>
+ </div>
{% csrf_token %}
<div class="row">
- <div class="col s8">
- <div class="card dark-text">
+ <div class="col s12 m12 l8">
+ <div class="card">
+ <div class="card-content">
<span class="card-title">
{% blocktrans %}Lesson documentation{% endblocktrans %}
+ </span>
+
+ {% form form=lesson_documentation_form %}{% endform %}
</div>
- {% csrf_token %}
- {% form form=lesson_documentation_form %}{% endform %}
</div>
</div>
- <div class="col s4">
- <div class="card dark-text">
+ <div class="col s12 m12 l4">
+ <div class="card">
+ <div class="card-content">
<span class="card-title">
{% blocktrans %}Change history{% endblocktrans %}
</span>
- {% include 'core/crud_events_ul.html' with class_ul='list-group list-group-flush' class_li='list-group-item d-flex justify-content-between align-items-center' obj=lesson_documentation %}
+ {% include 'core/crud_events.html' with obj=lesson_documentation %}
+ </div>
</div>
</div>
</div>
- <div class="card dark-text">
+ <div class="row">
+ <div class="col s12">
+ <div class="card">
+ <div class="card-content">
<span class="card-title">
{% blocktrans %}Personal notes{% endblocktrans %}
</span>
- {{ personal_note_formset.management_form }}
+ {% form form=personal_note_formset.management_form %}{% endform %}
- <table class="striped responsive-table">
- <tr>
- <th>{% blocktrans %}Person{% endblocktrans %}</th>
- <th>{% blocktrans %}Absent{% endblocktrans %}</th>
- <th>{% blocktrans %}Tardiness{% endblocktrans %}</th>
- <th>{% blocktrans %}Excused{% endblocktrans %}</th>
- <th>{% blocktrans %}Remarks{% endblocktrans %}</th>
- </tr>
- {% for form in personal_note_formset %}
- {{ form.id }}
- <tr>
- <td>{{ form.person_name }}</td>
- <td>{{ form.absent }}</td>
- <td>{{ form.late }}</td>
- <td>{{ form.excused }}</td>
- <td>{{ form.remarks }}</td>
- </tr>
- {% endfor %}
- </table>
+ <table class="striped responsive-table">
+ <thead>
+ <tr>
+ <th>{% blocktrans %}Person{% endblocktrans %}</th>
+ <th>{% blocktrans %}Absent{% endblocktrans %}</th>
+ <th>{% blocktrans %}Tardiness{% endblocktrans %}</th>
+ <th>{% blocktrans %}Excused{% endblocktrans %}</th>
+ <th>{% blocktrans %}Remarks{% endblocktrans %}</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for form in personal_note_formset %}
+ <tr>
+ {{ form.id }}
+ <td>{{ form.person_name }}{{ form.person_name.value }}</td>
+ <td class="center-align">
+ <label>
+ {{ form.absent }}
+ <span></span>
+ </label>
+ </td>
+ <td>
+ <div class="input-field">
+ {{ form.late }}
+ <label for="{{ form.absent.id_for_label }}">
+ {% trans "Tardiness (in m)" %}
+ </label>
+ </div>
+ </td>
+ <td class="center-align">
+ <label>
+ {{ form.excused }}
+ <span></span>
+ </label>
+ </td>
+ <td>
+ <div class="input-field">
+ {{ form.remarks }}
+ <label for="{{ form.absent.id_for_label }}">
+ {% trans "Remarks" %}
+ </label>
+ </div>
+ </td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col s12">
+ {% include "core/save_button.html" %}
+ </div>
</div>
- {% include "core/save_button.html" %}
</form>
{% endblock %}
diff --git a/aleksis/apps/alsijil/templates/alsijil/week_view.html b/aleksis/apps/alsijil/templates/alsijil/week_view.html
index 5b07b7f82439f9d69d86c91bf5280f9c2ce243b5..0e160ef17f5a125200e4e2df2c826974c4a65e9e 100644
--- a/aleksis/apps/alsijil/templates/alsijil/week_view.html
+++ b/aleksis/apps/alsijil/templates/alsijil/week_view.html
@@ -7,31 +7,32 @@
{% block extra_head %}
{{ block.super }}
- <link rel="stylesheet" href="{% static 'css/alsijil/alsijil.css' %}" />
+ <link rel="stylesheet" href="{% static 'css/alsijil/alsijil.css' %}"/>
{% endblock %}
{% block content %}
- <div class="row">
- <div class="col s10">
- <form method="get">
- <ul id="timetable_select_form">
+ <div class="row">
+ <div class="col s10">
+ <form method="post" action="">
+ {% csrf_token %}
{% form form=select_form %}{% endform %}
- </ul>
- <button type="submit" class="btn waves-effect waves-light">
- {% blocktrans %}Select{% endblocktrans %}
- </button>
- </form>
- </div>
- {% if group %}
- <div class="col s2">
- <a class="btn waves-effect waves-light" href="{% url 'full_register_group' group.id %}">
- <i class="material-icons">printer</i>
- </a>
+ <button type="submit" class="btn waves-effect waves-light">
+ {% blocktrans %}Select{% endblocktrans %}
+ </button>
+ </form>
</div>
- {% endif %}
- </div>
+ {% if group %}
+ <div class="col s2">
+ <a class="btn waves-effect waves-light right" href="{% url 'full_register_group' group.id %}">
+ <i class="material-icons center">print</i>
+ </a>
+ </div>
+ {% endif %}
+ </div>
+
+ <h4>{% blocktrans with el=el week=week.week %}CW {{ week }}: {{ instance }}{% endblocktrans %} </h4>
- {% if lesson_periods.count %}
+ {% if lesson_periods %}
<div class="row">
<div class="col s7">
{% regroup lesson_periods by period.get_weekday_display as periods_by_day %}
@@ -43,15 +44,15 @@
</span>
<table class="striped responsive-table datatable">
<thead>
- <tr>
- <th>{% blocktrans %}Period{% endblocktrans %}</th>
- <th>{% blocktrans %}Subject{% endblocktrans %}</th>
- <th>{% blocktrans %}Teachers{% endblocktrans %}</th>
- </tr>
+ <tr>
+ <th>{% blocktrans %}Period{% endblocktrans %}</th>
+ <th>{% blocktrans %}Subject{% endblocktrans %}</th>
+ <th>{% blocktrans %}Teachers{% endblocktrans %}</th>
+ </tr>
</thead>
<tbody>
- {% for period in periods %}
- <tr class="
+ {% for period in periods %}
+ <tr class="
{% if period.has_documentation %}
success
{% else %}
@@ -69,15 +70,15 @@
{% endif %}
{% endif %}
">
- <td>{{ period.period.period }}</td>
- <td>
- <a href="{% url 'lesson_by_week_and_period' week.year week.week period.id %}">
- {{ period.get_subject.name }}
- </a>
- </td>
- <td>{{ period.get_teacher_names }}</td>
- </tr>
- {% endfor %}
+ <td>{{ period.period.period }}</td>
+ <td>
+ <a href="{% url 'lesson_by_week_and_period' week.year week.week period.id %}">
+ {{ period.get_subject.name }}
+ </a>
+ </td>
+ <td>{{ period.get_teacher_names }}</td>
+ </tr>
+ {% endfor %}
</tbody>
</table>
</div>
@@ -93,20 +94,22 @@
{% for person in persons %}
<h5 class="card-title">{{ person.full_name }}</h5>
<p class="card-text">
- {% trans "Absent" %}: {{ person.absences }}
- ({{ person.unexcused }} {% trans "unexcused" %})
+ {% trans "Absent" %}: {{ person.absences_count }}
+ ({{ person.unexcused_count }} {% trans "unexcused" %})
</p>
<p class="card-text">
- {% trans "Summed up tardiness" %}: {{ person.tardiness }}
+ {% trans "Summed up tardiness" %}: {{ person.tardiness_sum }}'
</p>
{% for note in person.personal_notes|only_week:week %}
{% if note.remarks %}
- <blockquote class="blockquote mb-0">
+ <blockquote>
{{ note.remarks }}
- <footer class="blockquote-footer">
- {% weekday_to_date week note.lesson_period.period.weekday as note_date %}
- {{ note_date }}, {{ note.lesson_period.lesson.subject.name }}
- </footer>
+ {% weekday_to_date week note.lesson_period.period.weekday as note_date %}
+ <em class="right">
+ <a href="{% url 'lesson_by_week_and_period' week.year week.week note.lesson_period.id %}">
+ {{ note_date }}, {{ note.lesson_period.get_subject.name }}
+ </a>
+ </em>
</blockquote>
{% endif %}
{% endfor %}
@@ -123,10 +126,22 @@
</span>
<p>
{% blocktrans %}
- There are no lessons for the selected group, teacher, room or time.
+ There are no lessons for the selected group, teacher or time.
{% endblocktrans %}
</p>
</div>
</div>
{% endif %}
+
+ <script>
+ $(document).ready(function () {
+ $("#id_group").change(function () {
+ $("#id_teacher").val("").formSelect();
+ });
+ $("#id_teacher").change(function () {
+ $("#id_group").val("").formSelect();
+ });
+ });
+
+ </script>
{% endblock %}