Commit d124df75 authored by PabloLeCrapaud's avatar PabloLeCrapaud
Browse files

minor Group -- > StructuralGroup

parent 5e597397
......@@ -24,7 +24,7 @@
# you develop activities involving the FlOpEDT/FlOpScheduler software
# without disclosing the source code of your own applications.
from base.models import Day, Course, Group, CourseType, RoomType, Module,\
from base.models import Day, Course, StructuralGroup, CourseType, RoomType, Module,\
UserPreference, Department, ScheduledCourse, ModulePossibleTutors, Week
from MyFlOp.models import TutorHoursBounds
from base.preferences import split_preferences
......
......@@ -24,7 +24,7 @@
# you develop activities involving the FlOpEDT/FlOpScheduler software
# without disclosing the source code of your own applications.
from base.models import Day, Course, Group, CourseType, RoomType, Module,\
from base.models import Day, Course, StructuralGroup, CourseType, RoomType, Module,\
CourseStartTimeConstraint, TimeGeneralSettings, Department, UserPreference, ScheduledCourse, ModulePossibleTutors
from people.models import Tutor, UserDepartmentSettings
from misc.assign_colors import assign_tutor_color
......@@ -113,8 +113,8 @@ def deploy_scheduled_courses(semaine_depart, bookname=None):
}
liste_postes = [Module.objects.get(abbrev="Proj"), Module.objects.get(abbrev="Caisse"),
Module.objects.get(abbrev="Ct_Men"), Module.objects.get(abbrev="Autre")]
liste_groupes = [Group.objects.get(name="Proj"), Group.objects.get(name="Caisse"),
Group.objects.get(name="Ct_Men"), Group.objects.get(name="Autre")]
liste_groupes = [StructuralGroup.objects.get(name="Proj"), StructuralGroup.objects.get(name="Caisse"),
StructuralGroup.objects.get(name="Ct_Men"), StructuralGroup.objects.get(name="Autre")]
liste_types_de_salles = [RoomType.objects.get(name="Proj"), RoomType.objects.get(name="Caisse"),
RoomType.objects.get(name="Ct_Men"), RoomType.objects.get(name="Autre")]
heure=CourseType.objects.get(name='OS')
......
......@@ -24,7 +24,7 @@
# you develop activities involving the FlOpEDT/FlOpScheduler software
# without disclosing the source code of your own applications.
from base.models import Day, Course, Group, CourseType, RoomType, Module,\
from base.models import Day, Course, StructuralGroup, CourseType, RoomType, Module,\
UserPreference, Department, ScheduledCourse, ModulePossibleTutors, TrainingProgramme, Week, Room
from MyFlOp.models import TutorHoursBounds
from base.preferences import split_preferences
......@@ -85,7 +85,7 @@ def deploy_scheduled_courses(bookname=None, year=2021):
promo = TrainingProgramme.objects.get(abbrev="Creusot")
else:
promo = TrainingProgramme.objects.get(abbrev="Montceau")
groups = list(Group.objects.filter(train_prog=promo))
groups = list(StructuralGroup.objects.filter(train_prog=promo))
groups.sort(key=lambda x: x.name)
module = Module.objects.get(abbrev=promo.abbrev)
compteur = 0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment