Pass max-* values to calculation class

wger-project · Jan 15, 2025 · 1930a26 · 1930a26
1 parent 5f2803e
commit 1930a26
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/wger/manager/config_calculations/calculations.py b/wger/manager/config_calculations/calculations.py
@@ -31,28 +31,43 @@
 class AbstractSetCalculations(ABC):
     iteration: int
     sets_configs: list[AbstractChangeConfig]
+    max_sets_configs: list[AbstractChangeConfig]
     weight_configs: list[AbstractChangeConfig]
+    max_weight_configs: list[AbstractChangeConfig]
     reps_configs: list[AbstractChangeConfig]
+    max_reps_configs: list[AbstractChangeConfig]
     rir_configs: list[AbstractChangeConfig]
+    max_rir_configs: list[AbstractChangeConfig]
     rest_configs: list[AbstractChangeConfig]
+    max_rest_configs: list[AbstractChangeConfig]
     logs: list[WorkoutLog]
 
     def __init__(
         self,
         iteration: int,
         sets_configs: list[AbstractChangeConfig],
+        max_sets_configs: list[AbstractChangeConfig],
         weight_configs: list[AbstractChangeConfig],
+        max_weight_configs: list[AbstractChangeConfig],
         reps_configs: list[AbstractChangeConfig],
+        max_reps_configs: list[AbstractChangeConfig],
         rir_configs: list[AbstractChangeConfig],
+        max_rir_configs: list[AbstractChangeConfig],
         rest_configs: list[AbstractChangeConfig],
+        max_rest_configs: list[AbstractChangeConfig],
         logs: list[WorkoutLog],
     ):
         self.iteration = iteration
         self.sets_configs = sets_configs
+        self.max_sets_configs = 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.rir_configs = rir_configs
+        self.max_rir_configs = rir_configs
         self.rest_configs = rest_configs
+        self.max_rest_configs = rest_configs
         self.logs = logs
 
     @abstractmethod

diff --git a/wger/manager/models/slot_entry.py b/wger/manager/models/slot_entry.py
@@ -221,10 +221,15 @@ def get_config(self, iteration: int) -> SetConfigData:
             custom_logic = module.SetCalculations(
                 iteration=iteration,
                 sets_configs=self.setsconfig_set.filter(iteration__lte=iteration),
+                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.repsconfig_set.filter(iteration__lte=iteration),
+                max_reps_configs=self.maxrepsconfig_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),
+                max_rest_configs=self.maxrestconfig_set.filter(iteration__lte=iteration),
                 logs=self.workoutlog_set.filter(iteration__lte=iteration),
             )