Commit 587fafad authored by Jasin Goldkorn's avatar Jasin Goldkorn 🐨

Merge remote-tracking branch 'origin/master'

parents 30c9a64b 4d8917bd
......@@ -3,6 +3,7 @@
<component name="ChangeListManager">
<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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
......@@ -12,17 +13,44 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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="true">
<entry file="file://$PROJECT_DIR$/UI/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="416">
<caret line="65" column="26" lean-forward="true" selection-start-line="65" selection-start-column="26" selection-end-line="65" selection-end-column="26" />
<state relative-caret-position="136">
<caret line="267" column="92" selection-start-line="267" selection-start-column="92" selection-end-line="267" selection-end-column="92" />
<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="false">
<entry file="file://$PROJECT_DIR$/UI/css/freelancer.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-4556" />
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>schreiben</find>
<find>Versptäung</find>
<find>Statis</find>
</findStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
......@@ -30,6 +58,7 @@
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/../../untitled/dataQuery.php" />
<option value="$PROJECT_DIR$/UI/js/chart.js" />
<option value="$PROJECT_DIR$/UI/index.html" />
</list>
</option>
......@@ -69,6 +98,12 @@
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="UI" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="public" type="b2602c69:ProjectViewProjectNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="UI" type="462c0819:PsiDirectoryNode" />
<item name="css" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
......@@ -105,20 +140,21 @@
<updated>1561995555873</updated>
<workItem from="1561995557256" duration="86000" />
<workItem from="1562551348368" duration="449000" />
<workItem from="1562774440059" duration="940000" />
<workItem from="1563279689083" duration="76000" />
<workItem from="1563280496906" duration="638000" />
<workItem from="1562774440059" duration="1677000" />
<workItem from="1563206596683" duration="596000" />
<workItem from="1563345106408" duration="763000" />
<workItem from="1563374644786" duration="1488000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="2645000" />
<option name="totallyTimeSpent" value="5515000" />
</component>
<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" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26421267" />
<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="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
......@@ -131,7 +167,7 @@
<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="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="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" />
......@@ -150,18 +186,53 @@
</state>
</provider>
</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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" column="9" lean-forward="true" selection-start-line="5" selection-start-column="9" selection-end-line="5" selection-end-column="120" />
<state relative-caret-position="85">
<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$/UI/index.html">
<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="65" column="26" lean-forward="true" selection-start-line="65" selection-start-column="26" selection-end-line="65" selection-end-column="26" />
<caret line="50" column="5" selection-start-line="50" selection-start-column="5" selection-end-line="50" selection-end-column="5" />
</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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/UI/css/freelancer.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-4556" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/UI/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="267" column="92" selection-start-line="267" selection-start-column="92" selection-end-line="267" selection-end-column="92" />
<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>
......
......@@ -52,6 +52,9 @@
<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>
</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">
<a class="nav-link py-3 px-0 px-lg-3 rounded js-scroll-trigger" href="#contact">Kontakt</a>
......@@ -255,6 +258,27 @@
</div>
</section>
<!-- About Section -->
<section class="text-white mb-0" id="nextUpdate">
<div class="container">
<h2 class="text-center text-uppercase text-secondary">Mit dem nächsten Update</h2>
<hr class="star-dark mb-5">
<div class="row">
<p class="lead text-dark">Mit dem nächsten Update am 01.08.2019 kommt: <br>
1. Es werde nicht mehr nur noch Verspätungen, sondern auch Fahrtausfälle erfasst<br>
2. Erweiterte Statistik<br>
3. Mehr Stabilität</p>
</div>
<div class="text-center mt-4">
<a class="btn btn-xl btn-primary" href="https://rnv-monitor.de/public/stats">
<i class="far fa-chart-bar mr-2"></i>
Statistik zu Ihrer Verbindung
</a>
</div>
</div>
</section>
<!-- Contact Section
<section id="contact">
<div class="container">
......@@ -382,6 +406,9 @@
<div class="container">
<small>Copyright &copy; RNV-MONITOR 2018-2019 - Jasin Goldkorn</small>
</div>
<div class="container">
<small>V:1.0.7</small>
</div>
</div>
<!-- Scroll to Top Button (Only visible on small and extra-small screen sizes) -->
......
......@@ -69,6 +69,6 @@ function statsDataLoader()
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