From 882220a358b995a7a8cbd2f87e4306436595b281 Mon Sep 17 00:00:00 2001
From: Gregory Trullemans <redj@MacBook-Pro-de-Gregory.local>
Date: Tue, 6 Feb 2024 16:29:30 +0100
Subject: [PATCH] Fix bug

---
 jarvis/followup/models.py                       | 17 ++++++++++++++++-
 .../followup/templates/intensities/details.html |  6 +++---
 jarvis/followup/templates/intensities/list.html |  6 +++---
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/jarvis/followup/models.py b/jarvis/followup/models.py
index 39fb012..432784b 100644
--- a/jarvis/followup/models.py
+++ b/jarvis/followup/models.py
@@ -701,6 +701,8 @@ class Intensity(Markdownizable, Seasonisable):
     # Real statistics
     @property
     def mean_time_by_passe(self):
+        average_time_in_min = self.time / self.number_of_passes
+        average_time_in_sec = (average_time_in_min % 1) * 60
         return self.time / self.number_of_passes
 
     @property
@@ -741,15 +743,28 @@ class Intensity(Markdownizable, Seasonisable):
         print(average_passe_time)
 
         if self.mean_time_by_passe <= average_passe_time:
+            print("1")
             return 1
 
         if self.mean_time_by_passe <= (average_passe_time * 1.05):
+            print("2")
             return 2
 
-        if self.mean_time_by_passe >= (average_passe_time * 1.15):
+        if self.mean_time_by_passe >= (average_passe_time * 1.05):
+            print("3")
             return 3
 
     # Human readeable scores
+    @property
+    def mean_time_by_passe_readable(self):
+        average_time_in_min = self.mean_time_by_passe
+        average_time_in_sec = round((average_time_in_min % 1) * 60)
+        if average_time_in_sec < 10:
+            average_time_in_sec = "0" + str(average_time_in_sec)
+        else:
+            average_time_in_sec = str(average_time_in_sec)
+        return str(int(average_time_in_min)) + "min" + average_time_in_sec
+
     @property
     def difficulty_in_unit(self):
         return self.difficulty / 10
diff --git a/jarvis/followup/templates/intensities/details.html b/jarvis/followup/templates/intensities/details.html
index 593229d..cf27a31 100644
--- a/jarvis/followup/templates/intensities/details.html
+++ b/jarvis/followup/templates/intensities/details.html
@@ -109,11 +109,11 @@
                 <div class="col-2 text-right pl-0">
                     <b>
                         {% if intensity.passes_quality_for_gymnast >= 3 %}
-                            <span class="text-danger">{{ intensity.mean_time_by_passe | floatformat:3 }}</span>
+                            <span class="text-danger">{{ intensity.mean_time_by_passe_readable }}</span>
                         {% elif intensity.passes_quality_for_gymnast == 2 %}
-                            <span class="text-warning">{{ intensity.mean_time_by_passe | floatformat:3 }}</span>
+                            <span class="text-warning">{{ intensity.mean_time_by_passe_readable }}</span>
                         {% else %}
-                            <span class="text-success">{{ intensity.mean_time_by_passe | floatformat:3 }}</span>
+                            <span class="text-success">{{ intensity.mean_time_by_passe_readable }}</span>
                         {% endif %}
                     </b>
                 </div>
diff --git a/jarvis/followup/templates/intensities/list.html b/jarvis/followup/templates/intensities/list.html
index cefc161..4cc8bec 100644
--- a/jarvis/followup/templates/intensities/list.html
+++ b/jarvis/followup/templates/intensities/list.html
@@ -82,11 +82,11 @@
                         <td class="text-center">
                             <b>
                                 {% if intensity.passes_quality_for_gymnast >= 3 %}
-                                    <span class="text-danger">{{ intensity.mean_time_by_passe | floatformat:3 }}</span>
+                                    <span class="text-danger">{{ intensity.mean_time_by_passe_readable }}</span>
                                 {% elif intensity.passes_quality_for_gymnast == 2 %}
-                                    <span class="text-warning">{{ intensity.mean_time_by_passe | floatformat:3 }}</span>
+                                    <span class="text-warning">{{ intensity.mean_time_by_passe_readable }}</span>
                                 {% else %}
-                                    <span class="text-success">{{ intensity.mean_time_by_passe | floatformat:3 }}</span>
+                                    <span class="text-success">{{ intensity.mean_time_by_passe_readable }}</span>
                                 {% endif %}
                             </b>
                         </td>