Branch gui-dev auf aktuellen Stand bringen #10

Merged
mputzlocher merged 7 commits from main into gui-dev 2026-06-26 07:33:27 +00:00
4 changed files with 41 additions and 3 deletions
Showing only changes of commit e6d1b3407b - Show all commits
@@ -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),
),
]
+1 -3
View File
@@ -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)
+1
View File
@@ -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/', {},"" ),
]
+1
View File
@@ -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)