Commit bbf18b7b authored by Jasin's avatar Jasin

Merge branch 'development'

parents 66a2ab8c 28954e27
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="8c781855-12fc-4edd-b7db-fe31e2496215" name="Default Changelist" comment=""> <list default="true" id="8c781855-12fc-4edd-b7db-fe31e2496215" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/UI/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/UI/index.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/UI/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/UI/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/UI/js/chart.js" beforeDir="false" afterPath="$PROJECT_DIR$/UI/js/chart.js" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -12,17 +14,45 @@ ...@@ -12,17 +14,45 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/server/loop.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="416">
<caret line="50" column="5" selection-start-line="50" selection-start-column="5" selection-end-line="50" selection-end-column="5" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/UI/index.html"> <entry file="file://$PROJECT_DIR$/UI/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="251"> <state relative-caret-position="323">
<caret line="54" column="17" selection-start-line="54" selection-start-column="17" selection-end-line="54" selection-end-column="17" /> <caret line="55" column="125" selection-start-line="55" selection-start-column="125" selection-end-line="55" selection-end-column="125" />
<folding>
<element signature="n#style#0;n#section#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#p#0;n#div#0;n#div#0;n#div#0;n#section#4;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/UI/js/chart.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="337">
<caret line="71" column="46" selection-start-line="71" selection-start-column="46" selection-end-line="71" selection-end-column="46" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
</leaf> </leaf>
</component> </component>
<component name="FindInProjectRecents">
<findStrings>
<find>schreiben</find>
<find>Versptäung</find>
</findStrings>
</component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
...@@ -31,6 +61,7 @@ ...@@ -31,6 +61,7 @@
<list> <list>
<option value="$PROJECT_DIR$/../../untitled/dataQuery.php" /> <option value="$PROJECT_DIR$/../../untitled/dataQuery.php" />
<option value="$PROJECT_DIR$/UI/index.html" /> <option value="$PROJECT_DIR$/UI/index.html" />
<option value="$PROJECT_DIR$/UI/js/chart.js" />
</list> </list>
</option> </option>
</component> </component>
...@@ -105,19 +136,21 @@ ...@@ -105,19 +136,21 @@
<updated>1561995555873</updated> <updated>1561995555873</updated>
<workItem from="1561995557256" duration="86000" /> <workItem from="1561995557256" duration="86000" />
<workItem from="1562551348368" duration="449000" /> <workItem from="1562551348368" duration="449000" />
<workItem from="1562774440059" duration="940000" /> <workItem from="1562774440059" duration="1677000" />
<workItem from="1563279689083" duration="23000" /> <workItem from="1563206596683" duration="596000" />
<workItem from="1563345106408" duration="763000" />
<workItem from="1563374644786" duration="476000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="1954000" /> <option name="totallyTimeSpent" value="4503000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="69" y="-2" width="2491" height="1442" extended-state="6" /> <frame x="-8" y="-8" width="1616" height="876" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2617587" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2692802" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
...@@ -130,7 +163,7 @@ ...@@ -130,7 +163,7 @@
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="8" /> <window_info anchor="bottom" id="Version Control" order="8" />
<window_info anchor="bottom" id="Database Changes" order="9" /> <window_info anchor="bottom" id="Database Changes" order="9" />
<window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.32977912" /> <window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.32974428" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
...@@ -149,18 +182,48 @@ ...@@ -149,18 +182,48 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/../../untitled/dataQuery.php" /> <entry file="file://$PROJECT_DIR$/../../untitled/dataQuery.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="204">
<caret line="12" column="1" selection-start-line="12" selection-start-column="1" selection-end-line="12" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/server/api/getAllStops.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/server/getGeneralStats.php"> <entry file="file://$PROJECT_DIR$/server/getGeneralStats.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75"> <state relative-caret-position="85">
<caret line="5" column="9" lean-forward="true" selection-start-line="5" selection-start-column="9" selection-end-line="5" selection-end-column="120" /> <caret line="5" column="9" selection-start-line="5" selection-start-column="9" selection-end-line="5" selection-end-column="120" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/server/api/getCanceled.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/server/loop.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="416">
<caret line="50" column="5" selection-start-line="50" selection-start-column="5" selection-end-line="50" selection-end-column="5" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/UI/index.html"> <entry file="file://$PROJECT_DIR$/UI/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="251"> <state relative-caret-position="323">
<caret line="54" column="17" selection-start-line="54" selection-start-column="17" selection-end-line="54" selection-end-column="17" /> <caret line="55" column="125" selection-start-line="55" selection-start-column="125" selection-end-line="55" selection-end-column="125" />
<folding>
<element signature="n#style#0;n#section#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#p#0;n#div#0;n#div#0;n#div#0;n#section#4;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/UI/js/chart.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="337">
<caret line="71" column="46" selection-start-line="71" selection-start-column="46" selection-end-line="71" selection-end-column="46" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
...@@ -52,6 +52,9 @@ ...@@ -52,6 +52,9 @@
<li class="nav-item mx-0 mx-lg-1"> <li class="nav-item mx-0 mx-lg-1">
<a class="nav-link py-3 px-0 px-lg-3 rounded js-scroll-trigger" href="#method">Methodik</a> <a class="nav-link py-3 px-0 px-lg-3 rounded js-scroll-trigger" href="#method">Methodik</a>
</li> </li>
<li class="nav-item mx-0 mx-lg-1">
<a class="nav-link py-3 px-0 px-lg-3 rounded js-scroll-trigger" href="https://rnv-monitor.de/public/stats/form/">Ihre Verbindung</a>
</li>
<!--- <!---
<li class="nav-item mx-0 mx-lg-1"> <li class="nav-item mx-0 mx-lg-1">
<a class="nav-link py-3 px-0 px-lg-3 rounded js-scroll-trigger" href="#contact">Kontakt</a> <a class="nav-link py-3 px-0 px-lg-3 rounded js-scroll-trigger" href="#contact">Kontakt</a>
......
...@@ -69,6 +69,6 @@ function statsDataLoader() ...@@ -69,6 +69,6 @@ function statsDataLoader()
initChart(chartConfig); initChart(chartConfig);
addDataSet(dataDelays, "Verspung in Minuten"); addDataSet(dataDelays, "Verspätung in Minuten");
}); });
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment