diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7f1a51b6ef491c545742e23cd631a761b25662cb..7680489d9c9af051329fee2a02f1576d037bd787 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -12,6 +12,7 @@ Unreleased
Changed
~~~~~~~
+* [Dev] Rename the "late" field in the PersonalNote model to "tardiness".
* Use new icon set inside of models and templates
* Run full register printout generation in background
diff --git a/aleksis/apps/alsijil/actions.py b/aleksis/apps/alsijil/actions.py
index 9c307017ee629eec9f03cc170ed673af92b306b8..623a96b95ad28e319d16b4b2595f74352a03655d 100644
--- a/aleksis/apps/alsijil/actions.py
+++ b/aleksis/apps/alsijil/actions.py
@@ -41,7 +41,7 @@ def delete_personal_note(modeladmin, request, queryset):
personal_note.reset_values()
notes.append(personal_note)
PersonalNote.objects.bulk_update(
- notes, fields=["absent", "excused", "late", "excuse_type", "remarks"]
+ notes, fields=["absent", "excused", "tardiness", "excuse_type", "remarks"]
)
diff --git a/aleksis/apps/alsijil/filters.py b/aleksis/apps/alsijil/filters.py
index c924aec0d78b5c28032407f805000d5481def23e..0de3f04876edf978403287ed1031be79ba88790c 100644
--- a/aleksis/apps/alsijil/filters.py
+++ b/aleksis/apps/alsijil/filters.py
@@ -27,20 +27,20 @@ class PersonalNoteFilter(FilterSet):
data[name] = initial
super().__init__(data, *args, **kwargs)
- self.form.fields["late__lt"].label = _("Tardiness is lower than")
- self.form.fields["late__gt"].label = _("Tardiness is bigger than")
+ self.form.fields["tardiness__lt"].label = _("Tardiness is lower than")
+ self.form.fields["tardiness__gt"].label = _("Tardiness is bigger than")
self.form.layout = Layout(
Row("subject"),
Row("day_start", "day_end"),
Row("absent", "excused", "excuse_type"),
- Row("late__gt", "late__lt", "extra_marks"),
+ Row("tardiness__gt", "tardiness__lt", "extra_marks"),
)
class Meta:
model = PersonalNote
fields = {
"excused": ["exact"],
- "late": ["lt", "gt"],
+ "tardiness": ["lt", "gt"],
"absent": ["exact"],
"excuse_type": ["exact"],
"extra_marks": ["exact"],
diff --git a/aleksis/apps/alsijil/forms.py b/aleksis/apps/alsijil/forms.py
index 5c2578b7d435e1b2240c848212d3b062c4a26db5..4ef9b4e24e7315c75cd6106b72f3853410e9ef7b 100644
--- a/aleksis/apps/alsijil/forms.py
+++ b/aleksis/apps/alsijil/forms.py
@@ -75,7 +75,7 @@ class LessonDocumentationForm(forms.ModelForm):
class PersonalNoteForm(forms.ModelForm):
class Meta:
model = PersonalNote
- fields = ["absent", "late", "excused", "excuse_type", "extra_marks", "remarks"]
+ fields = ["absent", "tardiness", "excused", "excuse_type", "extra_marks", "remarks"]
person_name = forms.CharField(disabled=True)
diff --git a/aleksis/apps/alsijil/managers.py b/aleksis/apps/alsijil/managers.py
index 9d97e58091af8ab2149122d7e51f767faccb61f6..c9e26fa77a83dfe76212478d58e36c08dca4f4a9 100644
--- a/aleksis/apps/alsijil/managers.py
+++ b/aleksis/apps/alsijil/managers.py
@@ -119,7 +119,7 @@ class PersonalNoteQuerySet(RegisterObjectRelatedQuerySet, QuerySet):
def not_empty(self):
"""Get all not empty personal notes."""
return self.filter(
- ~Q(remarks="") | Q(absent=True) | ~Q(late=0) | Q(extra_marks__isnull=False)
+ ~Q(remarks="") | Q(absent=True) | ~Q(tardiness=0) | Q(extra_marks__isnull=False)
)
diff --git a/aleksis/apps/alsijil/migrations/0017_rename_late_to_tardiness.py b/aleksis/apps/alsijil/migrations/0017_rename_late_to_tardiness.py
new file mode 100644
index 0000000000000000000000000000000000000000..50dd5a18d2ce0271a3a145ff1f3605aeb1b6813e
--- /dev/null
+++ b/aleksis/apps/alsijil/migrations/0017_rename_late_to_tardiness.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.15 on 2022-08-27 15:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('alsijil', '0016_add_not_counted_excuse_types'),
+ ]
+
+ operations = [
+ migrations.RenameField(
+ model_name='personalnote',
+ old_name='late',
+ new_name='tardiness',
+ ),
+ ]
diff --git a/aleksis/apps/alsijil/model_extensions.py b/aleksis/apps/alsijil/model_extensions.py
index 2beb3c113c13556d99f6541a6bcb34c9cd0baaed..2c94f1fd980f54de9a18f2d7eb8f8424c241699a 100644
--- a/aleksis/apps/alsijil/model_extensions.py
+++ b/aleksis/apps/alsijil/model_extensions.py
@@ -326,12 +326,12 @@ def get_tardinesses(self, week: Optional[CalendarWeek] = None) -> QuerySet:
"""Get all personal notes of late persons for this lesson."""
if not week:
week = self.week
- return self.personal_notes.filter(week=week.week, year=week.year, late__gt=0)
+ return self.personal_notes.filter(week=week.week, year=week.year, tardiness__gt=0)
def get_tardinesses_simple(self, week: Optional[CalendarWeek] = None) -> QuerySet:
"""Get all personal notes of late persons for this event/extra lesson."""
- return self.personal_notes.filter(late__gt=0)
+ return self.personal_notes.filter(tardiness__gt=0)
Event.method(get_tardinesses_simple, "get_tardinesses")
@@ -459,7 +459,7 @@ def generate_person_list_with_class_register_statistics(
filter=Q(filtered_personal_notes__absent=True, filtered_personal_notes__excused=False),
distinct=True,
),
- tardiness=Sum("filtered_personal_notes__late"),
+ tardiness=Sum("filtered_personal_notes__tardiness"),
tardiness_count=Count(
"filtered_personal_notes", filter=Q(filtered_personal_notes__late__gt=0), distinct=True
),
diff --git a/aleksis/apps/alsijil/models.py b/aleksis/apps/alsijil/models.py
index 3b938941c7ec2891ab96253eafed6777bcc405fe..b504a294164a6388099148fda5149091767577a7 100644
--- a/aleksis/apps/alsijil/models.py
+++ b/aleksis/apps/alsijil/models.py
@@ -245,7 +245,7 @@ class PersonalNote(RegisterObjectRelatedMixin, ExtensibleModel):
)
absent = models.BooleanField(default=False)
- late = models.PositiveSmallIntegerField(default=0)
+ tardiness = models.PositiveSmallIntegerField(default=0)
excused = models.BooleanField(default=False)
excuse_type = models.ForeignKey(
ExcuseType,
@@ -277,7 +277,7 @@ class PersonalNote(RegisterObjectRelatedMixin, ExtensibleModel):
defaults = PersonalNote()
self.absent = defaults.absent
- self.late = defaults.late
+ self.tardiness = defaults.tardiness
self.excused = defaults.excused
self.excuse_type = defaults.excuse_type
self.remarks = defaults.remarks
diff --git a/aleksis/apps/alsijil/tables.py b/aleksis/apps/alsijil/tables.py
index c82385265b37d6b37f365048b2ad8c4b6ae52cf1..a0ef1734e5eea326fd9a8fd0f858b71a89089082 100644
--- a/aleksis/apps/alsijil/tables.py
+++ b/aleksis/apps/alsijil/tables.py
@@ -115,7 +115,7 @@ class PersonalNoteTable(tables.Table):
)
subject = tables.Column(verbose_name=_("Subject"), accessor=A("subject"), linkify=True)
absent = tables.Column(verbose_name=_("Absent"))
- late = tables.Column(verbose_name=_("Tardiness"))
+ tardiness = tables.Column(verbose_name=_("Tardiness"))
excused = tables.Column(verbose_name=_("Excuse"))
extra_marks = tables.Column(verbose_name=_("Extra marks"), accessor=A("extra_marks__all"))
@@ -151,9 +151,9 @@ class PersonalNoteTable(tables.Table):
return badge
return "–"
- def render_late(self, value):
+ def render_tardiness(self, value):
if value:
- content = _(f"{value}' late")
+ content = _(f"{value}' tardiness")
context = dict(content=content, classes="orange white-text")
return render_to_string("components/materialize-chips.html", context)
else:
diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/lesson/tabs/notes.html b/aleksis/apps/alsijil/templates/alsijil/partials/lesson/tabs/notes.html
index c1a1e0030ddf7b28a77362a3dbe3637ddb879357..e94fb66d7632272eacbdbc0b09ba868127fc9f84 100644
--- a/aleksis/apps/alsijil/templates/alsijil/partials/lesson/tabs/notes.html
+++ b/aleksis/apps/alsijil/templates/alsijil/partials/lesson/tabs/notes.html
@@ -54,7 +54,7 @@
</td>
<td>
<div class="input-field">
- {{ form.late }}
+ {{ form.tardiness }}
<label for="{{ form.absent.id_for_label }}">
{% trans "Tardiness (in m)" %}
</label>
@@ -109,9 +109,9 @@
<i class="material-icons iconify center" data-icon="mdi:{{ form.absent.value|yesno:"check,close" }}"></i>
</td>
<td>
- <i class="material-icons iconify center" data-icon="mdi:{{ form.late.value|yesno:"check,close" }}"></i>
+ <i class="material-icons iconify center" data-icon="mdi:{{ form.tardiness.value|yesno:"check,close" }}"></i>
<span class="alsijil-tardiness-text">
- {% if form.late.value %}{{ form.late.value|to_time|time:"i\m" }}{% endif %}
+ {% if form.tardiness.value %}{{ form.tardiness.value|to_time|time:"i\m" }}{% endif %}
</span>
</td>
<td>
diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/tardinesses.html b/aleksis/apps/alsijil/templates/alsijil/partials/tardinesses.html
index d11a94ea16f4ebd23a41dce65aca7980e1893172..ca20a9c4d1f420736febd149e657a67e855d45f4 100644
--- a/aleksis/apps/alsijil/templates/alsijil/partials/tardinesses.html
+++ b/aleksis/apps/alsijil/templates/alsijil/partials/tardinesses.html
@@ -2,6 +2,6 @@
{% for note in notes %}
{% has_perm "alsijil.view_personalnote_rule" user note as can_view_personalnote %}
{% if can_view_personalnote %}
- <span>{{ note.person }} ({{ note.late }}'){% if not forloop.last %},{% endif %}</span>
+ <span>{{ note.person }} ({{ note.tardiness }}'){% if not forloop.last %},{% endif %}</span>
{% endif %}
{% endfor %}
diff --git a/aleksis/apps/alsijil/templates/alsijil/print/full_register.html b/aleksis/apps/alsijil/templates/alsijil/print/full_register.html
index c8d71ff3f6b2162814f72a83cfbc14fa8c6f0b1b..c699287a00987ad99c1fd0c2d4617827670fae2f 100644
--- a/aleksis/apps/alsijil/templates/alsijil/print/full_register.html
+++ b/aleksis/apps/alsijil/templates/alsijil/print/full_register.html
@@ -357,7 +357,7 @@
<tbody>
{% for note in person.filtered_notes %}
- {% if note.absent or note.late or note.remarks or note.extra_marks.all %}
+ {% if note.absent or note.tardiness or note.remarks or note.extra_marks.all %}
<tr>
{% if note.date %}
<td>{{ note.date }}</td>
@@ -389,8 +389,8 @@
{% endif %}
</td>
<td>
- {% if note.late %}
- {{ note.late }}'
+ {% if note.tardiness %}
+ {{ note.tardiness }}'
{% endif %}
</td>
<td>
@@ -486,10 +486,10 @@
{% endif %}
</span>
{% endif %}
- {% if note.late %}
+ {% if note.tardiness %}
<span class="lesson-note-late">
{{ note.person.last_name }}, {{ note.person.first_name|slice:"0:1" }}.
- ({{ note.late }}′)
+ ({{ note.tardiness }}′)
{% if note.excused %}
<span class="lesson-note-excused">
{% if note.excuse_type %}
diff --git a/aleksis/apps/alsijil/tests/test_actions.py b/aleksis/apps/alsijil/tests/test_actions.py
index 6f1bd6ef4ce3900ddc6ea7dac5df6f3a25dd90fc..8dd499ac953583637a3ade36c835aa0e5d6aae24 100644
--- a/aleksis/apps/alsijil/tests/test_actions.py
+++ b/aleksis/apps/alsijil/tests/test_actions.py
@@ -52,7 +52,7 @@ def _prepare_notes():
excused=True,
excuse_type=excuse_type,
),
- PersonalNote(person=person, event=_generate_event(date(2021, 10, 4)), late=10),
+ PersonalNote(person=person, event=_generate_event(date(2021, 10, 4)), tardiness=10),
PersonalNote(
person=person, event=_generate_event(date(2032, 10, 11)), remarks="Good work!"
),
diff --git a/aleksis/apps/alsijil/views.py b/aleksis/apps/alsijil/views.py
index 1aa04dd2acd2e5ce8e0a325b66eb51a9d78db348..eabce1ff687ec433c943d5954f03ece20bb01877 100644
--- a/aleksis/apps/alsijil/views.py
+++ b/aleksis/apps/alsijil/views.py
@@ -537,10 +537,10 @@ def week_view(
filtered_personal_notes__absent=True, filtered_personal_notes__excused=False
),
),
- tardiness_sum=Sum("filtered_personal_notes__late"),
+ tardiness_sum=Sum("filtered_personal_notes__tardiness"),
tardiness_count=Count(
"filtered_personal_notes",
- filter=Q(filtered_personal_notes__late__gt=0),
+ filter=Q(filtered_personal_notes__tardiness__gt=0),
),
)
@@ -905,8 +905,10 @@ def overview_person(request: HttpRequest, id_: Optional[int] = None) -> HttpResp
unexcused=Count("absent")
)
)
- stat.update(personal_notes.aggregate(tardiness=Sum("late")))
- stat.update(personal_notes.filter(~Q(late=0)).aggregate(tardiness_count=Count("late")))
+ stat.update(personal_notes.aggregate(tardiness=Sum("tardiness")))
+ stat.update(
+ personal_notes.filter(~Q(tardiness=0)).aggregate(tardiness_count=Count("tardiness"))
+ )
for extra_mark in extra_marks:
stat.update(