diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 400cc01641890d1a9c7e2421e459390fca21b465..9908ea032bc2a3b96d42b1c4ad01fbfee7c2153d 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -19,6 +19,11 @@ Fixed
* The week overview page was not refreshed when a new week was selected in the dropdown.
+Added
+~~~~~
+
+* Excuse types can now be marked as `Count as absent`, which they are per default. If not, they aren't counted in the overviews.
+
`2.0.1`_ - 2022-02-12
---------------------
diff --git a/aleksis/apps/alsijil/forms.py b/aleksis/apps/alsijil/forms.py
index 3549c60882e825c99ac11677a841b4f38ae954e7..144188edf6599ddbe8f4c4d9a01828ab4b56dbf0 100644
--- a/aleksis/apps/alsijil/forms.py
+++ b/aleksis/apps/alsijil/forms.py
@@ -180,11 +180,11 @@ class ExtraMarkForm(forms.ModelForm):
class ExcuseTypeForm(forms.ModelForm):
- layout = Layout("short_name", "name")
+ layout = Layout("short_name", "name", "count_as_absent")
class Meta:
model = ExcuseType
- fields = ["short_name", "name"]
+ fields = ["short_name", "name", "count_as_absent"]
class PersonOverviewForm(ActionForm):
diff --git a/aleksis/apps/alsijil/migrations/0016_add_not_counted_excuse_types.py b/aleksis/apps/alsijil/migrations/0016_add_not_counted_excuse_types.py
new file mode 100644
index 0000000000000000000000000000000000000000..c45edee40fca69d73ca7edf67c816d389470f1ef
--- /dev/null
+++ b/aleksis/apps/alsijil/migrations/0016_add_not_counted_excuse_types.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.12 on 2022-03-20 10:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('alsijil', '0015_fix_unique_personal_note'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='excusetype',
+ name='count_as_absent',
+ field=models.BooleanField(default=True, help_text="If checked, this excuse type will be counted as a missed lesson. If not checked, it won't show up in the absence report.", verbose_name='Count as missed lesson'),
+ ),
+ ]
diff --git a/aleksis/apps/alsijil/model_extensions.py b/aleksis/apps/alsijil/model_extensions.py
index c5502d54e666f6446c257c99b88d229c8051e1e6..d18d66867ddfa2bf4c9fe763842b1e3401d6d24e 100644
--- a/aleksis/apps/alsijil/model_extensions.py
+++ b/aleksis/apps/alsijil/model_extensions.py
@@ -423,9 +423,18 @@ def generate_person_list_with_class_register_statistics(
).annotate(
absences_count=Count(
"filtered_personal_notes",
- filter=Q(filtered_personal_notes__absent=True),
+ filter=Q(filtered_personal_notes__absent=True)
+ & ~Q(filtered_personal_notes__excuse_type__count_as_absent=False),
),
excused=Count(
+ "filtered_personal_notes",
+ filter=Q(
+ filtered_personal_notes__absent=True,
+ filtered_personal_notes__excused=True,
+ )
+ & ~Q(filtered_personal_notes__excuse_type__count_as_absent=False),
+ ),
+ excused_without_excuse_type=Count(
"filtered_personal_notes",
filter=Q(
filtered_personal_notes__absent=True,
diff --git a/aleksis/apps/alsijil/models.py b/aleksis/apps/alsijil/models.py
index 1805831a1b25cbe01744f9a3a7e7a2baf7f27966..54e8be9c3bbdab2f2603ca423ec54f38550e22d5 100644
--- a/aleksis/apps/alsijil/models.py
+++ b/aleksis/apps/alsijil/models.py
@@ -50,6 +50,15 @@ class ExcuseType(ExtensibleModel):
short_name = models.CharField(max_length=255, unique=True, verbose_name=_("Short name"))
name = models.CharField(max_length=255, unique=True, verbose_name=_("Name"))
+ count_as_absent = models.BooleanField(
+ default=True,
+ verbose_name=_("Count as absent"),
+ help_text=_(
+ "If checked, this excuse type will be counted as a missed lesson. If not checked,"
+ "it won't show up in the absence report."
+ ),
+ )
+
def __str__(self):
return f"{self.name} ({self.short_name})"
diff --git a/aleksis/apps/alsijil/tables.py b/aleksis/apps/alsijil/tables.py
index 19abbc3a5d7d80ab5729086fff72dc7e8c60e59e..c82385265b37d6b37f365048b2ad8c4b6ae52cf1 100644
--- a/aleksis/apps/alsijil/tables.py
+++ b/aleksis/apps/alsijil/tables.py
@@ -37,6 +37,10 @@ class ExcuseTypeTable(tables.Table):
name = tables.LinkColumn("edit_excuse_type", args=[A("id")])
short_name = tables.Column()
+ count_as_absent = tables.BooleanColumn(
+ verbose_name=_("Count as absent"),
+ accessor="count_as_absent",
+ )
edit = tables.LinkColumn(
"edit_excuse_type",
args=[A("id")],
diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/person.html b/aleksis/apps/alsijil/templates/alsijil/class_register/person.html
index 304aae60e48a0a4292848e3a10ca93f0fb42c370..d11b192fbecb27004b1cb850e0e3070239975187 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/person.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/person.html
@@ -125,30 +125,44 @@
<div class="collapsible-body">
<table>
<tr>
- <th colspan="2">{% trans 'Absences' %}</th>
+ <th colspan="3">{% trans 'Absences' %}</th>
<td>{{ stat.absences_count }}</td>
</tr>
<tr>
- <td rowspan="{{ excuse_types.count|add:2 }}" class="hide-on-small-only">{% trans "thereof" %}</td>
- <td rowspan="{{ excuse_types.count|add:2 }}" class="hide-on-med-and-up"></td>
- <th class="truncate">{% trans 'Excused' %}</th>
+ <td rowspan="{{ excuse_types.count|add:3 }}" class="hide-on-small-only">{% trans "thereof" %}</td>
+ <td rowspan="{{ excuse_types.count|add:3 }}" class="hide-on-med-and-up"></td>
+ <th colspan="2">{% trans 'Excused' %}</th>
<td>{{ stat.excused }}</td>
</tr>
+ <tr>
+ <td rowspan="{{ excuse_types.count|add:1 }}" class="hide-on-small-only">{% trans "thereof" %}</td>
+ <td rowspan="{{ excuse_types.count|add:1 }}" class="hide-on-med-and-up"></td>
+ <th colspan="2" class="truncate">{% trans 'Without Excuse Type' %}</th>
+ <td>{{ stat.excused_no_excuse_type }}</td>
+ </tr>
{% for excuse_type in excuse_types %}
- <th>{{ excuse_type.name }}</th>
- <td>{{ stat|get_dict:excuse_type.count_label }}</td>
+ <tr>
+ <th>{{ excuse_type.name }}</th>
+ <td>{{ stat|get_dict:excuse_type.count_label }}</td>
+ </tr>
{% endfor %}
<tr>
- <th>{% trans 'Unexcused' %}</th>
+ <th colspan="2">{% trans 'Unexcused' %}</th>
<td>{{ stat.unexcused }}</td>
</tr>
+ {% for excuse_type in excuse_types_not_absent %}
+ <tr>
+ <th colspan="3">{{ excuse_type.name }}</th>
+ <td>{{ stat|get_dict:excuse_type.count_label }}</td>
+ </tr>
+ {% endfor %}
<tr>
- <th colspan="2">{% trans 'Tardiness' %}</th>
+ <th colspan="3">{% trans 'Tardiness' %}</th>
<td>{{ stat.tardiness }}'/{{ stat.tardiness_count }} ×</td>
</tr>
{% for extra_mark in extra_marks %}
<tr>
- <th colspan="2">{{ extra_mark.name }}</th>
+ <th colspan="3">{{ extra_mark.name }}</th>
<td>{{ stat|get_dict:extra_mark.count_label }}</td>
</tr>
{% endfor %}
diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/legend.html b/aleksis/apps/alsijil/templates/alsijil/partials/legend.html
index a2c6ba1aaee02c492155c08b902f1562b405b3a7..bf0c82d792b57943b36502f0b94dff3db193a70d 100644
--- a/aleksis/apps/alsijil/templates/alsijil/partials/legend.html
+++ b/aleksis/apps/alsijil/templates/alsijil/partials/legend.html
@@ -7,17 +7,21 @@
<h6>{% trans "General" %}</h6>
<ul class="collection">
<li class="collection-item chip-height">
- <strong>(a)</strong> {% trans "Absences" %}
+ <strong>{% trans "(a)" %}</strong> {% trans "Absences" %}
<span class="chip secondary-color white-text right">0</span>
</li>
<li class="collection-item chip-height">
- <strong>(u)</strong> {% trans "Unexcused absences" %}
+ <strong>{% trans "(u)" %}</strong> {% trans "Unexcused absences" %}
<span class="chip red white-text right">0</span>
</li>
<li class="collection-item chip-height">
- <strong>(e)</strong> {% trans "Excused absences" %}
+ <strong>{% trans "Sum (e)" %}</strong> {% trans "Sum of excused absences" %}
<span class="chip green white-text right">0</span>
</li>
+ <li class="collection-item chip-height">
+ <strong>{% trans "(e)" %}</strong> {% trans "Regular excused absences" %}
+ <span class="chip grey white-text right">0</span>
+ </li>
</ul>
</div>
@@ -33,6 +37,18 @@
</li>
{% endfor %}
</ul>
+ {% if excuse_types_not_absent %}
+ <h6>{% trans "Excuse types (not counted as absent)" %}</h6>
+
+ <ul class="collection">
+ {% for excuse_type in excuse_types_not_absent %}
+ <li class="collection-item chip-height">
+ <strong>({{ excuse_type.short_name }})</strong> {{ excuse_type.name }}
+ <span class="chip grey white-text right">0</span>
+ </li>
+ {% endfor %}
+ </ul>
+ {% endif %}
</div>
{% endif %}
diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/persons_with_stats.html b/aleksis/apps/alsijil/templates/alsijil/partials/persons_with_stats.html
index 404705dfbc3fe7cb4d6cfde5561ed2f3fb82de13..efa5bc3a89d72c75fbf5f3d1c9de5426c668270f 100644
--- a/aleksis/apps/alsijil/templates/alsijil/partials/persons_with_stats.html
+++ b/aleksis/apps/alsijil/templates/alsijil/partials/persons_with_stats.html
@@ -11,7 +11,8 @@
<tr class="hide-on-med-and-down">
<th rowspan="2">{% trans "Name" %}</th>
<th rowspan="2">{% trans "Primary group" %}</th>
- <th colspan="{{ excuse_types.count|add:3 }}">{% trans "Absences" %}</th>
+ <th colspan="{{ excuse_types.count|add:4 }}">{% trans "Absences" %}</th>
+ <th colspan="{{ excuse_types_not_absent.count }}">{% trans "Uncounted Absences" %}</th>
<th rowspan="2">{% trans "Tardiness" %}</th>
{% if extra_marks %}
<th colspan="{{ extra_marks.count }}">{% trans "Extra marks" %}</th>
@@ -22,6 +23,7 @@
<th class="truncate">{% trans "Name" %}</th>
<th class="truncate">{% trans "Primary group" %}</th>
<th class="truncate chip-height">{% trans "Absences" %}</th>
+ <th class="chip-height">{% trans "Sum (e)" %}</th>
<th class="chip-height">{% trans "(e)" %}</th>
{% for excuse_type in excuse_types %}
<th class="chip-height">
@@ -29,6 +31,11 @@
</th>
{% endfor %}
<th class="chip-height">{% trans "(u)" %}</th>
+ {% for excuse_type in excuse_types_not_absent %}
+ <th class="chip-height">
+ ({{ excuse_type.short_name }})
+ </th>
+ {% endfor %}
<th class="truncate chip-height">{% trans "Tardiness" %}</th>
{% for extra_mark in extra_marks %}
<th class="chip-height">
@@ -39,6 +46,7 @@
</tr>
<tr class="hide-on-med-and-down">
<th>{% trans "Sum" %}</th>
+ <th>{% trans "Sum (e)" %}</th>
<th>{% trans "(e)" %}</th>
{% for excuse_type in excuse_types %}
<th>
@@ -46,6 +54,11 @@
</th>
{% endfor %}
<th>{% trans "(u)" %}</th>
+ {% for excuse_type in excuse_types_not_absent %}
+ <th>
+ ({{ excuse_type.short_name }})
+ </th>
+ {% endfor %}
{% for extra_mark in extra_marks %}
<th>
{{ extra_mark.short_name }}
@@ -73,6 +86,11 @@
{{ person.excused }}
</span>
</td>
+ <td>
+ <span class="chip grey white-text" title="{% trans "Regular excused" %}">
+ {{ person.excused_without_excuse_type }}
+ </span>
+ </td>
{% for excuse_type in excuse_types %}
<td>
<span class="chip grey white-text" title="{{ excuse_type.name }}">
@@ -85,6 +103,13 @@
{{ person.unexcused }}
</span>
</td>
+ {% for excuse_type in excuse_types_not_absent %}
+ <td>
+ <span class="chip grey white-text" title="{{ excuse_type.name }}">
+ {{ person|get_dict:excuse_type.count_label }}
+ </span>
+ </td>
+ {% endfor %}
<td>
<span class="chip orange white-text" title="{% trans "Tardiness" %}">
{% firstof person.tardiness|to_time|time:"H\h i\m" "–" %}
diff --git a/aleksis/apps/alsijil/templates/alsijil/print/full_register.html b/aleksis/apps/alsijil/templates/alsijil/print/full_register.html
index 1f8b6132fa0dee3033c7ea466e872e2ffd61fa64..ab63dc7a7c9b44f9808d8c4af5460439ee7cdb8d 100644
--- a/aleksis/apps/alsijil/templates/alsijil/print/full_register.html
+++ b/aleksis/apps/alsijil/templates/alsijil/print/full_register.html
@@ -97,6 +97,18 @@
</ul>
{% endif %}
+ {% if excuse_types_not_absent %}
+ <h5>{% trans "Custom excuse types (not counted as absent)" %}</h5>
+
+ <ul class="collection">
+ {% for excuse_type in excuse_types_not_absent %}
+ <li class="collection-item">
+ <strong>({{ excuse_type.short_name }})</strong> {{ excuse_type.name }}
+ </li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+
{% if extra_marks %}
<h5>{% trans "Available extra marks" %}</h5>
@@ -123,11 +135,15 @@
<th>{% trans 'Sex' %}</th>
<th>{% trans 'Date of birth' %}</th>
<th>{% trans '(a)' %}</th>
+ <th>{% trans "Sum (e)" %}</th>
<th>{% trans "(e)" %}</th>
{% for excuse_type in excuse_types %}
<th>({{ excuse_type.short_name }})</th>
{% endfor %}
<th>{% trans '(u)' %}</th>
+ {% for excuse_type in excuse_types_not_absent %}
+ <th>({{ excuse_type.short_name }})</th>
+ {% endfor %}
<th>{% trans '(b)' %}</th>
{% for extra_mark in extra_marks %}
<th>{{ extra_mark.short_name }}</th>
@@ -145,11 +161,15 @@
<td>{{ person.date_of_birth }}</td>
<td>{{ person.absences_count }}</td>
<td>{{ person.excused }}</td>
+ <td>{{ person.excused_without_excuse_type }}</td>
{% for excuse_type in excuse_types %}
<td>{{ person|get_dict:excuse_type.count_label }}</td>
{% endfor %}
<td>{{ person.unexcused }}</td>
- <td>{{ person.tardiness }}'/{{ person.tardiness_count }} ×</td>
+ {% for excuse_type in excuse_types_not_absent %}
+ <td>{{ person|get_dict:excuse_type.count_label }}</td>
+ {% endfor %}
+ <td>{{ person.tardiness }}'/{{ person.tardiness_count }}×</td>
{% for extra_mark in extra_marks %}
<td>{{ person|get_dict:extra_mark.count_label }}</td>
{% endfor %}
@@ -263,43 +283,63 @@
</tr>
</table>
- <h5>{% trans 'Absences and tardiness' %}</h5>
- <table>
- <tr>
- <th colspan="2">{% trans 'Absences' %}</th>
- <td>{{ person.absences_count }}</td>
- </tr>
- <tr>
- <td rowspan="{{ excuse_types.count|add:2 }}" style="width: 16mm;"
- class="rotate small-print">{% trans "thereof" %}</td>
- <th>{% trans 'Excused' %}</th>
- <td>{{ person.excused }}</td>
- </tr>
- {% for excuse_type in excuse_types %}
- <th>{{ excuse_type.name }}</th>
- <td>{{ person|get_dict:excuse_type.count_label }}</td>
- {% endfor %}
- <tr>
- <th>{% trans 'Unexcused' %}</th>
- <td>{{ person.unexcused }}</td>
- </tr>
- <tr>
- <th colspan="2">{% trans 'Tardiness' %}</th>
- <td>{{ person.tardiness }}'/{{ person.tardiness_count }} ×</td>
- </tr>
- </table>
-
- {% if extra_marks %}
- <h5>{% trans 'Extra marks' %}</h5>
- <table>
- {% for extra_mark in extra_marks %}
+ <div class="row">
+ <div class="col s6">
+ <h5>{% trans 'Absences and tardiness' %}</h5>
+ <table>
<tr>
- <th>{{ extra_mark.name }}</th>
- <td>{{ person|get_dict:extra_mark.count_label }}</td>
+ <th colspan="3">{% trans 'Absences' %}</th>
+ <td>{{ person.absences_count }}</td>
</tr>
- {% endfor %}
- </table>
- {% endif %}
+ <tr>
+ <td rowspan="{{ excuse_types.count|add:3 }}" style="width: 16mm;"
+ class="rotate small-print">{% trans "thereof" %}</td>
+ <th colspan="2">{% trans 'Excused' %}</th>
+ <td>{{ person.excused }}</td>
+ </tr>
+ <tr>
+ <td rowspan="{{ excuse_types.count|add:1 }}" style="width: 16mm;"
+ class="rotate small-print">{% trans "thereof" %}</td>
+ <th>{% trans "Without excuse type" %}</th>
+ <td>{{ person.excused_without_excuse_type }}</td>
+ </tr>
+ {% for excuse_type in excuse_types %}
+ <tr>
+ <th>{{ excuse_type.name }}</th>
+ <td>{{ person|get_dict:excuse_type.count_label }}</td>
+ </tr>
+ {% endfor %}
+ <tr>
+ <th colspan="2">{% trans 'Unexcused' %}</th>
+ <td>{{ person.unexcused }}</td>
+ </tr>
+ {% for excuse_type in excuse_types_not_absent %}
+ <tr>
+ <th colspan="3">{{ excuse_type.name }}</th>
+ <td>{{ person|get_dict:excuse_type.count_label }}</td>
+ </tr>
+ {% endfor %}
+ <tr>
+ <th colspan="3">{% trans 'Tardiness' %}</th>
+ <td>{{ person.tardiness }}'/{{ person.tardiness_count }}×</td>
+ </tr>
+ </table>
+ </div>
+
+ <div class="col s6">
+ {% if extra_marks %}
+ <h5>{% trans 'Extra marks' %}</h5>
+ <table>
+ {% for extra_mark in extra_marks %}
+ <tr>
+ <th>{{ extra_mark.name }}</th>
+ <td>{{ person|get_dict:extra_mark.count_label }}</td>
+ </tr>
+ {% endfor %}
+ </table>
+ {% endif %}
+ </div>
+ </div>
<h5>{% trans 'Relevant personal notes' %}</h5>
<table class="small-print">
diff --git a/aleksis/apps/alsijil/views.py b/aleksis/apps/alsijil/views.py
index c8b1c96a3717fd190bd4a2a622fdb7fcd3d645f9..185c4c16e68a00a5499904b336c166fbfa05ccc3 100644
--- a/aleksis/apps/alsijil/views.py
+++ b/aleksis/apps/alsijil/views.py
@@ -712,7 +712,8 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse:
context["school_term"] = group.school_term
context["persons"] = prefetched_persons
- context["excuse_types"] = ExcuseType.objects.all()
+ context["excuse_types"] = ExcuseType.objects.filter(count_as_absent=True)
+ context["excuse_types_not_absent"] = ExcuseType.objects.filter(count_as_absent=False)
context["extra_marks"] = ExtraMark.objects.all()
context["group"] = group
context["weeks"] = weeks
@@ -768,7 +769,8 @@ def my_students(request: HttpRequest) -> HttpResponse:
new_groups.append((group, persons_for_group))
context["groups"] = new_groups
- context["excuse_types"] = ExcuseType.objects.all()
+ context["excuse_types"] = ExcuseType.objects.filter(count_as_absent=True)
+ context["excuse_types_not_absent"] = ExcuseType.objects.filter(count_as_absent=False)
context["extra_marks"] = ExtraMark.objects.all()
return render(request, "alsijil/class_register/persons.html", context)
@@ -794,7 +796,8 @@ class StudentsList(PermissionRequiredMixin, DetailView):
context["group"] = self.object
context["persons"] = self.object.generate_person_list_with_class_register_statistics()
context["extra_marks"] = ExtraMark.objects.all()
- context["excuse_types"] = ExcuseType.objects.all()
+ context["excuse_types"] = ExcuseType.objects.filter(count_as_absent=True)
+ context["excuse_types_not_absent"] = ExcuseType.objects.filter(count_as_absent=False)
return context
@@ -911,7 +914,8 @@ def overview_person(request: HttpRequest, id_: Optional[int] = None) -> HttpResp
note.set_object_permission_checker(checker)
personal_notes_list.append(note)
context["personal_notes"] = personal_notes_list
- context["excuse_types"] = ExcuseType.objects.all()
+ context["excuse_types"] = ExcuseType.objects.filter(count_as_absent=True)
+ context["excuse_types_not_absent"] = ExcuseType.objects.filter(count_as_absent=False)
form = PersonOverviewForm(request, request.POST or None, queryset=allowed_personal_notes)
if request.method == "POST" and request.user.has_perm(
@@ -945,12 +949,19 @@ def overview_person(request: HttpRequest, id_: Optional[int] = None) -> HttpResp
continue
stat.update(
- personal_notes.filter(absent=True).aggregate(absences_count=Count("absent"))
+ personal_notes.filter(absent=True)
+ .exclude(excuse_type__count_as_absent=False)
+ .aggregate(absences_count=Count("absent"))
)
stat.update(
- personal_notes.filter(
- absent=True, excused=True, excuse_type__isnull=True
- ).aggregate(excused=Count("absent"))
+ personal_notes.filter(absent=True, excused=True)
+ .exclude(excuse_type__count_as_absent=False)
+ .aggregate(excused=Count("absent"))
+ )
+ stat.update(
+ personal_notes.filter(absent=True, excused=True, excuse_type__isnull=True)
+ .exclude(excuse_type__count_as_absent=False)
+ .aggregate(excused_no_excuse_type=Count("absent"))
)
stat.update(
personal_notes.filter(absent=True, excused=False).aggregate(
@@ -977,7 +988,6 @@ def overview_person(request: HttpRequest, id_: Optional[int] = None) -> HttpResp
stats.append((school_term, stat))
context["stats"] = stats
- context["excuse_types"] = excuse_types
context["extra_marks"] = extra_marks
# Build filter with own form and logic as django-filter can't work with different models