Self hosted FLOSS fitness/workout, nutrition and weight tracker
Adding new fields to Ingredient, updating form
Harlene Samra5c55b9ff04d5
diff --git a/wger/nutrition/forms.py b/wger/nutrition/forms.pyindex 84c837b0e..95ceaaa7b 100644--- a/wger/nutrition/forms.py+++ b/wger/nutrition/forms.py@@ -265,6 +265,9 @@ class IngredientForm(forms.ModelForm):class Meta:model = Ingredientfields = ['name',+ 'common_name', #optional+ 'brand', # optional+ 'category', #option (Eg. vegetarian) include this as help text'energy','protein','carbohydrates',@@ -273,14 +276,22 @@ class IngredientForm(forms.ModelForm):'fat_saturated','fibres','sodium',+ 'image', # optional'license','license_author']+ widgets = {'category': forms.TextInput}def __init__(self, *args, **kwargs):super(IngredientForm, self).__init__(*args, **kwargs)self.helper = FormHelper()self.helper.layout = Layout(- 'name',+ Row(+ Column('name', css_class='form-group col-6 mb-0'),+ Column('common_name', css_class='form-group col-6 mb-0'),+ css_class='form-row'+ ),+ 'brand',+ 'category','energy','protein',Row(@@ -295,6 +306,7 @@ class IngredientForm(forms.ModelForm):),'fibres','sodium',+ 'image','license','license_author')diff --git a/wger/nutrition/migrations/0007_auto_20201211_0018.py b/wger/nutrition/migrations/0007_auto_20201211_0018.pynew file mode 100644index 000000000..5b92b189a--- /dev/null+++ b/wger/nutrition/migrations/0007_auto_20201211_0018.py@@ -0,0 +1,77 @@+# Generated by Django 3.1.4 on 2020-12-10 23:18++import django.core.validators+from django.db import migrations, models+import django.db.models.deletion+import django.utils.timezone+++class Migration(migrations.Migration):++ dependencies = [+ ('nutrition', '0006_auto_20201201_0653'),+ ]++ operations = [+ migrations.CreateModel(+ name='IngredientCategory',+ fields=[+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),+ ('name', models.CharField(max_length=100, verbose_name='Name')),+ ],+ options={+ 'verbose_name_plural': 'Ingredient Categories',+ 'ordering': ['name'],+ },+ ),+ migrations.AddField(+ model_name='ingredient',+ name='brand',+ 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'),+ ),+ 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'),+ ),+ migrations.AddField(+ model_name='ingredient',+ name='last_imported',+ field=models.DateTimeField(default=django.utils.timezone.now),+ ),+ migrations.AddField(+ model_name='ingredient',+ name='source_name',+ field=models.CharField(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),+ ),+ migrations.AlterField(+ model_name='ingredient',+ 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'),+ ),+ ]diff --git a/wger/nutrition/models.py b/wger/nutrition/models.pyindex 68b64469d..11403083d 100644--- a/wger/nutrition/models.py+++ b/wger/nutrition/models.py@@ -260,6 +260,36 @@ 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")+ ordering = ["name", ]++ def __str__(self):+ """+ Return a more human-readable representation+ """+ return self.name++ def get_owner_object(self):+ """+ Category has no owner information+ """+ return False++ def save(self, *args, **kwargs):+ """+ Reset all cached infos+ """++ super(IngredientCategory, self).save(*args, **kwargs)+class Ingredient(AbstractSubmissionModel, AbstractLicenseModel, models.Model):"""@@ -352,6 +382,43 @@ class Ingredient(AbstractSubmissionModel, AbstractLicenseModel, models.Model):help_text=_('In g per 100g of product'),validators=[MinValueValidator(0),MaxValueValidator(100)])+ code = models.CharField(max_length=200,+ verbose_name=_('Name'),+ null=True)++ source_name = models.CharField(max_length=200,+ verbose_name=_('Source Name'),+ null=True)++ source_url = models.URLField(verbose_name=_('Link'),+ help_text=_('Link to product'),+ blank=True,+ null=True)++ last_imported = models.DateTimeField(default=timezone.now)++ updated = models.DateTimeField(default=timezone.now)++ common_name = models.CharField(max_length=200,+ verbose_name=_('Common name of product'),+ null=True,+ blank=True)++ image = models.ImageField(verbose_name=_('Image'),+ help_text=_('Only PNG and JPEG formats are supported'),+ null=True,+ blank=True)++ category = models.ForeignKey(IngredientCategory,+ verbose_name=_('Category'),+ on_delete=models.CASCADE,+ null=True,+ blank=True)++ brand = models.CharField(max_length=200,+ verbose_name=_('Brand name of product'),+ null=True,+ blank=True)## Django methods