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 %} {{ trainingprogram.rank }} - {{ trainingprogram.passe.label }} {{ trainingprogram.passe.repetition }} - {{ trainingprogram.passe.number_of_skill}} - {{ trainingprogram.passe.difficulty }} + {{ trainingprogram.passe.label }} + {{ trainingprogram.number_of_skill}} + {{ trainingprogram.difficulty }} {% if request.user|has_group:"trainer" %}