From 9c14d24dbe3b765ddcc2d372801eb4ac505d5221 Mon Sep 17 00:00:00 2001 From: artus Date: Mon, 29 Oct 2018 20:51:29 +0100 Subject: [PATCH] fixes planning view and add link to create compterendu of the day on dashboard --- maraudes/templates/maraudes/index.html | 5 ++++ maraudes/templates/maraudes/planning.html | 29 ++++++++++------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/maraudes/templates/maraudes/index.html b/maraudes/templates/maraudes/index.html index f739f5a..118eb86 100644 --- a/maraudes/templates/maraudes/index.html +++ b/maraudes/templates/maraudes/index.html @@ -26,6 +26,11 @@ Aucune maraude prévue. {% endif %}

+ {% if prochaine_maraude.date == date %} + + + Rédiger le compte-rendu + {% endif %} Voir le planning diff --git a/maraudes/templates/maraudes/planning.html b/maraudes/templates/maraudes/planning.html index 85bc504..fc1b812 100644 --- a/maraudes/templates/maraudes/planning.html +++ b/maraudes/templates/maraudes/planning.html @@ -19,32 +19,27 @@ {% block page_content %}
- + {% csrf_token %} {{ formset.management_form }} - - +
+ {% for weekday in weekdays %}{% endfor %} {% for week in weeks %} {% for day, form in week %} - {% endfor %}
{{weekday}}
{% if day %}{% if form %} -
-
{% endif %} - {{ day }} - {% if form %}
-
+
+ {% if day %}{{ day }} + {% if form %} {% bootstrap_field form.id %} {% bootstrap_field form.date %} - {% bootstrap_field form.heure_debut layout="inline" size="small" %} - - -
- {% bootstrap_field form.binome layout="horizontal" size="small" show_label=False %} - {% bootstrap_field form.referent layout="horizontal" size="small" show_label=False %} -
- {% endif %} +
+ {% bootstrap_field form.heure_debut size="small" show_label=False %} + {% bootstrap_field form.binome size="small" show_label=False %} + {% bootstrap_field form.referent size="small" show_label=False %} +
+ {% endif %} {% endif %}