@@ -48,7 +48,7 @@ <h2 class="section-title" id="header-classes">Classes</h2>
4848< dl >
4949< dt id ="edupage_api.grades.EduGrade "> < code class ="flex name class ">
5050< span > class < span class ="ident "> EduGrade</ span > </ span >
51- < span > (</ span > < span > event_id: int,< br > title: str,< br > grade_n: int | float | str | None,< br > comment: str | None,< br > date: datetime.datetime,< br > subject_id: int,< br > subject_name: str | None,< br > teacher: < a title ="edupage_api.people.EduTeacher " href ="people.html#edupage_api.people.EduTeacher "> EduTeacher</ a > | None,< br > max_points: float | None,< br > importance: float,< br > verbal: bool,< br > percent: float)</ span >
51+ < span > (</ span > < span > event_id: int,< br > title: str,< br > grade_n: int | float | str | None,< br > comment: str | None,< br > date: datetime.datetime,< br > subject_id: int,< br > subject_name: str | None,< br > teacher: < a title ="edupage_api.people.EduTeacher " href ="people.html#edupage_api.people.EduTeacher "> EduTeacher</ a > | None,< br > max_points: float | None,< br > more_details: list[str] | None, < br > importance: float,< br > verbal: bool,< br > percent: float, < br > class_grade_avg: float | None )</ span >
5252</ code > </ dt >
5353< dd >
5454< details class ="source ">
@@ -66,13 +66,19 @@ <h2 class="section-title" id="header-classes">Classes</h2>
6666 subject_name: Optional[str]
6767 teacher: Optional[EduTeacher]
6868 max_points: Optional[float]
69+ more_details: Optional[list[str]]
6970 importance: float
7071 verbal: bool
71- percent: float</ code > </ pre >
72+ percent: float
73+ class_grade_avg: Optional[float]</ code > </ pre >
7274</ details >
73- < div class ="desc "> < p > EduGrade(event_id: int, title: str, grade_n: Union[int, float, str, NoneType], comment: Optional[str], date: datetime.datetime, subject_id: int, subject_name: Optional[str], teacher: Optional[edupage_api.people.EduTeacher], max_points: Optional[float], importance: float, verbal: bool, percent: float)</ p > </ div >
75+ < div class ="desc "> < p > EduGrade(event_id: int, title: str, grade_n: Union[int, float, str, NoneType], comment: Optional[str], date: datetime.datetime, subject_id: int, subject_name: Optional[str], teacher: Optional[edupage_api.people.EduTeacher], max_points: Optional[float], more_details: Optional[list[str]], importance: float, verbal: bool, percent: float, class_grade_avg: Optional[float] )</ p > </ div >
7476< h3 > Instance variables</ h3 >
7577< dl >
78+ < dt id ="edupage_api.grades.EduGrade.class_grade_avg "> < code class ="name "> var < span class ="ident "> class_grade_avg</ span > : float | None</ code > </ dt >
79+ < dd >
80+ < div class ="desc "> </ div >
81+ </ dd >
7682< dt id ="edupage_api.grades.EduGrade.comment "> < code class ="name "> var < span class ="ident "> comment</ span > : str | None</ code > </ dt >
7783< dd >
7884< div class ="desc "> </ div >
@@ -97,6 +103,10 @@ <h3>Instance variables</h3>
97103< dd >
98104< div class ="desc "> </ div >
99105</ dd >
106+ < dt id ="edupage_api.grades.EduGrade.more_details "> < code class ="name "> var < span class ="ident "> more_details</ span > : list[str] | None</ code > </ dt >
107+ < dd >
108+ < div class ="desc "> </ div >
109+ </ dd >
100110< dt id ="edupage_api.grades.EduGrade.percent "> < code class ="name "> var < span class ="ident "> percent</ span > : float</ code > </ dt >
101111< dd >
102112< div class ="desc "> </ div >
@@ -222,6 +232,14 @@ <h3>Instance variables</h3>
222232 max_points = float(details.get("p_vaha_body"))
223233 importance = float(details.get("p_vaha")) / 20
224234
235+ # More details coming from Edupage metadata
236+ more_details_raw = details.get("moredata")
237+ if isinstance(more_details_raw, list):
238+ more_details = [str(item) for item in more_details_raw]
239+ elif more_details_raw is None:
240+ more_details = None
241+ else:
242+ more_details = [str(more_details_raw)]
225243 # Grade
226244 grade_raw = grade.get("data").split(" (", 1)
227245 if grade_raw[0].isdigit():
@@ -247,6 +265,8 @@ <h3>Instance variables</h3>
247265 except:
248266 verbal = True
249267
268+ class_grade_avg = None if details.get("priemer") is None else float(details.get("priemer"))
269+
250270 grade = EduGrade(
251271 event_id,
252272 title,
@@ -257,9 +277,11 @@ <h3>Instance variables</h3>
257277 subject_name,
258278 teacher,
259279 max_points,
280+ more_details,
260281 importance,
261282 verbal,
262283 percent,
284+ class_grade_avg
263285 )
264286 output.append(grade)
265287
@@ -344,6 +366,14 @@ <h3>Methods</h3>
344366 max_points = float(details.get("p_vaha_body"))
345367 importance = float(details.get("p_vaha")) / 20
346368
369+ # More details coming from Edupage metadata
370+ more_details_raw = details.get("moredata")
371+ if isinstance(more_details_raw, list):
372+ more_details = [str(item) for item in more_details_raw]
373+ elif more_details_raw is None:
374+ more_details = None
375+ else:
376+ more_details = [str(more_details_raw)]
347377 # Grade
348378 grade_raw = grade.get("data").split(" (", 1)
349379 if grade_raw[0].isdigit():
@@ -369,6 +399,8 @@ <h3>Methods</h3>
369399 except:
370400 verbal = True
371401
402+ class_grade_avg = None if details.get("priemer") is None else float(details.get("priemer"))
403+
372404 grade = EduGrade(
373405 event_id,
374406 title,
@@ -379,9 +411,11 @@ <h3>Methods</h3>
379411 subject_name,
380412 teacher,
381413 max_points,
414+ more_details,
382415 importance,
383416 verbal,
384417 percent,
418+ class_grade_avg
385419 )
386420 output.append(grade)
387421
@@ -439,12 +473,14 @@ <h3>Class variables</h3>
439473< li >
440474< h4 > < code > < a title ="edupage_api.grades.EduGrade " href ="#edupage_api.grades.EduGrade "> EduGrade</ a > </ code > </ h4 >
441475< ul class ="two-column ">
476+ < li > < code > < a title ="edupage_api.grades.EduGrade.class_grade_avg " href ="#edupage_api.grades.EduGrade.class_grade_avg "> class_grade_avg</ a > </ code > </ li >
442477< li > < code > < a title ="edupage_api.grades.EduGrade.comment " href ="#edupage_api.grades.EduGrade.comment "> comment</ a > </ code > </ li >
443478< li > < code > < a title ="edupage_api.grades.EduGrade.date " href ="#edupage_api.grades.EduGrade.date "> date</ a > </ code > </ li >
444479< li > < code > < a title ="edupage_api.grades.EduGrade.event_id " href ="#edupage_api.grades.EduGrade.event_id "> event_id</ a > </ code > </ li >
445480< li > < code > < a title ="edupage_api.grades.EduGrade.grade_n " href ="#edupage_api.grades.EduGrade.grade_n "> grade_n</ a > </ code > </ li >
446481< li > < code > < a title ="edupage_api.grades.EduGrade.importance " href ="#edupage_api.grades.EduGrade.importance "> importance</ a > </ code > </ li >
447482< li > < code > < a title ="edupage_api.grades.EduGrade.max_points " href ="#edupage_api.grades.EduGrade.max_points "> max_points</ a > </ code > </ li >
483+ < li > < code > < a title ="edupage_api.grades.EduGrade.more_details " href ="#edupage_api.grades.EduGrade.more_details "> more_details</ a > </ code > </ li >
448484< li > < code > < a title ="edupage_api.grades.EduGrade.percent " href ="#edupage_api.grades.EduGrade.percent "> percent</ a > </ code > </ li >
449485< li > < code > < a title ="edupage_api.grades.EduGrade.subject_id " href ="#edupage_api.grades.EduGrade.subject_id "> subject_id</ a > </ code > </ li >
450486< li > < code > < a title ="edupage_api.grades.EduGrade.subject_name " href ="#edupage_api.grades.EduGrade.subject_name "> subject_name</ a > </ code > </ li >
0 commit comments