Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add style field to ExerciseImage

LucasSD1d190f1d6374
diff --git a/AUTHORS.rst b/AUTHORS.rst
index 9f2fb9db5..85fc52349 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -60,6 +60,7 @@ Developers
* Leninux - https://github.com/RedRudeBoy
* Ayush Kumar - https://github.com/gr8ayu
* Gorkem Arslan - https://github.com/gorkemarslan
+* Lucas Stone-Drake - https://github.com/LucasSD
Translators
-----------
diff --git a/wger/exercises/api/serializers.py b/wger/exercises/api/serializers.py
index 31b412434..41b2915d8 100644
--- a/wger/exercises/api/serializers.py
+++ b/wger/exercises/api/serializers.py
@@ -74,6 +74,7 @@ class ExerciseImageSerializer(serializers.ModelSerializer):
'image',
'is_main',
'status',
+ 'style',
]
diff --git a/wger/exercises/forms.py b/wger/exercises/forms.py
index adc29ae4b..0db52a2a6 100644
--- a/wger/exercises/forms.py
+++ b/wger/exercises/forms.py
@@ -33,6 +33,7 @@ class ExerciseImageForm(forms.ModelForm):
'is_main',
'license',
'license_author',
+ 'style',
)
diff --git a/wger/exercises/migrations/0014_exerciseimage_style.py b/wger/exercises/migrations/0014_exerciseimage_style.py
new file mode 100644
index 000000000..047f822ce
--- /dev/null
+++ b/wger/exercises/migrations/0014_exerciseimage_style.py
@@ -0,0 +1,32 @@
+# Generated by Django 3.2.7 on 2021-09-17 15:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('exercises', '0013_auto_20210503_1232'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='exerciseimage',
+ name='style',
+ field=models.CharField(
+ choices=[
+ ('1',
+ 'Line'),
+ ('2',
+ '3D'),
+ ('3',
+ 'Low-poly'),
+ ('4',
+ 'Photo'),
+ ('5',
+ 'Other')],
+ default='1',
+ help_text='The art style of your image',
+ max_length=1),
+ ),
+ ]
diff --git a/wger/exercises/models/image.py b/wger/exercises/models/image.py
index 18c4115f2..cd944fb97 100644
--- a/wger/exercises/models/image.py
+++ b/wger/exercises/models/image.py
@@ -39,10 +39,14 @@ def exercise_image_upload_dir(instance, filename):
Returns the upload target for exercise images
"""
ext = pathlib.Path(filename).suffix
- return "exercise-images/{0}/{1}{2}".format(instance.exercise_base.id, instance.uuid, ext)
+ return "exercise-images/{0}/{1}{2}".format(
+ instance.exercise_base.id, instance.uuid, ext)
-class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
+class ExerciseImage(
+ AbstractSubmissionModel,
+ AbstractLicenseModel,
+ models.Model):
"""
Model for an exercise image
"""
@@ -50,6 +54,19 @@ class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model)
objects = SubmissionManager()
"""Custom manager"""
+ LINE_ART = '1'
+ THREE_D = '2'
+ LOW_POLY = '3'
+ PHOTO = '4'
+ OTHER = '5'
+ STYLE = (
+ (LINE_ART, _('Line')),
+ (THREE_D, _('3D')),
+ (LOW_POLY, _('Low-poly')),
+ (PHOTO, _('Photo')),
+ (OTHER, _('Other')),
+ )
+
uuid = models.UUIDField(
default=uuid.uuid4,
editable=False,
@@ -83,6 +100,14 @@ class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model)
)
"""A flag indicating whether the image is the exercise's main image"""
+ style = models.CharField(
+ help_text=_('The art style of your image'),
+ max_length=1,
+ choices=STYLE,
+ default=PHOTO,
+ )
+ """The art style of the image"""
+
class Meta:
"""
Set default ordering
@@ -95,7 +120,9 @@ class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model)
Only one image can be marked as main picture at a time
"""
if self.is_main:
- ExerciseImage.objects.filter(exercise_base=self.exercise_base).update(is_main=False)
+ ExerciseImage.objects.filter(
+ exercise_base=self.exercise_base).update(
+ is_main=False)
self.is_main = True
else:
if ExerciseImage.objects.accepted()\
@@ -112,7 +139,8 @@ class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model)
for language in Language.objects.all():
delete_template_fragment_cache('muscle-overview', language.id)
delete_template_fragment_cache('exercise-overview', language.id)
- delete_template_fragment_cache('exercise-overview-mobile', language.id)
+ delete_template_fragment_cache(
+ 'exercise-overview-mobile', language.id)
delete_template_fragment_cache('equipment-overview', language.id)
# And go on
@@ -127,16 +155,16 @@ class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model)
for language in Language.objects.all():
delete_template_fragment_cache('muscle-overview', language.id)
delete_template_fragment_cache('exercise-overview', language.id)
- delete_template_fragment_cache('exercise-overview-mobile', language.id)
+ delete_template_fragment_cache(
+ 'exercise-overview-mobile', language.id)
delete_template_fragment_cache('equipment-overview', language.id)
# Make sure there is always a main image
- if not ExerciseImage.objects.accepted() \
- .filter(exercise_base=self.exercise_base, is_main=True).count() \
- and ExerciseImage.objects.accepted() \
- .filter(exercise_base=self.exercise_base) \
- .filter(is_main=False) \
- .count():
+ if not ExerciseImage.objects.accepted() .filter(
+ exercise_base=self.exercise_base,
+ is_main=True).count() and ExerciseImage.objects.accepted() .filter(
+ exercise_base=self.exercise_base) .filter(
+ is_main=False) .count():
image = ExerciseImage.objects.accepted() \
.filter(exercise_base=self.exercise_base, is_main=False)[0]
diff --git a/wger/exercises/tests/test_exercise_images.py b/wger/exercises/tests/test_exercise_images.py
index 7e82e0da2..14115946f 100644
--- a/wger/exercises/tests/test_exercise_images.py
+++ b/wger/exercises/tests/test_exercise_images.py
@@ -116,7 +116,8 @@ class AddExerciseImageTestCase(WgerAddTestCase):
data = {
'is_main': True,
'image': open('wger/exercises/tests/protestschwein.jpg', 'rb'),
- 'license': 1
+ 'license': 1,
+ 'style': '1'
}
@@ -128,7 +129,7 @@ class EditExerciseImageTestCase(WgerEditTestCase):
object_class = ExerciseImage
url = 'exercise:image:edit'
pk = 2
- data = {'is_main': True, 'license': 1}
+ data = {'is_main': True, 'license': 1, 'style': '1'}
class DeleteExerciseImageTestCase(WgerDeleteTestCase):