Skip to content
Snippets Groups Projects
Verified Commit f9131fbc authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Rename manage_abence to register_absence.

parent c802c4b3
No related branches found
No related tags found
No related merge requests found
...@@ -50,7 +50,7 @@ PersonalNoteFormSet = forms.modelformset_factory( ...@@ -50,7 +50,7 @@ PersonalNoteFormSet = forms.modelformset_factory(
PersonalNote, form=PersonalNoteForm, max_num=0, extra=0) 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_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) 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) starting_lesson = forms.IntegerField(label=_('Starting lesson'), initial=0, min_value=0)
......
...@@ -19,8 +19,8 @@ MENUS = { ...@@ -19,8 +19,8 @@ MENUS = {
'validators': ['menu_generator.validators.is_authenticated'] 'validators': ['menu_generator.validators.is_authenticated']
}, },
{ {
'name': _('Manage absence'), 'name': _('Register absence'),
'url': 'manage_absence', 'url': 'register_absence',
'validators': ['menu_generator.validators.is_superuser'] 'validators': ['menu_generator.validators.is_superuser']
} }
] ]
......
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
{% block bootstrap4_extra_head %} {% block bootstrap4_extra_head %}
{{ block.super }} {{ block.super }}
{{ manage_absence_form.media.css }} {{ register_absence_form.media.css }}
{% endblock %} {% endblock %}
{% block bootstrap4_extra_script %} {% block bootstrap4_extra_script %}
{{ block.super }} {{ block.super }}
{{ manage_absence_form.media.js }} {{ register_absence_form.media.js }}
{% endblock %} {% endblock %}
{% block bootstrap4_title %}{% blocktrans%}Manage absence{% endblocktrans %} - {{ block.super }}{% endblock %} {% block bootstrap4_title %}{% blocktrans%}Manage absence{% endblocktrans %} - {{ block.super }}{% endblock %}
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<form method="post"> <form method="post">
{% csrf_token %} {% csrf_token %}
{% bootstrap_form manage_absence_form %} {% bootstrap_form register_absence_form %}
<button type="submit" class="btn btn-dark"> <button type="submit" class="btn btn-dark">
{% blocktrans %}Save{% endblocktrans %} {% blocktrans %}Save{% endblocktrans %}
</button> </button>
......
...@@ -12,6 +12,6 @@ urlpatterns = [ ...@@ -12,6 +12,6 @@ urlpatterns = [
name='week_view_by_week'), name='week_view_by_week'),
path('print/group/<int:id_>', views.full_register_group, path('print/group/<int:id_>', views.full_register_group,
name='full_register_group'), name='full_register_group'),
path('absences/new', views.manage_absence, path('absence/new', views.register_absence,
name='manage_absence'), name='register_absence'),
] ]
...@@ -15,7 +15,7 @@ from biscuit.core.models import Group, Person ...@@ -15,7 +15,7 @@ from biscuit.core.models import Group, Person
from biscuit.core.decorators import admin_required from biscuit.core.decorators import admin_required
from biscuit.core.util import messages from biscuit.core.util import messages
from .forms import ManageAbsenceForm, LessonDocumentationForm, PersonalNoteFormSet, SelectForm from .forms import RegisterAbsenceFormLessonDocumentationForm, PersonalNoteFormSet, RegisterAbsenceForm, SelectForm
from .models import LessonDocumentation from .models import LessonDocumentation
...@@ -207,21 +207,21 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse: ...@@ -207,21 +207,21 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse:
@admin_required @admin_required
def manage_absence(request: HttpRequest) -> HttpResponse: def register_absence(request: HttpRequest) -> HttpResponse:
context = {} context = {}
manage_absence_form = ManageAbsenceForm(request.POST or None) register_absence_form = RegisterAbsenceForm(request.POST or None)
if request.method == 'POST': if request.method == 'POST':
if manage_absence_form.is_valid(): if register_absence_form.is_valid():
# Get data from form # Get data from form
person = manage_absence_form.cleaned_data['person'] person = register_absence_form.cleaned_data['person']
start_date = manage_absence_form.cleaned_data['date_start'] start_date = register_absence_form.cleaned_data['date_start']
end_date = manage_absence_form.cleaned_data['date_end'] end_date = register_absence_form.cleaned_data['date_end']
starting_lesson = manage_absence_form.cleaned_data['starting_lesson'] starting_lesson = register_absence_form.cleaned_data['starting_lesson']
absent = manage_absence_form.cleaned_data['absent'] absent = register_absence_form.cleaned_data['absent']
excused = manage_absence_form.cleaned_data['excused'] excused = register_absence_form.cleaned_data['excused']
remarks = manage_absence_form.cleaned_data['remarks'] remarks = register_absence_form.cleaned_data['remarks']
# Mark person as absent # Mark person as absent
delta = end_date - start_date delta = end_date - start_date
...@@ -233,6 +233,6 @@ def manage_absence(request: HttpRequest) -> HttpResponse: ...@@ -233,6 +233,6 @@ def manage_absence(request: HttpRequest) -> HttpResponse:
messages.success(request, _('The absence has been saved.')) messages.success(request, _('The absence has been saved.'))
return redirect('index') 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)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment