From 7ee83277e0e38135fa0e41d9e540c673f9c44a9c Mon Sep 17 00:00:00 2001
From: cs151051 <cs151051@gmail.com>
Date: Mon, 25 Nov 2019 15:29:42 +0200
Subject: [PATCH] v1.1

---
 iNode/data.json           |  4 ++--
 iNode/parking.py          | 24 +++++++++++++--------
 webInterface/parking.html | 45 ++++++++++++++++++++-------------------
 3 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/iNode/data.json b/iNode/data.json
index b991d4b..9d62f9c 100644
--- a/iNode/data.json
+++ b/iNode/data.json
@@ -1,4 +1,4 @@
 {
-    'ip': '192.168.1.13',
-    'port': '8080'
+    "ip": "192.168.89.14",
+    "port": "8080"
 }
diff --git a/iNode/parking.py b/iNode/parking.py
index 2d06542..65981d1 100644
--- a/iNode/parking.py
+++ b/iNode/parking.py
@@ -7,15 +7,18 @@ import serial
 import requests
 import json
 
-with open('data.json') as json_file:
-    server_par = json.load(json_file)
+# Open file to configure communication with server.
+with open('data.json', 'r') as json_file:
+    json_data = json_file.read()
+
+if json_data != "" and json_data != None:
+    server_par = json.loads(json_data.replace('\n','').replace(' ',''))
     
     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,
@@ -29,16 +32,19 @@ with open('data.json') as json_file:
         prev_status = ser.readline()
         while 1:
             park_status = ser.readline()
+            park_status_data = str(park_status).split("#")
+
+            parkingCode = park_status_data[0].replace('b\'','')
+            parkingStatus = park_status_data[1].replace('\\r\\n\'', '')
+            
             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)
+                    if parkingStatus == "1":
                         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)
+                    elif parkingStatus == "0":
                         print("parking not reserved. RESPONSE : ", r.status_code, "\n")
+                data = """{"no":""" + parkingCode + ""","status":""" + parkingStatus + """}"""
+                r = requests.post(url = API_ENDPOINT, data = data)
             except NameError:
                 print("**Not already prev variable.\n")
             prev_status = park_status
diff --git a/webInterface/parking.html b/webInterface/parking.html
index 49fd311..16c6d89 100644
--- a/webInterface/parking.html
+++ b/webInterface/parking.html
@@ -11,35 +11,36 @@
 </script>
 
 <script>
-function getParkingStatus(ip, port) {
-    jQuery.ajax({
-		    url: "http://" + ip + ":" + port + "8080/",
-		    type: "GET",
-		    
-		    contentType: "application/json; charset=utf-8",
-		    success: function(resultData) {
-			    $.each(resultData, function(key, val) {
-			        console.log(key + " -> " + val);
-				    if (val == "1")
-					    $("#" + key).removeClass("full").addClass("empty");
-				    else if (val == "0")
-					    $("#" + key).removeClass("empty").addClass("full");
-			    });
-		    },
-		    error: function(jqXHR, testStatus, errorThrown) {
-		    },
-		    
-		    timeout: 12000,
-	    });
-}
 $(document).ready(function(){
     $("#approve").click(function() {
         server_ip = $("#server_ip").val();
         server_port = $("#server_port").val();
+        alert(server_ip + "  " + server_port + ". Started!!!")
         $("#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);
+            
+            setInterval(function () {
+                jQuery.ajax({
+		                url: "http://" + server_ip + ":" + server_port + "/",
+		                type: "GET",
+		                
+		                contentType: "application/json; charset=utf-8",
+		                success: function(resultData) {
+			                $.each(resultData, function(key, val) {
+			                    console.log(key + " -> " + val);
+				                if (val == "1")
+					                $("#" + key).removeClass("full").addClass("empty");
+				                else if (val == "0")
+					                $("#" + key).removeClass("empty").addClass("full");
+			                });
+		                },
+		                error: function(jqXHR, testStatus, errorThrown) {
+		                },
+		                
+		                timeout: 12000,
+	                });
+	        }, 1000);
         } else {
             $("#msg").html("<font color='red'>Something went wrong. Try again</font>");
         }