Skip to content
Snippets Groups Projects
Verified Commit 047f4f11 authored by Tom Teichler's avatar Tom Teichler :beers:
Browse files

Add function to cancel lessons. Closes #25.

parent da6fc856
No related branches found
No related tags found
1 merge request!13Add function to cancel lessons. Closes #25.
...@@ -24,4 +24,4 @@ class SelectForm(forms.Form): ...@@ -24,4 +24,4 @@ class SelectForm(forms.Form):
class LessonSubstitutionForm(forms.ModelForm): class LessonSubstitutionForm(forms.ModelForm):
class Meta: class Meta:
model = LessonSubstitution model = LessonSubstitution
fields = ['week', 'lesson_period', 'subject', 'teachers', 'room'] fields = ['week', 'lesson_period', 'subject', 'teachers', 'room', 'canceled']
# Generated by Django 2.2.5 on 2019-09-07 13:24
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('chronos', '0002_db_indexes'),
]
operations = [
migrations.AddField(
model_name='lessonsubstitution',
name='canceled',
field=models.BooleanField(default=False),
),
]
...@@ -119,6 +119,8 @@ class LessonSubstitution(SchoolRelated): ...@@ -119,6 +119,8 @@ class LessonSubstitution(SchoolRelated):
related_name='lesson_substitutions') related_name='lesson_substitutions')
room = models.ForeignKey('Room', models.CASCADE, null=True) room = models.ForeignKey('Room', models.CASCADE, null=True)
canceled = models.BooleanField(default=False)
class Meta: class Meta:
unique_together = [['school', 'lesson_period', 'week']] unique_together = [['school', 'lesson_period', 'week']]
ordering = ['lesson_period__lesson__date_start', 'week', ordering = ['lesson_period__lesson__date_start', 'week',
......
{# -*- engine:django -*- #} {# -*- engine:django -*- #}
<div class="card chronos-lesson {% if not lesson_period.get_substitution.canceled %}
{% if lesson_period.get_substitution %} <div class="card chronos-lesson
border border-warning {% if lesson_period.get_substitution %}
{% endif %} border border-warning
" {% endif %}
style=" "
{% if lesson_period.lesson.subject.colour_fg %} style="
color: {{ lesson_period.lesson.subject.colour_fg }}; {% if lesson_period.lesson.subject.colour_fg %}
{% endif %} color: {{ lesson_period.lesson.subject.colour_fg }};
{% if lesson_period.lesson.subject.colour_bg %} {% endif %}
background-color: {{ lesson_period.lesson.subject.colour_bg }}; {% if lesson_period.lesson.subject.colour_bg %}
{% endif %} background-color: {{ lesson_period.lesson.subject.colour_bg }};
"> {% endif %}
<div class="card-body"> ">
<div class="row"> <div class="card-body">
<div class="col-sm"> <div class="row">
<span class="card-title"> <div class="col-sm">
{{ lesson_period.get_subject.abbrev }} <span class="card-title">
</span> {{ lesson_period.get_subject.abbrev }}
</span>
</div>
</div> </div>
</div> <div class="row">
<div class="row"> <div class="col-sm">
<div class="col-sm"> {% for group in lesson_period.get_groups.all %}
{% for group in lesson_period.get_groups.all %} <span class="card-text">{{ group.short_name }}</span>
<span class="card-text">{{ group.short_name }}</span> {% endfor %}
{% endfor %} </div>
</div> <div class="col-sm">
<div class="col-sm"> {% for teacher in lesson_period.get_teachers.all %}
{% for teacher in lesson_period.get_teachers.all %} <a href="{% url 'person_by_id' teacher.id %}"
<a href="{% url 'person_by_id' teacher.id %}" title="{{ teacher.first_name }} {{ teacher.last_name }}"
title="{{ teacher.first_name }} {{ teacher.last_name }}" class="card-text"
class="card-text" data-poload="{% url 'person_by_id_card' teacher.id %}">
data-poload="{% url 'person_by_id_card' teacher.id %}"> {{ teacher.short_name }}
{{ teacher.short_name }} </a>
</a> {% endfor %}
{% endfor %} </div>
<div class="col-sm">
<span class="card-text">{{ lesson_period.get_room.short_name }}</span>
</div>
</div> </div>
<div class="col-sm"> </div>
<span class="card-text">{{ lesson_period.get_room.short_name }}</span> </div>
{% else %}
<div class="card text-center chronos-lesson bg-danger">
<div class="card-body">
<div class="row">
<div class="col-sm">
{% blocktrans %}Canceled{% endblocktrans %}
</div>
</div> </div>
</div> </div>
</div> </div>
</div> {% endif %}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment