From 78cb2beb62a58309a28b35259a356702c1d0b949 Mon Sep 17 00:00:00 2001
From: cs151051 <cs151051@gmail.com>
Date: Mon, 25 Nov 2019 13:58:53 +0200
Subject: [PATCH] v1.2

---
 README.md                 |  4 ++-
 iNode/data.json           |  4 +++
 iNode/parking.py          | 66 +++++++++++++++++++++++----------------
 serverNode/serv.py        |  2 +-
 webInterface/parking.css  |  6 +++-
 webInterface/parking.html | 37 ++++++++++++++++++++--
 6 files changed, 86 insertions(+), 33 deletions(-)
 create mode 100644 iNode/data.json

diff --git a/README.md b/README.md
index cb36fca..cd44668 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
 # smartParking
+#Authors:   Oulis Evangelos, Oulis Nikolaos, Drosos Katsibras
+#===================================================================
 
 Smart and Autonomous parking.
 
@@ -10,5 +12,5 @@ and send it via serial port the information if there is a car or no.
 At folder iNode/ there is the application that runs on Raspberry Pi, get
 the information from Arduino and post it to REST-API as JSON.
 
-At webInterface there is an html page that provide the parking status simply get
+At folder webInterface/ there is an html page that provide the parking status simply get
 the information as JSON from REST-API.
diff --git a/iNode/data.json b/iNode/data.json
new file mode 100644
index 0000000..b991d4b
--- /dev/null
+++ b/iNode/data.json
@@ -0,0 +1,4 @@
+{
+    'ip': '192.168.1.13',
+    'port': '8080'
+}
diff --git a/iNode/parking.py b/iNode/parking.py
index bc13402..2d06542 100644
--- a/iNode/parking.py
+++ b/iNode/parking.py
@@ -1,35 +1,47 @@
+#Authors:   Oulis Evangelos, Oulis Nikolaos, Drosos Katsibras
+#===================================================================
 #!/usr/bin/env python
 
 import time
 import serial
 import requests
+import json
 
-API_ENDPOINT = 'http://192.168.1.13:8080/parkingStatus'
-parkingCode = "1"
-ser = serial.Serial(
-    port='/dev/ttyACM0',
-    baudrate = 9600,
-    parity=serial.PARITY_NONE,
-    stopbits=serial.STOPBITS_ONE,
-    bytesize=serial.EIGHTBITS,
-    timeout=1
-)
-counter=0
+with open('data.json') as json_file:
+    server_par = json.load(json_file)
+    
+    server_ip = server_par['ip']
+    server_port = server_par['port']
+    
+    if server_ip != None and server_port != None:
+        API_ENDPOINT = 'http://' + server_ip + ':' + server_port + '/parkingStatus'
+        parkingCode = "1"
+        ser = serial.Serial(
+            port='/dev/ttyACM0',
+            baudrate = 9600,
+            parity=serial.PARITY_NONE,
+            stopbits=serial.STOPBITS_ONE,
+            bytesize=serial.EIGHTBITS,
+            timeout=1
+        )
+        counter=0
 
-prev_status = ser.readline()
-while 1:
-    park_status = ser.readline()
-    try:
-        if park_status != prev_status:
-            if b'1' in park_status:
-                data = """{"no":""" + parkingCode + ""","status":1}"""
-                r = requests.post(url = API_ENDPOINT, data = data)
-                print("parking reserved. RESPONSE :", r.status_code, "\n")
-            elif b'0' in park_status:
-                data = """{"no":""" + parkingCode + ""","status":0}"""
-                r = requests.post(url = API_ENDPOINT, data = data)
-                print("parking not reserved. RESPONSE : ", r.status_code, "\n")
-    except NameError:
-        print("**Not already prev variable.\n")
-    prev_status = park_status
+        prev_status = ser.readline()
+        while 1:
+            park_status = ser.readline()
+            try:
+                if park_status != prev_status:
+                    if b'1' in park_status:
+                        data = """{"no":""" + parkingCode + ""","status":1}"""
+                        r = requests.post(url = API_ENDPOINT, data = data)
+                        print("parking reserved. RESPONSE :", r.status_code, "\n")
+                    elif b'0' in park_status:
+                        data = """{"no":""" + parkingCode + ""","status":0}"""
+                        r = requests.post(url = API_ENDPOINT, data = data)
+                        print("parking not reserved. RESPONSE : ", r.status_code, "\n")
+            except NameError:
+                print("**Not already prev variable.\n")
+            prev_status = park_status
+    else:
+        print("Create a *.json configuration like: {'ip' : 'xxx.xxx.xxx.xxx', 'port': 'xxxx'}")
 
diff --git a/serverNode/serv.py b/serverNode/serv.py
index 9c0ad8a..3f4be91 100644
--- a/serverNode/serv.py
+++ b/serverNode/serv.py
@@ -1,5 +1,5 @@
 #Authors:   Oulis Evangelos, Oulis Nikolaos, Drosos Katsibras
-
+#===================================================================
 # using flask restful
 from flask import Flask, request, jsonify
 from flask_restful import Resource, Api
diff --git a/webInterface/parking.css b/webInterface/parking.css
index a62e658..6a05587 100644
--- a/webInterface/parking.css
+++ b/webInterface/parking.css
@@ -1,3 +1,7 @@
+/*
+#Authors:   Oulis Evangelos, Oulis Nikolaos, Drosos Katsibras
+#===================================================================
+*/
 table, th, td {
   border: 1px solid black;
 }
@@ -26,4 +30,4 @@ table, th, td {
 
 .road {
 	color: lightgrey;
-}
\ No newline at end of file
+}
diff --git a/webInterface/parking.html b/webInterface/parking.html
index a4d3602..49fd311 100644
--- a/webInterface/parking.html
+++ b/webInterface/parking.html
@@ -1,3 +1,7 @@
+<!--
+#Authors:   Oulis Evangelos, Oulis Nikolaos, Drosos Katsibras
+#===================================================================
+-->
 <!DOCTYPE html>
 <html>
 <head>
@@ -7,9 +11,9 @@
 </script>
 
 <script>
-function getParkingStatus() {
+function getParkingStatus(ip, port) {
     jQuery.ajax({
-		    url: "http://192.168.1.13:8080/",
+		    url: "http://" + ip + ":" + port + "8080/",
 		    type: "GET",
 		    
 		    contentType: "application/json; charset=utf-8",
@@ -29,13 +33,40 @@ function getParkingStatus() {
 	    });
 }
 $(document).ready(function(){
-    setInterval(getParkingStatus, 1000);
+    $("#approve").click(function() {
+        server_ip = $("#server_ip").val();
+        server_port = $("#server_port").val();
+        $("#msg").empty();
+        if (server_ip !== "" && server_ip !== null && server_port !== "" && server_port !== null) {
+            $("#msg").html("<font color='red'>ok!</font>");
+            setInterval(getParkingStatus(server_ip, server_port), 1000);
+        } else {
+            $("#msg").html("<font color='red'>Something went wrong. Try again</font>");
+        }
+    });
 });
 </script>
 </head>
 <body>
 
 <h1>Parking</h1>
+<h3>Server Settings</h3>
+<table>
+    <tr>
+        <td>Server IP:</td>
+        <td><input type="text" id="server_ip" placeholder="xxx.xxx.xxx.xxx"/></td>
+    </tr>
+    <tr>
+        <td>Server PORT:</td>
+        <td><input type="text" id="server_port" placeholder="xxxx"/></td>
+    </tr>
+    <tr>
+        <td><div id="msg"></div></td>
+        <td><input type="button" id="approve" value="ok"/></td>
+    </tr>
+</table>
+
+<h3>Parking Diagram</h3>
 <table width="100%">
 	<tr>
 		<td id="park4" width="30%">No4<div id="4" class="full"></div></td>