Merge pull request #214 from Katharineum/dev

Merge devs

biscuit/apps/mensa/migrations/0001_initial.py

-# Generated by Django 2.0.7 on 2018-11-28 16:14
+# Generated by Django 2.2.1 on 2019-05-29 15:05
 
 from django.db import migrations, models
+import helper
 
 
 class Migration(migrations.Migration):
+
     initial = True
 
     dependencies = [
@@ -11,12 +13,17 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name='MealPlan',
+            name='Menu',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('calendar_week', models.IntegerField()),
-                ('year', models.IntegerField()),
-                ('pdf', models.FileField(upload_to='mealplan/%Y/')),
+                ('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',
+                'unique_together': {('calendar_week', 'year')},
+            },
         ),
     ]

biscuit/apps/mensa/migrations/0002_auto_20181129_1743.py

-# Generated by Django 2.0.7 on 2018-11-29 16:43
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('menu', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='mealplan',
-            name='pdf',
-            field=models.FileField(upload_to='menus/'),
-        ),
-    ]

biscuit/apps/mensa/migrations/0003_auto_20181129_1747.py

-# Generated by Django 2.0.7 on 2018-11-29 16:47
-
-from django.db import migrations, models
-import helper
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('menu', '0002_auto_20181129_1743'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='mealplan',
-            name='pdf',
-            field=models.FileField(upload_to=helper.path_and_rename),
-        ),
-    ]

biscuit/apps/mensa/migrations/0004_auto_20181211_1648.py

-# Generated by Django 2.0.7 on 2018-12-11 15:48
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('menu', '0003_auto_20181129_1747'),
-    ]
-
-    operations = [
-        migrations.AlterUniqueTogether(
-            name='mealplan',
-            unique_together={('calendar_week', 'year')},
-        ),
-    ]

biscuit/apps/mensa/migrations/0005_auto_20181211_1743.py

-# 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')},
-        ),
-    ]