Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Use structure compliant with autocomplete

Peter van der Does4e0b9a30355e
diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.py
index c0630e09f..73145e427 100644
--- a/wger/exercises/api/views.py
+++ b/wger/exercises/api/views.py
@@ -86,37 +86,41 @@ def search(request):
'''
q = request.GET.get('term', None)
results = []
- if not q:
- return Response(results)
-
- languages = load_item_languages(LanguageConfig.SHOW_ITEM_EXERCISES,
- language_code=request.GET.get('language', None))
- exercises = (Exercise.objects.filter(name__icontains=q)
- .filter(language__in=languages)
- .filter(status=Exercise.STATUS_ACCEPTED)
- .order_by('category__name', 'name')
- .distinct())
-
- for exercise in exercises:
- if exercise.main_image:
- image_obj = exercise.main_image
- image = image_obj.image.url
- t = get_thumbnailer(image_obj.image)
- thumbnail = t.get_thumbnail(aliases.get('micro_cropped')).url
- else:
- image = None
- thumbnail = None
-
- exercise_json = {'id': exercise.id,
- 'name': exercise.name,
- 'value': exercise.name,
- 'category': _(exercise.category.name),
- 'image': image,
- 'image_thumbnail': thumbnail}
-
- results.append(exercise_json)
-
- return Response(results)
+ json_response = {}
+
+ if q:
+ languages = load_item_languages(LanguageConfig.SHOW_ITEM_EXERCISES,
+ language_code=request.GET.get('language', None))
+ exercises = (Exercise.objects.filter(name__icontains=q)
+ .filter(language__in=languages)
+ .filter(status=Exercise.STATUS_ACCEPTED)
+ .order_by('category__name', 'name')
+ .distinct())
+
+ for exercise in exercises:
+ if exercise.main_image:
+ image_obj = exercise.main_image
+ image = image_obj.image.url
+ t = get_thumbnailer(image_obj.image)
+ thumbnail = t.get_thumbnail(aliases.get('micro_cropped')).url
+ else:
+ image = None
+ thumbnail = None
+
+ exercise_json = {
+ 'value': exercise.name,
+ 'data': {
+ 'id': exercise.id,
+ 'name': exercise.name,
+ 'category': _(exercise.category.name),
+ 'image': image,
+ 'image_thumbnail': thumbnail
+ }
+ }
+ results.append(exercise_json)
+ json_response['suggestions'] = results
+
+ return Response(json_response)
class EquipmentViewSet(viewsets.ReadOnlyModelViewSet):
@@ -166,8 +170,10 @@ class ExerciseImageViewSet(viewsets.ModelViewSet):
thumbnails = {}
for alias in aliases.all():
t = get_thumbnailer(image.image)
- thumbnails[alias] = {'url': t.get_thumbnail(aliases.get(alias)).url,
- 'settings': aliases.get(alias)}
+ thumbnails[alias] = {
+ 'url': t.get_thumbnail(aliases.get(alias)).url,
+ 'settings': aliases.get(alias)
+ }
thumbnails['original'] = image.image.url
return Response(thumbnails)