From b3e6c145a35e1a1fa05af385125aa780f68a0557 Mon Sep 17 00:00:00 2001 From: vextrixes <113197359+vextrixes@users.noreply.github.com> Date: Sat, 31 Oct 2026 02:37:56 +0100 Subject: [PATCH] added semester --- src/homework/endpoints.rs | 6 +++--- src/lib.rs | 4 +--- src/semester/endpoints.rs | 15 +++++++++++++++ src/semester/mod.rs | 5 +++++ src/{ => semester}/semester.rs | 0 tracker.md | 4 ++-- 6 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 src/semester/endpoints.rs create mode 100644 src/semester/mod.rs rename src/{ => semester}/semester.rs (100%) diff --git a/src/homework/endpoints.rs b/src/homework/endpoints.rs index ca3710f..c5367cb 100644 --- a/src/homework/endpoints.rs +++ b/src/homework/endpoints.rs @@ -2,7 +2,7 @@ use std::marker::PhantomData; use crate::{Endpoint, HomeworkList}; -pub const HOMEWORKS_COUNT_ENDPOINT: Endpoint<(), i64> = Endpoint::Get { +pub const HOMEWORKS_COUNT_ENDPOINT: Endpoint = Endpoint::Get { url: "/api/3/homeworks/count-actual", auth: true, _types: PhantomData, @@ -10,14 +10,14 @@ pub const HOMEWORKS_COUNT_ENDPOINT: Endpoint<(), i64> = Endpoint::Get { /// ID = homework ID (String) /// finished = homework state (bool) -pub const HOMEWORK_DONE_ENDPOINT: Endpoint<(), bool> = Endpoint::Get { +pub const HOMEWORK_DONE_ENDPOINT: Endpoint = Endpoint::Get { url: "api/3/homeworks/{id}/student-done/{finished}", auth: true, _types: PhantomData, }; /// Query 'from' and 'to' (Datetime) -pub const HOMEWORKS_ENDPOINT: Endpoint<(), HomeworkList> = Endpoint::Get { +pub const HOMEWORKS_ENDPOINT: Endpoint = Endpoint::Get { url: "api/3/homeworks", auth: true, _types: PhantomData, diff --git a/src/lib.rs b/src/lib.rs index c728c09..8e67459 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -38,9 +38,7 @@ pub use homework::*; pub use marks::*; pub use others::*; pub use payments::*; -pub use semester::{ - CertificateTerm, CertificateTerms, FinalMark, PedagogicalMeasure, PedagogicalMeasures, -}; +pub use semester::*; pub use stdtype::{ Room, RoomSet, SchoolClass, SchoolClassSet, StdClassGroup, StdType, StdTypeNullable, Student, Teacher, TeacherSet, TimetableStudent, diff --git a/src/semester/endpoints.rs b/src/semester/endpoints.rs new file mode 100644 index 0000000..e83270b --- /dev/null +++ b/src/semester/endpoints.rs @@ -0,0 +1,15 @@ +use std::marker::PhantomData; + +use crate::{CertificateTerms, Endpoint, PedagogicalMeasures}; + +pub const GET_CERTIFICATE_TERMS_ENDPOINT: Endpoint = Endpoint::Get { + url: "/api/3/marks/final", + auth: true, + _types: PhantomData, +}; + +pub const GET_PEDAGOGICAL_MEASURES_ENDPOINT: Endpoint = Endpoint::Get { + url: "/api/3/marks/measures", + auth: true, + _types: PhantomData, +}; \ No newline at end of file diff --git a/src/semester/mod.rs b/src/semester/mod.rs new file mode 100644 index 0000000..2d7088b --- /dev/null +++ b/src/semester/mod.rs @@ -0,0 +1,5 @@ +mod semester; +mod endpoints; + +pub use semester::*; +pub use endpoints::*; \ No newline at end of file diff --git a/src/semester.rs b/src/semester/semester.rs similarity index 100% rename from src/semester.rs rename to src/semester/semester.rs diff --git a/tracker.md b/tracker.md index 88b56c5..405d76e 100644 --- a/tracker.md +++ b/tracker.md @@ -44,7 +44,7 @@ - [x] /api/3/payments/classfund - [ ] /api/3/gdpr/consents/person/child - [ ] /api/3/komens/concept/:conceptId -- [ ] /api/3/marks/measures +- [x] /api/3/marks/measures - [ ] /api/3/unregister-user-notification - [ ] /api/3/gdpr/consent/:id/agree - [x] /api/3/marks/count-new @@ -66,7 +66,7 @@ - [ ] /api/3/gdpr/commissioner/send-report - [ ] /api/3/komens/message/:messageId/mark-as-unhidden - [ ] /api/3/lesson/:lessonId/studentsTimetable -- [ ] /api/3/marks/final +- [x] /api/3/marks/final - [x] /api/3/timetable/student/:studentId - [ ] /api/3/marking/atom/:atomId/headerOptions - [ ] /api/3/gdpr/consent/:id/disagree