diff --git a/biscuit/apps/alsijil/forms.py b/biscuit/apps/alsijil/forms.py index 324656931b585b5ae158445cb2bff8702cb99e98..cf9d90aab49a684d3a9b4269ae34290d6a049c3c 100644 --- a/biscuit/apps/alsijil/forms.py +++ b/biscuit/apps/alsijil/forms.py @@ -50,7 +50,7 @@ PersonalNoteFormSet = forms.modelformset_factory( PersonalNote, form=PersonalNoteForm, max_num=0, extra=0) -class ManageAbsenceForm(forms.Form): +class RegisterAbsenceForm(forms.Form): date_start = forms.DateField(label=_('Start date'), widget=forms.SelectDateWidget, initial=datetime.today) date_end = forms.DateField(label=_('End date'), widget=forms.SelectDateWidget, initial=datetime.today) starting_lesson = forms.IntegerField(label=_('Starting lesson'), initial=0, min_value=0) diff --git a/biscuit/apps/alsijil/menus.py b/biscuit/apps/alsijil/menus.py index 6184cbe5d54b5193c0050cd316e5a78b769a484a..9dbabfd9c4387fe3d5456d94d4b48579cc1d750c 100644 --- a/biscuit/apps/alsijil/menus.py +++ b/biscuit/apps/alsijil/menus.py @@ -19,8 +19,8 @@ MENUS = { 'validators': ['menu_generator.validators.is_authenticated'] }, { - 'name': _('Manage absence'), - 'url': 'manage_absence', + 'name': _('Register absence'), + 'url': 'register_absence', 'validators': ['menu_generator.validators.is_superuser'] } ] diff --git a/biscuit/apps/alsijil/templates/alsijil/manage_absence.html b/biscuit/apps/alsijil/templates/alsijil/register_absence.html similarity index 82% rename from biscuit/apps/alsijil/templates/alsijil/manage_absence.html rename to biscuit/apps/alsijil/templates/alsijil/register_absence.html index 16231893fd5975bbea0953a84fbcf57aea3faf44..8a4e5b120488d1103d9fb47e9f1fafead290cf55 100644 --- a/biscuit/apps/alsijil/templates/alsijil/manage_absence.html +++ b/biscuit/apps/alsijil/templates/alsijil/register_absence.html @@ -4,12 +4,12 @@ {% block bootstrap4_extra_head %} {{ block.super }} - {{ manage_absence_form.media.css }} + {{ register_absence_form.media.css }} {% endblock %} {% block bootstrap4_extra_script %} {{ block.super }} - {{ manage_absence_form.media.js }} + {{ register_absence_form.media.js }} {% endblock %} {% block bootstrap4_title %}{% blocktrans%}Manage absence{% endblocktrans %} - {{ block.super }}{% endblock %} @@ -20,7 +20,7 @@ <form method="post"> {% csrf_token %} - {% bootstrap_form manage_absence_form %} + {% bootstrap_form register_absence_form %} <button type="submit" class="btn btn-dark"> {% blocktrans %}Save{% endblocktrans %} </button> diff --git a/biscuit/apps/alsijil/urls.py b/biscuit/apps/alsijil/urls.py index 97aa3f4b1d251217419ecd3c520972fe67364d1b..7aa5cd22ba0cd7f660077cf28ed98c95d5aa3d92 100644 --- a/biscuit/apps/alsijil/urls.py +++ b/biscuit/apps/alsijil/urls.py @@ -12,6 +12,6 @@ urlpatterns = [ name='week_view_by_week'), path('print/group/<int:id_>', views.full_register_group, name='full_register_group'), - path('absences/new', views.manage_absence, - name='manage_absence'), + path('absence/new', views.register_absence, + name='register_absence'), ] diff --git a/biscuit/apps/alsijil/views.py b/biscuit/apps/alsijil/views.py index a9263b2edd93028215527d1f226610c4fde736f6..6b1130ac418b8c35a399ff2910689e29fbabcf54 100644 --- a/biscuit/apps/alsijil/views.py +++ b/biscuit/apps/alsijil/views.py @@ -15,7 +15,7 @@ from biscuit.core.models import Group, Person from biscuit.core.decorators import admin_required from biscuit.core.util import messages -from .forms import ManageAbsenceForm, LessonDocumentationForm, PersonalNoteFormSet, SelectForm +from .forms import RegisterAbsenceFormLessonDocumentationForm, PersonalNoteFormSet, RegisterAbsenceForm, SelectForm from .models import LessonDocumentation @@ -207,21 +207,21 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse: @admin_required -def manage_absence(request: HttpRequest) -> HttpResponse: +def register_absence(request: HttpRequest) -> HttpResponse: context = {} - manage_absence_form = ManageAbsenceForm(request.POST or None) + register_absence_form = RegisterAbsenceForm(request.POST or None) if request.method == 'POST': - if manage_absence_form.is_valid(): + if register_absence_form.is_valid(): # Get data from form - person = manage_absence_form.cleaned_data['person'] - start_date = manage_absence_form.cleaned_data['date_start'] - end_date = manage_absence_form.cleaned_data['date_end'] - starting_lesson = manage_absence_form.cleaned_data['starting_lesson'] - absent = manage_absence_form.cleaned_data['absent'] - excused = manage_absence_form.cleaned_data['excused'] - remarks = manage_absence_form.cleaned_data['remarks'] + person = register_absence_form.cleaned_data['person'] + start_date = register_absence_form.cleaned_data['date_start'] + end_date = register_absence_form.cleaned_data['date_end'] + starting_lesson = register_absence_form.cleaned_data['starting_lesson'] + absent = register_absence_form.cleaned_data['absent'] + excused = register_absence_form.cleaned_data['excused'] + remarks = register_absence_form.cleaned_data['remarks'] # Mark person as absent delta = end_date - start_date @@ -233,6 +233,6 @@ def manage_absence(request: HttpRequest) -> HttpResponse: messages.success(request, _('The absence has been saved.')) return redirect('index') - context['manage_absence_form'] = manage_absence_form + context['register_absence_form'] = register_absence_form - return render(request, 'alsijil/manage_absence.html', context) + return render(request, 'alsijil/register_absence.html', context)