principal-dashboard-lib-v2 0.0.11 → 0.0.13

package/bundles/principal-dashboard-lib-v2.umd.js

@@ -210,7 +210,9 @@
                         }
                         //----------//location
                         if (schoolTerminal[i].metadata !== undefined) {
-                            location = schoolTerminal[i].metadata; // get name of user w.r.t. ID
+                            var metadataJSON = JSON.parse(schoolTerminal[i].metadata);
+                            location = metadataJSON.location; // get name of user w.r.t. ID
+                            console.log("metadataJSON", location);
                         }
                         else {
                             location = '';
@@ -306,9 +308,14 @@
                         }
                         //----------// terminalIP and terminalLocation
                         for (var i_3 = 0; i_3 < schoolTerminalMatrix.length; i_3++) {
+                            console.log("schoolTerminalMatrix[i]", schoolTerminalMatrix[i_3]);
+                            console.log("schoolTerminalMatrix[i].terminalKey", terminalIP, schoolTerminalMatrix[i_3].terminalKey);
                             if (terminalIP === schoolTerminalMatrix[i_3].terminalKey) {
-                                // console.log("schoolTerminalMatrix[i].terminalKey",terminalIP,schoolTerminalMatrix[i]);
                                 terminalLocation = schoolTerminalMatrix[i_3].location;
+                                break;
+                            }
+                            else {
+                                terminalLocation = "location";
                             }
                         }
                         var userData = {
@@ -352,9 +359,9 @@
             var dataTableforChart = new Array();
             dataTableforChart = [];
             if (this.userConsoleData) {
-                // console.log("this.userConsoleData",this.userConsoleData);
+                console.log("this.userConsoleData", this.userConsoleData);
                 for (var i = 0; i < this.userConsoleData.length; i++) {
-                    var userData = [this.userConsoleData[i].terminalLocation, this.userConsoleData[i].startTime, this.userConsoleData[i].endTime];
+                    var userData = [this.userConsoleData[i].terminalIP, this.userConsoleData[i].startTime, this.userConsoleData[i].endTime];
                     dataTableforChart.push(userData);
                 }
             }
@@ -716,7 +723,7 @@
             this.isChartView = true;
         }
         ChartheaderComponent.prototype.ngOnInit = function () {
-            this.libVersion = "0.0.19";
+            this.libVersion = "0.0.13";
             // this.myIcon = document.getElementById('myIconImg');
             // this.changeChatType() 
         };
@@ -1185,7 +1192,7 @@
                 labels.removeChild(labels.lastChild);
             }
             this.chartDataTable = this.myChartDataMatrix;
-            // console.log("this.myChartDataMatrix",this.myChartDataMatrix);
+            console.log("this.myChartDataMatrix", this.myChartDataMatrix);
             (this.myChartOptions = {
                 tooltip: {
                     trigger: 'none',