From ce4ceac712a551b0288b0caee53bf604524f2fcf Mon Sep 17 00:00:00 2001 From: vextrixes <113197359+vextrixes@users.noreply.github.com> Date: Sun, 25 Oct 2026 17:50:13 +0100 Subject: [PATCH] added marks final --- src/lib.rs | 2 +- src/marks.rs | 36 ++++++++++++++++++++++++++++++++++++ tracker.md | 2 +- 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 02041c7..207d25a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -29,7 +29,7 @@ pub use lesson::{ AbsencesGroup, AbsentTypeOption, LessonAbsence, LessonHour, LessonLastTheme, LessonStudentAbsence, LessonStudentInfo, }; -pub use marks::{Mark, Marks, SubjectMarks}; +pub use marks::{Mark, Marks, SubjectMarks, MarksFinal, CertificateTerm, FinalMark}; pub use measures::{Measures, PedagogicalMeasure}; pub use payments::{AddBalance, ClassfundPayments, ClassfundSummary, Payment, PaymentMonthlyData}; pub use stdtype::{StdClassGroup, StdType}; diff --git a/src/marks.rs b/src/marks.rs index 7d64849..4c85485 100644 --- a/src/marks.rs +++ b/src/marks.rs @@ -46,3 +46,39 @@ pub struct Mark { pub confirmed_by: Option, pub mark_confirmation_state: String, } + +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "PascalCase")] +pub struct MarksFinal { + pub certificate_terms: Vec, +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "PascalCase")] +pub struct CertificateTerm { + pub final_marks: Vec, + pub subjects: StdType, + pub grade_name: String, + pub grade: u8, + pub year_in_school: u8, + pub school_year: String, + pub semester: String, + pub semester_name: String, + pub repeated: bool, + pub closed: bool, + pub achievement_text: String, + pub marks_average: f64, + pub absent_hours: u16, + pub not_excused_hours: u16, + pub certificate_date: DateTime, +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "PascalCase")] +pub struct FinalMark { + pub mark_date: DateTime, + pub edit_date: DateTime, + pub mark_text: String, + pub subject_id: String, + pub id: String, +} diff --git a/tracker.md b/tracker.md index 4d5b2c7..f11ea5b 100644 --- a/tracker.md +++ b/tracker.md @@ -9,7 +9,7 @@ - [x] lesson - [ ] lesson studentsTimetable - [x] marks -- [ ] marks final +- [x] marks final - [x] measures - [x] payments - [x] subjects