Self hosted FLOSS fitness/workout, nutrition and weight tracker
Pass max-* values to calculation class
Roland Geider1930a269581b
diff --git a/wger/manager/config_calculations/calculations.py b/wger/manager/config_calculations/calculations.pyindex 006706019..ec8ad4246 100644--- a/wger/manager/config_calculations/calculations.py+++ b/wger/manager/config_calculations/calculations.py@@ -31,28 +31,43 @@ from wger.manager.models import (class AbstractSetCalculations(ABC):iteration: intsets_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 = iterationself.sets_configs = sets_configs+ self.max_sets_configs = sets_configsself.weight_configs = weight_configs+ self.max_weight_configs = weight_configsself.reps_configs = reps_configs+ self.max_reps_configs = reps_configsself.rir_configs = rir_configs+ self.max_rir_configs = rir_configsself.rest_configs = rest_configs+ self.max_rest_configs = rest_configsself.logs = logs@abstractmethoddiff --git a/wger/manager/models/slot_entry.py b/wger/manager/models/slot_entry.pyindex 22d4e17e8..fd445ff1b 100644--- a/wger/manager/models/slot_entry.py+++ b/wger/manager/models/slot_entry.py@@ -221,10 +221,15 @@ class SlotEntry(models.Model):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),)