Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fixing migrations, style

Harlene Samrae1473dab599e
diff --git a/wger/nutrition/forms.py b/wger/nutrition/forms.py
index 31fa1b493..82be38e70 100644
--- a/wger/nutrition/forms.py
+++ b/wger/nutrition/forms.py
@@ -265,9 +265,9 @@ class IngredientForm(forms.ModelForm):
class Meta:
model = Ingredient
fields = ['name',
- 'common_name', #optional
- 'brand', # optional
- 'category', #option (Eg. vegetarian) include this as help text
+ 'common_name',
+ 'brand',
+ 'category',
'energy',
'protein',
'carbohydrates',
diff --git a/wger/nutrition/migrations/0007_auto_20201211_0018.py b/wger/nutrition/migrations/0007_auto_20201214_0013.py
similarity index 57%
rename from wger/nutrition/migrations/0007_auto_20201211_0018.py
rename to wger/nutrition/migrations/0007_auto_20201214_0013.py
index 5b92b189a..e8ac7a1a9 100644
--- a/wger/nutrition/migrations/0007_auto_20201211_0018.py
+++ b/wger/nutrition/migrations/0007_auto_20201214_0013.py
@@ -1,9 +1,8 @@
-# Generated by Django 3.1.4 on 2020-12-10 23:18
+# Generated by Django 3.1.4 on 2020-12-13 23:13
import django.core.validators
from django.db import migrations, models
import django.db.models.deletion
-import django.utils.timezone
class Migration(migrations.Migration):
@@ -16,7 +15,8 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='IngredientCategory',
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('id', models.AutoField(auto_created=True, primary_key=True,
+ serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=100, verbose_name='Name')),
],
options={
@@ -27,51 +27,49 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='ingredient',
name='brand',
- field=models.CharField(blank=True, max_length=200, null=True, verbose_name='Brand name of product'),
+ field=models.CharField(blank=True, max_length=200, null=True,
+ verbose_name='Brand name of product'),
),
migrations.AddField(
model_name='ingredient',
name='code',
- field=models.CharField(max_length=200, null=True, verbose_name='Name'),
+ field=models.CharField(blank=True, max_length=200, null=True, verbose_name='Name'),
),
migrations.AddField(
model_name='ingredient',
name='common_name',
- field=models.CharField(blank=True, max_length=200, null=True, verbose_name='Common name of product'),
- ),
- migrations.AddField(
- model_name='ingredient',
- name='image',
- field=models.ImageField(blank=True, help_text='Only PNG and JPEG formats are supported', null=True, upload_to='', verbose_name='Image'),
+ field=models.CharField(blank=True, max_length=200, null=True,
+ verbose_name='Common name of product'),
),
migrations.AddField(
model_name='ingredient',
name='last_imported',
- field=models.DateTimeField(default=django.utils.timezone.now),
+ field=models.DateTimeField(auto_now_add=True, null=True, verbose_name='Date'),
),
migrations.AddField(
model_name='ingredient',
name='source_name',
- field=models.CharField(max_length=200, null=True, verbose_name='Source Name'),
+ field=models.CharField(blank=True, max_length=200, null=True,
+ verbose_name='Source Name'),
),
migrations.AddField(
model_name='ingredient',
name='source_url',
- field=models.URLField(blank=True, help_text='Link to product', null=True, verbose_name='Link'),
- ),
- migrations.AddField(
- model_name='ingredient',
- name='updated',
- field=models.DateTimeField(default=django.utils.timezone.now),
+ field=models.URLField(blank=True, help_text='Link to product', null=True,
+ verbose_name='Link'),
),
migrations.AlterField(
model_name='ingredient',
name='name',
- field=models.CharField(max_length=200, validators=[django.core.validators.MinLengthValidator(3)], verbose_name='Name'),
+ field=models.CharField(max_length=200,
+ validators=[django.core.validators.MinLengthValidator(3)],
+ verbose_name='Name'),
),
migrations.AddField(
model_name='ingredient',
name='category',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='nutrition.ingredientcategory', verbose_name='Category'),
+ field=models.ForeignKey(blank=True, null=True,
+ on_delete=django.db.models.deletion.CASCADE,
+ to='nutrition.ingredientcategory', verbose_name='Category'),
),
]
diff --git a/wger/nutrition/migrations/0008_remove_ingredient_updated.py b/wger/nutrition/migrations/0008_remove_ingredient_updated.py
deleted file mode 100644
index e25feaa40..000000000
--- a/wger/nutrition/migrations/0008_remove_ingredient_updated.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 3.1.4 on 2020-12-12 21:38
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('nutrition', '0007_auto_20201211_0018'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='ingredient',
- name='updated',
- ),
- ]
diff --git a/wger/nutrition/models.py b/wger/nutrition/models.py
index 74b63febf..7e79e2faf 100644
--- a/wger/nutrition/models.py
+++ b/wger/nutrition/models.py
@@ -260,12 +260,14 @@ class NutritionPlan(models.Model):
result[key] += values[key]
return result
+
class IngredientCategory(models.Model):
"""
Model for an Ingredient category
"""
name = models.CharField(max_length=100,
verbose_name=_('Name'))
+
# Metaclass to set some other properties
class Meta:
verbose_name_plural = _("Ingredient Categories")
@@ -384,24 +386,26 @@ class Ingredient(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
MaxValueValidator(100)])
code = models.CharField(max_length=200,
verbose_name=_('Name'),
- null=True)
+ null=True,
+ blank=True)
source_name = models.CharField(max_length=200,
verbose_name=_('Source Name'),
- null=True)
-
+ null=True,
+ blank=True)
+
source_url = models.URLField(verbose_name=_('Link'),
- help_text=_('Link to product'),
- blank=True,
- null=True)
-
- last_imported = models.DateTimeField(default=timezone.now)
+ help_text=_('Link to product'),
+ blank=True,
+ null=True)
+
+ last_imported = models.DateTimeField(_('Date'), auto_now_add=True, null=True, blank=True)
common_name = models.CharField(max_length=200,
verbose_name=_('Common name of product'),
null=True,
blank=True)
-
+
category = models.ForeignKey(IngredientCategory,
verbose_name=_('Category'),
on_delete=models.CASCADE,
@@ -409,9 +413,9 @@ class Ingredient(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
blank=True)
brand = models.CharField(max_length=200,
- verbose_name=_('Brand name of product'),
- null=True,
- blank=True)
+ verbose_name=_('Brand name of product'),
+ null=True,
+ blank=True)
#
# Django methods