CLERC/Reskreen
6
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

Merge branch 'master' of https://gitea.prod.resk-u.ch/CLERC/Reskreen

Browse Source
This commit is contained in:
Cloud User
2024-07-05 14:53:43 +02:00
parent 65025b0521 d82d742755
commit 4ef657128d
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mycaldav/export_team_pdf.py
View File

@@ -49,6 +49,7 @@ class PDF(FPDF):
self.set_font('Arial', '', 10) self.set_font('Arial', '', 10)
self.caldavClient.get_events_by_date(self.caldavClient.a_team, self.start) self.caldavClient.get_events_by_date(self.caldavClient.a_team, self.start)
self.ln() self.ln()
days_fr = ["Lundi","Mardi","Mercredi","Jeudi", "Vendredi", "Samedi", "Dimanche"] 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.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=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") self.cell(w=60, h=5, align="L", txt=f"Jour", ln=1, border="B")
for item in self.o_caldav.day: for item in self.o_caldav.day:

10
mycaldav/models.py
View File

@@ -120,15 +120,16 @@ class cls_caldav():
self.day.sort(key=lambda x: x.key, reverse=reverse) self.day.sort(key=lambda x: x.key, reverse=reverse)
self.night.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 = ssl.create_default_context()
ctx.check_hostname = False ctx.check_hostname = False
ctx.verify_mode = ssl.CERT_NONE ctx.verify_mode = ssl.CERT_NONE
self.clear_data() self.clear_data()
if not isinstance(dest_date, datetime):
modified_url = self.url + f"&start={int((date-timedelta(days=days_delta)).timestamp())}&end={int((date +timedelta(days=days_delta)).timestamp())}&expand=1" 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}") print(f"ICS CALL URL = {modified_url}")
with urllib.request.urlopen(modified_url, context=ctx) as o_url: with urllib.request.urlopen(modified_url, context=ctx) as o_url:
self.data = o_url.read() self.data = o_url.read()
@@ -139,7 +140,8 @@ class cls_caldav():
if date is None: if date is None:
date = datetime.now() 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"))