diff --git a/mycaldav/models.py b/mycaldav/models.py index 15e5856..57e97c1 100644 --- a/mycaldav/models.py +++ b/mycaldav/models.py @@ -83,6 +83,9 @@ class cls_caldav(): if "$" in item.key: item.team_transfert = True item.key = item.key.replace("$","") + if "Manif" in item.key: + item.team_manif = True + item.key = item.key.replace("Manif", "") item.name = arr[1] if "&" in item.name: arr = item.name.split("&") @@ -303,6 +306,7 @@ class _caldav_item(): team_1_chef = False team_2_chef = False team_transfert = False + team_manif = False def format_str_date(self): self.str_start_date = datetime.strptime(self.dtstart,"%d.%m.%Y %H:%M").strftime("%d.%m") diff --git a/mycaldav/static/mycaldav/style.css b/mycaldav/static/mycaldav/style.css index 8758122..e3b6282 100644 --- a/mycaldav/static/mycaldav/style.css +++ b/mycaldav/static/mycaldav/style.css @@ -14,3 +14,9 @@ table{ width: 100%; } +.team_svg_icon{ + width: 24px; + height: 24px; + fill: white; +} + diff --git a/mycaldav/templates/reskreen.html b/mycaldav/templates/reskreen.html index b65e370..0ae37e2 100644 --- a/mycaldav/templates/reskreen.html +++ b/mycaldav/templates/reskreen.html @@ -65,12 +65,12 @@ Ambulance Clerc SA
- +
-
MONTHEY METEO +
MONTHEY METEO diff --git a/mycaldav/templates/team/team_view.html b/mycaldav/templates/team/team_view.html index 30e593d..eae3b75 100644 --- a/mycaldav/templates/team/team_view.html +++ b/mycaldav/templates/team/team_view.html @@ -10,84 +10,62 @@ {{task.key}} {% if task.team_transfert %} - + + - + + + + + + + + + - + + + + + + + + + + + + {% endif %} + {% if task.team_manif %} + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +