diff --git a/ofu_app/apps/food/migrations/0004_auto_20171020_0146.py b/ofu_app/apps/food/migrations/0004_auto_20171020_0146.py new file mode 100644 index 0000000..a0bdeb8 --- /dev/null +++ b/ofu_app/apps/food/migrations/0004_auto_20171020_0146.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.2 on 2017-10-19 23:46 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('food', '0003_auto_20171013_1902'), + ] + + operations = [ + migrations.AddField( + model_name='singlefood', + name='image', + field=models.ImageField(blank=True, upload_to='food/%Y/%m/'), + ), + migrations.AddField( + model_name='singlefood', + name='rating', + field=models.FloatField(default=0), + ), + ] diff --git a/ofu_app/apps/food/models.py b/ofu_app/apps/food/models.py index 1172710..952211a 100644 --- a/ofu_app/apps/food/models.py +++ b/ofu_app/apps/food/models.py @@ -23,6 +23,8 @@ class Menu(models.Model): class SingleFood(models.Model): id = models.AutoField(primary_key=True) name = models.CharField(unique=True, max_length=MAX_LENGTH) + image = models.ImageField(upload_to='food/%Y/%m/', blank=True) + rating = models.FloatField(default=0) def __str__(self): return self.name diff --git a/ofu_app/ofu_app/__pycache__/settings.cpython-35.pyc b/ofu_app/ofu_app/__pycache__/settings.cpython-35.pyc index e0c3039..1b31c30 100644 Binary files a/ofu_app/ofu_app/__pycache__/settings.cpython-35.pyc and b/ofu_app/ofu_app/__pycache__/settings.cpython-35.pyc differ diff --git a/ofu_app/ofu_app/settings.py b/ofu_app/ofu_app/settings.py index 343c5c8..6601853 100644 --- a/ofu_app/ofu_app/settings.py +++ b/ofu_app/ofu_app/settings.py @@ -151,3 +151,6 @@ USE_X_FORWARDED_HOST = True SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') # FORCE_SCRIPT_NAME = "app" +# Media files should be stored here +MEDIA_ROOT = os.path.join(BASE_DIR, "media") +MEDIA_URL = '/media/' diff --git a/ofu_app/templates/macros/food_macros.jinja b/ofu_app/templates/macros/food_macros.jinja index cf03396..e089ee4 100644 --- a/ofu_app/templates/macros/food_macros.jinja +++ b/ofu_app/templates/macros/food_macros.jinja @@ -1,7 +1,7 @@ {% macro day_menu(title, location_menu, fail_text) -%}
-

{{ title }}

+

{{ title }}

{% if location_menu %}

{{ location_menu.date.strftime('%d.%m.%Y') }}

{{ get_menu(location_menu.menu.all()) }} @@ -31,7 +31,8 @@ {% macro get_menu(menu) -%} {% endmacro %}