added measures
This commit is contained in:
5 files changed
+25
-4
No files matched your search
+3
-1
@@ -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};
|
||||
@@ -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<PedagogicalMeasure>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "PascalCase")]
|
||||
pub struct PedagogicalMeasure {
|
||||
school_year: String,
|
||||
semester: String,
|
||||
type_label: String,
|
||||
date: DateTime<Utc>,
|
||||
type_id: String,
|
||||
text: String,
|
||||
}
|
||||
+1
-1
@@ -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<String>,
|
||||
|
||||
+1
-1
@@ -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,
|
||||
|
||||
Reference in new issue
Block a user