From 3e6aa6b29abcd581d3b6a49ac797d5df7c3cc1a2 Mon Sep 17 00:00:00 2001 From: Ambulance Clerc Date: Thu, 30 Jun 2022 16:22:05 +0200 Subject: [PATCH] Ajout road --- caldav/models.py | 7 +++++++ caldav/templates/rh/rh_view.html | 2 +- caldav/templates/road/road_view.html | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/caldav/models.py b/caldav/models.py index 27b6962..ac0b273 100644 --- a/caldav/models.py +++ b/caldav/models.py @@ -62,6 +62,12 @@ class cls_caldav(): item.desc = event["DESCRIPTION"] if "#" in item.desc: item.done = True + if '{href=' in item.desc: + temp_str = item.desc.split('{href=')[1] + temp_str = temp_str.split('}')[0] + item.href = temp_str + item.desc = item.desc.replace("{href=" + item.href + "}","") + item.dtstart = event["DTSTART"].dt.strftime("%d.%m.%Y %H:%M") item.dtstamp = int(event["DTSTART"].dt.strftime("%Y%m%d%H%M")) print(item.dtstamp) @@ -98,6 +104,7 @@ class _caldav_item(): str_end_time = "" dtstamp = None done = False + href = "" def format_str_date(self): self.str_start_date = datetime.strptime(self.dtstart,"%d.%m.%Y %H:%M").strftime("%d.%m") diff --git a/caldav/templates/rh/rh_view.html b/caldav/templates/rh/rh_view.html index 6a89a12..b44da1a 100644 --- a/caldav/templates/rh/rh_view.html +++ b/caldav/templates/rh/rh_view.html @@ -9,7 +9,7 @@      - {{ task.name }}
+ {{ task.name }}
{{task.desc}} diff --git a/caldav/templates/road/road_view.html b/caldav/templates/road/road_view.html index 1fff0f1..864404c 100644 --- a/caldav/templates/road/road_view.html +++ b/caldav/templates/road/road_view.html @@ -6,10 +6,11 @@ {{task.key}}
{{task.str_start_date}} - {{task.str_end_date}}
+ {{task.str_start_time}} - {{task.str_end_time}}
     - {{ task.name }}
+ {{ task.name }}
{{task.desc}}