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

Amélioration génération pdf caldav

Browse Source
This commit is contained in:
Ambulance Clerc
2022-11-09 12:08:30 +01:00
parent f9c750f244
commit 3b498b4504
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mycaldav/export_team_pdf.py
View File

@@ -52,18 +52,21 @@ class PDF(FPDF):
self.ln()
days_fr = ["Lundi","Mardi","Mercredi","Jeudi", "Vendredi", "Samedi", "Dimanche"]
self.o_caldav.get_caldav_data(periode=7, date=self.start)
for d in range(7):
tmp_x = self.get_x()
tmp_y = self.get_y()
max_y = tmp_y
dt = self.start + timedelta(days=d)
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.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:
if datetime.strptime(item.dtstart,"%d.%m.%Y %H:%M").date() != dt:
continue
self.set_fill_color(255,143,0)
if item.team_transfert:
item.key += " Transfert"
@@ -77,8 +80,7 @@ class PDF(FPDF):
self.cell(w=115, h=5, align="L", txt=f"", ln=0)
self.cell(w=75, h=5, align="L", txt=f"Nuit", ln=1, border="B")
for item in self.o_caldav.night:
if item.str_start_date != dt.strftime('%d.%m'):
if datetime.strptime(item.dtstart, "%d.%m.%Y %H:%M").date() != dt:
continue
self.set_fill_color(255,143,0)

2
mycaldav/models.py
View File

@@ -68,7 +68,7 @@ class cls_caldav():
tomorow = date + timedelta(days=1)
events = recurring_ical_events.of(Calendar.from_ical(self.data)).between(today,tomorow)
elif periode == 7:
endweek = date + timedelta(days=6)
endweek = date + timedelta(days=7)
events = recurring_ical_events.of(Calendar.from_ical(self.data)).between(today,endweek)
self.parse_data(events)