From 11d0a9f2e2ea50f4a38a87da757dd4735629ebd0 Mon Sep 17 00:00:00 2001
From: HanseGucker <joniweth@gmx.de>
Date: Tue, 11 Dec 2018 17:48:15 +0100
Subject: [PATCH] Finished renaming of mealplan to menu
---
schoolapps/mealplan/admin.py | 6 ----
schoolapps/mealplan/apps.py | 5 ---
schoolapps/{mealplan => menu}/__init__.py | 0
schoolapps/menu/admin.py | 6 ++++
schoolapps/menu/apps.py | 5 +++
schoolapps/{mealplan => menu}/default.odt | Bin
schoolapps/{mealplan => menu}/default.pdf | Bin
schoolapps/{mealplan => menu}/forms.py | 4 +--
.../migrations/0001_initial.py | 0
.../migrations/0002_auto_20181129_1743.py | 2 +-
.../migrations/0003_auto_20181129_1747.py | 2 +-
.../migrations/0004_auto_20181211_1648.py | 2 +-
.../migrations/0005_auto_20181211_1743.py | 33 ++++++++++++++++++
.../{mealplan => menu}/migrations/__init__.py | 0
schoolapps/{mealplan => menu}/models.py | 2 +-
.../templates/menu/index.html | 0
.../templates/menu/upload.html | 0
schoolapps/{mealplan => menu}/tests.py | 0
schoolapps/{mealplan => menu}/urls.py | 0
schoolapps/{mealplan => menu}/views.py | 12 +++----
schoolapps/schoolapps/settings.py | 2 +-
schoolapps/schoolapps/urls.py | 2 +-
22 files changed, 58 insertions(+), 25 deletions(-)
delete mode 100644 schoolapps/mealplan/admin.py
delete mode 100644 schoolapps/mealplan/apps.py
rename schoolapps/{mealplan => menu}/__init__.py (100%)
create mode 100644 schoolapps/menu/admin.py
create mode 100644 schoolapps/menu/apps.py
rename schoolapps/{mealplan => menu}/default.odt (100%)
rename schoolapps/{mealplan => menu}/default.pdf (100%)
rename schoolapps/{mealplan => menu}/forms.py (92%)
rename schoolapps/{mealplan => menu}/migrations/0001_initial.py (100%)
rename schoolapps/{mealplan => menu}/migrations/0002_auto_20181129_1743.py (89%)
rename schoolapps/{mealplan => menu}/migrations/0003_auto_20181129_1747.py (88%)
rename schoolapps/{mealplan => menu}/migrations/0004_auto_20181211_1648.py (86%)
create mode 100644 schoolapps/menu/migrations/0005_auto_20181211_1743.py
rename schoolapps/{mealplan => menu}/migrations/__init__.py (100%)
rename schoolapps/{mealplan => menu}/models.py (94%)
rename schoolapps/{mealplan => menu}/templates/menu/index.html (100%)
rename schoolapps/{mealplan => menu}/templates/menu/upload.html (100%)
rename schoolapps/{mealplan => menu}/tests.py (100%)
rename schoolapps/{mealplan => menu}/urls.py (100%)
rename schoolapps/{mealplan => menu}/views.py (85%)
diff --git a/schoolapps/mealplan/admin.py b/schoolapps/mealplan/admin.py
deleted file mode 100644
index d21a2a983..000000000
--- a/schoolapps/mealplan/admin.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.
-from mealplan.models import MealPlan
-
-admin.site.register(MealPlan)
diff --git a/schoolapps/mealplan/apps.py b/schoolapps/mealplan/apps.py
deleted file mode 100644
index be788ac1f..000000000
--- a/schoolapps/mealplan/apps.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class MealplanConfig(AppConfig):
- name = 'mealplan'
diff --git a/schoolapps/mealplan/__init__.py b/schoolapps/menu/__init__.py
similarity index 100%
rename from schoolapps/mealplan/__init__.py
rename to schoolapps/menu/__init__.py
diff --git a/schoolapps/menu/admin.py b/schoolapps/menu/admin.py
new file mode 100644
index 000000000..791aaba46
--- /dev/null
+++ b/schoolapps/menu/admin.py
@@ -0,0 +1,6 @@
+from django.contrib import admin
+
+# Register your models here.
+from menu.models import Menu
+
+admin.site.register(Menu)
diff --git a/schoolapps/menu/apps.py b/schoolapps/menu/apps.py
new file mode 100644
index 000000000..94ae6d4f8
--- /dev/null
+++ b/schoolapps/menu/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class MenuConfig(AppConfig):
+ name = 'menu'
diff --git a/schoolapps/mealplan/default.odt b/schoolapps/menu/default.odt
similarity index 100%
rename from schoolapps/mealplan/default.odt
rename to schoolapps/menu/default.odt
diff --git a/schoolapps/mealplan/default.pdf b/schoolapps/menu/default.pdf
similarity index 100%
rename from schoolapps/mealplan/default.pdf
rename to schoolapps/menu/default.pdf
diff --git a/schoolapps/mealplan/forms.py b/schoolapps/menu/forms.py
similarity index 92%
rename from schoolapps/mealplan/forms.py
rename to schoolapps/menu/forms.py
index 0260c2860..a1c0777f5 100644
--- a/schoolapps/mealplan/forms.py
+++ b/schoolapps/menu/forms.py
@@ -2,7 +2,7 @@ from django import forms
from django.core.validators import FileExtensionValidator
from django.utils import timezone
-from mealplan.models import MealPlan
+from menu.models import Menu
current_year = timezone.datetime.now().year
options_for_year = [(current_year, current_year),
@@ -17,5 +17,5 @@ class MenuUploadForm(forms.ModelForm):
pdf = forms.FileField(label="PDF-Datei", validators=[FileExtensionValidator(allowed_extensions=["pdf"])])
class Meta:
- model = MealPlan
+ model = Menu
fields = ("calendar_week", "year", "pdf")
diff --git a/schoolapps/mealplan/migrations/0001_initial.py b/schoolapps/menu/migrations/0001_initial.py
similarity index 100%
rename from schoolapps/mealplan/migrations/0001_initial.py
rename to schoolapps/menu/migrations/0001_initial.py
diff --git a/schoolapps/mealplan/migrations/0002_auto_20181129_1743.py b/schoolapps/menu/migrations/0002_auto_20181129_1743.py
similarity index 89%
rename from schoolapps/mealplan/migrations/0002_auto_20181129_1743.py
rename to schoolapps/menu/migrations/0002_auto_20181129_1743.py
index 79a20831b..f1a9d77ca 100644
--- a/schoolapps/mealplan/migrations/0002_auto_20181129_1743.py
+++ b/schoolapps/menu/migrations/0002_auto_20181129_1743.py
@@ -5,7 +5,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
- ('mealplan', '0001_initial'),
+ ('menu', '0001_initial'),
]
operations = [
diff --git a/schoolapps/mealplan/migrations/0003_auto_20181129_1747.py b/schoolapps/menu/migrations/0003_auto_20181129_1747.py
similarity index 88%
rename from schoolapps/mealplan/migrations/0003_auto_20181129_1747.py
rename to schoolapps/menu/migrations/0003_auto_20181129_1747.py
index 7e5ce206c..4976b2af8 100644
--- a/schoolapps/mealplan/migrations/0003_auto_20181129_1747.py
+++ b/schoolapps/menu/migrations/0003_auto_20181129_1747.py
@@ -6,7 +6,7 @@ import helper
class Migration(migrations.Migration):
dependencies = [
- ('mealplan', '0002_auto_20181129_1743'),
+ ('menu', '0002_auto_20181129_1743'),
]
operations = [
diff --git a/schoolapps/mealplan/migrations/0004_auto_20181211_1648.py b/schoolapps/menu/migrations/0004_auto_20181211_1648.py
similarity index 86%
rename from schoolapps/mealplan/migrations/0004_auto_20181211_1648.py
rename to schoolapps/menu/migrations/0004_auto_20181211_1648.py
index 893767b97..1dd555897 100644
--- a/schoolapps/mealplan/migrations/0004_auto_20181211_1648.py
+++ b/schoolapps/menu/migrations/0004_auto_20181211_1648.py
@@ -5,7 +5,7 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
- ('mealplan', '0003_auto_20181129_1747'),
+ ('menu', '0003_auto_20181129_1747'),
]
operations = [
diff --git a/schoolapps/menu/migrations/0005_auto_20181211_1743.py b/schoolapps/menu/migrations/0005_auto_20181211_1743.py
new file mode 100644
index 000000000..0947f0d80
--- /dev/null
+++ b/schoolapps/menu/migrations/0005_auto_20181211_1743.py
@@ -0,0 +1,33 @@
+# Generated by Django 2.0.7 on 2018-12-11 16:43
+
+from django.db import migrations, models
+import helper
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ('menu', '0004_auto_20181211_1648'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Menu',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('calendar_week', models.IntegerField(verbose_name='KW')),
+ ('year', models.IntegerField(verbose_name='Jahr')),
+ ('pdf', models.FileField(upload_to=helper.path_and_rename, verbose_name='PDF')),
+ ],
+ options={
+ 'verbose_name': 'Speiseplan',
+ 'verbose_name_plural': 'Speisepläne',
+ },
+ ),
+ migrations.DeleteModel(
+ name='MealPlan',
+ ),
+ migrations.AlterUniqueTogether(
+ name='menu',
+ unique_together={('calendar_week', 'year')},
+ ),
+ ]
diff --git a/schoolapps/mealplan/migrations/__init__.py b/schoolapps/menu/migrations/__init__.py
similarity index 100%
rename from schoolapps/mealplan/migrations/__init__.py
rename to schoolapps/menu/migrations/__init__.py
diff --git a/schoolapps/mealplan/models.py b/schoolapps/menu/models.py
similarity index 94%
rename from schoolapps/mealplan/models.py
rename to schoolapps/menu/models.py
index 71bf6257a..ecd3938db 100644
--- a/schoolapps/mealplan/models.py
+++ b/schoolapps/menu/models.py
@@ -4,7 +4,7 @@ from django.db import models
from helper import path_and_rename
-class MealPlan(models.Model):
+class Menu(models.Model):
calendar_week = models.IntegerField(verbose_name="KW")
year = models.IntegerField(verbose_name="Jahr")
pdf = models.FileField(upload_to=path_and_rename, verbose_name="PDF")
diff --git a/schoolapps/mealplan/templates/menu/index.html b/schoolapps/menu/templates/menu/index.html
similarity index 100%
rename from schoolapps/mealplan/templates/menu/index.html
rename to schoolapps/menu/templates/menu/index.html
diff --git a/schoolapps/mealplan/templates/menu/upload.html b/schoolapps/menu/templates/menu/upload.html
similarity index 100%
rename from schoolapps/mealplan/templates/menu/upload.html
rename to schoolapps/menu/templates/menu/upload.html
diff --git a/schoolapps/mealplan/tests.py b/schoolapps/menu/tests.py
similarity index 100%
rename from schoolapps/mealplan/tests.py
rename to schoolapps/menu/tests.py
diff --git a/schoolapps/mealplan/urls.py b/schoolapps/menu/urls.py
similarity index 100%
rename from schoolapps/mealplan/urls.py
rename to schoolapps/menu/urls.py
diff --git a/schoolapps/mealplan/views.py b/schoolapps/menu/views.py
similarity index 85%
rename from schoolapps/mealplan/views.py
rename to schoolapps/menu/views.py
index 8e745620a..2b684f0ce 100644
--- a/schoolapps/mealplan/views.py
+++ b/schoolapps/menu/views.py
@@ -5,7 +5,7 @@ from django.http import FileResponse
from django.shortcuts import render, redirect
from django.utils import timezone
-from mealplan.models import MealPlan
+from menu.models import Menu
from .forms import MenuUploadForm
@@ -25,13 +25,13 @@ def upload(request):
def delete(request, id):
print(id)
- MealPlan.objects.get(id=id).delete()
+ Menu.objects.get(id=id).delete()
return redirect("menu_index_msg", msg="delete_success")
def index(request, msg=None):
- menus = MealPlan.objects.all().order_by("calendar_week", "year")
+ menus = Menu.objects.all().order_by("calendar_week", "year")
return render(request, 'menu/index.html', {"msg": msg, "menus": menus})
@@ -45,7 +45,7 @@ def return_pdf(filename):
def return_default_pdf():
"""Response the default PDF"""
- return return_pdf(os.path.join("mealplan", "default.pdf"))
+ return return_pdf(os.path.join("menu", "default.pdf"))
def show_current(request):
@@ -68,9 +68,9 @@ def show_current(request):
# Look for matching PDF in DB
try:
- obj = MealPlan.objects.get(year=year, calendar_week=calendar_week)
+ obj = Menu.objects.get(year=year, calendar_week=calendar_week)
return return_pdf(os.path.join("media", str(obj.pdf)))
# Or show the default PDF
- except MealPlan.DoesNotExist:
+ except Menu.DoesNotExist:
return return_default_pdf()
diff --git a/schoolapps/schoolapps/settings.py b/schoolapps/schoolapps/settings.py
index ecf3bf704..75e7319d6 100755
--- a/schoolapps/schoolapps/settings.py
+++ b/schoolapps/schoolapps/settings.py
@@ -44,7 +44,7 @@ INSTALLED_APPS = [
'aub.apps.AubConfig',
'untisconnect.apps.UntisconnectConfig',
'timetable.apps.TimetableConfig',
- 'mealplan.apps.MealplanConfig',
+ 'menu.apps.MenuConfig',
'dbsettings',
'django.contrib.admin',
'django.contrib.auth',
diff --git a/schoolapps/schoolapps/urls.py b/schoolapps/schoolapps/urls.py
index 1360f4682..988115f1e 100755
--- a/schoolapps/schoolapps/urls.py
+++ b/schoolapps/schoolapps/urls.py
@@ -43,7 +43,7 @@ urlpatterns = [
########
# MENU #
########
- path('menu/', include('mealplan.urls')),
+ path('menu/', include('menu.urls')),
#########
# Admin #
--
GitLab