From 39f4231969f539061279159f3b06ecead4d13121 Mon Sep 17 00:00:00 2001
From: michigg <michael-guenther.goetz@stud.uni-bamberg.de>
Date: Fri, 20 Oct 2017 01:50:08 +0200
Subject: [PATCH] expanded Single food model

---
 .../migrations/0004_auto_20171020_0146.py     |  25 ++++++++++++++++++
 ofu_app/apps/food/models.py                   |   2 ++
 .../__pycache__/settings.cpython-35.pyc       | Bin 2970 -> 3040 bytes
 ofu_app/ofu_app/settings.py                   |   3 +++
 ofu_app/templates/macros/food_macros.jinja    |   5 ++--
 5 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 ofu_app/apps/food/migrations/0004_auto_20171020_0146.py

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 e0c30391460db9a98343649a8deaf73bdc13108c..1b31c30eb06db11bf8c4a870e83c257c9a2fd50a 100644
GIT binary patch
delta 170
zcmbOw{y<z=oR^pDi`mP_Xh8;s#|%h-7sz%1;^G4vm0cMb?Ive3MylB}M9DIwGBRW_
zF=X*Dq_Q!j*f2CRF+|BRq}Vb<$up!dF$8NmY(C3q!!B@(H8(XSGqH+YA57~{=HxVI
zRM_mu+03YLi_6#5#nUl9$lpKY7AJ%q8sxK*p~w<wWs&9Nvs}T9Rg)FDD_PiBL>U1?
Ci6@u<

delta 98
zcmaDLK1*C#oR^pDP5G0^F9Hk<j~S2vFOcm3#KlWDD!Vc=+Dy)5jO4auh>~SUVPXi@
qwA=iG(T07p38y)u+~yq4W=77H3`J%@^+jfr`MHA`%O)ptR{{Vv9~L73

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) -%}
     <div class="col p-2">
         <div class="p-3 border border-dark rounded bg-light text-dark">
-            <h2>{{ title }}</h2>
+            <h2>{{ title }} </h2>
             {% if location_menu %}
                 <p>{{ location_menu.date.strftime('%d.%m.%Y') }}</p>
                 {{ get_menu(location_menu.menu.all()) }}
@@ -31,7 +31,8 @@
 {% macro get_menu(menu) -%}
     <ul class="border">
         {% for single_food in menu %}
-            <li><p>{{ single_food.name }}</p></li>
+            <li><p>{{ single_food.name }} <i class="fa fa-star-o" aria-hidden="true"></i>
+            </p></li>
         {% endfor %}
     </ul>
 {% endmacro %}