From 12efdfcf59d71b94d56df1865f6e443121f922ae Mon Sep 17 00:00:00 2001 From: Ambulance Clerc Date: Thu, 13 Oct 2022 13:02:35 +0200 Subject: [PATCH] Changement frontend caldav --- mycaldav/settings.py | 3 +++ mycaldav/static/mycaldav/style.css | 16 ++++++++++++++ mycaldav/templates/manif/manif_view.html | 27 ++++++++++++++++++++++++ mycaldav/templates/op/op_view.html | 7 ++++-- mycaldav/templates/reskreen.html | 14 ++++++------ mycaldav/templates/rh/rh_view.html | 7 ++++-- mycaldav/templates/road/road_view.html | 7 ++++-- mycaldav/templates/task/task.html | 11 ++++++---- mycaldav/templates/team/team_view.html | 7 ++++-- mycaldav/templates/vhc/vhc_view.html | 7 ++++-- mycaldav/urls.py | 1 + mycaldav/views.py | 9 ++++++++ 12 files changed, 95 insertions(+), 21 deletions(-) create mode 100644 mycaldav/static/mycaldav/style.css create mode 100644 mycaldav/templates/manif/manif_view.html diff --git a/mycaldav/settings.py b/mycaldav/settings.py index 16dd490..fa95e92 100644 --- a/mycaldav/settings.py +++ b/mycaldav/settings.py @@ -6,3 +6,6 @@ caldav_cfg["rh"] = "https://sync.infomaniak.com/calendars/AA01593/c9916d31-c25b- caldav_cfg["road"] = "https://sync.infomaniak.com/calendars/AA01593/d608fcce-2f30-42f0-816c-b5524a0672fe?export" caldav_cfg["op"] = "https://sync.infomaniak.com/calendars/AA01593/73f3c787-abe1-4cd0-bf2a-c44dbc7015b9?export" caldav_cfg["team"] = "https://sync.infomaniak.com/calendars/AA01593/2d61a30c-16b9-4e4a-aab4-aabcbca6961f?export" +caldav_cfg["manif"] = "https://sync.infomaniak.com/calendars/AA01593/f3ab342d-921b-42ed-8fde-c8f393673819?export" + + diff --git a/mycaldav/static/mycaldav/style.css b/mycaldav/static/mycaldav/style.css new file mode 100644 index 0000000..8758122 --- /dev/null +++ b/mycaldav/static/mycaldav/style.css @@ -0,0 +1,16 @@ +:root{ + --main-text-color: white; + --main-text-family: 'Source Sans Pro', sans-serif; +} + +.ifram_main_div{ + color: white +} + +table{ + font-family: var(--main-text-family); + font-size: 12pt; + color: var(--main-text-color); + width: 100%; +} + diff --git a/mycaldav/templates/manif/manif_view.html b/mycaldav/templates/manif/manif_view.html new file mode 100644 index 0000000..afa90e0 --- /dev/null +++ b/mycaldav/templates/manif/manif_view.html @@ -0,0 +1,27 @@ +{% load static %} + + +
+{% if latest_task_list %} + + {% for task in latest_task_list %} + + + + + + + {% endfor %} +
+ {{task.key}}
+ {{task.str_start_date}} - {{task.str_end_date}}
+ {{task.str_start_time}} - {{task.str_end_time}}
+ + 		+ {{task.name}}
+ {{task.desc}} +
 
+{% else %} +

Aucune information manifestation

+{% endif %} +
diff --git a/mycaldav/templates/op/op_view.html b/mycaldav/templates/op/op_view.html index 0e466f2..739b91e 100644 --- a/mycaldav/templates/op/op_view.html +++ b/mycaldav/templates/op/op_view.html @@ -1,6 +1,9 @@ -
+{% load static %} + + +
{% if latest_task_list %} - +
{% for task in latest_task_list %} diff --git a/mycaldav/templates/reskreen.html b/mycaldav/templates/reskreen.html index c9b29d5..ac754b1 100644 --- a/mycaldav/templates/reskreen.html +++ b/mycaldav/templates/reskreen.html @@ -74,34 +74,34 @@

