From 32f4c1acaa4ea90352762fb925f80f0ae5186305 Mon Sep 17 00:00:00 2001
From: michigg <michael-guenther.goetz@stud.uni-bamberg.de>
Date: Mon, 16 Oct 2017 17:52:32 +0200
Subject: [PATCH] fixed happy hour bug

---
 ofu_app/templates/food/daily_food.jinja    | 22 +------------------
 ofu_app/templates/food/weekly_food.jinja   | 23 +-------------------
 ofu_app/templates/macros/food_macros.jinja | 25 ++++++++++++++++++++++
 3 files changed, 27 insertions(+), 43 deletions(-)

diff --git a/ofu_app/templates/food/daily_food.jinja b/ofu_app/templates/food/daily_food.jinja
index b9486f2..74ec953 100644
--- a/ofu_app/templates/food/daily_food.jinja
+++ b/ofu_app/templates/food/daily_food.jinja
@@ -15,27 +15,7 @@
             {{ macros.day_menu(title='Markusplatz', location_menu=markus_cafete, fail_text='Aktuell gibt es keine warmen Speisen') }}
         </div>
         <div class="row">
-            <div class="col p-2">
-                <div class="p-3 border border-dark rounded bg-light text-dark">
-                    <h2>Happy Hour Guide von Feki.de</h2>
-                    {% if happy_hours %}
-                        <div class="row">
-                            <div class="col-4">Location</div>
-                            <div class="col-4">Time</div>
-                            <div class="col-4">Description</div>
-                            {% for happy_hour in happy_hours %}
-                                <div class="row">
-                                    <div class="col-4">{{ happy_hour.location }}</div>
-                                    <div class="col-4">{{ happy_hour.starttime.strftime('%H:%M') }} - {{ happy_hour.endtime.strftime('%H:%M') }}</div>
-                                    <div class="col-4">{{ happy_hour.description }}</div>
-                                </div>
-                            {% endfor %}
-                        </div>
-                    {% else %}
-                        <p>Leider gibt es heute keine Happy Hours :(</p>
-                    {% endif %}
-                </div>
-            </div>
+            {{ macros.happy_hours(happy_hours=happy_hours) }}
         </div>
     </div>
 
diff --git a/ofu_app/templates/food/weekly_food.jinja b/ofu_app/templates/food/weekly_food.jinja
index 27ff583..99ff620 100644
--- a/ofu_app/templates/food/weekly_food.jinja
+++ b/ofu_app/templates/food/weekly_food.jinja
@@ -15,28 +15,7 @@
             {{ macros.week_menu(title='Markusplatz', location_menus=markus_cafete, fail_text='Aktuell gibt es keine warmen Speisen') }}
         </div>
         <div class="row">
-            <div class="col p-2">
-                <div class="p-3 border border-dark rounded bg-light text-dark">
-                    <h2>Happy Hour Guide von Feki.de</h2>
-                    {% if happy_hours %}
-                        <div class="row">
-                            <div class="col-4">Location</div>
-                            <div class="col-4">Time</div>
-                            <div class="col-4">Description</div>
-                            {% for happy_hour in happy_hours %}
-                                <div class="row">
-                                    <div class="col-4">{{ happy_hour.location }}</div>
-                                    <div class="col-4">{{ happy_hour.starttime.strftime('%H:%M') }} - {{ happy_hour.endtime.strftime('%H:%M') }}</div>
-                                    <div class="col-4">{{ happy_hour.description }}</div>
-                                </div>
-                            {% endfor %}
-                        </div>
-                    {% else %}
-                        <p>Leider gibt es heute keine Happy Hours :(</p>
-                    {% endif %}
-                </div>
-            </div>
+             {{ macros.happy_hours(happy_hours=happy_hours) }}
         </div>
     </div>
-
 {% endblock %}
\ No newline at end of file
diff --git a/ofu_app/templates/macros/food_macros.jinja b/ofu_app/templates/macros/food_macros.jinja
index 26b2d68..90e566f 100644
--- a/ofu_app/templates/macros/food_macros.jinja
+++ b/ofu_app/templates/macros/food_macros.jinja
@@ -34,4 +34,29 @@
             <li><p>{{ single_food.name }}</p></li>
         {% endfor %}
     </ul>
+{% endmacro %}
+
+{% macro happy_hours(happy_hours) %}
+    <div class="col p-2">
+        <div class="p-3 border border-dark rounded bg-light text-dark">
+            <h2>Happy Hours <small>von Feki.de</small></h2>
+            {% if happy_hours %}
+                <div class="row">
+                    <div class="col-4"><strong>Location</strong></div>
+                    <div class="col-4"><strong>Time</strong></div>
+                    <div class="col-4"><strong>Description</strong></div>
+                </div>
+                {% for happy_hour in happy_hours %}
+                    <div class="row">
+                        <div class="col-4">{{ happy_hour.location }}</div>
+                        <div class="col-4">{{ happy_hour.starttime.strftime('%H:%M') }}
+                            - {{ happy_hour.endtime.strftime('%H:%M') }}</div>
+                        <div class="col-4">{{ happy_hour.description }}</div>
+                    </div>
+                {% endfor %}
+                </div>
+            {% else %}
+                <p>Leider gibt es heute keine Happy Hours :(</p>
+            {% endif %}
+    </div>
 {% endmacro %}
\ No newline at end of file