principal-dashboard-lib-v2 0.0.12 → 0.0.14
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 +12 -8
- 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 +3 -2
- package/esm2015/lib/principal-dashboard-lib-v2.service.js +10 -7
- package/fesm2015/principal-dashboard-lib-v2.js +12 -8
- package/fesm2015/principal-dashboard-lib-v2.js.map +1 -1
- package/package.json +1 -1
|
@@ -308,9 +308,11 @@
|
|
|
308
308
|
}
|
|
309
309
|
//----------// terminalIP and terminalLocation
|
|
310
310
|
for (var i_3 = 0; i_3 < schoolTerminalMatrix.length; i_3++) {
|
|
311
|
+
console.log("schoolTerminalMatrix[i]", schoolTerminalMatrix[i_3]);
|
|
311
312
|
console.log("schoolTerminalMatrix[i].terminalKey", terminalIP, schoolTerminalMatrix[i_3].terminalKey);
|
|
312
313
|
if (terminalIP === schoolTerminalMatrix[i_3].terminalKey) {
|
|
313
314
|
terminalLocation = schoolTerminalMatrix[i_3].location;
|
|
315
|
+
break;
|
|
314
316
|
}
|
|
315
317
|
else {
|
|
316
318
|
terminalLocation = "location";
|
|
@@ -357,12 +359,12 @@
|
|
|
357
359
|
var dataTableforChart = new Array();
|
|
358
360
|
dataTableforChart = [];
|
|
359
361
|
if (this.userConsoleData) {
|
|
360
|
-
console.log("this.userConsoleData", this.userConsoleData);
|
|
361
362
|
for (var i = 0; i < this.userConsoleData.length; i++) {
|
|
362
|
-
var userData = [this.userConsoleData[i].
|
|
363
|
+
var userData = [this.userConsoleData[i].terminalIP, this.userConsoleData[i].startTime, this.userConsoleData[i].endTime];
|
|
363
364
|
dataTableforChart.push(userData);
|
|
364
365
|
}
|
|
365
366
|
}
|
|
367
|
+
console.log("this.classRoomWiseChartData", dataTableforChart);
|
|
366
368
|
return dataTableforChart;
|
|
367
369
|
};
|
|
368
370
|
PrincipalDashboardLibV2Service.prototype.allUserChartData = function () {
|
|
@@ -425,20 +427,21 @@
|
|
|
425
427
|
var inActiveClassRoom = void 0;
|
|
426
428
|
for (var i = 0; i < this.userConsoleData.length; i++) {
|
|
427
429
|
allRoomsDetails.push(this.userConsoleData[i]);
|
|
428
|
-
var userData = [this.userConsoleData[i].
|
|
430
|
+
var userData = [this.userConsoleData[i].terminalIP, this.userConsoleData[i].startTime, this.userConsoleData[i].endTime];
|
|
429
431
|
dataTableforChart.push(userData);
|
|
430
432
|
}
|
|
431
433
|
for (var i = 0; i < this.schoolTerminalData.length; i++) {
|
|
432
|
-
|
|
434
|
+
console.log("schoolTerminalData", this.schoolTerminalData);
|
|
435
|
+
inActiveClassRoom = this.schoolTerminalData[i].terminalKey;
|
|
433
436
|
myChartRowData = {
|
|
434
437
|
userId: "",
|
|
435
438
|
userName: "",
|
|
436
439
|
startTime: new Date(this.myEndTime),
|
|
437
440
|
endTime: new Date(this.myEndTime),
|
|
438
|
-
terminalIP:
|
|
441
|
+
terminalIP: inActiveClassRoom,
|
|
439
442
|
resourceMetauserConsoleData: [],
|
|
440
443
|
duration: 0,
|
|
441
|
-
terminalLocation:
|
|
444
|
+
terminalLocation: "",
|
|
442
445
|
userSubjects: ""
|
|
443
446
|
};
|
|
444
447
|
allRoomsDetails.push(myChartRowData);
|
|
@@ -721,7 +724,7 @@
|
|
|
721
724
|
this.isChartView = true;
|
|
722
725
|
}
|
|
723
726
|
ChartheaderComponent.prototype.ngOnInit = function () {
|
|
724
|
-
this.libVersion = "0.0.
|
|
727
|
+
this.libVersion = "0.0.14";
|
|
725
728
|
// this.myIcon = document.getElementById('myIconImg');
|
|
726
729
|
// this.changeChatType()
|
|
727
730
|
};
|
|
@@ -1226,8 +1229,9 @@
|
|
|
1226
1229
|
}
|
|
1227
1230
|
else {
|
|
1228
1231
|
for (var i = 0; i < detailViewMatrix.length; i++) {
|
|
1232
|
+
// console.log("detailViewMatrix[i]",detailViewMatrix[i]);
|
|
1229
1233
|
id_durationArray = {
|
|
1230
|
-
name: detailViewMatrix[i].
|
|
1234
|
+
name: detailViewMatrix[i].terminalIP,
|
|
1231
1235
|
value: parseInt(detailViewMatrix[i].duration),
|
|
1232
1236
|
};
|
|
1233
1237
|
id_durationMatrix.push(id_durationArray);
|