Self hosted FLOSS fitness/workout, nutrition and weight tracker
Expose the logs for the routine
Roland Geidera8e94a5a809a
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex 8193c5309..cf3825b93 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -367,16 +367,11 @@ class WorkoutSessionSerializer(serializers.ModelSerializer):Workout session serializer"""- user = serializers.PrimaryKeyRelatedField(- read_only=True, default=serializers.CurrentUserDefault()- )-class Meta:model = WorkoutSessionfields = ['id',- 'user',- 'workout',+ 'routine','date','notes','impression',@@ -395,6 +390,15 @@ class WorkoutLogSerializer(serializers.ModelSerializer):exclude = ('user',)+class LogDataSerializer(serializers.Serializer):+ """+ Log Data serializer+ """++ session = WorkoutSessionSerializer()+ logs = WorkoutLogSerializer(many=True)++class ScheduleStepSerializer(serializers.ModelSerializer):"""ScheduleStep serializerdiff --git a/wger/manager/api/views.py b/wger/manager/api/views.pyindex 3dc060634..c7503ea8e 100644--- a/wger/manager/api/views.py+++ b/wger/manager/api/views.py@@ -17,6 +17,7 @@# Standard Libraryimport json+from datetime import datetime# Djangofrom django.shortcuts import get_object_or_404@@ -30,6 +31,7 @@ from rest_framework.response import Responsefrom wger.exercises.models import ExerciseBasefrom wger.manager.api.serializers import (DaySerializer,+ LogDataSerializer,RoutineSerializer,RoutineStructureSerializer,ScheduleSerializer,@@ -131,8 +133,8 @@ class RoutineViewSet(viewsets.ModelViewSet):"""return Response(WorkoutDayDataDisplayModeSerializer(- self.get_object().data_for_iteration(),- many=True).data+ self.get_object().data_for_iteration(), many=True+ ).data)@action(detail=True, url_path='current-iteration-gym-mode')@@ -151,6 +153,20 @@ class RoutineViewSet(viewsets.ModelViewSet):"""return Response(RoutineStructureSerializer(self.get_object()).data)+ @action(detail=True, url_path='logs')+ def logs(self, request, pk):+ """+ Returns the logs for the routine+ """+ date = request.GET.get('date')+ if date:+ try:+ date = datetime.strptime(date, '%Y-%m-%d')+ except ValueError:+ pass++ return Response(LogDataSerializer(self.get_object().logs_display(date), many=True).data)+class WorkoutViewSet(viewsets.ModelViewSet):"""@@ -266,7 +282,7 @@ class WorkoutSessionViewSet(WgerOwnerObjectModelViewSet):ordering_fields = '__all__'filterset_fields = ('date',- 'workout',+ 'routine','notes','impression','time_start',@@ -371,10 +387,10 @@ class WorkoutLogViewSet(WgerOwnerObjectModelViewSet):ordering_fields = '__all__'filterset_fields = ('date',- 'exercise_base',+ 'exercise','reps','weight',- 'workout',+ 'routine','repetition_unit','weight_unit',)diff --git a/wger/manager/models/log.py b/wger/manager/models/log.pyindex 654aa5d85..67df160f1 100644--- a/wger/manager/models/log.py+++ b/wger/manager/models/log.py@@ -71,6 +71,7 @@ class WorkoutLog(models.Model):verbose_name=_('Session'),on_delete=models.CASCADE,null=True,+ related_name='logs',)"""The session this log belongs to.diff --git a/wger/manager/models/routine.py b/wger/manager/models/routine.pyindex b078a25dc..6df650628 100644--- a/wger/manager/models/routine.py+++ b/wger/manager/models/routine.py@@ -253,3 +253,18 @@ class Routine(models.Model):out.append(data)return out++ def logs_display(self, date: datetime.date = None):+ """+ Returns all the logs for this routine, grouped by the session+ """+ out = []++ qs = self.workoutsession_set.all()+ if date:+ qs = qs.filter(date=date)++ for session in qs:+ out.append({'session': session, 'logs': session.logs.all()})++ return out