From f9131fbcc18d973cb4ed69cb679890d204881380 Mon Sep 17 00:00:00 2001
From: Dominik George <nik@naturalnet.de>
Date: Wed, 20 Nov 2019 00:25:09 +0100
Subject: [PATCH] Rename manage_abence to register_absence.
---
biscuit/apps/alsijil/forms.py | 2 +-
biscuit/apps/alsijil/menus.py | 4 +--
...age_absence.html => register_absence.html} | 6 ++---
biscuit/apps/alsijil/urls.py | 4 +--
biscuit/apps/alsijil/views.py | 26 +++++++++----------
5 files changed, 21 insertions(+), 21 deletions(-)
rename biscuit/apps/alsijil/templates/alsijil/{manage_absence.html => register_absence.html} (82%)
diff --git a/biscuit/apps/alsijil/forms.py b/biscuit/apps/alsijil/forms.py
index 324656931..cf9d90aab 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 6184cbe5d..9dbabfd9c 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 16231893f..8a4e5b120 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 97aa3f4b1..7aa5cd22b 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 a9263b2ed..6b1130ac4 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)
--
GitLab