Merge branch 'sortable_tables' into 'beta'

Sortable tables See merge request bde/nk20!257
Merge branch 'Fix_time_zone_calendar.ics' into 'beta'
2024-08-07 21:30:04 +02:00 · 2024-08-07 21:26:32 +02:00 · 2024-08-07 21:25:22 +02:00 · 2024-08-01 17:29:24 +02:00 · 2024-07-31 23:18:41 +02:00 · 2024-03-11 10:25:48 +01:00
2 changed files with 6 additions and 6 deletions
--- a/apps/activity/views.py
+++ b/apps/activity/views.py
@ -334,8 +334,8 @@ X-WR-CALNAME:Kfet Calendar
 NAME:Kfet Calendar
 CALSCALE:GREGORIAN
 BEGIN:VTIMEZONE
-TZID:Europe/Berlin
+TZID:Europe/Paris
-X-LIC-LOCATION:Europe/Berlin
+X-LIC-LOCATION:Europe/Paris
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
@ -357,10 +357,10 @@ END:VTIMEZONE
 DTSTAMP:{"{:%Y%m%dT%H%M%S}".format(activity.date_start)}Z
 UID:{md5((activity.name + "$" + str(activity.id) + str(activity.date_start)).encode("UTF-8")).hexdigest()}
 SUMMARY;CHARSET=UTF-8:{self.multilines(activity.name, 75, 22)}
-DTSTART;TZID=Europe/Berlin:{"{:%Y%m%dT%H%M%S}".format(activity.date_start)}
+DTSTART:{"{:%Y%m%dT%H%M%S}Z".format(activity.date_start)}
-DTEND;TZID=Europe/Berlin:{"{:%Y%m%dT%H%M%S}".format(activity.date_end)}
+DTEND:{"{:%Y%m%dT%H%M%S}Z".format(activity.date_end)}
 LOCATION:{self.multilines(activity.location, 75, 9) if activity.location else "Kfet"}
-DESCRIPTION;CHARSET=UTF-8:""" + self.multilines(activity.description.replace("\n", "\\n"), 75, 26) + """
+DESCRIPTION;CHARSET=UTF-8:""" + self.multilines(activity.description.replace("\n", "\\n"), 75, 26) + f"""
 -- {activity.organizer.name}
 END:VEVENT
 """
--- a/tox.ini
+++ b/tox.ini
@ -51,4 +51,4 @@ max-complexity = 15
 max-line-length = 160
 import-order-style = google
 application-import-names = flake8
-format = ${cyan}%(path)s${reset}:${yellow_bold}%(row)d${reset}:${green_bold}%(col)d${reset}: ${red_bold}%(code)s${reset} %(text)s
+format = %(cyan)s%(path)s%(reset)s:%(yellow)s%(bold)s%(row)d%(reset)s:%(green)s%(bold)s%(col)d%(reset)s: %(red)s%(bold)s%(code)s%(reset)s %(text)s
Author	SHA1	Message	Date
korenstin	4234383621	Merge branch 'sortable_tables' into 'beta' Sortable tables See merge request bde/nk20!257	2024-08-07 21:30:04 +02:00
korenstin	a3920fcae3	Merge branch 'Fix_time_zone_calendar.ics' into 'beta' Update views.py - Fix calendar.ics See merge request bde/nk20!237	2024-08-07 21:26:32 +02:00
korenstin	ae4213d087	Merge branch 'colored_linters' into 'beta' Colored linters See merge request bde/nk20!255	2024-08-07 21:25:22 +02:00
korenstin	35ffbfcf55	Colored linters	2024-08-01 17:29:24 +02:00
korenstin	581715d804	Fix #95 (calendar)	2024-07-31 23:18:41 +02:00
charliep	6c61daf1c5	Update views.py Passage à la time zone Europe/Paris	2024-03-11 10:25:48 +01:00