jarvis/core/views.py

@@ -21,7 +21,6 @@ from django.db.models import Max
 from django.conf import settings
 from .models import Citation
 from jarvis.tools.models import from_date_to_week_number
-from jarvis.tools.clean_name import clean_name
 
 from jarvis.tools.models import Season
 
@@ -195,10 +194,8 @@ def search(request):
     pattern = request.GET.get("pattern", None)
 
     if pattern:
-        name = clean_name(pattern)
-        print(name)
         gymnast_list = Gymnast.objects.filter(
-            Q(cleaned_last_name__icontains=name) | Q(cleaned_first_name__icontains=name)
+            Q(last_name__icontains=pattern) | Q(first_name__icontains=pattern)
         )
 
         if gymnast_list.count() == 1:

jarvis/followup/models.py

@@ -701,8 +701,6 @@ 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
@@ -735,36 +733,20 @@ class Intensity(Markdownizable, Seasonisable):
 
     @property
     def passes_quality_for_gymnast(self):
-        average_passe_time = (
-            (90 + pow(100, 1 / self.number_of_gymnast)) * self.number_of_gymnast
-        ) / 60
+        average_gymnast_time = 150 + (
+            self.number_of_gymnast * pow(100, 1 / self.number_of_gymnast)
+        )
 
-        print(self.mean_time_by_passe)
-        print(average_passe_time)
-
-        if self.mean_time_by_passe <= average_passe_time:
-            print("1")
+        if self.mean_time_by_passe <= average_gymnast_time:
             return 1
 
-        if self.mean_time_by_passe <= (average_passe_time * 1.05):
-            print("2")
+        if self.mean_time_by_passe <= (average_gymnast_time * 1.05):
             return 2
 
-        if self.mean_time_by_passe >= (average_passe_time * 1.05):
-            print("3")
+        if self.mean_time_by_passe <= (average_gymnast_time * 1.15):
             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

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_readable }}</span>
+                            <span class="text-danger">{{ intensity.mean_time_by_passe | floatformat:3 }}</span>
                         {% elif intensity.passes_quality_for_gymnast == 2 %}
-                            <span class="text-warning">{{ intensity.mean_time_by_passe_readable }}</span>
+                            <span class="text-warning">{{ intensity.mean_time_by_passe | floatformat:3 }}</span>
                         {% else %}
-                            <span class="text-success">{{ intensity.mean_time_by_passe_readable }}</span>
+                            <span class="text-success">{{ intensity.mean_time_by_passe | floatformat:3 }}</span>
                         {% endif %}
                     </b>
                 </div>

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_readable }}</span>
+                                    <span class="text-danger">{{ intensity.mean_time_by_passe | floatformat:3 }}</span>
                                 {% elif intensity.passes_quality_for_gymnast == 2 %}
-                                    <span class="text-warning">{{ intensity.mean_time_by_passe_readable }}</span>
+                                    <span class="text-warning">{{ intensity.mean_time_by_passe | floatformat:3 }}</span>
                                 {% else %}
-                                    <span class="text-success">{{ intensity.mean_time_by_passe_readable }}</span>
+                                    <span class="text-success">{{ intensity.mean_time_by_passe | floatformat:3 }}</span>
                                 {% endif %}
                             </b>
                         </td>

jarvis/followup/views.py

@@ -1375,7 +1375,7 @@ def plan_create_or_update(request, plan_id=None, gymnast_id=None, skill_id=None)
 
             send_mail(
                 title,
-                f"Nouvel objectif fixé pour {plan.gymnast}",
+                f"Nouvel objectif fixé pour {gymnast}",
                 settings.EMAIL_HOST_USER,
                 receivers,
                 fail_silently=False,
@@ -1583,7 +1583,7 @@ def season_information_create_or_update(
 
             send_mail(
                 title,
-                f"Une nouvelle information de saison enregistrée pour {season_information.gymnast}",
+                f"Une nouvelle information de saison enregistrée pour {gymnast}",
                 settings.EMAIL_HOST_USER,
                 receivers,
                 fail_silently=False,