diff --git a/ofu_app/apps/donar/migrations/0005_merge_20171221_1152.py b/ofu_app/apps/donar/migrations/0005_merge_20171221_1152.py new file mode 100644 index 0000000..668ebcf --- /dev/null +++ b/ofu_app/apps/donar/migrations/0005_merge_20171221_1152.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.7 on 2017-12-21 10:52 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('donar', '0003_auto_20171111_1013'), + ('donar', '0004_auto_20171030_0031'), + ] + + operations = [ + ] diff --git a/ofu_app/apps/donar/migrations/0006_auto_20171221_1209.py b/ofu_app/apps/donar/migrations/0006_auto_20171221_1209.py new file mode 100644 index 0000000..749eb7d --- /dev/null +++ b/ofu_app/apps/donar/migrations/0006_auto_20171221_1209.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.7 on 2017-12-21 11:09 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('donar', '0005_merge_20171221_1152'), + ] + + operations = [ + migrations.AlterField( + model_name='lecture_terms', + name='starttime', + field=models.TimeField(default=datetime.datetime(2017, 12, 21, 11, 9, 9, 865784, tzinfo=utc)), + ), + ] diff --git a/ofu_app/apps/donar/migrations/0007_auto_20171221_1209.py b/ofu_app/apps/donar/migrations/0007_auto_20171221_1209.py new file mode 100644 index 0000000..c6cd490 --- /dev/null +++ b/ofu_app/apps/donar/migrations/0007_auto_20171221_1209.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.7 on 2017-12-21 11:09 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('donar', '0006_auto_20171221_1209'), + ] + + operations = [ + migrations.AlterField( + model_name='lecture_terms', + name='starttime', + field=models.TimeField(default=datetime.datetime(2017, 12, 21, 11, 9, 16, 431869, tzinfo=utc)), + ), + ] diff --git a/ofu_app/apps/donar/migrations/0008_auto_20171221_1209.py b/ofu_app/apps/donar/migrations/0008_auto_20171221_1209.py new file mode 100644 index 0000000..b2ed5d5 --- /dev/null +++ b/ofu_app/apps/donar/migrations/0008_auto_20171221_1209.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.7 on 2017-12-21 11:09 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('donar', '0007_auto_20171221_1209'), + ] + + operations = [ + migrations.AlterField( + model_name='lecture_terms', + name='starttime', + field=models.TimeField(default=datetime.datetime(2017, 12, 21, 11, 9, 18, 686083, tzinfo=utc)), + ), + ] diff --git a/ofu_app/apps/donar/migrations/0009_auto_20171221_1209.py b/ofu_app/apps/donar/migrations/0009_auto_20171221_1209.py new file mode 100644 index 0000000..fbdeac0 --- /dev/null +++ b/ofu_app/apps/donar/migrations/0009_auto_20171221_1209.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.7 on 2017-12-21 11:09 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('donar', '0008_auto_20171221_1209'), + ] + + operations = [ + migrations.AlterField( + model_name='lecture_terms', + name='starttime', + field=models.TimeField(default=datetime.datetime(2017, 12, 21, 11, 9, 19, 968276, tzinfo=utc)), + ), + ] diff --git a/ofu_app/apps/donar/migrations/0010_auto_20171221_1209.py b/ofu_app/apps/donar/migrations/0010_auto_20171221_1209.py new file mode 100644 index 0000000..0653ca9 --- /dev/null +++ b/ofu_app/apps/donar/migrations/0010_auto_20171221_1209.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.7 on 2017-12-21 11:09 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('donar', '0009_auto_20171221_1209'), + ] + + operations = [ + migrations.AlterField( + model_name='lecture_terms', + name='starttime', + field=models.TimeField(default=datetime.datetime(2017, 12, 21, 11, 9, 21, 301721, tzinfo=utc)), + ), + ] diff --git a/ofu_app/apps/donar/migrations/0011_auto_20171221_1209.py b/ofu_app/apps/donar/migrations/0011_auto_20171221_1209.py new file mode 100644 index 0000000..e82a672 --- /dev/null +++ b/ofu_app/apps/donar/migrations/0011_auto_20171221_1209.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.7 on 2017-12-21 11:09 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('donar', '0010_auto_20171221_1209'), + ] + + operations = [ + migrations.AlterField( + model_name='lecture_terms', + name='starttime', + field=models.TimeField(default=datetime.datetime(2017, 12, 21, 11, 9, 22, 322899, tzinfo=utc)), + ), + ] diff --git a/ofu_app/apps/donar/migrations/0012_auto_20171221_1209.py b/ofu_app/apps/donar/migrations/0012_auto_20171221_1209.py new file mode 100644 index 0000000..34e1fe0 --- /dev/null +++ b/ofu_app/apps/donar/migrations/0012_auto_20171221_1209.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.7 on 2017-12-21 11:09 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('donar', '0011_auto_20171221_1209'), + ] + + operations = [ + migrations.AlterField( + model_name='lecture_terms', + name='starttime', + field=models.TimeField(default=datetime.datetime(2017, 12, 21, 11, 9, 23, 249623, tzinfo=utc)), + ), + ] diff --git a/ofu_app/apps/donar/migrations/0013_auto_20171221_1209.py b/ofu_app/apps/donar/migrations/0013_auto_20171221_1209.py new file mode 100644 index 0000000..7089340 --- /dev/null +++ b/ofu_app/apps/donar/migrations/0013_auto_20171221_1209.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.7 on 2017-12-21 11:09 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('donar', '0012_auto_20171221_1209'), + ] + + operations = [ + migrations.AlterField( + model_name='lecture_terms', + name='starttime', + field=models.TimeField(default=datetime.datetime(2017, 12, 21, 11, 9, 24, 184020, tzinfo=utc)), + ), + ] diff --git a/ofu_app/apps/donar/migrations/0014_auto_20171221_1209.py b/ofu_app/apps/donar/migrations/0014_auto_20171221_1209.py new file mode 100644 index 0000000..e53d713 --- /dev/null +++ b/ofu_app/apps/donar/migrations/0014_auto_20171221_1209.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.7 on 2017-12-21 11:09 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('donar', '0013_auto_20171221_1209'), + ] + + operations = [ + migrations.AlterField( + model_name='lecture_terms', + name='starttime', + field=models.TimeField(default=datetime.datetime(2017, 12, 21, 11, 9, 25, 856781, tzinfo=utc)), + ), + ] diff --git a/ofu_app/apps/donar/migrations/0015_auto_20171221_1218.py b/ofu_app/apps/donar/migrations/0015_auto_20171221_1218.py new file mode 100644 index 0000000..16d04c5 --- /dev/null +++ b/ofu_app/apps/donar/migrations/0015_auto_20171221_1218.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.7 on 2017-12-21 11:18 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('donar', '0014_auto_20171221_1209'), + ] + + operations = [ + migrations.AlterField( + model_name='lecture_terms', + name='starttime', + field=models.TimeField(default=datetime.datetime(2017, 12, 21, 11, 18, 4, 770009, tzinfo=utc)), + ), + ] diff --git a/ofu_app/apps/donar/migrations/0016_auto_20171221_1222.py b/ofu_app/apps/donar/migrations/0016_auto_20171221_1222.py new file mode 100644 index 0000000..21d0f85 --- /dev/null +++ b/ofu_app/apps/donar/migrations/0016_auto_20171221_1222.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.7 on 2017-12-21 11:22 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('donar', '0015_auto_20171221_1218'), + ] + + operations = [ + migrations.AlterField( + model_name='lecture_terms', + name='starttime', + field=models.TimeField(default=datetime.datetime(2017, 12, 21, 11, 22, 1, 546723, tzinfo=utc)), + ), + ] diff --git a/ofu_app/apps/donar/migrations/0017_auto_20171221_1226.py b/ofu_app/apps/donar/migrations/0017_auto_20171221_1226.py new file mode 100644 index 0000000..b967275 --- /dev/null +++ b/ofu_app/apps/donar/migrations/0017_auto_20171221_1226.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.7 on 2017-12-21 11:26 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('donar', '0016_auto_20171221_1222'), + ] + + operations = [ + migrations.AlterField( + model_name='lecture_terms', + name='starttime', + field=models.TimeField(default=datetime.datetime(2017, 12, 21, 11, 26, 18, 313275, tzinfo=utc)), + ), + ] diff --git a/ofu_app/apps/food/migrations/0001_initial.py b/ofu_app/apps/food/migrations/0001_initial.py index a68857d..2a15598 100644 --- a/ofu_app/apps/food/migrations/0001_initial.py +++ b/ofu_app/apps/food/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.2 on 2017-10-29 23:28 +# Generated by Django 1.11.7 on 2017-12-21 11:21 from __future__ import unicode_literals from django.conf import settings diff --git a/ofu_app/apps/food/migrations/0002_auto_20171221_1226.py b/ofu_app/apps/food/migrations/0002_auto_20171221_1226.py new file mode 100644 index 0000000..db7d037 --- /dev/null +++ b/ofu_app/apps/food/migrations/0002_auto_20171221_1226.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.7 on 2017-12-21 11:26 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('food', '0001_initial'), + ] + + operations = [ + migrations.RenameField( + model_name='singlefood', + old_name='image', + new_name='food_image', + ), + ] diff --git a/ofu_app/apps/food/models.py b/ofu_app/apps/food/models.py index 7e9054d..26bff03 100644 --- a/ofu_app/apps/food/models.py +++ b/ofu_app/apps/food/models.py @@ -27,7 +27,7 @@ class SingleFood(models.Model): price_student = models.CharField(max_length=10, blank=True, null=True) price_employee = models.CharField(max_length=10, blank=True, null=True) price_guest = models.CharField(max_length=10, blank=True, null=True) - image = models.ImageField(upload_to='food/%Y/%m/', blank=True) + food_image = models.ImageField(upload_to='food/%Y/%m/', blank=True) rating = models.FloatField(default=0) allergens = models.ManyToManyField("Allergene", blank=True)