diff --git a/jarvis/objective/models.py b/jarvis/objective/models.py index 5fe925a..6e93748 100644 --- a/jarvis/objective/models.py +++ b/jarvis/objective/models.py @@ -299,7 +299,7 @@ class Routine(Educative): age_boy_masterised = 0 age_girl_masterised = 0 difficulty = 0 - is_routine = False + # is_routine = False is_competitive = True for skill_link in self.skill_links.all(): @@ -338,8 +338,10 @@ class Routine(Educative): skill.age_girl_masterised, age_girl_masterised ) - if self.skill_links.all().count() < 5: - is_routine = False + # Je ne sais plus pourquoi j'ai mis ce bout de code. + # if self.skill_links.all().count() < 5: + # is_routine = False + # print("Not a routine.") if not self.is_routine: is_competitive = False @@ -347,7 +349,7 @@ class Routine(Educative): if self.skill_links.all().count() != 10: is_competitive = False - self.is_routine = is_routine + # self.is_routine = is_routine self.is_competitive = is_competitive self.difficulty = difficulty diff --git a/jarvis/objective/templates/combinations/details.html b/jarvis/objective/templates/combinations/details.html index c1b8706..872ae8b 100644 --- a/jarvis/objective/templates/combinations/details.html +++ b/jarvis/objective/templates/combinations/details.html @@ -33,26 +33,25 @@
Age Boy : {{ routine.age_boy_masterised }}
Age Girl : {{ routine.age_girl_masterised }}
-
-
Routine : {{ routine.is_routine }}
-
Competition : {{ routine.is_competitive }}
+
+ +
{% else %}

No skill defined for this routine.

{% endif %} + {% if routine.informations %} +
+
+
Informations
+ + + {{ routine.to_markdown | safe }} + +
+ {% endif %}
- - {% if routine.informations %} -
-
-

Informations

- - - {{ routine.to_markdown | safe }} - -
- {% endif %}