From e98f0058d51128265221f4eb6f520eebcd0f4544 Mon Sep 17 00:00:00 2001
From: Ambulance Clerc <ambulance.clerc@outlook.com>
Date: Thu, 11 May 2023 07:21:36 +0200
Subject: [PATCH] Debug team_pdf

---
 mycaldav/models.py | 24 +++++++++++++++++-------
 mycaldav/views.py  |  6 +++++-
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/mycaldav/models.py b/mycaldav/models.py
index db11e16..70b3917 100644
--- a/mycaldav/models.py
+++ b/mycaldav/models.py
@@ -74,6 +74,7 @@ class cls_caldav():
         elif periode == 3:
             today = date + timedelta(days=-2)
             tomorow = date + timedelta(days=2)
+            print(f"affichage: {today} <> {tomorow}")
             events = recurring_ical_events.of(Calendar.from_ical(self.data)).between(today,tomorow)
         elif periode == 7:
             endweek = date + timedelta(days=7)
@@ -236,9 +237,9 @@ class cls_caldav_client():
 
     def format_data_event(self,event):
         summary = event.vobject_instance.vevent.summary.value
-        if "--" not in summary:
+        if Key_separator not in summary:
             return False
-        key = summary.split("--")
+        key = summary.split(Key_separator)
         if "&" not in key[1]:
             return False
         equipage = key[1].split("&")
@@ -274,7 +275,7 @@ class cls_caldav_client():
             print("Already with MC")
 
         if updated:
-            event.vobject_instance.vevent.summary.value = f"{key[0]} - {equipage[0].strip()} & {equipage[1].strip()}"
+            event.vobject_instance.vevent.summary.value = f"{key[0]} {Key_separator} {equipage[0].strip()} & {equipage[1].strip()}"
             event.save()
 
 
@@ -342,6 +343,8 @@ class cls_caldav_client():
                 print(f"reformat: [{summary}]")
                 event.vobject_instance.vevent.summary.value = summary
                 event.save()
+            elif  "--" in summary:
+                pass
             elif "-" in summary:
                 summary = summary.replace("-",Key_separator)
                 print(f"reformat: [{summary}]")
@@ -349,23 +352,30 @@ class cls_caldav_client():
                 event.save()
 
     def change_utc_to_zurich_all_events(self,calandar):
-        events = calandar.date_search(start=datetime(2023, 1, 1), end=datetime.now() + relativedelta(years=1),
+        events = calandar.date_search(start=datetime(2023, 4, 1), end=datetime.now() + relativedelta(years=1),
                                       expand=True)
 
         for event in events:
             start = event.vobject_instance.vevent.dtstart.value
-            end = event.vobject_instance.vevent.dtend.value
+            end = start + relativedelta(day=1)
 
             if start.hour < 12:
                 new_start = datetime(start.year, start.month, start.day,7,0,0, tzinfo = pytz.timezone("Europe/Zurich"))
                 new_end = datetime(start.year, start.month, start.day, 19, 0, 0, tzinfo=pytz.timezone("Europe/Zurich"))
             elif start.hour > 12:
                 new_start = datetime(start.year, start.month, start.day,19,0,0, tzinfo = pytz.timezone("Europe/Zurich"))
-                new_end = datetime(start.year, start.month, end.day, 7, 0, 0, tzinfo=pytz.timezone("Europe/Zurich"))
+                new_end = datetime(start.year, start.month,start.day, 23, 59, 0, tzinfo=pytz.timezone("Europe/Zurich"))
 
-            print(new_start)
             event.vobject_instance.vevent.dtstart.value = new_start
             event.vobject_instance.vevent.dtend.value = new_end
+
+
+            if new_end<new_start :
+                print(f"{new_start}>{new_end}")
+                print("ERROR")
+                event.vobject_instance.vevent.dtend.value = new_start
+
+
             event.save()
 
 
diff --git a/mycaldav/views.py b/mycaldav/views.py
index 7763b20..14ca097 100644
--- a/mycaldav/views.py
+++ b/mycaldav/views.py
@@ -81,8 +81,12 @@ def view_op_caldav(request):
 @xframe_options_exempt
 def view_team_caldav(request):
     #Change timezone
-    #myclient = cls_caldav_client()
+    myclient = cls_caldav_client()
+    #myclient.reformat_all_events(myclient.a_team)
     #myclient.change_utc_to_zurich_all_events(myclient.a_team)
+    #myclient.reformat_all_events(myclient.a_task_config)
+    #myclient.change_utc_to_zurich_all_events(myclient.a_task)
+
     o_caldav = cls_caldav(url=caldav_cfg["team"])
     o_caldav.get_caldav_data(periode=3)
     template = loader.get_template("team/team_view.html")