mgoetz/basta-server
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Jinja Path fix

Browse Source
This commit is contained in:
Götz 2017-09-25 14:53:00 +02:00
parent af977308d3
commit f06e32570c
3 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
html/food.html
View File

@ -11,7 +11,7 @@
<body>
<h1>Food for Students</h1>
<p>Last execute: Sunday, 24.09.2017</p>
<p>Last execute: Monday, 25.09.2017</p>
<div class="container">
<div class="row">
<div class="col">

24
ofu-food/.idea/workspace.xml generated
View File

@ -15,7 +15,7 @@
<SUITE FILE_PATH="coverage/ofu_food$fekide_happyhour_page_parser.coverage" NAME="fekide-happyhour-page-parser Coverage Results" MODIFIED="1506204094485" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/ofu_food$cafete_page_parser.coverage" NAME="cafete-page-parser Coverage Results" MODIFIED="1506201552685" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/ofu_food$ofu_food.coverage" NAME="ofu-food Coverage Results" MODIFIED="1506272180490" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/ofu_food$generator_food_page.coverage" NAME="generator-food-page Coverage Results" MODIFIED="1506280041068" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/ofu_food$generator_food_page.coverage" NAME="generator-food-page Coverage Results" MODIFIED="1506343906434" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
@ -65,8 +65,8 @@
<file leaf-file-name="generator-food-page.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/food/generator-food-page.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="12" column="55" lean-forward="false" selection-start-line="12" selection-start-column="55" selection-end-line="12" selection-end-column="55" />
<state relative-caret-position="144">
<caret line="35" column="45" lean-forward="false" selection-start-line="35" selection-start-column="45" selection-end-line="35" selection-end-column="45" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
@ -139,6 +139,20 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="ofu-food" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="ofu-food" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="templates" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="ofu-food" />
@ -640,8 +654,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/food/generator-food-page.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="12" column="55" lean-forward="false" selection-start-line="12" selection-start-column="55" selection-end-line="12" selection-end-column="55" />
<state relative-caret-position="144">
<caret line="35" column="45" lean-forward="false" selection-start-line="35" selection-start-column="45" selection-end-line="35" selection-end-column="45" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>

31
ofu-food/food/generator-food-page.py
View File

@ -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: