Sulley
/
Ultron
1
0
Fork 0
Code Issues 15 Pull Requests 1 Projects Releases Wiki Activity

Bug fixes in routine and skill search + routine listing in gymnast details
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Gregory Trullemans 2021-12-14 18:30:05 +01:00
parent 98d64fbb49
commit f13f38f7fb
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/peoples/gymnasts/list_routine.html
View File

@ -29,7 +29,7 @@
<!-- </a> -->
<!-- </td> -->
<td class="text-center">{{ ghr.get_routine_type_display }}</td>
<td class="text-left"><a href="{% url 'routine_details' ghr.routine.id %}">{{ ghr.routine.longLabel }}</a></td>
<td class="text-left"><a href="{% url 'routine_details' ghr.routine.id %}">{{ ghr.routine.long_label }}</a></td>
<td class="text-center">{{ ghr.datebegin | date:"d-m-Y"}}</td>
<td class="text-center">{% if ghr.dateend %}{{ ghr.dateend | date:"d F Y" }}{% else %}… to now.{% endif %}</td>
<td class="text-center">{{ ghr.routine.difficulty }}</td>

2
ultron/objective/models.py
View File

@ -202,7 +202,7 @@ class Routine(Educative):
Renvoie True si la série contient au moins un tomber de base, False sinon.
"""
return self.skill_links.filter(
skill__landing__longLabel__in=["Assis", "Dos", "Ventre"]
skill__landing__long_label__in=["Assis", "Dos", "Ventre"]
).exists()
def contains_basic_salto(self):

4
ultron/objective/views.py
View File

@ -48,7 +48,7 @@ def skill_listing(request, field=None, expression=None, value=None, level=None):
if pattern:
skill_list = Skill.objects.filter(
Q(longLabel__icontains=pattern) | Q(shortLabel__icontains=pattern)
Q(long_label__icontains=pattern) | Q(short_label__icontains=pattern)
)
elif field and expression and value:
kwargs = {"{0}__{1}".format(field, expression): value}
@ -105,7 +105,7 @@ def routine_listing(request):
pattern = request.GET.get("pattern", None)
if pattern:
routine_list = Routine.objects.filter(
Q(longLabel__icontains=pattern) | Q(shortLabel__icontains=pattern)
Q(long_label__icontains=pattern) | Q(short_label__icontains=pattern)
)
else:
routine_list = Routine.objects.all()