mirror of
https://git.v0id.ovh/n3wt-innov/n3wt-school.git
synced 2026-01-28 23:43:22 +00:00
refactor: Utilisation d'une application "Common" pour tous les modèles
de référence
This commit is contained in:
@ -9,9 +9,6 @@ from .models import (
|
||||
Fee,
|
||||
PaymentPlan,
|
||||
PaymentMode,
|
||||
Domain,
|
||||
Category,
|
||||
Competency,
|
||||
EstablishmentCompetency
|
||||
)
|
||||
from Auth.models import Profile, ProfileRole
|
||||
@ -22,21 +19,6 @@ from N3wtSchool import settings
|
||||
from django.utils import timezone
|
||||
import pytz
|
||||
|
||||
class DomainSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = Domain
|
||||
fields = '__all__'
|
||||
|
||||
class CategorySerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = Category
|
||||
fields = '__all__'
|
||||
|
||||
class CompetencySerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = Competency
|
||||
fields = '__all__'
|
||||
|
||||
class EstablishmentCompetencySerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = EstablishmentCompetency
|
||||
@ -203,7 +185,6 @@ class SchoolClassSerializer(serializers.ModelSerializer):
|
||||
number_of_students=validated_data.get('number_of_students', 0),
|
||||
teaching_language=validated_data.get('teaching_language', ''),
|
||||
school_year=validated_data.get('school_year', ''),
|
||||
levels=levels_data,
|
||||
type=validated_data.get('type', 1),
|
||||
time_range=validated_data.get('time_range', ['08:30', '17:30']),
|
||||
opening_days=validated_data.get('opening_days', [1, 2, 4, 5]),
|
||||
@ -211,6 +192,7 @@ class SchoolClassSerializer(serializers.ModelSerializer):
|
||||
)
|
||||
|
||||
school_class.teachers.set(teachers_data)
|
||||
school_class.levels.set(levels_data)
|
||||
|
||||
for planning_data in plannings_data:
|
||||
Planning.objects.create(
|
||||
@ -231,7 +213,6 @@ class SchoolClassSerializer(serializers.ModelSerializer):
|
||||
instance.number_of_students = validated_data.get('number_of_students', instance.number_of_students)
|
||||
instance.teaching_language = validated_data.get('teaching_language', instance.teaching_language)
|
||||
instance.school_year = validated_data.get('school_year', instance.school_year)
|
||||
instance.levels = levels_data
|
||||
instance.type = validated_data.get('type', instance.type)
|
||||
instance.time_range = validated_data.get('time_range', instance.time_range)
|
||||
instance.opening_days = validated_data.get('opening_days', instance.opening_days)
|
||||
@ -239,6 +220,7 @@ class SchoolClassSerializer(serializers.ModelSerializer):
|
||||
|
||||
instance.save()
|
||||
instance.teachers.set(teachers_data)
|
||||
instance.levels.set(levels_data)
|
||||
|
||||
existing_plannings = {planning.level: planning for planning in instance.plannings.all()}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user