From e6f0e329b1d8205baca31a3c1b13675ba50662db Mon Sep 17 00:00:00 2001 From: vextrixes <113197359+vextrixes@users.noreply.github.com> Date: Sun, 25 Oct 2026 17:33:04 +0100 Subject: [PATCH] added measures --- src/lib.rs | 4 +++- src/measures.rs | 19 +++++++++++++++++++ src/user.rs | 2 +- src/what_if.rs | 2 +- tracker.md | 2 +- 5 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 src/measures.rs diff --git a/src/lib.rs b/src/lib.rs index 61e87dc..02041c7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -7,6 +7,7 @@ mod gdpr; mod homework; mod lesson; mod marks; +mod measures; mod payments; mod stdtype; mod subjects; @@ -29,6 +30,7 @@ pub use lesson::{ LessonStudentAbsence, LessonStudentInfo, }; pub use marks::{Mark, Marks, SubjectMarks}; +pub use measures::{Measures, PedagogicalMeasure}; pub use payments::{AddBalance, ClassfundPayments, ClassfundSummary, Payment, PaymentMonthlyData}; pub use stdtype::{StdClassGroup, StdType}; pub use subjects::{Subject, Subjects}; @@ -37,4 +39,4 @@ pub use themes::{Theme, Themes}; 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}; +pub use what_if::{WhatIfResult, WhatIfResultMark, WhatIfStartingEnvironmentMark}; diff --git a/src/measures.rs b/src/measures.rs new file mode 100644 index 0000000..8c4b65e --- /dev/null +++ b/src/measures.rs @@ -0,0 +1,19 @@ +use chrono::{DateTime, Utc}; +use serde::{Deserialize, Serialize}; + +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "PascalCase")] +pub struct Measures { + pedagogical_measures: Vec, +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "PascalCase")] +pub struct PedagogicalMeasure { + school_year: String, + semester: String, + type_label: String, + date: DateTime, + type_id: String, + text: String, +} diff --git a/src/user.rs b/src/user.rs index edc715b..8afed14 100644 --- a/src/user.rs +++ b/src/user.rs @@ -11,7 +11,7 @@ pub struct User { pub user_uid: String, pub campaign_category_code: String, pub class: StdType, - // TeacherClasses: Option TODO + // TeacherClasses: Option<> TODO unknown pub full_name: String, pub school_organization_name: String, pub school_type: Option, diff --git a/src/what_if.rs b/src/what_if.rs index 8eb7d59..76d74bf 100644 --- a/src/what_if.rs +++ b/src/what_if.rs @@ -5,7 +5,7 @@ use crate::StdType; #[derive(Debug, Clone, Serialize, Deserialize)] #[serde(rename_all = "PascalCase")] -pub struct WhatIfStartingEnviromentMark { +pub struct WhatIfStartingEnvironmentMark { pub id: String, pub mark_text: String, pub weight: u8, diff --git a/tracker.md b/tracker.md index d24e603..4d5b2c7 100644 --- a/tracker.md +++ b/tracker.md @@ -10,7 +10,7 @@ - [ ] lesson studentsTimetable - [x] marks - [ ] marks final -- [ ] measures +- [x] measures - [x] payments - [x] subjects - [x] substitutions