Updated IGD21 timetable for new school year 2023

bszet-davinci/src/timetable/igd21.rs

@@ -5,7 +5,7 @@ use time::Weekday::{Friday, Monday, Thursday, Tuesday, Wednesday};
 
 use crate::timetable::Subject::{
   Art, Chemistry, EnglishAdvanced, EnglishBasic, Ethics, French, GermanBasic, History, Lf10, Lf11,
-  Lf6_7_9, Lf8, Literature, MathAdvanced, MathBasic, PhysicalEducation, Physics, Russian,
+  Lf9_12, Lf13, Literature, MathAdvanced, MathBasic, PhysicalEducation, Physics, Russian,
 };
 use crate::timetable::{Lesson, Timetable};
 
@@ -15,59 +15,60 @@ pub static IGD21: Lazy<Timetable> = Lazy::new(|| {
     (
       Monday,
       vec![
-        Lesson::new(1, None, MathBasic, "B10"),
-        Lesson::new(2, None, Lf6_7_9, "B8"),
-        Lesson::new(3, Some(1), History, "B4"),
-        Lesson::new(3, Some(2), EnglishAdvanced, "B03"),
-        Lesson::new(3, Some(2), MathAdvanced, "B11"),
-        Lesson::new(4, None, Lf11, "B5"),  // group 1
-        Lesson::new(4, None, Lf8, "B405"), // group 2
-        Lesson::new(5, Some(1), EnglishBasic, "B03"),
-        Lesson::new(5, Some(2), Art, "A06"),
+        Lesson::new(1, None, GermanBasic, "B6"),
+        Lesson::new(2, None, Chemistry, "B9"),
+        Lesson::new(3, Some(1), EnglishAdvanced, "A102"),
+        Lesson::new(3, Some(1), MathAdvanced, "B11"),
+        Lesson::new(3, Some(2), Lf11, "B5"),
+        Lesson::new(4, Some(1), History, "B104"),
+        Lesson::new(4, Some(2), Art, "A06"),
+        Lesson::new(4, Some(2), Literature, "B4"),
       ],
     ),
     (
       Tuesday,
       vec![
-        Lesson::new(1, None, Lf6_7_9, "B8"),
+        Lesson::new(1, None, MathBasic, "B05"),
+        Lesson::new(1, None, EnglishBasic, "B104"),
         Lesson::new(2, None, GermanBasic, "B6"),
-        Lesson::new(3, None, History, "B8"),
-        Lesson::new(4, None, Ethics, "B112"),
+        Lesson::new(3, None, Lf13, "B5"),  // group 1
+        Lesson::new(3, None, Lf11, "B3"),  // group 2
+        Lesson::new(4, None, EnglishAdvanced, "A102"),
+        Lesson::new(4, None, MathAdvanced, "B11"),
       ],
     ),
     (
       Wednesday,
       vec![
-        Lesson::new(1, None, French, "A102"),
-        Lesson::new(1, None, Russian, "B4"),
-        Lesson::new(2, None, Chemistry, "B9"),
-        Lesson::new(3, None, GermanBasic, "B6"),
-        Lesson::new(4, None, EnglishAdvanced, "B03"),
-        Lesson::new(4, None, MathAdvanced, "B11"),
-        Lesson::new(5, Some(2), Literature, "B4"),
+        Lesson::new(1, None, EnglishAdvanced, "B6"),
+        Lesson::new(1, None, MathAdvanced, "B11"),
+        Lesson::new(2, None, EnglishBasic, "B105"),
+        Lesson::new(2, None, MathBasic, "B106"),
+        Lesson::new(3, None, Ethics, "B4"),
+        Lesson::new(4, None, French, "B111"),
+        Lesson::new(4, None, Russian, "B4"),
       ],
     ),
     (
       Thursday,
       vec![
-        Lesson::new(1, None, Physics, "B110"),
-        Lesson::new(2, None, Lf8, "B5"),    // group 1
-        Lesson::new(2, None, Lf11, "B405"), // group 2
-        Lesson::new(3, None, EnglishBasic, "B05"),
-        Lesson::new(3, None, MathBasic, "B11"),
-        Lesson::new(4, None, PhysicalEducation, "117.GS"),
+        Lesson::new(1, None, History, "B4"),
+        Lesson::new(2, None, Lf9_12, "B8"),
+        Lesson::new(3, None, PhysicalEducation, "117.GS"),
+        Lesson::new(4, None, Lf10, "B405"),  // group 1
+        Lesson::new(4, None, Lf13, "A103"),  // group 2
       ],
     ),
     (
       Friday,
       vec![
-        Lesson::new(1, None, Lf10, "B405"), // group: 1
+        Lesson::new(1, None, Physics, "B112"),
         Lesson::new(2, None, French, "A102"),
         Lesson::new(2, None, Russian, "B4"),
-        Lesson::new(3, None, EnglishAdvanced, "B6"),
-        Lesson::new(3, None, MathAdvanced, "B11"),
-        Lesson::new(4, None, Lf8, "B3"),  // group: 1
-        Lesson::new(4, None, Lf11, "B5"), // group: 2
+        Lesson::new(3, None, Lf13, "A103"),  // group 1
+        Lesson::new(3, None, Lf10, "B405"),  // group 2
+        Lesson::new(4, None, Lf11, "B5"),  // group 1
+        Lesson::new(4, None, Lf13, "A103"),  // group 2
       ],
     ),
   ])

bszet-davinci/src/timetable/mod.rs

@@ -41,9 +41,11 @@ pub enum Subject {
   Literature,
 
   Lf6_7_9,
+  Lf9_12,
   Lf8,
   Lf10,
   Lf11,
+  Lf13,
 
   FaeVerb,
   None,
@@ -74,13 +76,17 @@ impl From<&str> for Subject {
       "LIT" => Self::Literature,
 
       "LF 6+7+9" => Self::Lf6_7_9,
-      "IS-GP" => Self::Lf6_7_9,
+      "LF 9+12" => Self::Lf9_12,
+      "IS-GP" => Self::Lf9_12,
       "LF8D_I1" => Self::Lf8,
       "LF8D_I2" => Self::Lf8,
       "LF10D_I1" => Self::Lf10,
       "LF10D_I2" => Self::Lf10,
+      "LF11D" => Self::Lf11,
       "LF11D_I1" => Self::Lf11,
       "LF11D_I2" => Self::Lf11,
+      "LF13D_I1" => Self::Lf13,
+      "LF13D_I2" => Self::Lf13,
 
       "_fä.verb." => Self::FaeVerb,
       "" => Self::None,
@@ -122,9 +128,11 @@ impl Display for Subject {
       Self::PhysicalEducation => f.write_str("Sp"),
       Self::Literature => f.write_str("Lit"),
       Self::Lf6_7_9 => f.write_str("LF 6+7+9"),
+      Self::Lf9_12 => f.write_str("LF 9+12"),
       Self::Lf8 => f.write_str("LF 8"),
       Self::Lf10 => f.write_str("LF 10"),
       Self::Lf11 => f.write_str("LF 11"),
+      Self::Lf13 => f.write_str("LF 13"),
       Self::FaeVerb => f.write_str("Fä-Verb"),
       Self::None => f.write_str("None"),
       Self::Cancel(inner) => {