diff --git a/html/food.html b/html/food.html
index e8c4faa..c4520d0 100644
--- a/html/food.html
+++ b/html/food.html
@@ -11,7 +11,7 @@
Food for Students
-Last execute: Sunday, 24.09.2017
+Last execute: Monday, 25.09.2017
diff --git a/ofu-food/.idea/workspace.xml b/ofu-food/.idea/workspace.xml
index 1c7e9e1..f45765a 100644
--- a/ofu-food/.idea/workspace.xml
+++ b/ofu-food/.idea/workspace.xml
@@ -15,7 +15,7 @@
-
+
@@ -65,8 +65,8 @@
-
-
+
+
@@ -139,6 +139,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -640,8 +654,8 @@
-
-
+
+
diff --git a/ofu-food/food/generator-food-page.py b/ofu-food/food/generator-food-page.py
index 269c34d..29910ae 100644
--- a/ofu-food/food/generator-food-page.py
+++ b/ofu-food/food/generator-food-page.py
@@ -1,20 +1,23 @@
import jinja2
import json
import datetime
+from jinja2 import Environment, FileSystemLoader
# Config global
CSSFILE_WEB = "../css/bootstrap-4.0.0-beta-dist/css/bootstrap.css"
# Config Thinkpad
-# JSON_FILES_PATH = "../json/"
-# OUTPUT = "../html/food.html"
+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"
-
+# 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"
def getJsonFromFile(path):
@@ -28,6 +31,10 @@ def main():
fekiJson = getJsonFromFile(JSON_FILES_PATH + "feki-mensa.json")
austrJson = getJsonFromFile(JSON_FILES_PATH + "austr-mensa.json")
fekideJson = getJsonFromFile(JSON_FILES_PATH + "feki-happyhour-guide.json")
+
+ env = Environment(loader=FileSystemLoader(JINJA_PATH))
+ template = env.get_template(TEMPLATE_PATH)
+
templateVars = {
"cssfile": CSSFILE_WEB,
"executiontime": datetime.datetime.today().strftime("%A, %d.%m.%Y"),
@@ -42,14 +49,16 @@ def main():
"happyHourDay": fekideJson['day'],
"happyhours": fekideJson['happyhours'],
}
- templateLoader = jinja2.FileSystemLoader(searchpath="./")
- templateEnv = jinja2.Environment(loader=templateLoader)
+ # templateLoader = jinja2.FileSystemLoader(searchpath="./")
+ # templateEnv = jinja2.Environment(loader=templateLoader)
- TEMPLATE_FILE = "templates/food.jinja"
- template = templateEnv.get_template(TEMPLATE_FILE)
+ # TEMPLATE_FILE = "templates/food.jinja"
+ # template = templateEnv.get_template(TEMPLATE_FILE)
# Template Vars: cssfile, executiontime, erbaCafeteTitle, erbaWeekmenu, markusCafeteTitle, markusWeekmenu, austrMensaTitle, austrWeekmenu, fekiMensaTitle, fekiWeekmenu, happyHourDay, happyhours
+ # html = template.render(templateVars)
+
html = template.render(templateVars)
with open(OUTPUT, "w") as file: