From c8039d47afaf2a70d8f1e91270417fccdc2c3587 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jake=20Libbert=20=E2=9A=A1?= <jlibbert@burnsmcd.com>
Date: Wed, 16 Oct 2019 18:53:26 -0500
Subject: [PATCH] Fixing web api

---
 PiWebAPIFinal/Content/app.css       | 24 ++++++++++++++++--------
 PiWebAPIFinal/Content/bootstrap.css |  1 +
 PiWebAPIFinal/Scripts/app.js        |  6 +++---
 PiWebAPIFinal/index.html            | 26 ++++++++++++++------------
 4 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/PiWebAPIFinal/Content/app.css b/PiWebAPIFinal/Content/app.css
index a322af5..cf7c81a 100644
--- a/PiWebAPIFinal/Content/app.css
+++ b/PiWebAPIFinal/Content/app.css
@@ -1,21 +1,27 @@
 
 * {
-	margin: 0;
-	padding: 0;
+    margin: 0;
+    padding: 0;
 }
 		
 html, body, #dataView, #login {
 	width: 100%;
 	height: 100%;
+
 }
 
-#dataView{
-    text-align:center;
+#dataView {
+    text-align: center;
+    background-color: aliceblue;
 }
 
 #circuitSelect{
     
-}	
+}
+
+#circuitSelector {
+    padding:100px;
+}
 
 .dataDiv{
     float:left;
@@ -28,11 +34,13 @@ html, body, #dataView, #login {
 	height: 30%;
 	bottom: 0px;
 }
-		
 
-		
+h4{
+    color:maroon;
+}
+
 #info *, #login * {
-	position: relative;
+    position: relative;
 }
 
 #login {
diff --git a/PiWebAPIFinal/Content/bootstrap.css b/PiWebAPIFinal/Content/bootstrap.css
index 680e768..657866c 100644
--- a/PiWebAPIFinal/Content/bootstrap.css
+++ b/PiWebAPIFinal/Content/bootstrap.css
@@ -11,6 +11,7 @@ html {
 }
 body {
   margin: 0;
+
 }
 article,
 aside,
diff --git a/PiWebAPIFinal/Scripts/app.js b/PiWebAPIFinal/Scripts/app.js
index c2a78ea..ac7d014 100644
--- a/PiWebAPIFinal/Scripts/app.js
+++ b/PiWebAPIFinal/Scripts/app.js
@@ -4,7 +4,7 @@ var baseServiceUrl = "https://osi.burnsmcdbts.com/PIWebApi/";
 var statusWebID;
 
 var authSuccessCallBack = function (data, statusMessage, statusObj) {
-    if (statusObj.status == 200) {
+    if (statusObj.status === 200) {
         $("#login").hide();
         $("#dataView").show();
 
@@ -13,7 +13,7 @@ var authSuccessCallBack = function (data, statusMessage, statusObj) {
 };
 
 var authErrorCallBack = function (data) {
-    if (data.status == 401) {
+    if (data.status === 401) {
         alert("Invalid username and password.");
     }
     else {
@@ -33,7 +33,7 @@ function loadCircuitCallBak(data) {
 
 function circuitChange() {
     var newCircuit = $('#circuitSelect').val();
-    if (newCircuit != "") {
+    if (newCircuit !== "") {
         $(".valuesContainer").show();
         piwebapi.GetAllEvents(newCircuit);
 
diff --git a/PiWebAPIFinal/index.html b/PiWebAPIFinal/index.html
index 67a2832..2e3f3d9 100644
--- a/PiWebAPIFinal/index.html
+++ b/PiWebAPIFinal/index.html
@@ -23,7 +23,7 @@ <h3>Outage and Emergency Tracker: Login</h3>
     </div>
     <div id="dataView" style="display : none; padding-left:150px;">
         <div style="min-width:1000px">
-            <div class="dataDiv" >
+            <div class="dataDiv" id="circuitSelector" >
                 <h3>Circuit</h3>
                 <select id="circuitSelect" style="width:150px;" onchange="circuitChange()">
                     <option value="">-select-</option>
@@ -46,17 +46,19 @@ <h3>
                 <h4 id="emerName"></h4>
             </div>
             <div style="clear: both;"></div>
-            <div class="dataDiv valuesContainer" style="display : none;">
-                <h4>Overall Circuit Status:</h4><h4 id="lblCurrentStatus"></h4>
-            </div>
-            <div class="dataDiv valuesContainer" style="display : none;">
-                <h4>Update Circuit Status</h4>
-                <select id="statusSelect" style="width:150px;">
-                    <option value="">-select-</option>
-                    <option value="true">Good Status</option>
-                    <option value="false">Alarm Status</option>
-                </select>
-                <input id="btnUpdateStatus" type="button" onclick="updateStatus()" value="Submit" />
+            <div style="margin-left:450px;">
+                <div class="dataDiv valuesContainer" style="display : none;">
+                    <h3>Overall Circuit Status:</h3><h4 id="lblCurrentStatus"></h4>
+                </div>
+                <div class="dataDiv valuesContainer" style="display : none;">
+                    <h3>Update Circuit Status</h3>
+                    <select id="statusSelect" style="width:150px;">
+                        <option value="">-select-</option>
+                        <option value="true">Good Status</option>
+                        <option value="false">Alarm Status</option>
+                    </select>
+                    <input id="btnUpdateStatus" type="button" onclick="updateStatus()" value="Submit" />
+                </div>
             </div>
 
         </div>