From 10c73276d46f58884e126370c6a9ae0c057901f0 Mon Sep 17 00:00:00 2001
From: Gregory Trullemans <redj@MacBook-Pro-de-Gregory.local>
Date: Sat, 2 Mar 2024 18:41:15 +0100
Subject: [PATCH] Minor optimisations for training program

---
 jarvis/objective/models.py                               | 5 +----
 jarvis/objective/templates/trainingprograms/details.html | 6 +++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/jarvis/objective/models.py b/jarvis/objective/models.py
index ed801e5..5586fb0 100644
--- a/jarvis/objective/models.py
+++ b/jarvis/objective/models.py
@@ -523,10 +523,7 @@ class Passe(Markdownizable):
 
     def __str__(self):
         if self.label:
-            if self.regexp:
-                return f"{self.label} {self.regexp}   ({self.number_of_skill} | {self.difficulty})"
-            else:
-                return f"{self.label}   ({self.number_of_skill} | {self.difficulty})"
+            return f"{self.label}   ({self.number_of_skill} | {self.difficulty})"
         else:
             return f"-   ({self.number_of_skill} | {self.difficulty})"
 
diff --git a/jarvis/objective/templates/trainingprograms/details.html b/jarvis/objective/templates/trainingprograms/details.html
index 4138e8c..1b84bd1 100644
--- a/jarvis/objective/templates/trainingprograms/details.html
+++ b/jarvis/objective/templates/trainingprograms/details.html
@@ -19,9 +19,9 @@
                         {% for trainingprogram in trainingprogram_list %}
                             <tr role="row" class="{% cycle 'odd' 'even' %}">
                                 <td>{{ trainingprogram.rank }}</td>
-                                <td>{{ trainingprogram.passe.label }}   {{ trainingprogram.passe.repetition }}</td>
-                                <td class="text-center">{{ trainingprogram.passe.number_of_skill}}</td>
-                                <td class="text-center">{{ trainingprogram.passe.difficulty }}</td>
+                                <td>{{ trainingprogram.passe.label }}</td>
+                                <td class="text-center">{{ trainingprogram.number_of_skill}}</td>
+                                <td class="text-center">{{ trainingprogram.difficulty }}</td>
                                 {% if request.user|has_group:"trainer" %}
                                     <td class="text-right p-2">
                                         <a href="#" class="up">