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

Ajout road

Browse Source
This commit is contained in:
Ambulance Clerc
2022-06-30 16:22:05 +02:00
parent 55e53afc11
commit 3e6aa6b29a
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
caldav/models.py
View File

@@ -62,6 +62,12 @@ class cls_caldav():
item.desc = event["DESCRIPTION"] item.desc = event["DESCRIPTION"]
if "#" in item.desc: if "#" in item.desc:
item.done = True 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.dtstart = event["DTSTART"].dt.strftime("%d.%m.%Y %H:%M")
item.dtstamp = int(event["DTSTART"].dt.strftime("%Y%m%d%H%M")) item.dtstamp = int(event["DTSTART"].dt.strftime("%Y%m%d%H%M"))
print(item.dtstamp) print(item.dtstamp)
@@ -98,6 +104,7 @@ class _caldav_item():
str_end_time = "" str_end_time = ""
dtstamp = None dtstamp = None
done = False done = False
href = ""
def format_str_date(self): def format_str_date(self):
self.str_start_date = datetime.strptime(self.dtstart,"%d.%m.%Y %H:%M").strftime("%d.%m") self.str_start_date = datetime.strptime(self.dtstart,"%d.%m.%Y %H:%M").strftime("%d.%m")

2
caldav/templates/rh/rh_view.html
View File

@@ -9,7 +9,7 @@
</td>&nbsp;&nbsp;&nbsp;&nbsp; </td>&nbsp;&nbsp;&nbsp;&nbsp;
<td style="{% if task.done %}text-decoration:line-through{% endif %}"> <td style="{% if task.done %}text-decoration:line-through{% endif %}">
{{ task.name }}<br> <a href="{{task.href}}" target="_blank" style="text-decoration: none;color: black" >{{ task.name }}<br></a>
{{task.desc}} {{task.desc}}
</td> </td>
</tr> </tr>

3
caldav/templates/road/road_view.html
View File

@@ -6,10 +6,11 @@
<td style="vertical-align: top;" width="150" > <td style="vertical-align: top;" width="150" >
<span style="font-weight: bold;">{{task.key}}</span><br> <span style="font-weight: bold;">{{task.key}}</span><br>
{{task.str_start_date}} - {{task.str_end_date}}<br> {{task.str_start_date}} - {{task.str_end_date}}<br>
{{task.str_start_time}} - {{task.str_end_time}}<br>
</td>&nbsp;&nbsp;&nbsp;&nbsp; </td>&nbsp;&nbsp;&nbsp;&nbsp;
<td style="{% if task.done %}text-decoration:line-through{% endif %}"> <td style="{% if task.done %}text-decoration:line-through{% endif %}">
{{ task.name }}<br> <a href="{{task.href}}" target="_blank" style="text-decoration: none;color: black" >{{ task.name }}<br></a>
{{task.desc}} {{task.desc}}
</td> </td>
</tr> </tr>