From db44425d737b36d33531ad71421526525413b442 Mon Sep 17 00:00:00 2001
From: Gregory Trullemans <redj@MacBook-Pro-de-Gregory.local>
Date: Sun, 12 Nov 2023 19:22:52 +0100
Subject: [PATCH] =?UTF-8?q?Add=20intensity=20d=C3=A9tails?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jarvis/followup/models.py                      |  4 ++++
 .../followup/templates/intensities/list.html   | 18 +++++++++---------
 jarvis/followup/urls.py                        |  7 ++++++-
 jarvis/followup/views.py                       | 13 +++++++++++++
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/jarvis/followup/models.py b/jarvis/followup/models.py
index 3ed6028..24a14d7 100644
--- a/jarvis/followup/models.py
+++ b/jarvis/followup/models.py
@@ -576,6 +576,10 @@ class Intensity(Markdownizable, Seasonisable):
     def mean_difficulty_by_passe(self):
         return self.difficulty / self.number_of_passes
 
+    @property
+    def mean_difficulty_by_passe_in_unit(self):
+        return (self.difficulty / 10) / self.number_of_passes
+
     @property
     def mean_quantity_of_skill(self):
         return self.quantity_of_skill / self.time
diff --git a/jarvis/followup/templates/intensities/list.html b/jarvis/followup/templates/intensities/list.html
index 8e1c226..9244df1 100644
--- a/jarvis/followup/templates/intensities/list.html
+++ b/jarvis/followup/templates/intensities/list.html
@@ -46,20 +46,20 @@
                                 <span class="tim-icons icon-pencil text-warning"></span>
                             </a>
                         </td>
-                        <td>{{ intensity.date | date:"d-m-Y" }}</td>
+                        <td><a href="{% url 'intensity_details' intensity.id %}">{{ intensity.date | date:"d-m-Y" }}</a></td>
                         <td class="text-left">
                             <a href="{% url 'gymnast_details_tab' intensity.gymnast.id 'routine' %}">
                                 {{ intensity.gymnast }}
                             </a>
                         </td>
-                        <td class="text-center">{{ intensity.time }}</td>
-                        <td class="text-center">{{ intensity.difficulty }}</td>
-                        <td class="text-center">{{ intensity.quantity_of_skill }}</td>
-                        <td class="text-center">{{ intensity.number_of_passes }}</td>
-                        <td class="text-center">{{ intensity.mean_difficulty_by_passe | floatformat:2 }}</td>
-                        <td class="text-center">{{ intensity.mean_quantity_of_skill | floatformat:2 }}</td>
-                        <td class="text-center">{{ intensity.quantity_of_skill_by_passe | floatformat:2 }}</td>
-                        <td class="text-center">{{ intensity.mean_difficulty_by_skill | floatformat:2 }}</td>
+                        <td class="text-right">{{ intensity.time }}</td>
+                        <td class="text-right">{{ intensity.difficulty }}</td>
+                        <td class="text-right">{{ intensity.quantity_of_skill }}</td>
+                        <td class="text-right">{{ intensity.number_of_passes }}</td>
+                        <td class="text-right">{{ intensity.mean_difficulty_by_passe | floatformat:2 }}</td>
+                        <td class="text-right">{{ intensity.mean_quantity_of_skill | floatformat:2 }}</td>
+                        <td class="text-right">{{ intensity.quantity_of_skill_by_passe | floatformat:2 }}</td>
+                        <td class="text-right">{{ intensity.mean_difficulty_by_skill | floatformat:2 }}</td>
                     </tr>
                     {% endfor %}
                 </tbody>
diff --git a/jarvis/followup/urls.py b/jarvis/followup/urls.py
index 6ff605d..a8fb090 100644
--- a/jarvis/followup/urls.py
+++ b/jarvis/followup/urls.py
@@ -101,7 +101,7 @@ urlpatterns = [
     #
     #
     # INTENSITY
-    path(r"intensity/", views.chrono_listing, name="intensity_list"),
+    path(r"intensity/", views.intensity_listing, name="intensity_list"),
     path(
         r"intensity/gymnast/<int:gymnast_id>/",
         views.intensity_listing,
@@ -118,6 +118,11 @@ urlpatterns = [
         views.intensity_create_or_update,
         name="intensity_update",
     ),
+    path(
+        r"intensity/details/<int:intensity_id>/",
+        views.intensity_details,
+        name="intensity_details",
+    ),
     #
     #
     # LEARNEDSKILL
diff --git a/jarvis/followup/views.py b/jarvis/followup/views.py
index 53e3691..7dfd2fb 100644
--- a/jarvis/followup/views.py
+++ b/jarvis/followup/views.py
@@ -1316,6 +1316,19 @@ def plan_create_or_update(request, plan_id=None, gymnast_id=None, skill_id=None)
     return render(request, "plan/create.html", context)
 
 
+@login_required
+@require_http_methods(["GET"])
+def intensity_details(request, intensity_id):
+    """
+    Récupère toutes les informations d'une intensité.
+
+    Args:
+        intensity_id   (int)   identifiant d'une intensité
+    """
+    intensity = get_object_or_404(Intensity, pk=intensity_id)
+    return render(request, "intensities/details.html", {"intensity": intensity})
+
+
 @login_required
 @require_http_methods(["GET"])
 def intensity_listing(request, gymnast_id=None):