From e6d1b3407b1c9852f503d9f8c6ebdf7707e58a6c Mon Sep 17 00:00:00 2001 From: Martin Putzlocher Date: Thu, 25 Jun 2026 08:59:15 +0200 Subject: [PATCH] =?UTF-8?q?kleine=20=C3=84nderungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ns_alter_gericht_time_creation_and_more.py | 38 +++++++++++++++++++ mensa_app/models.py | 4 +- mensa_app/urls.py | 1 + mensa_app/views.py | 1 + 4 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 mensa_app/migrations/0011_alter_person_options_alter_gericht_time_creation_and_more.py diff --git a/mensa_app/migrations/0011_alter_person_options_alter_gericht_time_creation_and_more.py b/mensa_app/migrations/0011_alter_person_options_alter_gericht_time_creation_and_more.py new file mode 100644 index 0000000..81d30d5 --- /dev/null +++ b/mensa_app/migrations/0011_alter_person_options_alter_gericht_time_creation_and_more.py @@ -0,0 +1,38 @@ +# Generated by Django 5.2.15 on 2026-06-12 10:50 + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('mensa_app', '0010_merge_20260612_0913'), + ] + + operations = [ + migrations.AlterModelOptions( + name='person', + options={}, + ), + migrations.AlterField( + model_name='gericht', + name='time_creation', + field=models.TimeField(default=datetime.datetime(2026, 6, 12, 10, 50, 49, 206132)), + ), + migrations.AlterField( + model_name='gericht', + name='time_last_change', + field=models.TimeField(default=datetime.datetime(2026, 6, 12, 10, 50, 49, 206132)), + ), + migrations.AlterField( + model_name='gerichtbild', + name='id', + field=models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + migrations.AlterField( + model_name='person', + name='rolle', + field=models.CharField(choices=[('schueler', 'Schüler'), ('eltern', 'Eltern'), ('lehrer', 'Lehrer'), ('mitarbeiter', 'Mensa-Mitarbeiter'), ('chef', 'Mensa-Leitung')], max_length=20), + ), + ] diff --git a/mensa_app/models.py b/mensa_app/models.py index 88062d2..fb88a67 100644 --- a/mensa_app/models.py +++ b/mensa_app/models.py @@ -1,10 +1,8 @@ +import os from django.db import models from django.contrib.auth.models import User from django.utils import timezone import datetime - -import os -from django.db import models from django.core.exceptions import ValidationError from django.core.validators import FileExtensionValidator # Pillow ist für die Bildbearbeitung zuständig (installiere per pip install pillow) diff --git a/mensa_app/urls.py b/mensa_app/urls.py index c59a541..0a3ecbe 100644 --- a/mensa_app/urls.py +++ b/mensa_app/urls.py @@ -7,4 +7,5 @@ urlpatterns = [ path('speisekarte/', GerichtListView.as_view(), name='speisekarte'), path('speiseplan/', SpeiseplanView.as_view(), name='speiseplan'), path('bestellungen/summary/', BestellSummaryView.as_view(), name='bestell_summary'), + path('userlist/', {},"" ), ] diff --git a/mensa_app/views.py b/mensa_app/views.py index 662af6f..ba9d79d 100644 --- a/mensa_app/views.py +++ b/mensa_app/views.py @@ -36,6 +36,7 @@ class SpeiseplanView(TemplateView): context['target_date'] = target_date context['menues_day'] = Menue.objects.filter(tag__datum=target_date) + # 3. Dauerangebote laden (unabhängig vom Tag) context['dauerangebote'] = Gericht.objects.filter(ist_dauerangebot=True)