diff --git a/html/food.html b/html/food.html index 7c0069e..5075791 100644 --- a/html/food.html +++ b/html/food.html @@ -11,10 +11,9 @@

Food for Students

-

Last execute: Monday, 25.09.2017

-
+

Cafeteria Erba-Insel

24.07.Rinderhacksteak an Cognacsoße und Spätzle

@@ -26,7 +25,7 @@

27.07.Kaiserschmarrn mit Apfelmus

-
+

Cafeteria Markusplatz

24.07.Vegetarisches Chili sin Carne

@@ -40,7 +39,7 @@
-
+

Speiseplan für Austraße Bamberg

Montag 18.09.

@@ -93,7 +92,7 @@
-
+

Speiseplan für Feldkirchenstraße Bamberg

Montag 18.09.

@@ -154,7 +153,7 @@
-
+

Feki.de Happy Hour Guide for Food

Sunday, 24.09.2017

@@ -163,6 +162,7 @@
+

Last execute: Monday, 25.09.2017

\ No newline at end of file diff --git a/ofu-food/.idea/workspace.xml b/ofu-food/.idea/workspace.xml index 4872d8a..a8bf976 100644 --- a/ofu-food/.idea/workspace.xml +++ b/ofu-food/.idea/workspace.xml @@ -15,7 +15,7 @@ - + @@ -55,8 +55,8 @@ - - + + @@ -65,8 +65,8 @@ - - + + @@ -646,16 +646,16 @@ - - + + - - + + diff --git a/ofu-food/food/generator-food-page.py b/ofu-food/food/generator-food-page.py index 1e4cfb0..c65d8c8 100644 --- a/ofu-food/food/generator-food-page.py +++ b/ofu-food/food/generator-food-page.py @@ -5,19 +5,17 @@ from jinja2 import Environment, FileSystemLoader # Config global CSSFILE_WEB = "../css/bootstrap-4.0.0-beta-dist/css/bootstrap.css" +TEMPLATE_PATH = 'food.jinja' # Config Thinkpad # JSON_FILES_PATH = "../json/" # OUTPUT = "../html/food.html" # JINJA_PATH = 'templates/' -TEMPLATE_PATH = 'food.jinja' # PI JSON_FILES_PATH = "/media/data_1/www/pub-html/ofu-food/json/" OUTPUT = "/media/data_1/www/pub-html/ofu-food/food.html" -# CSSFILE_SRC = "../bootstrap-4.0.0-beta-dist" -# CSSFILE_DEST = "/media/data_1/www/css" JINJA_PATH = '/media/data_1/skripts/ofu-app-webskripts/ofu-food/templates/' @@ -51,7 +49,6 @@ def main(): "happyhours": fekideJson['happyhours'], } - # Template Vars: cssfile, executiontime, erbaCafeteTitle, erbaWeekmenu, markusCafeteTitle, markusWeekmenu, austrMensaTitle, austrWeekmenu, fekiMensaTitle, fekiWeekmenu, happyHourDay, happyhours html = template.render(templateVars) diff --git a/ofu-food/templates/food.jinja b/ofu-food/templates/food.jinja index ad2ae79..068cdf7 100644 --- a/ofu-food/templates/food.jinja +++ b/ofu-food/templates/food.jinja @@ -11,16 +11,15 @@

Food for Students

-

Last execute: {{ executiontime }}

-
+

{{ erbaCafeteTitle }}

{% for menu in erbaWeekmenu %}

{{ menu.date }}{{ menu.menu[0] }}

{% endfor %}
-
+

{{ markusCafeteTitle }}

{% for menu in markusWeekmenu %}

{{ menu.date }}{{ menu.menu[0] }}

@@ -28,7 +27,7 @@
-
+

{{ austrMensaTitle }}

{% for dayMenu in austrWeekmenu %}

{{ dayMenu.date }}

@@ -37,7 +36,7 @@ {% endfor %} {% endfor %}
-
+

{{ fekiMensaTitle }}

{% for dayMenu in fekiWeekmenu %}

{{ dayMenu.date }}

@@ -48,7 +47,7 @@
-
+

Feki.de Happy Hour Guide for Food

{{ happyHourDay }}

{% if happyhours %} @@ -76,6 +75,7 @@
+

Last execute: {{ executiontime }}

\ No newline at end of file