server address connection + error handling + bug fix

Author: dustin-H

apis/siocon.js

@@ -9,6 +9,9 @@ if (typeof module !== 'undefined' && module.exports) {
 var serverVerifier = 'StockParty Server by David Ehlen, Robin Frischmann, Nils Hirsekorn, Dustin Hoffner';
 
 var siocon = function (url, views, devices, error, connect) {
+    if ( url === ''){
+        return error('Invalid server address!');
+    }
     if (url[url.length - 1] !== '/') {
         url += '/';
     }

config.json

@@ -1 +1,68 @@
-{"global":{"configmode":false,"devicenameprefix":"device","clientnameprefix":"client","configfilepath":"/Users/david/Desktop/Zeugs/StockParty/app/config.json","port":4217,"interval":30,"stockcrash":false,"running":false},"clients":{"client000":{"_id":"client000","name":"ADMIN","type":"adminpanel","maxsockets":99999,"view":"adminpanel"},"client001":{"_id":"client001","name":"Kasse 1","type":"cashpanel","maxsockets":1,"idd":"device000","view":"cashpanel"},"client002":{"_id":"client002","name":"Kasse 2","type":"cashpanel","maxsockets":1,"idd":"device002","view":"cashpanel"},"client003":{"_id":"client003","name":"Connectors","type":"connector","maxsockets":99999,"view":"connector"},"client004":{"_id":"client004","name":"Monitor 1","type":"monitor","maxsockets":1,"drinks":["drinkid1","drinkid2"],"fontsize":14,"theme":"dark","view":"monitor"}},"devices":{"device000":{"_id":"device000","type":"idd","name":"IDD Device","hid":"3c:15:c2:ba:7b:94-0"},"device001":{"_id":"device001","type":"idd","name":"IDD Device","hid":"3c:15:c2:ba:7b:94-1"}}}
+{
+    "global": {
+        "configmode": false,
+        "devicenameprefix": "device",
+        "clientnameprefix": "client",
+        "configfilepath": "/Users/david/Desktop/Zeugs/StockParty/app/config.json",
+        "port": 4217,
+        "interval": 30,
+        "stockcrash": false,
+        "running": false
+    },
+    "clients": {
+        "client000": {
+            "_id": "client000",
+            "name": "ADMIN",
+            "type": "adminpanel",
+            "maxsockets": 99999,
+            "view": "adminpanel"
+        },
+        "client001": {
+            "_id": "client001",
+            "name": "Kasse 1",
+            "type": "cashpanel",
+            "maxsockets": 1,
+            "idd": "device000",
+            "view": "cashpanel"
+        },
+        "client002": {
+            "_id": "client002",
+            "name": "Kasse 2",
+            "type": "cashpanel",
+            "maxsockets": 1,
+            "idd": "device002",
+            "view": "cashpanel"
+        },
+        "client003": {
+            "_id": "client003",
+            "name": "Connectors",
+            "type": "connector",
+            "maxsockets": 99999,
+            "view": "connector"
+        },
+        "client004": {
+            "_id": "client004",
+            "name": "Monitor 1",
+            "type": "monitor",
+            "maxsockets": 1,
+            "drinks": ["drinkid1", "drinkid2"],
+            "fontsize": 14,
+            "theme": "dark",
+            "view": "monitor"
+        }
+    },
+    "devices": {
+        "device000": {
+            "_id": "device000",
+            "type": "idd",
+            "name": "IDD Device",
+            "hid": "3c:15:c2:ba:7b:94-0"
+        },
+        "device001": {
+            "_id": "device001",
+            "type": "idd",
+            "name": "IDD Device",
+            "hid": "3c:15:c2:ba:7b:94-1"
+        }
+    }
+}

public/cashPanel.html

@@ -44,8 +44,6 @@
                         <td class="button">CANCEL</td>
                         <td class="button">OK</td>
                     </tr>
-                    </tr>
-                    </tr>
                 </table>
             </div>
             <div id="userOrderTable">
@@ -66,4 +64,4 @@
     </div>
 </body>
 
-</html>
+</html>

public/index.html

@@ -11,6 +11,8 @@
     <!-- First ALL Controllers -->
     <script src="listView.js"></script>
     <script src="adminPanelView.js"></script>
+    <script src="cashPanelView.js"></script>
+    <script src="monitorView.js"></script>
     <!--    <script src="scanner.js"></script>-->
 
     <!--     Register Devices and Views -->

public/javascript/UIHandler.js

@@ -128,9 +128,9 @@ function login() {
 function connectServer(inputBox) {
     uiConnector.connect(inputBox.value, function (success) {
         if (success) {
-            alert("success");
+            console.log("success");
         } else {
-            alert("not success")
+            console.log("not success")
         };
     });
 }
@@ -202,4 +202,4 @@ function addPoint() {
 }
 
 window.onload = loadPage;
-window.onresize = loadPage;
+window.onresize = loadPage;

public/script.js

@@ -2,24 +2,24 @@ var url = 'http://localhost:4217/';
 
 var uiConnector = {};
 
-uiConnector.connect = function(url){
+uiConnector.connect = function(url, cb){
     console.log('Starting Connection...');
     siocon(url, views, devices, function error(err) {
         console.log('UI: Show connecting to server loading circle');
         // UI: Show connecting to server loading circle
         if(err === 'Invalid server address!'){
             console.log('Connection failed! Please try again!', err);
             console.log('UI: Show Invalid Server Address please again');
-            // UI: Show Invalid Server Address please again
+            cb(false); // UI: Show Invalid Server Address please again
         } else {
             var msg = 'Connection error!';
             console.log('UI: Show Error Page', msg);
-            // UI: Show Error Page with message msg
+            showErrorPage(); // UI: Show Error Page with message msg
         }
     }, function connect(socket) {
         uiConnector.socket = socket;
         console.log('UI: Show Login fields');
-        // UI: Show Login fields
+        cb(true); // UI: Show Login fields
     });
 };