diff --git a/aleksis/apps/alsijil/model_extensions.py b/aleksis/apps/alsijil/model_extensions.py index c27bfc88ade60a7e85a33861be0f852633b866ee..ac5d929a4f31e57bb40c6ad1b82ba2906e5f4834 100644 --- a/aleksis/apps/alsijil/model_extensions.py +++ b/aleksis/apps/alsijil/model_extensions.py @@ -1,7 +1,7 @@ from datetime import date from django.db.models import Exists, F, OuterRef, QuerySet -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from calendarweek import CalendarWeek @@ -103,5 +103,5 @@ Group.add_permission("edit_personalnote_group", _("Can edit all personal notes o Group.add_permission("view_lessondocumentation_group", _("Can view all lesson documentation of a group")) Group.add_permission("edit_lessondocumentation_group", _("Can edit all lesson documentation of a group")) Group.add_permission("view_full_register_group", _("Can view full register of a group")) -Group.add_permission("register_absence_group", _("Can register a absence for all members of a group")) -Person.add_permission("register_absence_person", _("Can register a absence for a person")) +Group.add_permission("register_absence_group", _("Can register an absence for all members of a group")) +Person.add_permission("register_absence_person", _("Can register an absence for a person")) diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html b/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html index 5cbcd655c6205c05761b9bfaa0a2a2e82bd89adf..6f262a7deb9d408d48b1fb4532620837f585b9bd 100644 --- a/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html +++ b/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html @@ -37,7 +37,6 @@ </div> </div> {% csrf_token %} - <div class="row"> <div class="col s12 m12 l6 xl8"> <div class="card"> @@ -107,9 +106,8 @@ </thead> <tbody> {% for form in personal_note_formset %} - <tr> - {% if can_edit_personalnote %} - + {% if can_edit_personalnote %} + <tr> {{ form.id }} <td>{{ form.person_name }}{{ form.person_name.value }}</td> <td class="center-align"> @@ -158,12 +156,12 @@ </div> </div> - <div class="row"> - <div class="col s12"> - {% if can_edit_lesson_documentation or can_edit_personalnote %} + {% if can_edit_lesson_documentation or can_edit_personalnote %} + <div class="row"> + <div class="col s12"> {% include "core/partials/save_button.html" %} - {% endif %} + </div> </div> - </div> + {% endif %} </form> {% endblock %} diff --git a/aleksis/apps/alsijil/util/alsijil_helpers.py b/aleksis/apps/alsijil/util/alsijil_helpers.py index f1c1f4a3fb4e96fa239793b11ec9b00efd05a499..dcb2bbf1fe5274bf5e3b32ab0bf650bb478de36e 100644 --- a/aleksis/apps/alsijil/util/alsijil_helpers.py +++ b/aleksis/apps/alsijil/util/alsijil_helpers.py @@ -18,6 +18,7 @@ def get_lesson_period_by_pk( week: Optional[int] = None, period_id: Optional[int] = None, ): + """Get LessonPeriod object either by given object_id or by time and current person.""" if period_id: lesson_period = LessonPeriod.objects.get(pk=period_id) elif hasattr(request, "user") and hasattr(request.user, "person"): @@ -37,6 +38,7 @@ def get_instance_by_pk( type_: Optional[str] = None, id_: Optional[int] = None, ): + """Get Instance object by given type and id or the current person.""" if type_ and id_: return get_el_by_pk(request, type_, id_) elif hasattr(request, "user") and hasattr(request.user, "person"):