Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Use "repetition" instead of reps like in the rest of the model

Roland Geider34f57d239383
diff --git a/wger/manager/config_calculations/calculations.py b/wger/manager/config_calculations/calculations.py
index ec8ad4246..959b6200e 100644
--- a/wger/manager/config_calculations/calculations.py
+++ b/wger/manager/config_calculations/calculations.py
@@ -34,8 +34,8 @@ class AbstractSetCalculations(ABC):
max_sets_configs: list[AbstractChangeConfig]
weight_configs: list[AbstractChangeConfig]
max_weight_configs: list[AbstractChangeConfig]
- reps_configs: list[AbstractChangeConfig]
- max_reps_configs: list[AbstractChangeConfig]
+ repetition_configs: list[AbstractChangeConfig]
+ max_repetition_configs: list[AbstractChangeConfig]
rir_configs: list[AbstractChangeConfig]
max_rir_configs: list[AbstractChangeConfig]
rest_configs: list[AbstractChangeConfig]
@@ -49,8 +49,8 @@ class AbstractSetCalculations(ABC):
max_sets_configs: list[AbstractChangeConfig],
weight_configs: list[AbstractChangeConfig],
max_weight_configs: list[AbstractChangeConfig],
- reps_configs: list[AbstractChangeConfig],
- max_reps_configs: list[AbstractChangeConfig],
+ repetition_configs: list[AbstractChangeConfig],
+ max_repetition_configs: list[AbstractChangeConfig],
rir_configs: list[AbstractChangeConfig],
max_rir_configs: list[AbstractChangeConfig],
rest_configs: list[AbstractChangeConfig],
@@ -59,15 +59,15 @@ class AbstractSetCalculations(ABC):
):
self.iteration = iteration
self.sets_configs = sets_configs
- self.max_sets_configs = sets_configs
+ self.max_sets_configs = max_sets_configs
self.weight_configs = weight_configs
- self.max_weight_configs = weight_configs
- self.reps_configs = reps_configs
- self.max_reps_configs = reps_configs
+ self.max_weight_configs = max_weight_configs
+ self.repetition_configs = repetition_configs
+ self.max_repetition_configs = max_repetition_configs
self.rir_configs = rir_configs
- self.max_rir_configs = rir_configs
+ self.max_rir_configs = max_rir_configs
self.rest_configs = rest_configs
- self.max_rest_configs = rest_configs
+ self.max_rest_configs = max_rest_configs
self.logs = logs
@abstractmethod
diff --git a/wger/manager/models/slot_entry.py b/wger/manager/models/slot_entry.py
index 03ad1a817..a66dbc737 100644
--- a/wger/manager/models/slot_entry.py
+++ b/wger/manager/models/slot_entry.py
@@ -323,8 +323,10 @@ class SlotEntry(models.Model):
max_sets_configs=self.maxsetsconfig_set.filter(iteration__lte=iteration),
weight_configs=self.weightconfig_set.filter(iteration__lte=iteration),
max_weight_configs=self.maxweightconfig_set.filter(iteration__lte=iteration),
- reps_configs=self.repetitionsconfig_set.filter(iteration__lte=iteration),
- max_reps_configs=self.maxrepetitionsconfig_set.filter(iteration__lte=iteration),
+ repetition_configs=self.repetitionsconfig_set.filter(iteration__lte=iteration),
+ max_repetition_configs=self.maxrepetitionsconfig_set.filter(
+ iteration__lte=iteration
+ ),
rir_configs=self.rirconfig_set.filter(iteration__lte=iteration),
max_rir_configs=self.maxrirconfig_set.filter(iteration__lte=iteration),
rest_configs=self.restconfig_set.filter(iteration__lte=iteration),