refactor: Partie "School"

This commit is contained in:
N3WT DE COMPET
2025-01-12 13:18:34 +01:00
parent 83f4d67a6f
commit 58fe509734
7 changed files with 139 additions and 182 deletions

View File

@ -18,22 +18,22 @@ LEVEL_CHOICES = [
class Speciality(models.Model):
name = models.CharField(max_length=100)
updatedDate = models.DateTimeField(auto_now=True)
colorCode = models.CharField(max_length=7, default='#FFFFFF')
updated_date = models.DateTimeField(auto_now=True)
color_code = models.CharField(max_length=7, default='#FFFFFF')
def __str__(self):
return self.name
class Teacher(models.Model):
lastName = models.CharField(max_length=100)
firstName = models.CharField(max_length=100)
last_name = models.CharField(max_length=100)
first_name = models.CharField(max_length=100)
email = models.EmailField(unique=True)
specialities = models.ManyToManyField(Speciality, related_name='teachers')
associatedProfile = models.ForeignKey(Profile, on_delete=models.CASCADE, null=True, blank=True)
updatedDate = models.DateTimeField(auto_now=True)
specialities = models.ManyToManyField(Speciality, blank=True)
associated_profile = models.ForeignKey(Profile, on_delete=models.CASCADE, null=True, blank=True)
updated_date = models.DateTimeField(auto_now=True)
def __str__(self):
return f"{self.lastName} {self.firstName}"
return f"{self.last_name} {self.first_name}"
class SchoolClass(models.Model):
PLANNING_TYPE_CHOICES = [
@ -42,25 +42,25 @@ class SchoolClass(models.Model):
(3, 'Trimestriel')
]
atmosphereName = models.CharField(max_length=255, null=True, blank=True)
ageGroup = models.JSONField()
numberOfStudents = models.PositiveIntegerField()
teachingLanguage = models.CharField(max_length=255)
schoolYear = models.CharField(max_length=9)
updatedDate = models.DateTimeField(auto_now_add=True)
teachers = models.ManyToManyField(Teacher, related_name='schoolClasses')
atmosphere_name = models.CharField(max_length=255, null=True, blank=True)
age_range = models.JSONField(blank=True)
number_of_students = models.PositiveIntegerField(blank=True)
teaching_language = models.CharField(max_length=255, blank=True)
school_year = models.CharField(max_length=9, blank=True)
updated_date = models.DateTimeField(auto_now_add=True)
teachers = models.ManyToManyField(Teacher, blank=True)
levels = ArrayField(models.IntegerField(choices=LEVEL_CHOICES), default=list)
type = models.IntegerField(choices=PLANNING_TYPE_CHOICES, default=1)
schedule = models.JSONField(default=list)
openingDays = ArrayField(models.IntegerField(), default=list)
time_range = models.JSONField(default=list)
opening_days = ArrayField(models.IntegerField(), default=list)
def __str__(self):
return self.atmosphereName
return self.atmosphere_name
class Planning(models.Model):
level = models.IntegerField(choices=LEVEL_CHOICES, null=True, blank=True)
classModel = models.ForeignKey(SchoolClass, null=True, blank=True, related_name='plannings', on_delete=models.CASCADE)
school_class = models.ForeignKey(SchoolClass, null=True, blank=True, related_name='plannings', on_delete=models.CASCADE)
schedule = JSONField(default=dict)
def __str__(self):
return f'Planning for {self.level} of {self.classModel.atmosphereName}'
return f'Planning for {self.level} of {self.school_class.atmosphere_name}'