Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Improve workout day output

Roland Geiderd78d9d069aac
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.py
index dadf71db3..7df55610e 100644
--- a/wger/manager/api/serializers.py
+++ b/wger/manager/api/serializers.py
@@ -314,25 +314,29 @@ class SetConfigDataSerializer(serializers.Serializer):
comment = serializers.CharField()
-class SetExerciseDataSerializer(serializers.Serializer):
- """
- SetData serializer
- """
-
- data = SetConfigDataSerializer()
- config = SetConfigSerializer()
-
-
class SlotDataSerializer(serializers.Serializer):
"""
Slot Data serializer
"""
comment = serializers.CharField()
+ is_superset = serializers.BooleanField()
exercises = serializers.ListSerializer(child=serializers.IntegerField())
sets = SetConfigDataSerializer(many=True)
+class WorkoutDayDisplayDataSerializer(serializers.Serializer):
+ """
+ WorkoutDayData serializer - display mode
+ """
+
+ iteration = serializers.IntegerField()
+ date = serializers.DateField()
+ label = serializers.CharField()
+ day = DayNgSerializer()
+ slots = SlotDataSerializer(many=True, source='slots_display')
+
+
class WorkoutDayDataSerializer(serializers.Serializer):
"""
WorkoutDayData serializer
diff --git a/wger/manager/api/views.py b/wger/manager/api/views.py
index 21319d9dd..be79180cd 100644
--- a/wger/manager/api/views.py
+++ b/wger/manager/api/views.py
@@ -38,6 +38,7 @@ from wger.manager.api.serializers import (
SetSerializer,
SettingSerializer,
WorkoutDayDataSerializer,
+ WorkoutDayDisplayDataSerializer,
WorkoutLogSerializer,
WorkoutSerializer,
WorkoutSessionSerializer,
@@ -97,7 +98,16 @@ class RoutineViewSet(viewsets.ModelViewSet):
"""
return Response(DayNgSerializer(self.get_object().day_sequence, many=True).data)
- @action(detail=True, url_path='date-sequence')
+ @action(detail=True, url_path='date-sequence-display')
+ def date_sequence_display(self, request, pk):
+ """
+ Return the day sequence of the routine
+ """
+ return Response(
+ WorkoutDayDisplayDataSerializer(self.get_object().date_sequence, many=True).data
+ )
+
+ @action(detail=True, url_path='date-sequence-gym-mode')
def date_sequence(self, request, pk):
"""
Return the day sequence of the routine
diff --git a/wger/manager/dataclasses.py b/wger/manager/dataclasses.py
index 26d07fcf5..a29371f0e 100644
--- a/wger/manager/dataclasses.py
+++ b/wger/manager/dataclasses.py
@@ -137,6 +137,10 @@ class SlotData:
exercises: List[int] = field(default_factory=list)
sets: List[SetConfigData] = field(default_factory=list)
+ @property
+ def is_superset(self) -> bool:
+ return len(self.exercises) > 1
+
@dataclass
class WorkoutDayData:
@@ -151,3 +155,12 @@ class WorkoutDayData:
return []
return self.day.get_slots(self.iteration)
+
+ @property
+ def slots_display(self) -> List[SlotData]:
+ """Returns the slots optimized for display in the template"""
+
+ if not self.day:
+ return []
+
+ return self.day.get_slots_display(self.iteration)
diff --git a/wger/manager/models/day.py b/wger/manager/models/day.py
index fea94d29f..111df7d06 100644
--- a/wger/manager/models/day.py
+++ b/wger/manager/models/day.py
@@ -136,6 +136,53 @@ class DayNg(models.Model):
for s in self.slots.all()
]
+ def get_slots_display(self, iteration: int) -> List[SlotData]:
+ """
+ Return the sets for this day.
+
+ The difference to get_slots above is that here some data massaging happens
+ so that we can better display the data in the template. Specially, we
+ collect the sets for the same exercise in the same slot.
+
+ This only happens for slots that have only one exercise.
+
+ Instead of
+ * Slot1 -> Exercise1, [Config1]
+ * Slot2 -> Exercise1, [Config2]
+ * Slot3 -> Exercise1, [Config3]
+
+ We return
+ * Slot1 -> Exercise1, [Config1, Config2, Config3]
+
+ """
+ out = []
+ last_exercise_id = None
+ current_slot = None
+ for slot in self.slots.all():
+ if slot.is_superset:
+ out.append(
+ SlotData(
+ comment=slot.comment,
+ exercises=slot.get_exercises(),
+ sets=[s.data for s in slot.set_data(iteration)],
+ )
+ )
+ current_slot = None
+ else:
+ exercise_id = slot.get_exercises()[0]
+ if slot.get_exercises()[0] != last_exercise_id:
+ current_slot = SlotData(
+ comment=slot.comment,
+ exercises=[exercise_id],
+ sets=[s.data for s in slot.set_data(iteration)],
+ )
+ out.append(current_slot)
+ last_exercise_id = exercise_id
+ else:
+ current_slot.sets.extend([s.data for s in slot.set_data(iteration)])
+
+ return out
+
class Day(models.Model):
"""
diff --git a/wger/manager/models/slot.py b/wger/manager/models/slot.py
index 290ae3fdc..7ef6292e5 100644
--- a/wger/manager/models/slot.py
+++ b/wger/manager/models/slot.py
@@ -58,6 +58,13 @@ class Slot(models.Model):
"""
return self.day.routine
+ @property
+ def is_superset(self) -> bool:
+ """
+ Checks whether this slot is a superset or not
+ """
+ return self.configs.count() > 1
+
def set_data(self, iteration: int) -> List[SetExerciseData]:
"""Calculates the set data for a specific iteration"""