diff --git a/cookbook/forms.py b/cookbook/forms.py index 9a70b22e0..f65696e6c 100644 --- a/cookbook/forms.py +++ b/cookbook/forms.py @@ -1,6 +1,5 @@ -from dal_select2.widgets import ModelSelect2 from django import forms -from django.forms import widgets, SelectDateWidget +from django.forms import widgets from django.utils.translation import gettext as _ from emoji_picker.widgets import EmojiPickerTextInput @@ -21,6 +20,10 @@ class MultiSelectWidget(widgets.SelectMultiple): class DateWidget(forms.DateInput): input_type = 'date' + def __init__(self, **kwargs): + kwargs["format"] = "%Y-%m-%d" + super().__init__(**kwargs) + class ExternalRecipeForm(forms.ModelForm): file_path = forms.CharField(disabled=True, required=False) diff --git a/cookbook/models.py b/cookbook/models.py index 0299a6bec..459f10490 100644 --- a/cookbook/models.py +++ b/cookbook/models.py @@ -129,3 +129,6 @@ class MealPlan(models.Model): meal = models.CharField(choices=MEAL_TYPES, max_length=128, default=BREAKFAST) note = models.TextField(blank=True) date = models.DateField() + + def __str__(self): + return self.meal + ' (' + str(self.date) + ') ' + str(self.recipe) diff --git a/cookbook/templates/meal_plan.html b/cookbook/templates/meal_plan.html index 8cff0ecf7..38cc2d1d0 100644 --- a/cookbook/templates/meal_plan.html +++ b/cookbook/templates/meal_plan.html @@ -42,6 +42,7 @@ {% for day_key, days_value in plan_value.days.items %}