Self hosted FLOSS fitness/workout, nutrition and weight tracker
Formatting
Roland Geidera9d10db5ef96
diff --git a/wger/trophies/checkers/personal_record.py b/wger/trophies/checkers/personal_record.pyindex 6b772b67a..6fc09f63c 100644--- a/wger/trophies/checkers/personal_record.py+++ b/wger/trophies/checkers/personal_record.py@@ -14,10 +14,14 @@# 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 Libraryfrom typing import Optional+# wgerfrom wger.trophies.models.trophy import Trophyfrom wger.trophies.models.user_trophy import UserTrophy++# Localfrom .base import BaseTrophyCheckerdiff --git a/wger/trophies/checkers/registry.py b/wger/trophies/checkers/registry.pyindex bc96161bc..426fc0382 100644--- a/wger/trophies/checkers/registry.py+++ b/wger/trophies/checkers/registry.py@@ -24,6 +24,8 @@ from typing import (# Djangofrom django.contrib.auth.models import User++# wgerfrom wger.trophies.models.trophy import Trophy# Local@@ -31,11 +33,11 @@ from .base import BaseTrophyCheckerfrom .count_based import CountBasedCheckerfrom .date_based import DateBasedCheckerfrom .inactivity_return import InactivityReturnChecker+from .personal_record import PersonalRecordCheckerfrom .streak import StreakCheckerfrom .time_based import TimeBasedCheckerfrom .volume import VolumeCheckerfrom .weekend_warrior import WeekendWarriorChecker-from .personal_record import PersonalRecordCheckerlogger = logging.getLogger(__name__)diff --git a/wger/trophies/models/user_trophy.py b/wger/trophies/models/user_trophy.pyindex 02df3b548..f6687e577 100644--- a/wger/trophies/models/user_trophy.py+++ b/wger/trophies/models/user_trophy.py@@ -20,7 +20,10 @@ from django.core.validators import (MaxValueValidator,MinValueValidator,)-from django.db import IntegrityError, models+from django.db import (+ IntegrityError,+ models,+)from django.utils.translation import gettext_lazy as _# Localdiff --git a/wger/trophies/services/trophy.py b/wger/trophies/services/trophy.pyindex 32790bc68..999f92e8c 100644--- a/wger/trophies/services/trophy.py+++ b/wger/trophies/services/trophy.py@@ -26,7 +26,6 @@ from typing import (# Djangofrom django.conf import settingsfrom django.contrib.auth.models import User-from django.db.models import Qfrom django.utils import timezone# wgerdiff --git a/wger/trophies/tests/test_checkers.py b/wger/trophies/tests/test_checkers.pyindex f083b91b1..032d07a74 100644--- a/wger/trophies/tests/test_checkers.py+++ b/wger/trophies/tests/test_checkers.py@@ -509,12 +509,14 @@ class PersonalRecordCheckerTestCase(WgerTestCase):)def test_check_returns_false_with_no_logs(self):+ # wgerfrom wger.trophies.checkers.personal_record import PersonalRecordCheckerchecker = PersonalRecordChecker(self.user, self.trophy, {})self.assertFalse(checker.check())def test_first_log_counts_as_pr(self):+ # wgerfrom wger.trophies.checkers.personal_record import PersonalRecordCheckerlog = WorkoutLog(user=self.user, exercise=self.exercise, repetitions=10, weight=100)@@ -526,6 +528,7 @@ class PersonalRecordCheckerTestCase(WgerTestCase):self.assertIsNotNone(context)def test_improvement_detected_and_context_values(self):+ # wgerfrom wger.trophies.checkers.personal_record import PersonalRecordCheckerlog1 = WorkoutLog(user=self.user, exercise=self.exercise, repetitions=10, weight=100)@@ -540,6 +543,7 @@ class PersonalRecordCheckerTestCase(WgerTestCase):self.assertIsNotNone(context)def no_award_if_not_an_improvement(self):+ # wgerfrom wger.trophies.checkers.personal_record import PersonalRecordCheckerlog1 = WorkoutLog(user=self.user, exercise=self.exercise, repetitions=10, weight=100)@@ -562,6 +566,7 @@ class PersonalRecordCheckerTestCase(WgerTestCase):self.assertFalse(checker4.check())def test_estimate_1rm(self):+ # wgerfrom wger.trophies.checkers.personal_record import PersonalRecordCheckerlog = WorkoutLog(user=self.user, exercise=self.exercise, repetitions=10, weight=100)@@ -573,6 +578,7 @@ class PersonalRecordCheckerTestCase(WgerTestCase):self.assertEqual(checker.get_context_data().get('one_rep_max_estimate'), one_rm)def test_estimate_1rm_raises_on_missing_values(self):+ # wgerfrom wger.trophies.checkers.personal_record import PersonalRecordChecker# No log@@ -596,6 +602,7 @@ class PersonalRecordCheckerTestCase(WgerTestCase):self.assertIsNone(context.get('one_rep_max_estimate'))def test_estimate_1rm_raises_on_repetitions_37(self):+ # wgerfrom wger.trophies.checkers.personal_record import PersonalRecordCheckerlog = WorkoutLog(user=self.user, exercise=self.exercise, weight=100, repetitions=37)