Équipages

- +

Restrictions routières

- +

Manifestations

- +

Agenda véhicules

- +

Accueil

- +

Tâches à faire

- +

Communications importantes

- +
diff --git a/mycaldav/templates/rh/rh_view.html b/mycaldav/templates/rh/rh_view.html index 1a92d00..a40ad76 100644 --- a/mycaldav/templates/rh/rh_view.html +++ b/mycaldav/templates/rh/rh_view.html @@ -1,6 +1,9 @@ -
+{% load static %} + + +
{% if latest_task_list %} -
+
{% for task in latest_task_list %} diff --git a/mycaldav/templates/road/road_view.html b/mycaldav/templates/road/road_view.html index 442424b..75b3639 100644 --- a/mycaldav/templates/road/road_view.html +++ b/mycaldav/templates/road/road_view.html @@ -1,6 +1,9 @@ -
+{% load static %} + + +
{% if latest_task_list %} -
+
{% for task in latest_task_list %} diff --git a/mycaldav/templates/task/task.html b/mycaldav/templates/task/task.html index a6a968c..f171d22 100644 --- a/mycaldav/templates/task/task.html +++ b/mycaldav/templates/task/task.html @@ -1,7 +1,10 @@ -
+{% load static %} + + +
{% if latest_task_list %} -
- +
Jour
+ {% for task in latest_task_list %}      {% endfor %} @@ -17,4 +20,4 @@ {% else %}

Aucune tâche disponible.

{% endif %} - \ No newline at end of file + diff --git a/mycaldav/templates/team/team_view.html b/mycaldav/templates/team/team_view.html index c422462..2e2a744 100644 --- a/mycaldav/templates/team/team_view.html +++ b/mycaldav/templates/team/team_view.html @@ -1,6 +1,9 @@ -
+{% load static %} + + +
{% if latest_task_list %} -
Jour 2
{{task.key}}{{ task.name }}
{{task.desc}}
+
{% for task in latest_task_list %} diff --git a/mycaldav/templates/vhc/vhc_view.html b/mycaldav/templates/vhc/vhc_view.html index 7aff861..0e12bc3 100644 --- a/mycaldav/templates/vhc/vhc_view.html +++ b/mycaldav/templates/vhc/vhc_view.html @@ -1,6 +1,9 @@ -
+{% load static %} + + +
{% if latest_task_list %} -
+
{% for task in latest_task_list %} diff --git a/mycaldav/urls.py b/mycaldav/urls.py index 742d563..8072b84 100644 --- a/mycaldav/urls.py +++ b/mycaldav/urls.py @@ -12,6 +12,7 @@ urlpatterns = [ path('road', views.view_road_caldav, name='view_road_caldav'), path('op', views.view_op_caldav, name='view_op_caldav'), path('team', views.view_team_caldav, name='view_team_caldav'), + path('manif', views.view_manif_caldav, name='view_manif_caldav'), path('team_pdf', views.view_team_pdf_caldav, name='view_team_pdf_caldav'), path('reskreen', views.view_reskreen, name='view_reskreen'), diff --git a/mycaldav/views.py b/mycaldav/views.py index 6354bf4..348d7ba 100644 --- a/mycaldav/views.py +++ b/mycaldav/views.py @@ -67,6 +67,15 @@ def view_team_caldav(request): context = {'latest_task_list': o_caldav.day, 'night_task_list': o_caldav.night, 'today': datetime.today().strftime('%d.%m')} return HttpResponse(template.render(context, request)) +@xframe_options_exempt +def view_manif_caldav(request): + o_caldav = cls_caldav(url=caldav_cfg["manif"]) + o_caldav.get_caldav_data(periode=1) + template = loader.get_template("manif/manif_view.html") + o_caldav.sort_array_by_key(True) + context = {'latest_task_list': o_caldav.day, 'night_task_list': o_caldav.night, 'today': datetime.today().strftime('%d.%m')} + return HttpResponse(template.render(context, request)) + @xframe_options_exempt def view_team_pdf_caldav(request): o_caldav = cls_caldav(url=caldav_cfg["team"])