Self hosted FLOSS fitness/workout, nutrition and weight tracker
Fix remaining references to the removed WorkoutSession date fields
Roland Geiderf4c20f05a101
diff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.htmlindex 97bd270d4..49eb8045c 100644--- a/wger/core/templates/user/overview.html+++ b/wger/core/templates/user/overview.html@@ -93,7 +93,7 @@{% for log in session %}<tr><td>- {{log.date}}+ {{log.datetime_start|date}}</td><td>{{log.get_impression_display}}@@ -102,8 +102,8 @@{{log.notes|default:'-/-'|truncatewords:6}}</td><td>- {% if log.time_start and log.time_end %}- {{log.time_start|time:"H:i"}} - {{log.time_end|time:"H:i"}}+ {% if log.datetime_end %}+ {{log.datetime_start|time:"H:i"}} - {{log.datetime_end|time:"H:i"}}{% else %}-/-{% endif %}diff --git a/wger/core/tests/test_delete_user.py b/wger/core/tests/test_delete_user.pyindex 7f2462a5c..e343426b1 100644--- a/wger/core/tests/test_delete_user.py+++ b/wger/core/tests/test_delete_user.py@@ -251,7 +251,7 @@ class UserDeleteTrophyIntegrationTestCase(WgerTestCase):user = User.objects.create_user(username='trophyuser', email='[email protected]', password='testpass')- WorkoutSession.objects.create(user=user, date=timezone.now().date())+ WorkoutSession.objects.create(user=user, datetime_start=timezone.now())Trophy.objects.create(name='DeleteTestTrophy',trophy_type=0,diff --git a/wger/core/tests/test_user.py b/wger/core/tests/test_user.pyindex f8cecf229..771bc5579 100644--- a/wger/core/tests/test_user.py+++ b/wger/core/tests/test_user.py@@ -21,6 +21,8 @@ from django.urls import (reverse,reverse_lazy,)+from django.utils import timezone+from django.utils.formats import date_format# Third Partyfrom allauth.account.models import EmailAddress@@ -32,6 +34,7 @@ from wger.core.tests.base_testcase import (WgerEditTestCase,WgerTestCase,)+from wger.manager.models import WorkoutSessionclass StatusUserTestCase(WgerTestCase):@@ -361,6 +364,37 @@ class UserDetailPageTestCase2(WgerAccessTestCase):)+class UserDetailPageSessionTableTestCase(WgerTestCase):+ """+ Test the workout session table on the user detail page+ """++ def test_session_date_and_times_are_rendered(self):+ """The session table shows the day and the start/end times of a session"""++ session = WorkoutSession.objects.get(pk='bbbbbbbb-bbbb-bbbb-bbbb-000000000005')+ start = timezone.localtime(session.datetime_start)+ end = timezone.localtime(session.datetime_end)++ self.user_login('trainer1')+ response = self.client.get(reverse('core:user:overview', kwargs={'pk': 2}))++ self.assertContains(response, date_format(start))+ self.assertContains(response, f'{start:%H:%M} - {end:%H:%M}')++ def test_session_without_end_shows_no_times(self):+ """An open session (no end) falls back to the placeholder"""++ WorkoutSession.objects.filter(pk='bbbbbbbb-bbbb-bbbb-bbbb-000000000005').update(+ datetime_end=None+ )++ self.user_login('trainer1')+ response = self.client.get(reverse('core:user:overview', kwargs={'pk': 2}))++ self.assertContains(response, '-/-')++class UserTrustworthinessTestCase(WgerTestCase):request = HttpRequest()diff --git a/wger/core/views/user.py b/wger/core/views/user.pyindex 8a2e87d3b..ecf6d1070 100644--- a/wger/core/views/user.py+++ b/wger/core/views/user.py@@ -666,7 +666,9 @@ class UserDetailView(LoginRequiredMixin, WgerMultiplePermissionRequiredMixin, Decontext['nutrition_plans'] = NutritionPlan.objects.filter(user=self.object).order_by('-creation_date')[:5]- context['session'] = WorkoutSession.objects.filter(user=self.object).order_by('-date')[:10]+ context['session'] = WorkoutSession.objects.filter(user=self.object).order_by(+ '-datetime_start'+ )[:10]context['admin_notes'] = AdminUserNote.objects.filter(member=self.object)[:5]context['contracts'] = Contract.objects.filter(member=self.object)[:5]diff --git a/wger/manager/tests/test_log_model.py b/wger/manager/tests/test_log_model.pyindex 920858861..648099bc8 100644--- a/wger/manager/tests/test_log_model.py+++ b/wger/manager/tests/test_log_model.py@@ -66,7 +66,9 @@ class LogModelTestCase(WgerTestCase):# A duplicate (user, date, routine=None) — only possible because a NULL# routine escapes the unique_together guard.- WorkoutSession.objects.create(user_id=1, datetime_start=session.datetime_start, routine=None)+ WorkoutSession.objects.create(+ user_id=1, datetime_start=session.datetime_start, routine=None+ )self.assertEqual(WorkoutSession.objects.count(), 2)# A second log for the same day must not crash and must not add a session.diff --git a/wger/manager/tests/test_log_session_api.py b/wger/manager/tests/test_log_session_api.pyindex b42ff1c5d..32214a4e5 100644--- a/wger/manager/tests/test_log_session_api.py+++ b/wger/manager/tests/test_log_session_api.py@@ -105,7 +105,9 @@ class WorkoutLogSessionPinningRESTTestCase(WgerTestCase):"""POST without a session falls back to the legacy auto-create."""new_date = datetime.date(2030, 6, 15)- before = WorkoutSession.objects.filter(user_id=1, routine_id=1, datetime_start__date=new_date).count()+ before = WorkoutSession.objects.filter(+ user_id=1, routine_id=1, datetime_start__date=new_date+ ).count()self.assertEqual(before, 0)response = self.client.post(diff --git a/wger/trophies/tests/test_integration.py b/wger/trophies/tests/test_integration.pyindex f935ed2cf..b13ed7ce6 100644--- a/wger/trophies/tests/test_integration.py+++ b/wger/trophies/tests/test_integration.py@@ -479,7 +479,9 @@ class UserDeletionTestCase(WgerTestCase):user = User.objects.create_user('to_delete', '[email protected]', 'pass')exercise = Exercise.objects.create(category=ExerciseCategory.objects.create(name='cat'))- WorkoutSession.objects.create(user=user, datetime_start=datetime.datetime(2024, 1, 1, tzinfo=datetime.timezone.utc))+ WorkoutSession.objects.create(+ user=user, datetime_start=datetime.datetime(2024, 1, 1, tzinfo=datetime.timezone.utc)+ )WorkoutLog.objects.create(user=user, exercise=exercise, repetitions=10, weight=100)# The statistics row is already gone when the workout-deletion signals@@ -533,7 +535,10 @@ class LoadDataSignalGuardTestCase(WgerTestCase):def test_raw_workout_session_save_skips_statistics(self):"""A raw WorkoutSession save creates no statistics row"""- session = WorkoutSession.objects.create(user=self.user, datetime_start=datetime.datetime(2024, 1, 1, tzinfo=datetime.timezone.utc))+ session = WorkoutSession.objects.create(+ user=self.user,+ datetime_start=datetime.datetime(2024, 1, 1, tzinfo=datetime.timezone.utc),+ )UserStatistics.objects.filter(user=self.user).delete()