mirror of
https://git.v0id.ovh/n3wt-innov/n3wt-school.git
synced 2026-01-28 23:43:22 +00:00
feat: Gestion des absences du jour [#16]
This commit is contained in:
@ -130,34 +130,4 @@ class PaymentMode(models.Model):
|
||||
establishment = models.ForeignKey(Establishment, on_delete=models.CASCADE, related_name='payment_modes')
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.get_mode_display()} - {self.get_type_display()}"
|
||||
|
||||
class AbsenceMoment(models.IntegerChoices):
|
||||
MORNING = 1, 'Morning'
|
||||
AFTERNOON = 2, 'Afternoon'
|
||||
TOTAL = 3, 'Total'
|
||||
|
||||
class AbsenceReason(models.IntegerChoices):
|
||||
JUSTIFIED_ABSENCE = 1, 'Justified Absence'
|
||||
UNJUSTIFIED_ABSENCE = 2, 'Unjustified Absence'
|
||||
JUSTIFIED_LATE = 3, 'Justified Late'
|
||||
UNJUSTIFIED_LATE = 4, 'Unjustified Late'
|
||||
|
||||
class AbsenceManagement(models.Model):
|
||||
day = models.DateField()
|
||||
moment = models.IntegerField(
|
||||
choices=AbsenceMoment.choices,
|
||||
default=AbsenceMoment.TOTAL
|
||||
)
|
||||
reason = models.IntegerField(
|
||||
choices=AbsenceReason.choices,
|
||||
default=AbsenceReason.UNJUSTIFIED_ABSENCE
|
||||
)
|
||||
student = models.ForeignKey(
|
||||
'Subscriptions.Student',
|
||||
on_delete=models.CASCADE,
|
||||
related_name='absences'
|
||||
)
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.student} - {self.day} - {self.get_moment_display()} - {self.get_reason_display()}"
|
||||
return f"{self.get_mode_display()} - {self.get_type_display()}"
|
||||
@ -1,5 +1,5 @@
|
||||
from rest_framework import serializers
|
||||
from .models import Teacher, Speciality, SchoolClass, Planning, LEVEL_CHOICES, Discount, Fee, PaymentPlan, PaymentMode, AbsenceManagement
|
||||
from .models import Teacher, Speciality, SchoolClass, Planning, LEVEL_CHOICES, Discount, Fee, PaymentPlan, PaymentMode
|
||||
from Auth.models import Profile, ProfileRole
|
||||
from Subscriptions.models import Student
|
||||
from Establishment.models import Establishment
|
||||
@ -8,11 +8,6 @@ from N3wtSchool import settings, bdd
|
||||
from django.utils import timezone
|
||||
import pytz
|
||||
|
||||
class AbsenceManagementSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = AbsenceManagement
|
||||
fields = '__all__'
|
||||
|
||||
class SpecialitySerializer(serializers.ModelSerializer):
|
||||
updated_date_formatted = serializers.SerializerMethodField()
|
||||
|
||||
|
||||
@ -17,8 +17,6 @@ from .views import (
|
||||
PaymentPlanDetailView,
|
||||
PaymentModeListCreateView,
|
||||
PaymentModeDetailView,
|
||||
AbsenceManagementListCreateView,
|
||||
AbsenceManagementDetailView
|
||||
)
|
||||
|
||||
urlpatterns = [
|
||||
@ -45,7 +43,4 @@ urlpatterns = [
|
||||
|
||||
re_path(r'^paymentModes$', PaymentModeListCreateView.as_view(), name="payment_mode_list_create"),
|
||||
re_path(r'^paymentModes/(?P<id>[0-9]+)$', PaymentModeDetailView.as_view(), name="payment_mode_detail"),
|
||||
|
||||
re_path(r'^absences$', AbsenceManagementListCreateView.as_view(), name="absence_list_create"),
|
||||
re_path(r'^absences/(?P<id>[0-9]+)$', AbsenceManagementDetailView.as_view(), name="absence_detail"),
|
||||
]
|
||||
@ -413,48 +413,3 @@ class PaymentModeDetailView(APIView):
|
||||
|
||||
def delete(self, request, id):
|
||||
return delete_object(PaymentMode, id)
|
||||
|
||||
@method_decorator(csrf_protect, name='dispatch')
|
||||
@method_decorator(ensure_csrf_cookie, name='dispatch')
|
||||
class AbsenceManagementListCreateView(APIView):
|
||||
def get(self, request):
|
||||
absences = AbsenceManagement.objects.all()
|
||||
serializer = AbsenceManagementSerializer(absences, many=True)
|
||||
return JsonResponse(serializer.data, safe=False, status=status.HTTP_200_OK)
|
||||
|
||||
def post(self, request):
|
||||
serializer = AbsenceManagementSerializer(data=request.data)
|
||||
if serializer.is_valid():
|
||||
serializer.save()
|
||||
return JsonResponse(serializer.data, safe=False, status=status.HTTP_201_CREATED)
|
||||
return JsonResponse(serializer.errors, safe=False, status=status.HTTP_400_BAD_REQUEST)
|
||||
|
||||
@method_decorator(csrf_protect, name='dispatch')
|
||||
@method_decorator(ensure_csrf_cookie, name='dispatch')
|
||||
class AbsenceManagementDetailView(APIView):
|
||||
def get(self, request, id):
|
||||
try:
|
||||
absence = AbsenceManagement.objects.get(id=id)
|
||||
serializer = AbsenceManagementSerializer(absence)
|
||||
return JsonResponse(serializer.data, safe=False, status=status.HTTP_200_OK)
|
||||
except AbsenceManagement.DoesNotExist:
|
||||
return JsonResponse({"error": "Absence not found"}, safe=False, status=status.HTTP_404_NOT_FOUND)
|
||||
|
||||
def put(self, request, id):
|
||||
try:
|
||||
absence = AbsenceManagement.objects.get(id=id)
|
||||
serializer = AbsenceManagementSerializer(absence, data=request.data)
|
||||
if serializer.is_valid():
|
||||
serializer.save()
|
||||
return JsonResponse(serializer.data, safe=False, status=status.HTTP_200_OK)
|
||||
return JsonResponse(serializer.errors, safe=False, status=status.HTTP_400_BAD_REQUEST)
|
||||
except AbsenceManagement.DoesNotExist:
|
||||
return JsonResponse({"error": "Absence not found"}, safe=False, status=status.HTTP_404_NOT_FOUND)
|
||||
|
||||
def delete(self, request, id):
|
||||
try:
|
||||
absence = AbsenceManagement.objects.get(id=id)
|
||||
absence.delete()
|
||||
return JsonResponse(safe=False, status=status.HTTP_204_NO_CONTENT)
|
||||
except AbsenceManagement.DoesNotExist:
|
||||
return JsonResponse({"error": "Absence not found"}, safe=False, status=status.HTTP_404_NOT_FOUND)
|
||||
|
||||
@ -357,3 +357,34 @@ class RegistrationParentFileTemplate(models.Model):
|
||||
for reg_file in registration_files:
|
||||
filenames.append(reg_file.file.path)
|
||||
return filenames
|
||||
|
||||
class AbsenceMoment(models.IntegerChoices):
|
||||
MORNING = 1, 'Morning'
|
||||
AFTERNOON = 2, 'Afternoon'
|
||||
TOTAL = 3, 'Total'
|
||||
|
||||
class AbsenceReason(models.IntegerChoices):
|
||||
JUSTIFIED_ABSENCE = 1, 'Justified Absence'
|
||||
UNJUSTIFIED_ABSENCE = 2, 'Unjustified Absence'
|
||||
JUSTIFIED_LATE = 3, 'Justified Late'
|
||||
UNJUSTIFIED_LATE = 4, 'Unjustified Late'
|
||||
|
||||
class AbsenceManagement(models.Model):
|
||||
day = models.DateField()
|
||||
moment = models.IntegerField(
|
||||
choices=AbsenceMoment.choices,
|
||||
default=AbsenceMoment.TOTAL
|
||||
)
|
||||
reason = models.IntegerField(
|
||||
choices=AbsenceReason.choices,
|
||||
default=AbsenceReason.UNJUSTIFIED_ABSENCE
|
||||
)
|
||||
student = models.ForeignKey(
|
||||
Student,
|
||||
on_delete=models.CASCADE,
|
||||
related_name='absences'
|
||||
)
|
||||
establishment = models.ForeignKey(Establishment, on_delete=models.CASCADE, related_name='absences')
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.student} - {self.day} - {self.get_moment_display()} - {self.get_reason_display()}"
|
||||
@ -1,5 +1,5 @@
|
||||
from rest_framework import serializers
|
||||
from .models import RegistrationFileGroup, RegistrationForm, Student, Guardian, Sibling, Language, RegistrationSchoolFileMaster, RegistrationSchoolFileTemplate, RegistrationParentFileMaster, RegistrationParentFileTemplate
|
||||
from .models import RegistrationFileGroup, RegistrationForm, Student, Guardian, Sibling, Language, RegistrationSchoolFileMaster, RegistrationSchoolFileTemplate, RegistrationParentFileMaster, RegistrationParentFileTemplate, AbsenceManagement
|
||||
from School.models import SchoolClass, Fee, Discount, FeeType
|
||||
from School.serializers import FeeSerializer, DiscountSerializer
|
||||
from Auth.models import ProfileRole, Profile
|
||||
@ -12,6 +12,11 @@ import pytz
|
||||
from datetime import datetime
|
||||
import Subscriptions.util as util
|
||||
|
||||
class AbsenceManagementSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = AbsenceManagement
|
||||
fields = '__all__'
|
||||
|
||||
class RegistrationSchoolFileMasterSerializer(serializers.ModelSerializer):
|
||||
id = serializers.IntegerField(required=False)
|
||||
class Meta:
|
||||
|
||||
@ -15,7 +15,9 @@ from .views import (
|
||||
RegistrationParentFileMasterSimpleView,
|
||||
RegistrationParentFileMasterView,
|
||||
RegistrationParentFileTemplateSimpleView,
|
||||
RegistrationParentFileTemplateView
|
||||
RegistrationParentFileTemplateView,
|
||||
AbsenceManagementListCreateView,
|
||||
AbsenceManagementDetailView
|
||||
)
|
||||
|
||||
from .views import RegistrationFileGroupView, RegistrationFileGroupSimpleView, get_registration_files_by_group
|
||||
@ -58,4 +60,7 @@ urlpatterns = [
|
||||
|
||||
re_path(r'^students/(?P<student_id>[0-9]+)/guardians/(?P<guardian_id>[0-9]+)/dissociate', DissociateGuardianView.as_view(), name='dissociate-guardian'),
|
||||
|
||||
re_path(r'^absences$', AbsenceManagementListCreateView.as_view(), name="absence_list_create"),
|
||||
re_path(r'^absences/(?P<id>[0-9]+)$', AbsenceManagementDetailView.as_view(), name="absence_detail"),
|
||||
|
||||
]
|
||||
@ -12,6 +12,7 @@ from .registration_file_views import (
|
||||
from .registration_file_group_views import RegistrationFileGroupView, RegistrationFileGroupSimpleView, get_registration_files_by_group
|
||||
from .student_views import StudentView, StudentListView, ChildrenListView
|
||||
from .guardian_views import GuardianView, DissociateGuardianView
|
||||
from .absences_views import AbsenceManagementDetailView, AbsenceManagementListCreateView
|
||||
|
||||
__all__ = [
|
||||
'RegisterFormView',
|
||||
@ -36,5 +37,7 @@ __all__ = [
|
||||
'StudentListView',
|
||||
'ChildrenListView',
|
||||
'GuardianView',
|
||||
'DissociateGuardianView'
|
||||
'DissociateGuardianView',
|
||||
'AbsenceManagementDetailView',
|
||||
'AbsenceManagementListCreateView'
|
||||
]
|
||||
|
||||
50
Back-End/Subscriptions/views/absences_views.py
Normal file
50
Back-End/Subscriptions/views/absences_views.py
Normal file
@ -0,0 +1,50 @@
|
||||
from django.http.response import JsonResponse
|
||||
from rest_framework.views import APIView
|
||||
from rest_framework import status
|
||||
from drf_yasg.utils import swagger_auto_schema
|
||||
from drf_yasg import openapi
|
||||
from django.views.decorators.csrf import ensure_csrf_cookie, csrf_protect
|
||||
from django.utils.decorators import method_decorator
|
||||
from Subscriptions.serializers import AbsenceManagementSerializer
|
||||
from Subscriptions.models import AbsenceManagement
|
||||
from N3wtSchool.bdd import delete_object
|
||||
|
||||
@method_decorator(csrf_protect, name='dispatch')
|
||||
@method_decorator(ensure_csrf_cookie, name='dispatch')
|
||||
class AbsenceManagementListCreateView(APIView):
|
||||
def get(self, request):
|
||||
absences = AbsenceManagement.objects.all()
|
||||
serializer = AbsenceManagementSerializer(absences, many=True)
|
||||
return JsonResponse(serializer.data, safe=False, status=status.HTTP_200_OK)
|
||||
|
||||
def post(self, request):
|
||||
serializer = AbsenceManagementSerializer(data=request.data)
|
||||
if serializer.is_valid():
|
||||
serializer.save()
|
||||
return JsonResponse(serializer.data, safe=False, status=status.HTTP_201_CREATED)
|
||||
return JsonResponse(serializer.errors, safe=False, status=status.HTTP_400_BAD_REQUEST)
|
||||
|
||||
@method_decorator(csrf_protect, name='dispatch')
|
||||
@method_decorator(ensure_csrf_cookie, name='dispatch')
|
||||
class AbsenceManagementDetailView(APIView):
|
||||
def get(self, request, id):
|
||||
try:
|
||||
absence = AbsenceManagement.objects.get(id=id)
|
||||
serializer = AbsenceManagementSerializer(absence)
|
||||
return JsonResponse(serializer.data, safe=False, status=status.HTTP_200_OK)
|
||||
except AbsenceManagement.DoesNotExist:
|
||||
return JsonResponse({"error": "Absence not found"}, safe=False, status=status.HTTP_404_NOT_FOUND)
|
||||
|
||||
def put(self, request, id):
|
||||
try:
|
||||
absence = AbsenceManagement.objects.get(id=id)
|
||||
serializer = AbsenceManagementSerializer(absence, data=request.data)
|
||||
if serializer.is_valid():
|
||||
serializer.save()
|
||||
return JsonResponse(serializer.data, safe=False, status=status.HTTP_200_OK)
|
||||
return JsonResponse(serializer.errors, safe=False, status=status.HTTP_400_BAD_REQUEST)
|
||||
except AbsenceManagement.DoesNotExist:
|
||||
return JsonResponse({"error": "Absence not found"}, safe=False, status=status.HTTP_404_NOT_FOUND)
|
||||
|
||||
def delete(self, request, id):
|
||||
return delete_object(AbsenceManagement, id)
|
||||
Reference in New Issue
Block a user