diff --git a/mycaldav/export_team_pdf.py b/mycaldav/export_team_pdf.py index 87ae75b..0fcd7fc 100644 --- a/mycaldav/export_team_pdf.py +++ b/mycaldav/export_team_pdf.py @@ -49,6 +49,7 @@ class PDF(FPDF): self.set_font('Arial', '', 10) self.caldavClient.get_events_by_date(self.caldavClient.a_team, self.start) + self.ln() days_fr = ["Lundi","Mardi","Mercredi","Jeudi", "Vendredi", "Samedi", "Dimanche"] @@ -61,7 +62,7 @@ class PDF(FPDF): #self.o_caldav.get_caldav_data(periode=1, date=dt) - self.o_caldav.sort_array_by_key(reverse=True) + #self.o_caldav.sort_array_by_key(reverse=True) self.cell(w=50, h=5, align="L", txt=f"{days_fr[d]} {dt.strftime('%d.%m.%Y')}", ln=0) self.cell(w=60, h=5, align="L", txt=f"Jour", ln=1, border="B") for item in self.o_caldav.day: diff --git a/mycaldav/models.py b/mycaldav/models.py index 6f008d8..bb9a9a6 100644 --- a/mycaldav/models.py +++ b/mycaldav/models.py @@ -120,15 +120,16 @@ class cls_caldav(): self.day.sort(key=lambda x: x.key, reverse=reverse) self.night.sort(key=lambda x: x.key, reverse=reverse) - def caldav_open_url(self, days_delta, date): + def caldav_open_url(self, days_delta, dest_date): ctx = ssl.create_default_context() ctx.check_hostname = False ctx.verify_mode = ssl.CERT_NONE self.clear_data() - - modified_url = self.url + f"&start={int((date-timedelta(days=days_delta)).timestamp())}&end={int((date +timedelta(days=days_delta)).timestamp())}&expand=1" + if not isinstance(dest_date, datetime): + dest_date = datetime.strptime(dest_date, '%y-%m-%d') + modified_url = self.url + f"&start={int((dest_date-timedelta(days=days_delta)).timestamp())}&end={int((dest_date +timedelta(days=days_delta)).timestamp())}&expand=1" print(f"ICS CALL URL = {modified_url}") with urllib.request.urlopen(modified_url, context=ctx) as o_url: self.data = o_url.read() @@ -139,7 +140,8 @@ class cls_caldav(): if date is None: date = datetime.now() - self.caldav_open_url(days_delta=periode,date=date) + + self.caldav_open_url(days_delta=periode,dest_date=date.strftime("%y-%m-%d"))