Self hosted FLOSS fitness/workout, nutrition and weight tracker
Formatting
Roland Geiderb0c16e55144d
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex e2feab1ca..25d417d80 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -88,7 +88,7 @@ class BaseConfigSerializer(serializers.ModelSerializer):requirements = serializers.JSONField(validators=[validate_requirements],allow_null=True,- required=False+ required=False,)@@ -443,7 +443,7 @@ class WorkoutLogSerializer(serializers.ModelSerializer):'rir','rir_target','rest',- 'rest_target'+ 'rest_target',]diff --git a/wger/manager/dataclasses.py b/wger/manager/dataclasses.pyindex d354a2eaa..3746ceb6e 100644--- a/wger/manager/dataclasses.py+++ b/wger/manager/dataclasses.py@@ -220,8 +220,8 @@ class RoutineLogData:def round_value(- x: int | float | Decimal | None,- base: int | float | Decimal | None = None,+ x: int | float | Decimal | None,+ base: int | float | Decimal | None = None,) -> Decimal | None:"""Rounds a value to the nearest basediff --git a/wger/manager/migrations/0018_flexible_routines.py b/wger/manager/migrations/0018_flexible_routines.pyindex 5506e3fce..4e496813e 100644--- a/wger/manager/migrations/0018_flexible_routines.py+++ b/wger/manager/migrations/0018_flexible_routines.py@@ -148,13 +148,13 @@ class Migration(migrations.Migration):),),migrations.AddField(- model_name="workoutlog",- name="rest",+ model_name='workoutlog',+ name='rest',field=models.PositiveIntegerField(blank=True, null=True),),migrations.AddField(- model_name="workoutlog",- name="rest_target",+ model_name='workoutlog',+ name='rest_target',field=models.PositiveIntegerField(blank=True, null=True),),migrations.AlterField(diff --git a/wger/manager/models/day.py b/wger/manager/models/day.pyindex bff23253a..d43cbe5af 100644--- a/wger/manager/models/day.py+++ b/wger/manager/models/day.py@@ -108,7 +108,6 @@ class Day(models.Model):return self.descriptiondef save(self, *args, **kwargs):-# Rest days have no exercisesif self.pk and self.is_rest:for slot in self.slots.all():diff --git a/wger/manager/models/routine.py b/wger/manager/models/routine.pyindex e159a871b..04d98fd74 100644--- a/wger/manager/models/routine.py+++ b/wger/manager/models/routine.py@@ -305,12 +305,12 @@ class Routine(models.Model):intensity_counter = GroupedLogData()def update_grouped_log_data(- entry: GroupedLogData,- date: datetime.date,- week_nr: int,- iter: int,- exercise: Exercise,- value: Decimal | int,+ entry: GroupedLogData,+ date: datetime.date,+ week_nr: int,+ iter: int,+ exercise: Exercise,+ value: Decimal | int,):"""Updates grouped log datadiff --git a/wger/manager/tests/test_log_model.py b/wger/manager/tests/test_log_model.pyindex 8a9958435..1d050ed6d 100644--- a/wger/manager/tests/test_log_model.py+++ b/wger/manager/tests/test_log_model.py@@ -22,6 +22,7 @@ from wger.manager.models import (WorkoutSession,)+logger = logging.getLogger(__name__)diff --git a/wger/manager/views/ical.py b/wger/manager/views/ical.pyindex baa9e925a..2413a1563 100644--- a/wger/manager/views/ical.py+++ b/wger/manager/views/ical.py@@ -67,8 +67,7 @@ def get_calendar():def get_events_workout(calendar, routine: Routine):"""Creates all necessary events from the given workout and adds them to- the calendar. Each event's occurrence ist set to weekly (one event for- each training day).+ the calendar."""generator = UIDGenerator()@@ -96,6 +95,7 @@ def export(request, pk):if request.user.is_anonymous:return HttpResponseForbidden()+routine = get_object_or_404(Routine, pk=pk, user=request.user)# Create the calendar