merged types to StdClassGroup

src/lesson.rs

@@ -1,5 +1,7 @@
 use serde::{Deserialize, Serialize};
 
+use crate::StdClassGroup;
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "PascalCase")]
 pub struct LessonAbsence {
@@ -29,7 +31,7 @@ pub struct LessonHour {
 pub struct AbsencesGroup {
     pub students_absences: Vec<LessonStudentAbsence>,
     pub absent_type_options: Vec<AbsentTypeOption>,
-    //   "Group": {"ClassId": "1A", "Id": "AA", "Abbrev": "1.A", "Name": "1.A"}
+    pub group: StdClassGroup,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]

src/lib.rs

@@ -30,14 +30,11 @@ pub use lesson::{
 };
 pub use marks::{Mark, Marks, SubjectMarks};
 pub use payments::{AddBalance, ClassfundPayments, ClassfundSummary, Payment, PaymentMonthlyData};
-pub use stdtype::StdType;
+pub use stdtype::{StdClassGroup, StdType};
 pub use subjects::{Subject, Subjects};
 pub use substitutions::{SubstitutionChange, Substitutions};
 pub use themes::{Theme, Themes};
-pub use timetable::{
-    Timetable, TimetableAtom, TimetableChange, TimetableDay, TimetableGroup,
-    TimetableHour,
-};
+pub use timetable::{Timetable, TimetableAtom, TimetableChange, TimetableDay, TimetableHour};
 pub use user::{Module, User};
 pub use webmodules::{Webmodule, Webmodules};
 pub use what_if::{WhatIfResult, WhatIfResultMark, WhatIfStartingEnviromentMark};

src/stdtype.rs

@@ -7,3 +7,12 @@ pub struct StdType {
     pub abbrev: String,
     pub name: String,
 }
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "PascalCase")]
+pub struct StdClassGroup {
+    pub class_id: String,
+    pub id: String,
+    pub abbrev: String,
+    pub name: String,
+}

src/timetable.rs

@@ -1,7 +1,7 @@
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
-use crate::StdType;
+use crate::{StdClassGroup, StdType};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "PascalCase")]
@@ -9,7 +9,7 @@ pub struct Timetable {
     pub hours: Vec<TimetableHour>,
     pub days: Vec<TimetableDay>,
     pub classes: Vec<StdType>,
-    pub groups: Vec<TimetableGroup>,
+    pub groups: Vec<StdClassGroup>,
     pub subjects: Vec<StdType>,
     pub teachers: Vec<StdType>,
     pub rooms: Vec<StdType>,
@@ -61,12 +61,3 @@ pub struct TimetableChange {
     pub type_abbrev: Option<String>,
     pub type_name: Option<String>,
 }
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "PascalCase")]
-pub struct TimetableGroup {
-    pub class_id: String,
-    pub id: String,
-    pub abbrev: String,
-    pub name: String,
-}