principal-dashboard-lib-v2 0.0.11 → 0.0.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/principal-dashboard-lib-v2.umd.js +10 -5
- package/bundles/principal-dashboard-lib-v2.umd.js.map +1 -1
- package/bundles/principal-dashboard-lib-v2.umd.min.js +1 -1
- package/bundles/principal-dashboard-lib-v2.umd.min.js.map +1 -1
- package/esm2015/lib/chartheader/chartheader.component.js +2 -2
- package/esm2015/lib/chartview/chartview.component.js +2 -2
- package/esm2015/lib/principal-dashboard-lib-v2.service.js +9 -4
- package/fesm2015/principal-dashboard-lib-v2.js +10 -5
- package/fesm2015/principal-dashboard-lib-v2.js.map +1 -1
- package/package.json +1 -1
|
@@ -210,7 +210,9 @@
|
|
|
210
210
|
}
|
|
211
211
|
//----------//location
|
|
212
212
|
if (schoolTerminal[i].metadata !== undefined) {
|
|
213
|
-
|
|
213
|
+
var metadataJSON = JSON.parse(schoolTerminal[i].metadata);
|
|
214
|
+
location = metadataJSON.location; // get name of user w.r.t. ID
|
|
215
|
+
console.log("metadataJSON", location);
|
|
214
216
|
}
|
|
215
217
|
else {
|
|
216
218
|
location = '';
|
|
@@ -306,10 +308,13 @@
|
|
|
306
308
|
}
|
|
307
309
|
//----------// terminalIP and terminalLocation
|
|
308
310
|
for (var i_3 = 0; i_3 < schoolTerminalMatrix.length; i_3++) {
|
|
311
|
+
console.log("schoolTerminalMatrix[i].terminalKey", terminalIP, schoolTerminalMatrix[i_3].terminalKey);
|
|
309
312
|
if (terminalIP === schoolTerminalMatrix[i_3].terminalKey) {
|
|
310
|
-
// console.log("schoolTerminalMatrix[i].terminalKey",terminalIP,schoolTerminalMatrix[i]);
|
|
311
313
|
terminalLocation = schoolTerminalMatrix[i_3].location;
|
|
312
314
|
}
|
|
315
|
+
else {
|
|
316
|
+
terminalLocation = "location";
|
|
317
|
+
}
|
|
313
318
|
}
|
|
314
319
|
var userData = {
|
|
315
320
|
userId: userId,
|
|
@@ -352,7 +357,7 @@
|
|
|
352
357
|
var dataTableforChart = new Array();
|
|
353
358
|
dataTableforChart = [];
|
|
354
359
|
if (this.userConsoleData) {
|
|
355
|
-
|
|
360
|
+
console.log("this.userConsoleData", this.userConsoleData);
|
|
356
361
|
for (var i = 0; i < this.userConsoleData.length; i++) {
|
|
357
362
|
var userData = [this.userConsoleData[i].terminalLocation, this.userConsoleData[i].startTime, this.userConsoleData[i].endTime];
|
|
358
363
|
dataTableforChart.push(userData);
|
|
@@ -716,7 +721,7 @@
|
|
|
716
721
|
this.isChartView = true;
|
|
717
722
|
}
|
|
718
723
|
ChartheaderComponent.prototype.ngOnInit = function () {
|
|
719
|
-
this.libVersion = "0.0.
|
|
724
|
+
this.libVersion = "0.0.20";
|
|
720
725
|
// this.myIcon = document.getElementById('myIconImg');
|
|
721
726
|
// this.changeChatType()
|
|
722
727
|
};
|
|
@@ -1185,7 +1190,7 @@
|
|
|
1185
1190
|
labels.removeChild(labels.lastChild);
|
|
1186
1191
|
}
|
|
1187
1192
|
this.chartDataTable = this.myChartDataMatrix;
|
|
1188
|
-
|
|
1193
|
+
console.log("this.myChartDataMatrix", this.myChartDataMatrix);
|
|
1189
1194
|
(this.myChartOptions = {
|
|
1190
1195
|
tooltip: {
|
|
1191
1196
|
trigger: 'none',
|