Self hosted FLOSS fitness/workout, nutrition and weight tracker
Set a default value for the nutritional plan start
Roland Geiderfc05154c1a0c
diff --git a/wger/nutrition/fixtures/test-nutrition-data.json b/wger/nutrition/fixtures/test-nutrition-data.jsonindex 863f2d39e..546f4736b 100644--- a/wger/nutrition/fixtures/test-nutrition-data.json+++ b/wger/nutrition/fixtures/test-nutrition-data.json@@ -1,356 +1,366 @@[- {- "pk": 5,- "model": "nutrition.nutritionplan",- "fields": {- "description": "Description 1",- "user": 1,- "creation_date": "2012-11-19"- }- },- {- "pk": 4,- "model": "nutrition.nutritionplan",- "fields": {- "description": "My plan to do xyz",- "user": 2,- "creation_date": "2012-11-12"- }- },- {- "pk": 3,- "model": "nutrition.nutritionplan",- "fields": {- "description": "",- "user": 1,- "creation_date": "2012-11-09"- }- },- {- "pk": 2,- "model": "nutrition.nutritionplan",- "fields": {- "description": "",- "user": 1,- "creation_date": "2012-10-29"- }- },- {- "pk": 1,- "model": "nutrition.nutritionplan",- "fields": {- "description": "",- "user": 2,- "creation_date": "2012-09-22"- }- },- {- "pk": 1,- "model": "nutrition.meal",- "fields": {- "time": null,- "plan": 1,- "order": 1- }- },- {- "pk": 2,- "model": "nutrition.meal",- "fields": {- "time": "07:00:00",- "plan": 4,- "order": 1- }- },- {- "pk": 3,- "model": "nutrition.meal",- "fields": {- "time": "08:00:00",- "plan": 2,- "order": 1- }- },- {- "pk": 4,- "model": "nutrition.meal",- "fields": {- "time": "08:00:00",- "plan": 3,- "order": 1- }- },- {- "pk": 5,- "model": "nutrition.meal",- "fields": {- "time": "08:00:00",- "plan": 2,- "order": 1- }- },- {- "pk": 6,- "model": "nutrition.meal",- "fields": {- "time": "08:00:00",- "plan": 5,- "order": 1- }- },- {- "pk": 7,- "model": "nutrition.meal",- "fields": {- "time": "08:02:00",- "plan": 4,- "order": 1- }- },- {- "pk": 8,- "model": "nutrition.meal",- "fields": {- "time": "10:00:00",- "plan": 2,- "order": 1- }- },- {- "pk": 9,- "model": "nutrition.meal",- "fields": {- "time": "10:00:00",- "plan": 4,- "order": 1- }- },- {- "pk": 10,- "model": "nutrition.meal",- "fields": {- "time": "19:02:00",- "plan": 4,- "order": 1- }- },- {- "pk": 11,- "model": "nutrition.meal",- "fields": {- "time": "22:00:00",- "plan": 4,- "order": 1- }- },- {- "pk": 1,- "model": "nutrition.mealitem",- "fields": {- "ingredient": 1,- "amount": 200,- "meal": 1,- "order": 1- }- },- {- "pk": 2,- "model": "nutrition.mealitem",- "fields": {- "ingredient": 1,- "amount": 200,- "meal": 1,- "order": 1- }- },- {- "pk": 3,- "model": "nutrition.mealitem",- "fields": {- "ingredient": 1,- "amount": 200,- "meal": 1,- "order": 1- }- },- {- "pk": 4,- "model": "nutrition.mealitem",- "fields": {- "ingredient": 4,- "amount": 300,- "meal": 3,- "order": 1- }- },- {- "pk": 5,- "model": "nutrition.mealitem",- "fields": {- "ingredient": 2,- "amount": 100,- "meal": 8,- "order": 1- }- },- {- "pk": 6,- "model": "nutrition.mealitem",- "fields": {- "ingredient": 5,- "amount": 100,- "meal": 8,- "order": 1- }- },- {- "pk": 7,- "model": "nutrition.mealitem",- "fields": {- "ingredient": 3,- "amount": 300,- "meal": 7,- "order": 1- }- },- {- "pk": 8,- "model": "nutrition.mealitem",- "fields": {- "ingredient": 1,- "amount": 101,- "meal": 9,- "order": 1- }- },- {- "pk": 9,- "model": "nutrition.mealitem",- "fields": {- "ingredient": 2,- "amount": 100,- "meal": 9,- "order": 1- }- },- {- "pk": 10,- "model": "nutrition.mealitem",- "fields": {- "ingredient": 3,- "amount": 100,- "meal": 2,- "order": 1- }- },- {- "pk": 11,- "model": "nutrition.mealitem",- "fields": {- "ingredient": 4,- "amount": 200,- "meal": 10,- "order": 1- }- },- {- "pk": 12,- "model": "nutrition.mealitem",- "fields": {- "ingredient": 4,- "amount": 200,- "meal": 10,- "order": 1- }- },- {- "pk": 13,- "model": "nutrition.mealitem",- "fields": {- "ingredient": 3,- "amount": 100,- "meal": 7,- "order": 1- }- },- {- "pk": 14,- "model": "nutrition.mealitem",- "fields": {- "ingredient": 6,- "amount": 30,- "meal": 7,- "order": 1- }- },- {- "pk": 15,- "model": "nutrition.mealitem",- "fields": {- "ingredient": 3,- "amount": 150,- "meal": 10,- "order": 1- }- },- {- "pk": 16,- "model": "nutrition.mealitem",- "fields": {- "ingredient": 1,- "amount": 500,- "meal": 11,- "order": 1- }- },- {- "pk": 17,- "model": "nutrition.mealitem",- "fields": {- "ingredient": 6,- "amount": 100,- "meal": 6,- "order": 1- }- },- {- "pk": 18,- "model": "nutrition.mealitem",- "fields": {- "ingredient": 4,- "amount": 100,- "meal": 6,- "order": 1- }- },- {- "pk": 19,- "model": "nutrition.mealitem",- "fields": {- "ingredient": 3,- "amount": 100,- "meal": 6,- "order": 1- }- },- {- "pk": 20,- "model": "nutrition.mealitem",- "fields": {- "ingredient": 2,- "amount": 100,- "meal": 6,- "order": 1- }- },- {- "pk": 21,- "model": "nutrition.mealitem",- "fields": {- "ingredient": 1,- "amount": 100,- "meal": 6,- "order": 1- }+ {+ "pk": 1,+ "model": "nutrition.nutritionplan",+ "fields": {+ "description": "",+ "user": 2,+ "creation_date": "2012-09-22",+ "start": "2012-09-22",+ "end": null}+ },+ {+ "pk": 2,+ "model": "nutrition.nutritionplan",+ "fields": {+ "description": "",+ "user": 1,+ "creation_date": "2012-10-29",+ "start": "2012-11-01",+ "end": "2012-11-30"+ }+ },+ {+ "pk": 3,+ "model": "nutrition.nutritionplan",+ "fields": {+ "description": "",+ "user": 1,+ "creation_date": "2012-11-09",+ "start": "2012-11-09",+ "end": null+ }+ },+ {+ "pk": 4,+ "model": "nutrition.nutritionplan",+ "fields": {+ "description": "My plan to do xyz",+ "user": 2,+ "creation_date": "2012-11-12",+ "start": "2012-11-12",+ "end": null+ }+ },+ {+ "pk": 5,+ "model": "nutrition.nutritionplan",+ "fields": {+ "description": "Description 1",+ "user": 1,+ "creation_date": "2012-11-19",+ "start": "2012-12-01",+ "end": "2012-12-31"+ }+ },+ {+ "pk": 1,+ "model": "nutrition.meal",+ "fields": {+ "time": null,+ "plan": 1,+ "order": 1+ }+ },+ {+ "pk": 2,+ "model": "nutrition.meal",+ "fields": {+ "time": "07:00:00",+ "plan": 4,+ "order": 1+ }+ },+ {+ "pk": 3,+ "model": "nutrition.meal",+ "fields": {+ "time": "08:00:00",+ "plan": 2,+ "order": 1+ }+ },+ {+ "pk": 4,+ "model": "nutrition.meal",+ "fields": {+ "time": "08:00:00",+ "plan": 3,+ "order": 1+ }+ },+ {+ "pk": 5,+ "model": "nutrition.meal",+ "fields": {+ "time": "08:00:00",+ "plan": 2,+ "order": 1+ }+ },+ {+ "pk": 6,+ "model": "nutrition.meal",+ "fields": {+ "time": "08:00:00",+ "plan": 5,+ "order": 1+ }+ },+ {+ "pk": 7,+ "model": "nutrition.meal",+ "fields": {+ "time": "08:02:00",+ "plan": 4,+ "order": 1+ }+ },+ {+ "pk": 8,+ "model": "nutrition.meal",+ "fields": {+ "time": "10:00:00",+ "plan": 2,+ "order": 1+ }+ },+ {+ "pk": 9,+ "model": "nutrition.meal",+ "fields": {+ "time": "10:00:00",+ "plan": 4,+ "order": 1+ }+ },+ {+ "pk": 10,+ "model": "nutrition.meal",+ "fields": {+ "time": "19:02:00",+ "plan": 4,+ "order": 1+ }+ },+ {+ "pk": 11,+ "model": "nutrition.meal",+ "fields": {+ "time": "22:00:00",+ "plan": 4,+ "order": 1+ }+ },+ {+ "pk": 1,+ "model": "nutrition.mealitem",+ "fields": {+ "ingredient": 1,+ "amount": 200,+ "meal": 1,+ "order": 1+ }+ },+ {+ "pk": 2,+ "model": "nutrition.mealitem",+ "fields": {+ "ingredient": 1,+ "amount": 200,+ "meal": 1,+ "order": 1+ }+ },+ {+ "pk": 3,+ "model": "nutrition.mealitem",+ "fields": {+ "ingredient": 1,+ "amount": 200,+ "meal": 1,+ "order": 1+ }+ },+ {+ "pk": 4,+ "model": "nutrition.mealitem",+ "fields": {+ "ingredient": 4,+ "amount": 300,+ "meal": 3,+ "order": 1+ }+ },+ {+ "pk": 5,+ "model": "nutrition.mealitem",+ "fields": {+ "ingredient": 2,+ "amount": 100,+ "meal": 8,+ "order": 1+ }+ },+ {+ "pk": 6,+ "model": "nutrition.mealitem",+ "fields": {+ "ingredient": 5,+ "amount": 100,+ "meal": 8,+ "order": 1+ }+ },+ {+ "pk": 7,+ "model": "nutrition.mealitem",+ "fields": {+ "ingredient": 3,+ "amount": 300,+ "meal": 7,+ "order": 1+ }+ },+ {+ "pk": 8,+ "model": "nutrition.mealitem",+ "fields": {+ "ingredient": 1,+ "amount": 101,+ "meal": 9,+ "order": 1+ }+ },+ {+ "pk": 9,+ "model": "nutrition.mealitem",+ "fields": {+ "ingredient": 2,+ "amount": 100,+ "meal": 9,+ "order": 1+ }+ },+ {+ "pk": 10,+ "model": "nutrition.mealitem",+ "fields": {+ "ingredient": 3,+ "amount": 100,+ "meal": 2,+ "order": 1+ }+ },+ {+ "pk": 11,+ "model": "nutrition.mealitem",+ "fields": {+ "ingredient": 4,+ "amount": 200,+ "meal": 10,+ "order": 1+ }+ },+ {+ "pk": 12,+ "model": "nutrition.mealitem",+ "fields": {+ "ingredient": 4,+ "amount": 200,+ "meal": 10,+ "order": 1+ }+ },+ {+ "pk": 13,+ "model": "nutrition.mealitem",+ "fields": {+ "ingredient": 3,+ "amount": 100,+ "meal": 7,+ "order": 1+ }+ },+ {+ "pk": 14,+ "model": "nutrition.mealitem",+ "fields": {+ "ingredient": 6,+ "amount": 30,+ "meal": 7,+ "order": 1+ }+ },+ {+ "pk": 15,+ "model": "nutrition.mealitem",+ "fields": {+ "ingredient": 3,+ "amount": 150,+ "meal": 10,+ "order": 1+ }+ },+ {+ "pk": 16,+ "model": "nutrition.mealitem",+ "fields": {+ "ingredient": 1,+ "amount": 500,+ "meal": 11,+ "order": 1+ }+ },+ {+ "pk": 17,+ "model": "nutrition.mealitem",+ "fields": {+ "ingredient": 6,+ "amount": 100,+ "meal": 6,+ "order": 1+ }+ },+ {+ "pk": 18,+ "model": "nutrition.mealitem",+ "fields": {+ "ingredient": 4,+ "amount": 100,+ "meal": 6,+ "order": 1+ }+ },+ {+ "pk": 19,+ "model": "nutrition.mealitem",+ "fields": {+ "ingredient": 3,+ "amount": 100,+ "meal": 6,+ "order": 1+ }+ },+ {+ "pk": 20,+ "model": "nutrition.mealitem",+ "fields": {+ "ingredient": 2,+ "amount": 100,+ "meal": 6,+ "order": 1+ }+ },+ {+ "pk": 21,+ "model": "nutrition.mealitem",+ "fields": {+ "ingredient": 1,+ "amount": 100,+ "meal": 6,+ "order": 1+ }+ }]diff --git a/wger/nutrition/migrations/0026_add_start_and_end_fields.py b/wger/nutrition/migrations/0026_add_start_and_end_fields.pyindex f1dc8c940..aa304d10f 100644--- a/wger/nutrition/migrations/0026_add_start_and_end_fields.py+++ b/wger/nutrition/migrations/0026_add_start_and_end_fields.py@@ -1,6 +1,7 @@-# Generated by Django 5.2.3 on 2025-06-26 08:51+# Generated by Django 5.2.5 on 2025-09-11 09:02++import datetime-import django.utils.timezonefrom django.db import migrations, models@@ -23,11 +24,10 @@ class Migration(migrations.Migration):migrations.AddField(model_name='nutritionplan',name='start',- field=models.DateField(default=django.utils.timezone.now, verbose_name='Start date'),- preserve_default=False,+ field=models.DateField(default=datetime.date.today, verbose_name='Start date'),),migrations.RunPython(copy_creation_date_to_start,- reverse_code=migrations.RunPython.noop+ reverse_code=migrations.RunPython.noop,),]diff --git a/wger/nutrition/models/plan.py b/wger/nutrition/models/plan.pyindex a285dcc99..4c8c15f39 100644--- a/wger/nutrition/models/plan.py+++ b/wger/nutrition/models/plan.py@@ -60,6 +60,7 @@ class NutritionPlan(models.Model):start = models.DateField(_('Start date'),+ default=datetime.date.today,)end = models.DateField(