From 9560daf027967e0ab06ba12b1ee57887a0e44005 Mon Sep 17 00:00:00 2001 From: vextrixes <113197359+vextrixes@users.noreply.github.com> Date: Tue, 27 Oct 2026 21:39:14 +0100 Subject: [PATCH] large changes --- src/absence.rs | 12 ++-- src/attachment.rs | 2 +- src/events.rs | 32 ++++----- src/gdpr.rs | 38 +++++++++-- src/homework.rs | 26 ++++---- src/lesson.rs | 73 --------------------- src/lib.rs | 54 +++++++-------- src/marks.rs | 81 +++++++---------------- src/measures.rs | 19 ------ src/payments.rs | 39 ++++++----- src/semester.rs | 22 ++++++- src/stdtype.rs | 76 +++++---------------- src/subjects.rs | 10 +-- src/substitutions.rs | 29 +++++--- src/teaching.rs | 39 +++++++++++ src/themes.rs | 20 ------ src/timetable.rs | 153 +++++++++++++++++++++++++++++++------------ src/user.rs | 34 +++++----- src/webmodules.rs | 17 ----- src/what_if.rs | 49 -------------- tracker.md | 59 +++++------------ 21 files changed, 387 insertions(+), 497 deletions(-) delete mode 100644 src/lesson.rs delete mode 100644 src/measures.rs create mode 100644 src/teaching.rs delete mode 100644 src/themes.rs delete mode 100644 src/webmodules.rs delete mode 100644 src/what_if.rs diff --git a/src/absence.rs b/src/absence.rs index 9ca6e2c..389725e 100644 --- a/src/absence.rs +++ b/src/absence.rs @@ -1,18 +1,18 @@ -use chrono::Utc; +use chrono::FixedOffset; use serde::{Deserialize, Serialize}; #[derive(Debug, Clone, Serialize, Deserialize)] #[serde(rename_all = "PascalCase")] -pub struct Absence { +pub struct StudentAbsenceOverviewResponse { pub percentage_threshold: f64, //TODO: cutom type (u8) - pub absences: Vec, - pub absences_per_subject: Vec, + pub absences: Vec, + pub absences_per_subject: Option>, } #[derive(Debug, Clone, Serialize, Deserialize)] #[serde(rename_all = "PascalCase")] -pub struct AbsenceListItem { - pub date: chrono::DateTime, +pub struct AbsenceDay { + pub date: chrono::DateTime, pub unsolved: u16, pub ok: u16, pub missed: u16, diff --git a/src/attachment.rs b/src/attachment.rs index 8e34eba..23c3f37 100644 --- a/src/attachment.rs +++ b/src/attachment.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; #[derive(Debug, Clone, Serialize, Deserialize)] #[serde(rename_all = "PascalCase")] -pub struct Attachment { +pub struct AttachmentInfo { pub id: String, pub name: String, pub r#type: String, diff --git a/src/events.rs b/src/events.rs index ee112b4..9c35ef5 100644 --- a/src/events.rs +++ b/src/events.rs @@ -1,5 +1,5 @@ -use crate::StdType; -use chrono::{DateTime, Utc}; +use crate::{Room, RoomSet, SchoolClass, SchoolClassSet, StdType, Student, Teacher, TeacherSet}; +use chrono::{DateTime, FixedOffset}; use serde::{Deserialize, Serialize}; #[derive(Debug, Clone, Serialize, Deserialize)] @@ -14,23 +14,25 @@ pub struct Event { pub id: String, pub title: String, pub description: String, - pub times: Vec