Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix Punishment class parsing; closes #225 #226

Merged
merged 1 commit into from
Mar 20, 2023
Merged

fix Punishment class parsing; closes #225 #226

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 40 additions & 28 deletions pronotepy/dataClasses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1724,9 +1724,10 @@ class Punishment(Object):

Attributes:
id (str)
given (datetime.datetime): Date and time when the punishment was given
exclusion (bool): If the punishment is an exclusion
during_lesson (bool)
given (Union[datetime.datetime, datetime.date]): Date and time when the punishment was given
exclusion (bool): If the punishment is an exclusion from class
during_lesson (bool): If the punishment was given during a lesson.
`self.during_lesson is True => self.given is datetime.datetime`
homework (str): Text description of the homework that was given as the punishment
homework_documents (List[Attachment]): Attached documents for homework
circumstances (str)
Expand All @@ -1745,26 +1746,32 @@ class ScheduledPunishment(Object):

Attributes:
id (str)
start (datetime.datetime)
start (Union[datetime.datetime, datetime.date])
duration (datetime.timedelta)
"""

def __init__(self, client: ClientBase, json_dict: dict) -> None:
super().__init__(json_dict)
print(json_dict)
self.id: str = self._resolver(str, "N")

# construct a full datetime from "date" and "placeExecution" fields
date = self._resolver(Util.date_parse, "date", "V")
place = self._resolver(int, "placeExecution")
liste_heures = client.func_options["donneesSec"]["donnees"]["General"][
"ListeHeures"
]["V"]
try:
self.start: datetime.datetime = datetime.datetime.combine(
date, Util.place2time(liste_heures, place)
)
except ValueError as e:
raise DataError(str(e))
place = self._resolver(int, "placeExecution", strict=False)

self.start: Union[datetime.datetime, datetime.date]
if place is not None:
liste_heures = client.func_options["donneesSec"]["donnees"]["General"][
"ListeHeures"
]["V"]
try:
self.start = datetime.datetime.combine(
date, Util.place2time(liste_heures, place)
)
except ValueError as e:
raise DataError(str(e))
else:
self.start = date

self.duration: datetime.timedelta = self._resolver(
lambda v: datetime.timedelta(minutes=int(v)), "duree"
Expand All @@ -1776,21 +1783,26 @@ def __init__(self, client: ClientBase, json_dict: dict) -> None:
super().__init__(json_dict)
self.id: str = self._resolver(str, "N")

# construct a full datetime from "dateDemande" and "placeDemande" fields
date = self._resolver(Util.date_parse, "dateDemande", "V")
time_place = self._resolver(int, "placeDemande")
liste_heures = client.func_options["donneesSec"]["donnees"]["General"][
"ListeHeures"
]["V"]
try:
self.given: datetime.datetime = datetime.datetime.combine(
date, Util.place2time(liste_heures, time_place)
)
except ValueError as e:
raise DataError(str(e))
self.during_lesson: bool = self._resolver(lambda v: not bool(v), "horsCours")

# construct a full datetime from "dateDemande" and "placeDemande" fields
self.given: Union[datetime.datetime, datetime.date]
if self.during_lesson:
time_place = self._resolver(int, "placeDemande")
liste_heures = client.func_options["donneesSec"]["donnees"]["General"][
"ListeHeures"
]["V"]
try:
self.given = datetime.datetime.combine(
date, Util.place2time(liste_heures, time_place)
)
except ValueError as e:
raise DataError(str(e))
else:
self.given = date

self.exclusion: bool = self._resolver(bool, "estUneExclusion")
self.during_lesson: bool = self._resolver(bool, "horsCours")

self.homework: str = self._resolver(str, "travailAFaire")
self.homework_documents: List[Attachment] = self._resolver(
Expand Down Expand Up @@ -1823,6 +1835,6 @@ def __init__(self, client: ClientBase, json_dict: dict) -> None:
"V",
)

self.duration: datetime.timedelta = self._resolver(
lambda v: datetime.timedelta(minutes=int(v)), "duree"
self.duration: Optional[datetime.timedelta] = self._resolver(
lambda v: datetime.timedelta(minutes=int(v)), "duree", strict=False
)