Add timestamps

elections/templates/elections/election.html

@@ -4,15 +4,15 @@
 
 {% block content %}
 
-<div class="level">
+<div class="level mb-2">
   {# Titre de l'élection #}
   <div class="level-left is-flex-shrink-1">
     <h1 class="title">{{ election.name }}</h1>
   </div>
 
-  <div class="level-right">
+  <div class="level-right is-flex">
     {# Liste des votant·e·s #}
-    <div class="level-item">
+    <div class="level-item is-flex-grow-1 mb-0">
       <a class="button is-primary is-light is-outlined" href="{% url 'election.voters' election.pk %}">
         <span class="icon">
           <i class="fas fa-clipboard-list"></i>
@@ -23,7 +23,7 @@
 
     {# Liste des bulletins #}
     {% if election.results_public %}
-    <div class="level-item">
+    <div class="level-item is-flex-grow-1 mb-0">
       <a class="button is-primary is-light is-outlined" href="{% url 'election.ballots' election.pk %}">
         <span class="icon">
           <i class="fas fa-list"></i>
@@ -35,7 +35,7 @@
 
     {% if election.start_date < current_time %}
     {# Statut de l'élection #}
-    <div class="level-item">
+    <div class="level-item is-flex-grow-1 mb-0">
       <span class="tag is-medium is-outlined is-light is-primary">
         {% if election.end_date < current_time %}
         {% trans "Élection terminée" %}
@@ -48,7 +48,7 @@
 
     {# Lien vers la page d'administration #}
     {% if election.created_by == user %}
-    <div class="level-item">
+    <div class="level-item is-flex-grow-1">
       <a class="button has-tooltip-primary" href="{% url 'election.admin' election.pk %}" data-tooltip="{% trans "Administrer" %}">
         <span class="icon">
           <i class="fas fa-cog"></i>
@@ -59,10 +59,10 @@
   </div>
 </div>
 
-<div class="level">
+<div class="level mb-2">
   {# Dates d'ouverture de l'élection #}
-  <div class="level-left">
-    <div class="level-item">
+  <div class="level-left is-flex">
+    <div class="level-item is-flex-grow-1 mb-0">
       <span class="tag is-medium is-primary">
         <span class="icon-text">
           <span>{{ election.start_date|date:"d/m/Y H:i" }}</span>
@@ -75,7 +75,7 @@
     </div>
 
     {# Créateurice de l'élection #}
-    <div class="level-item">
+    <div class="level-item is-flex-grow-1 mb-0">
       <span class="tag is-primary is-light is-outlined">{% blocktrans with creator=election.created_by.full_name %}Créé par {{ creator }}{% endblocktrans %}</span>
     </div>
   </div>
@@ -96,6 +96,28 @@
   </div>
   {% endif %}
 </div>
+
+<div class="level">
+  <div class="level-left is-flex">
+    {# Date du dépouillement #}
+    {% if election.time_tallied %}
+    <div class="level-item is-flex-grow-1 mb-0">
+      <span class="tag is-success is-light is-outlined">
+        {% blocktrans with timestamp=election.time_tallied|date:"d/m/Y H:i" %}Dépouillé le {{ timestamp }}{% endblocktrans %}
+      </span>
+    </div>
+    {% endif %}
+
+    {# Date de la publication #}
+    {% if election.time_published %}
+    <div class="level-item is-flex-grow-1 mb-0">
+      <span class="tag is-info is-light is-outlined">
+        {% blocktrans with timestamp=election.time_published|date:"d/m/Y H:i" %}Publié le {{ timestamp }}{% endblocktrans %}
+      </span>
+    </div>
+    {% endif %}
+  </div>
+</div>
 <hr>
 
 {# Précisions sur les modalités de vote #}

elections/templates/elections/election_list.html

@@ -60,23 +60,6 @@
         </div>
         {% endif %}
 
-        {% if e.tallied %}
-        <div class="level-item">
-          <span class="tag is-success is-light">{% trans "Élection dépouillée" %}</span>
-        </div>
-        {% endif %}
-
-        {% if e.results_public %}
-        <div class="level-item">
-          <span class="tag is-info is-light">{% trans "Élection publiée" %}</span>
-        </div>
-        {% endif %}
-
-        {% if e.archived %}
-        <div class="level-item">
-          <span class="tag is-danger is-light">{% trans "Élection archivée" %}</span>
-        </div>
-        {% endif %}
 
         {% if e.created_by == user %}
         <div class="level-item">
@@ -91,6 +74,38 @@
     </div>
   </div>
 
+  {% if e.tallied or e.results_public or e.archived %}
+  <div class="panel-block">
+    <div class="is-flex-grow-1">
+      <div class="tags">
+        {% if e.tallied %}
+        <span class="tag is-success is-light is-outlined">
+          {% if e.time_tallied %}
+          {% blocktrans with timestamp=e.time_tallied|date:"d/m/Y H:i" %}Élection dépouillée le {{ timestamp }}{% endblocktrans %}
+          {% else %}
+          {% trans "Élection dépouillée" %}
+          {% endif %}
+        </span>
+        {% endif %}
+
+        {% if e.results_public %}
+        <span class="tag is-info is-light is-outlined">
+          {% if e.time_published %}
+          {% blocktrans with timestamp=e.time_published|date:"d/m/Y H:i" %}Élection publiée le {{ timestamp }}{% endblocktrans %}
+          {% else %}
+          {% trans "Élection publiée" %}
+          {% endif %}
+        </span>
+        {% endif %}
+
+        {% if e.archived %}
+        <span class="tag is-danger is-light is-outlined">{% trans "Élection archivée" %}</span>
+        {% endif %}
+      </div>
+    </div>
+  </div>
+  {% endif %}
+
   {% if e.description %}
   <div class="panel-block">
     <div class="content is-flex-grow-1">