From 89af0e40c0e0fc91748acfd8dce10e2f123b2500 Mon Sep 17 00:00:00 2001
From: Gabriel Augendre <gabriel@augendre.info>
Date: Sun, 4 Mar 2018 09:57:25 +0100
Subject: [PATCH] Display rounds for current machine if session in progress

---
 gym/templates/gym/equipment.html | 17 +++++++++++++++++
 gym/views.py                     | 11 ++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/gym/templates/gym/equipment.html b/gym/templates/gym/equipment.html
index c4d5563..531c3e9 100644
--- a/gym/templates/gym/equipment.html
+++ b/gym/templates/gym/equipment.html
@@ -56,4 +56,21 @@
             {% endif %}
         </div>
     </div>
+    {% if session %}
+        <div class="row">
+            <div class="col-12">
+                <h2>Séries de la séance en cours</h2>
+                {% if rounds %}
+                    <ul class="list-group">
+                        {% for round in rounds %}
+                            <a href="#" class="list-group-item">{{ round.repetition_number }} répétitions
+                                &times; {{ round.chosen_weight }}</a>
+                        {% endfor %}
+                    </ul>
+                {% else %}
+                    <p>Pas de série pour cette machine aujourd'hui.</p>
+                {% endif %}
+            </div>
+        </div>
+    {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/gym/views.py b/gym/views.py
index 249eada..9936b3e 100644
--- a/gym/views.py
+++ b/gym/views.py
@@ -40,10 +40,19 @@ class EquipmentDetailView(generic.DetailView):
     model = Equipment
     context_object_name = 'equipment'
     template_name = 'gym/equipment.html'
+    session = None
+
+    def dispatch(self, request, *args, **kwargs):
+        session_pk = self.request.session.get('session_pk')
+        if session_pk:
+            self.session = Session.objects.get(pk=session_pk)
+        return super().dispatch(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context['session'] = self.request.session.get('session_pk')
+        if self.session:
+            context['session'] = self.session.pk
+            context['rounds'] = Round.objects.filter(session=self.session, equipment=self.get_object())
         return context