From 7e2b7b97ff95d7fda23917db7d03ca05973c158d Mon Sep 17 00:00:00 2001 From: stijndcl Date: Sun, 25 Sep 2022 00:17:36 +0200 Subject: [PATCH] Add more schedule settings --- database/scripts/db01_ufora_courses_22_23.py | 37 ++++++++++++++++++++ settings.py | 24 ++++++++----- 2 files changed, 53 insertions(+), 8 deletions(-) diff --git a/database/scripts/db01_ufora_courses_22_23.py b/database/scripts/db01_ufora_courses_22_23.py index 3be21ec..4e75946 100644 --- a/database/scripts/db01_ufora_courses_22_23.py +++ b/database/scripts/db01_ufora_courses_22_23.py @@ -104,6 +104,30 @@ async def main(): alternative_overarching_role_id=1023278462733127710, ) + inleiding_tot_elektrotechniek = UforaCourse( + code="C003806", + name="Inleiding tot de Elektrotechniek", + year=3, + compulsory=True, + overarching_role_id=891744390035415111, + ) + + inleiding_tot_telecommunicatie = UforaCourse( + code="C003787", + name="Inleiding tot de Telecommunicatie", + year=3, + compulsory=True, + overarching_role_id=891744390035415111, + ) + + wiskundige_modellering = UforaCourse( + code="C003788", + name="Wiskundige Modellering in de Ingenieurswetenschappen", + year=3, + compulsory=True, + overarching_role_id=891744390035415111, + ) + session.add_all( [ artificiele_intelligentie, @@ -116,6 +140,9 @@ async def main(): modelleren_en_simuleren, informatiebeveiliging, parallelle_computersystemen, + inleiding_tot_elektrotechniek, + inleiding_tot_telecommunicatie, + wiskundige_modellering, ] ) await session.commit() @@ -137,6 +164,10 @@ async def main(): parallel_computer_systems = UforaCourseAlias( parallelle_computersystemen.course_id, alias="Parallel Computer Systems" ) + elektro = UforaCourseAlias(course_id=inleiding_tot_elektrotechniek.course_id, alias="Elektro") + elektrotechniek = UforaCourseAlias(course_id=inleiding_tot_elektrotechniek.course_id, alias="Elektrotechniek") + telecom = UforaCourseAlias(course_id=inleiding_tot_telecommunicatie.course_id, alias="Telecom") + wimo = UforaCourseAlias(course_id=wiskundige_modellering.course_id, alias="WiMo") session.add_all( [ @@ -154,7 +185,13 @@ async def main(): information_security, pcs, parallel_computer_systems, + elektro, + elektrotechniek, + telecom, + wimo, ] ) await session.commit() + + """1st Master CS""" diff --git a/settings.py b/settings.py index ab91fe2..9e36f1f 100644 --- a/settings.py +++ b/settings.py @@ -70,8 +70,10 @@ UFORA_ANNOUNCEMENTS_CHANNEL: Optional[int] = env.int("UFORA_ANNOUNCEMENTS_CHANNE """Discord Role ID's""" BA3_ROLE: Optional[int] = env.int("BA3_ROLE", 891743208248324196) -MA_CS_ROLE: Optional[int] = env.int("MA_CS_ROLE", None) -MA_CS_ENG_ROLE: Optional[int] = env.int("MA_CS_ENG_ROLE", None) +MA_CS_1_ROLE: Optional[int] = env.int("MA_CS_1_ROLE", 1023293447387496570) +MA_CS_2_ROLE: Optional[int] = env.int("MA_CS_2_ROLE", 1023302736210567208) +MA_CS_ENG_1_ROLE: Optional[int] = env.int("MA_CS_ENG_1_ROLE", 1023278462733127710) +MA_CS_ENG_2_ROLE: Optional[int] = env.int("MA_CS_ENG_2_ROLE", 1023300434800164914) """API Keys""" UFORA_RSS_TOKEN: Optional[str] = env.str("UFORA_RSS_TOKEN", None) @@ -81,8 +83,10 @@ IMGFLIP_PASSWORD: Optional[str] = env.str("IMGFLIP_PASSWORD", None) """Schedule URLs""" BA3_SCHEDULE_URL: Optional[str] = env.str("BA3_SCHEDULE_URL", None) -MA_CS_SCHEDULE_URL: Optional[str] = env.str("MA_CS_SCHEDULE_URL", None) -MA_CS_ENG_SCHEDULE_URL: Optional[str] = env.str("MA_CS_ENG_SCHEDULE_URL", None) +MA_CS_1_SCHEDULE_URL: Optional[str] = env.str("MA_CS_1_SCHEDULE_URL", None) +MA_CS_2_SCHEDULE_URL: Optional[str] = env.str("MA_CS_2_SCHEDULE_URL", None) +MA_CS_ENG_1_SCHEDULE_URL: Optional[str] = env.str("MA_CS_ENG_1_SCHEDULE_URL", None) +MA_CS_ENG_2_SCHEDULE_URL: Optional[str] = env.str("MA_CS_ENG_2_SCHEDULE_URL", None) """Computed properties""" @@ -92,8 +96,10 @@ class ScheduleType(str, Enum): """Enum to differentiate schedules""" BA3 = "ba3" - MA_CS = "ma_cs" - MA_CS_ENG = "ma_cs_eng" + MA_CS_1 = "ma_cs_1" + MA_CS_2 = "ma_cs_2" + MA_CS_ENG_1 = "ma_cs_eng_1" + MA_CS_ENG_2 = "ma_cs_eng_2" @dataclass @@ -107,6 +113,8 @@ class ScheduleInfo: SCHEDULE_DATA = [ ScheduleInfo(name=ScheduleType.BA3, role_id=BA3_ROLE, schedule_url=BA3_SCHEDULE_URL), - ScheduleInfo(name=ScheduleType.MA_CS, role_id=MA_CS_ROLE, schedule_url=MA_CS_SCHEDULE_URL), - ScheduleInfo(name=ScheduleType.MA_CS_ENG, role_id=MA_CS_ENG_ROLE, schedule_url=MA_CS_ENG_SCHEDULE_URL), + ScheduleInfo(name=ScheduleType.MA_CS_1, role_id=MA_CS_1_ROLE, schedule_url=MA_CS_1_SCHEDULE_URL), + ScheduleInfo(name=ScheduleType.MA_CS_2, role_id=MA_CS_2_ROLE, schedule_url=MA_CS_2_SCHEDULE_URL), + ScheduleInfo(name=ScheduleType.MA_CS_ENG_1, role_id=MA_CS_ENG_1_ROLE, schedule_url=MA_CS_ENG_1_SCHEDULE_URL), + ScheduleInfo(name=ScheduleType.MA_CS_ENG_2, role_id=MA_CS_ENG_2_ROLE, schedule_url=MA_CS_ENG_2_SCHEDULE_URL), ]