From 6f5f0d6676f33d3f245ad071e0c4a9b7b8ed5f72 Mon Sep 17 00:00:00 2001
From: michigg <michael-guenther.goetz@stud.uni-bamberg.de>
Date: Thu, 28 Sep 2017 03:18:09 +0200
Subject: [PATCH] ups

---
 ofu-food/.idea/workspace.xml | 40 ++++++++++++++++++------------------
 ofu-food/html-generator.py   | 16 +++++++--------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/ofu-food/.idea/workspace.xml b/ofu-food/.idea/workspace.xml
index 6c9246c..a24dbf8 100644
--- a/ofu-food/.idea/workspace.xml
+++ b/ofu-food/.idea/workspace.xml
@@ -47,11 +47,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="events.jinja" pinned="false" current-in-tab="true">
+      <file leaf-file-name="events.jinja" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/templates/events.jinja">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="280">
-              <caret line="17" column="39" lean-forward="false" selection-start-line="17" selection-start-column="39" selection-end-line="17" selection-end-column="39" />
+            <state relative-caret-position="240">
+              <caret line="12" column="54" lean-forward="false" selection-start-line="12" selection-start-column="54" selection-end-line="12" selection-end-column="54" />
               <folding>
                 <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
               </folding>
@@ -69,11 +69,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="html-generator.py" pinned="false" current-in-tab="false">
+      <file leaf-file-name="html-generator.py" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/html-generator.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-345">
-              <caret line="23" column="0" lean-forward="true" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
+            <state relative-caret-position="220">
+              <caret line="11" column="0" lean-forward="false" selection-start-line="11" selection-start-column="2" selection-end-line="14" selection-end-column="27" />
               <folding>
                 <element signature="e#0#13#0" expanded="true" />
               </folding>
@@ -106,8 +106,8 @@
         <option value="$PROJECT_DIR$/food/generator-food-page.py" />
         <option value="$PROJECT_DIR$/events/eventpage-parser-controller.py" />
         <option value="$PROJECT_DIR$/events/ofu-eventpage-parser.py" />
-        <option value="$PROJECT_DIR$/html-generator.py" />
         <option value="$PROJECT_DIR$/templates/events.jinja" />
+        <option value="$PROJECT_DIR$/html-generator.py" />
       </list>
     </option>
   </component>
@@ -499,7 +499,7 @@
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.35191256" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.35191256" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -844,25 +844,25 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/html-generator.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-345">
-          <caret line="23" column="0" lean-forward="true" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/events.jinja">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="280">
-          <caret line="17" column="39" lean-forward="false" selection-start-line="17" selection-start-column="39" selection-end-line="17" selection-end-column="39" />
+        <state relative-caret-position="240">
+          <caret line="12" column="54" lean-forward="false" selection-start-line="12" selection-start-column="54" selection-end-line="12" selection-end-column="54" />
           <folding>
             <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/html-generator.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="0" lean-forward="false" selection-start-line="11" selection-start-column="2" selection-end-line="14" selection-end-column="27" />
+          <folding>
+            <element signature="e#0#13#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/ofu-food/html-generator.py b/ofu-food/html-generator.py
index fe9ff47..c9a3115 100644
--- a/ofu-food/html-generator.py
+++ b/ofu-food/html-generator.py
@@ -9,17 +9,17 @@ from pprint import pprint
 TEMPLATE_PATH = 'events.jinja'
 
 # Config Thinkpad
-CSSFILE_WEB = "../css/bootstrap-4.0.0-beta-dist/css/bootstrap.css"
-JSON_FILES_PATH = "../json/"
-OUTPUT = "../html/event.html"
-JINJA_PATH = 'templates/'
+# CSSFILE_WEB = "../css/bootstrap-4.0.0-beta-dist/css/bootstrap.css"
+# JSON_FILES_PATH = "../json/"
+# OUTPUT = "../html/event.html"
+# JINJA_PATH = 'templates/'
 
 
 # PI
-# CSSFILE_WEB = "../../css/bootstrap-4.0.0-beta-dist/css/bootstrap.css"
-# JSON_FILES_PATH = "/media/data_1/www/pub-html/events/json/"
-# OUTPUT = "/media/data_1/www/pub-html/events/index.html"
-# JINJA_PATH = '/media/data_1/skripts/ofu-app-webskripts/ofu-food/templates/'
+CSSFILE_WEB = "../../css/bootstrap-4.0.0-beta-dist/css/bootstrap.css"
+JSON_FILES_PATH = "/media/data_1/www/pub-html/events/json/"
+OUTPUT = "/media/data_1/www/pub-html/events/index.html"
+JINJA_PATH = '/media/data_1/skripts/ofu-app-webskripts/ofu-food/templates/'
 
 
 def getJsonFromFile(path):