18
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3bf71e7..3a4ea05 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +3,7 @@
<component name="ChangeListManager">
<list default="true" id="ab19ce1b-f89c-47e9-85b3-501caccc0201" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/eventsHandler.js" afterPath="$PROJECT_DIR$/public/eventsHandler.js" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/views/mapp.ejs" afterPath="$PROJECT_DIR$/views/mapp.ejs" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/style/styles.css" afterPath="$PROJECT_DIR$/public/style/styles.css" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/routes/index.js" afterPath="$PROJECT_DIR$/routes/index.js" />
</list>
<ignored path="intelIoTHackathon.iws" />
<ignored path=".idea/workspace.xml" />
@@ -45,11 +44,11 @@
</provider>
</entry>
</file>
- <file leaf-file-name="index.js" pinned="false" current-in-tab="false">
+ <file leaf-file-name="index.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/routes/index.js">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="50" column="18" selection-start-line="50" selection-start-column="17" selection-end-line="50" selection-end-column="18" />
+ <state vertical-scroll-proportion="0.5625">
+ <caret line="69" column="52" selection-start-line="69" selection-start-column="52" selection-end-line="69" selection-end-column="52" />
<folding />
</state>
</provider>
@@ -97,16 +96,16 @@
<entry file="file://$PROJECT_DIR$/public/eventsHandler.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="13" column="34" selection-start-line="13" selection-start-column="33" selection-end-line="13" selection-end-column="34" />
+ <caret line="5" column="32" selection-start-line="5" selection-start-column="32" selection-end-line="5" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="styles.css" pinned="false" current-in-tab="true">
+ <file leaf-file-name="styles.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/style/styles.css">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.78125">
+ <state vertical-scroll-proportion="0.0">
<caret line="25" column="18" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
<folding />
</state>
@@ -137,11 +136,11 @@
<option value="$PROJECT_DIR$/config/config.json" />
<option value="$PROJECT_DIR$/app.js" />
<option value="$PROJECT_DIR$/views/index.ejs" />
- <option value="$PROJECT_DIR$/routes/index.js" />
<option value="$PROJECT_DIR$/public/styles.css" />
- <option value="$PROJECT_DIR$/public/eventsHandler.js" />
<option value="$PROJECT_DIR$/views/mapp.ejs" />
<option value="$PROJECT_DIR$/public/style/styles.css" />
+ <option value="$PROJECT_DIR$/public/eventsHandler.js" />
+ <option value="$PROJECT_DIR$/routes/index.js" />
</list>
</option>
</component>
@@ -727,7 +726,7 @@
<window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25679544" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3298153" sideWeight="0.49713877" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3298153" sideWeight="0.49713877" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298153" sideWeight="0.5028612" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298153" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -938,14 +937,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/routes/index.js">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="50" column="18" selection-start-line="50" selection-start-column="17" selection-end-line="50" selection-end-column="18" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/config/config.json">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-9.375">
@@ -954,14 +945,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/public/eventsHandler.js">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="13" column="34" selection-start-line="13" selection-start-column="33" selection-end-line="13" selection-end-column="34" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/views/mapp.ejs">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-15.625">
@@ -980,11 +963,27 @@
</entry>
<entry file="file://$PROJECT_DIR$/public/style/styles.css">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.78125">
+ <state vertical-scroll-proportion="0.0">
<caret line="25" column="18" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/public/eventsHandler.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="5" column="32" selection-start-line="5" selection-start-column="32" selection-end-line="5" selection-end-column="32" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/routes/index.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.5625">
+ <caret line="69" column="52" selection-start-line="69" selection-start-column="52" selection-end-line="69" selection-end-column="52" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
</project>
\ No newline at end of file
diff --git a/public/eventsHandler.js b/public/eventsHandler.js
index c5020e9..0256a43 100644
--- a/public/eventsHandler.js
+++ b/public/eventsHandler.js
@@ -3,6 +3,7 @@
$.ajax({
url:"/parkingContext",
success:function(result){
+ console.log(result);
$('#spaceCounter').html(result.freeSpaces);
$('section').fadeIn(500);
}
diff --git a/routes/index.js b/routes/index.js
index b80158c..420026c 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -67,6 +67,7 @@
function cmpOldParkingContextWithNew(newParkingContext){
prevParkingContext = newParkingContext;
prevParkingContext.reserved = reserve;
+ prevParkingContext.freeSpaces = getFreePlaces();
}
function getFreePlaces(){