Skip to content

armgit / wger

Public Imported from GitHub
0

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.py
index 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 Library
from typing import Optional
+# wger
from wger.trophies.models.trophy import Trophy
from wger.trophies.models.user_trophy import UserTrophy
+
+# Local
from .base import BaseTrophyChecker
diff --git a/wger/trophies/checkers/registry.py b/wger/trophies/checkers/registry.py
index bc96161bc..426fc0382 100644
--- a/wger/trophies/checkers/registry.py
+++ b/wger/trophies/checkers/registry.py
@@ -24,6 +24,8 @@ from typing import (
# Django
from django.contrib.auth.models import User
+
+# wger
from wger.trophies.models.trophy import Trophy
# Local
@@ -31,11 +33,11 @@ from .base import BaseTrophyChecker
from .count_based import CountBasedChecker
from .date_based import DateBasedChecker
from .inactivity_return import InactivityReturnChecker
+from .personal_record import PersonalRecordChecker
from .streak import StreakChecker
from .time_based import TimeBasedChecker
from .volume import VolumeChecker
from .weekend_warrior import WeekendWarriorChecker
-from .personal_record import PersonalRecordChecker
logger = logging.getLogger(__name__)
diff --git a/wger/trophies/models/user_trophy.py b/wger/trophies/models/user_trophy.py
index 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 _
# Local
diff --git a/wger/trophies/services/trophy.py b/wger/trophies/services/trophy.py
index 32790bc68..999f92e8c 100644
--- a/wger/trophies/services/trophy.py
+++ b/wger/trophies/services/trophy.py
@@ -26,7 +26,6 @@ from typing import (
# Django
from django.conf import settings
from django.contrib.auth.models import User
-from django.db.models import Q
from django.utils import timezone
# wger
diff --git a/wger/trophies/tests/test_checkers.py b/wger/trophies/tests/test_checkers.py
index 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):
+ # wger
from wger.trophies.checkers.personal_record import PersonalRecordChecker
checker = PersonalRecordChecker(self.user, self.trophy, {})
self.assertFalse(checker.check())
def test_first_log_counts_as_pr(self):
+ # wger
from wger.trophies.checkers.personal_record import PersonalRecordChecker
log = 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):
+ # wger
from wger.trophies.checkers.personal_record import PersonalRecordChecker
log1 = 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):
+ # wger
from wger.trophies.checkers.personal_record import PersonalRecordChecker
log1 = 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):
+ # wger
from wger.trophies.checkers.personal_record import PersonalRecordChecker
log = 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):
+ # wger
from 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):
+ # wger
from wger.trophies.checkers.personal_record import PersonalRecordChecker
log = WorkoutLog(user=self.user, exercise=self.exercise, weight=100, repetitions=37)