Self hosted FLOSS fitness/workout, nutrition and weight tracker
Use the date and user information from the session
Roland Geider49f2caf8d932
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex 68d0585b3..04862198f 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -385,7 +385,19 @@ class WorkoutLogSerializer(serializers.ModelSerializer):class Meta:model = WorkoutLog- exclude = ('user',)+ fields = [+ 'session',+ 'routine',+ 'slot_config',+ 'next_log',+ 'exercise',+ 'reps',+ 'repetition_unit',+ 'weight',+ 'weight_unit',+ 'rir',+ 'iteration',+ ]class LogDataSerializer(serializers.Serializer):diff --git a/wger/manager/api/views.py b/wger/manager/api/views.pyindex 0c03bec2f..be046087f 100644--- a/wger/manager/api/views.py+++ b/wger/manager/api/views.py@@ -423,9 +423,9 @@ class WorkoutLogViewSet(WgerOwnerObjectModelViewSet):if getattr(self, 'swagger_fake_view', False):return WorkoutLog.objects.none()- return WorkoutLog.objects.filter(user=self.request.user)+ return WorkoutLog.objects.filter(session__user=self.request.user)- def perform_create(self, serializer):+ def perform_create(self, serializer: WorkoutLogSerializer):"""Set the owner"""diff --git a/wger/manager/models/log.py b/wger/manager/models/log.pyindex 67df160f1..41d0ad433 100644--- a/wger/manager/models/log.py+++ b/wger/manager/models/log.py@@ -14,7 +14,6 @@# You should have received a copy of the GNU Affero General Public License# along with this program. If not, see <http://www.gnu.org/licenses/>.-# Standard Libraryimport datetime@@ -30,12 +29,10 @@ from wger.core.models import (WeightUnit,)from wger.exercises.models import ExerciseBase+from wger.manager.consts import RIR_OPTIONS+from wger.manager.models.session import WorkoutSessionfrom wger.utils.cache import reset_workout_log-# Local-from ..consts import RIR_OPTIONS-from .session import WorkoutSession-class WorkoutLog(models.Model):"""@@ -173,9 +170,6 @@ class WorkoutLog(models.Model):Plumbing"""- # Reset cache- reset_workout_log(self.user_id, self.date.year, self.date.month, self.date.day)-# If the routine does not belong to this user, do not saveif self.routine and self.routine.user != self.user:return@@ -192,6 +186,14 @@ class WorkoutLog(models.Model):routine=self.routine,)[0]+ # Reset cache+ reset_workout_log(+ self.user_id,+ self.session.date.year,+ self.session.date.month,+ self.session.date.day,+ )+# If the user of next_log is not this user, remove foreign keyif self.next_log and self.next_log.user != self.user:self.next_log = None@@ -208,5 +210,10 @@ class WorkoutLog(models.Model):"""Reset cache"""- reset_workout_log(self.user_id, self.date.year, self.date.month, self.date.day)+ reset_workout_log(+ self.user_id,+ self.session.date.year,+ self.session.date.month,+ self.session.date.day,+ )super(WorkoutLog, self).delete(*args, **kwargs)