diff --git a/maraudes/models.py b/maraudes/models.py index b1669aa..d0a91f8 100644 --- a/maraudes/models.py +++ b/maraudes/models.py @@ -136,7 +136,7 @@ class Maraude(models.Model): return '%(dayname)s %(day)i %(month)s' % { 'dayname': WEEKDAYS[self.date.weekday()][1], # Retrieve text inside tuple 'day': self.date.day, - 'month': MONTHS[self.date.month][:3] + ".", + 'month': MONTHS[self.date.month], } def est_terminee(self): diff --git a/notes/templates/notes/liste.html b/notes/templates/notes/liste.html index 894bd3b..566e846 100644 --- a/notes/templates/notes/liste.html +++ b/notes/templates/notes/liste.html @@ -32,5 +32,5 @@ {% endif %} - {% table object_list cols=3 cell_template=table_cell_template %} + {% table object_list cols=2 cell_template=table_cell_template %} {% endblock %} diff --git a/notes/templates/notes/table_cell_maraudes.html b/notes/templates/notes/table_cell_maraudes.html index 3dc9dac..44e2b03 100644 --- a/notes/templates/notes/table_cell_maraudes.html +++ b/notes/templates/notes/table_cell_maraudes.html @@ -1,6 +1,10 @@ {% if object.est_terminee %} -{% else %}{% endif %}{{ object }} -
- {{ object.binome }} & {{ object.referent }} - {% if object.est_terminee %}{{object.rencontres.count}} rencontres{% endif %} -
+{% else %}{% endif %} + {{ object }} + +
+ {{ object.binome }} & {{ object.referent }} + {% if object.est_terminee %} + {{object.rencontres.count}} rencontres + {% endif %} +
diff --git a/notes/templates/notes/table_cell_sujets.html b/notes/templates/notes/table_cell_sujets.html index f6539d4..35f05fd 100644 --- a/notes/templates/notes/table_cell_sujets.html +++ b/notes/templates/notes/table_cell_sujets.html @@ -1,4 +1,7 @@ -{{object}} + + {{object.genre}} {{object.nom}} {{object.prenom}}
+ {% if object.surnom %}"{{object.surnom}}"{% endif %} +
{{ object.notes.count }} notes {% with object.statistiques.info_completed as completed %} diff --git a/website/templates/tables/table.html b/website/templates/tables/table.html index 713340f..df731da 100644 --- a/website/templates/tables/table.html +++ b/website/templates/tables/table.html @@ -1,9 +1,9 @@ - +
{% if header %}{% endif %} - {% for row in rows %} - {% for object in row %} + {% for object in row %} {% endfor %}
{{ header }}
+ {% for row in rows %}
{% if object %}{% include cell_template with object=object %}{%endif%}