Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Make RiR field a Charfield

Roland Geider00f450523d65
diff --git a/wger/manager/forms.py b/wger/manager/forms.py
index 00dcc9efe..0cf058b04 100644
--- a/wger/manager/forms.py
+++ b/wger/manager/forms.py
@@ -132,7 +132,6 @@ class WorkoutLogForm(ModelForm):
initial=0,
required=False)
rir = ChoiceField(label=_('RiR'),
-
choices=RIR_OPTIONS,
required=False)
diff --git a/wger/manager/helpers.py b/wger/manager/helpers.py
index 586125608..c9d4d21c2 100644
--- a/wger/manager/helpers.py
+++ b/wger/manager/helpers.py
@@ -210,7 +210,7 @@ def reps_smart_text(settings, set_obj):
"""
if setting.rir:
- rir = "{0} RiR".format(normalize_decimal(setting.rir))
+ rir = f"{setting.rir} RiR"
else:
rir = ""
return rir
diff --git a/wger/manager/migrations/0010_auto_20210102_1446.py b/wger/manager/migrations/0010_auto_20210102_1446.py
new file mode 100644
index 000000000..38e5819ec
--- /dev/null
+++ b/wger/manager/migrations/0010_auto_20210102_1446.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.1.3 on 2021-01-02 13:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('manager', '0009_auto_20201202_1559'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='setting',
+ name='rir',
+ field=models.CharField(blank=True, choices=[(None, '------'), ('0', 0), ('0.5', 0.5), ('1', 1), ('1.5', 1.5), ('2', 2), ('2.5', 2.5), ('3', 3), ('3.5', 3.5), ('4', 4)], max_length=3, null=True, verbose_name='RiR'),
+ ),
+ migrations.AlterField(
+ model_name='workoutlog',
+ name='rir',
+ field=models.CharField(blank=True, choices=[(None, '------'), ('0', 0), ('0.5', 0.5), ('1', 1), ('1.5', 1.5), ('2', 2), ('2.5', 2.5), ('3', 3), ('3.5', 3.5), ('4', 4)], max_length=3, null=True, verbose_name='RiR'),
+ ),
+ ]
diff --git a/wger/manager/models.py b/wger/manager/models.py
index 85ec7deeb..110c81172 100644
--- a/wger/manager/models.py
+++ b/wger/manager/models.py
@@ -56,15 +56,15 @@ from wger.utils.fields import Html5DateField
logger = logging.getLogger(__name__)
RIR_OPTIONS = [(None, '------'),
- (0, 0),
- (0.5, 0.5),
- (1, 1),
- (1.5, 1.5),
- (2, 2),
- (2.5, 2.5),
- (3, 3),
- (3.5, 3.5),
- (4, 4)]
+ ('0', 0),
+ ('0.5', 0.5),
+ ('1', 1),
+ ('1.5', 1.5),
+ ('2', 2),
+ ('2.5', 2.5),
+ ('3', 3),
+ ('3.5', 3.5),
+ ('4', 4)]
#
@@ -665,12 +665,11 @@ class Setting(models.Model):
The weight unit of a set. This can be e.g. kg, lb, km/h, etc.
"""
- rir = models.DecimalField(verbose_name=_('RiR'),
- decimal_places=1,
- max_digits=3,
- blank=True,
- null=True,
- choices=RIR_OPTIONS)
+ rir = models.CharField(verbose_name=_('RiR'),
+ max_length=3,
+ blank=True,
+ null=True,
+ choices=RIR_OPTIONS)
"""
Reps in reserve, RiR. The amount of reps that could realistically still be
done in the set.
@@ -767,12 +766,11 @@ class WorkoutLog(models.Model):
date = Html5DateField(verbose_name=_('Date'))
- rir = models.DecimalField(verbose_name=_('RiR'),
- decimal_places=1,
- max_digits=3,
- blank=True,
- null=True,
- choices=RIR_OPTIONS)
+ rir = models.CharField(verbose_name=_('RiR'),
+ max_length=3,
+ blank=True,
+ null=True,
+ choices=RIR_OPTIONS)
"""
Reps in reserve, RiR. The amount of reps that could realistically still be
done in the set.
diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.py
index 6c1051f66..b22ede805 100644
--- a/wger/manager/tests/test_weight_log.py
+++ b/wger/manager/tests/test_weight_log.py
@@ -194,26 +194,26 @@ class WeightLogOverviewAddTestCase(WgerTestCase):
# Add new log entries
count_before = WorkoutLog.objects.count()
- response = self.client.post(reverse('manager:day:log', kwargs={'pk': 1}),
- {'date': '2012-01-01',
- 'notes': 'My cool impression',
- 'impression': '3',
- 'time_start': datetime.time(10, 0),
- 'time_end': datetime.time(12, 0),
- 'form-0-reps': 10,
- 'form-0-repetition_unit': 1,
- 'form-0-weight': 10,
- 'form-0-weight_unit': 1,
- 'form-0-rir': '1',
- 'form-1-reps': 10,
- 'form-1-repetition_unit': 1,
- 'form-1-weight': 10,
- 'form-1-weight_unit': 1,
- 'form-1-rir': '2',
- 'form-TOTAL_FORMS': 3,
- 'form-INITIAL_FORMS': 0,
- 'form-MAX-NUM_FORMS': 3
- })
+ form_data = {'date': '2012-01-01',
+ 'notes': 'My cool impression',
+ 'impression': '3',
+ 'time_start': datetime.time(10, 0),
+ 'time_end': datetime.time(12, 0),
+ 'form-0-reps': 10,
+ 'form-0-repetition_unit': 1,
+ 'form-0-weight': 10,
+ 'form-0-weight_unit': 1,
+ 'form-0-rir': '1',
+ 'form-1-reps': 10,
+ 'form-1-repetition_unit': 1,
+ 'form-1-weight': 10,
+ 'form-1-weight_unit': 1,
+ 'form-1-rir': '2',
+ 'form-TOTAL_FORMS': 3,
+ 'form-INITIAL_FORMS': 0,
+ 'form-MAX-NUM_FORMS': 3
+ }
+ response = self.client.post(reverse('manager:day:log', kwargs={'pk': 1}), form_data)
count_after = WorkoutLog.objects.count()
# Logged out users get a 302 redirect to login page
@@ -225,6 +225,22 @@ class WeightLogOverviewAddTestCase(WgerTestCase):
self.assertEqual(response.status_code, 302)
self.assertGreater(count_after, count_before)
+ #
+ # Post log without RiR
+ #
+ form_data['form-0-rir'] = ''
+ form_data['form-1-rir'] = ''
+ count_before = WorkoutLog.objects.count()
+ response = self.client.post(reverse('manager:day:log', kwargs={'pk': 1}), form_data)
+ count_after = WorkoutLog.objects.count()
+
+ if fail:
+ self.assertIn(response.status_code, (302, 403))
+ self.assertEqual(count_before, count_after)
+ else:
+ self.assertEqual(response.status_code, 302)
+ self.assertGreater(count_after, count_before)
+
def test_add_weight_log_anonymous(self):
"""
Tests adding weight log entries as an anonymous user
diff --git a/wger/nutrition/migrations/0008_auto_20210102_1446.py b/wger/nutrition/migrations/0008_auto_20210102_1446.py
new file mode 100644
index 000000000..1071a9947
--- /dev/null
+++ b/wger/nutrition/migrations/0008_auto_20210102_1446.py
@@ -0,0 +1,34 @@
+# Generated by Django 3.1.3 on 2021-01-02 13:46
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('nutrition', '0007_auto_20201214_0013'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='ingredient',
+ name='code',
+ field=models.CharField(blank=True, db_index=True, max_length=200, null=True),
+ ),
+ migrations.AlterField(
+ model_name='ingredient',
+ name='common_name',
+ field=models.CharField(blank=True, max_length=200, null=True),
+ ),
+ migrations.AlterField(
+ model_name='ingredient',
+ name='source_name',
+ field=models.CharField(blank=True, max_length=200, null=True),
+ ),
+ migrations.AlterField(
+ model_name='logitem',
+ name='plan',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='nutrition.nutritionplan', verbose_name='Nutrition plan'),
+ ),
+ ]