principal-dashboard-lib-v2 0.0.16 → 0.0.18
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 +48 -13
- 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/header/header.component.js +3 -3
- package/esm2015/lib/principal-dashboard-lib-v2.service.js +44 -9
- package/fesm2015/principal-dashboard-lib-v2.js +46 -11
- package/fesm2015/principal-dashboard-lib-v2.js.map +1 -1
- package/package.json +1 -1
- package/principal-dashboard-lib-v2.metadata.json +1 -1
|
@@ -381,8 +381,13 @@
|
|
|
381
381
|
dataTableforChart = [];
|
|
382
382
|
if (this.userConsoleData) {
|
|
383
383
|
for (var i = 0; i < this.userConsoleData.length; i++) {
|
|
384
|
-
console.log('bbb-->', this.userConsoleData[i]);
|
|
385
|
-
var
|
|
384
|
+
console.log('bbb-->', this.userConsoleData[i].terminalLocation);
|
|
385
|
+
var roomName = this.userConsoleData[i].terminalLocation;
|
|
386
|
+
if (roomName === "") {
|
|
387
|
+
roomName = "No Name";
|
|
388
|
+
}
|
|
389
|
+
var location = roomName + " - " + this.userConsoleData[i].terminalIP;
|
|
390
|
+
var userData = [location, this.userConsoleData[i].startTime, this.userConsoleData[i].endTime];
|
|
386
391
|
dataTableforChart.push(userData);
|
|
387
392
|
}
|
|
388
393
|
}
|
|
@@ -398,14 +403,18 @@
|
|
|
398
403
|
var inActiveuserName = void 0;
|
|
399
404
|
var userSubjects = void 0;
|
|
400
405
|
var myID = void 0;
|
|
401
|
-
var
|
|
406
|
+
var AlluserDetails_1 = new Array();
|
|
402
407
|
for (var index = 0; index < this.userConsoleData.length; index++) {
|
|
403
|
-
|
|
408
|
+
AlluserDetails_1.push(this.userConsoleData[index]);
|
|
404
409
|
AlluserDetailsForTableChart.push(this.userConsoleData[index]);
|
|
405
410
|
}
|
|
406
411
|
for (var i = 0; i < this.usersMetaData.length; i++) {
|
|
407
412
|
myID = this.usersMetaData[i].userId;
|
|
408
413
|
inActiveuserName = this.usersMetaData[i].userName;
|
|
414
|
+
//if(inActiveuserName === undefined)
|
|
415
|
+
{
|
|
416
|
+
console.log("alluser-1->>", inActiveuserName);
|
|
417
|
+
}
|
|
409
418
|
userSubjects = this.usersMetaData[i].userSubjects;
|
|
410
419
|
var myChartRowuserConsoleData = {
|
|
411
420
|
userId: myID,
|
|
@@ -418,7 +427,7 @@
|
|
|
418
427
|
terminalLocation: "",
|
|
419
428
|
userSubjects: userSubjects
|
|
420
429
|
};
|
|
421
|
-
AlluserDetails.push(myChartRowuserConsoleData);
|
|
430
|
+
//AlluserDetails.push(myChartRowuserConsoleData);
|
|
422
431
|
var myTableRowuserConsoleData = {
|
|
423
432
|
userId: myID,
|
|
424
433
|
userName: inActiveuserName,
|
|
@@ -430,12 +439,30 @@
|
|
|
430
439
|
terminalLocation: "",
|
|
431
440
|
userSubjects: userSubjects
|
|
432
441
|
};
|
|
442
|
+
//console.log("alluser-2->>",inActiveuserName);
|
|
433
443
|
AlluserDetailsForTableChart.push(myTableRowuserConsoleData);
|
|
444
|
+
AlluserDetails_1.push(myChartRowuserConsoleData);
|
|
434
445
|
}
|
|
435
|
-
|
|
436
|
-
var
|
|
437
|
-
|
|
438
|
-
|
|
446
|
+
setTimeout(function () {
|
|
447
|
+
for (var i = 0; i < AlluserDetails_1.length; i++) {
|
|
448
|
+
console.log("alluser-3->>", AlluserDetails_1[i].userName);
|
|
449
|
+
if (AlluserDetails_1[i].userName === undefined) {
|
|
450
|
+
AlluserDetails_1[i].userName = "--";
|
|
451
|
+
}
|
|
452
|
+
var userData = [AlluserDetails_1[i].userName, AlluserDetails_1[i].startTime, AlluserDetails_1[i].endTime];
|
|
453
|
+
dataTableforChart.push(userData);
|
|
454
|
+
}
|
|
455
|
+
}, 50);
|
|
456
|
+
/*
|
|
457
|
+
for(let i = 0; i < AlluserDetails.length; i++){
|
|
458
|
+
console.log("alluser-3->>",AlluserDetails[i].userName);
|
|
459
|
+
if(AlluserDetails[i].userName === undefined){
|
|
460
|
+
AlluserDetails[i].userName = "(-)"
|
|
461
|
+
}
|
|
462
|
+
|
|
463
|
+
let userData = [AlluserDetails[i].userName,AlluserDetails[i].startTime,AlluserDetails[i].endTime];
|
|
464
|
+
dataTableforChart.push(userData);
|
|
465
|
+
}*/
|
|
439
466
|
}
|
|
440
467
|
return { forChartData: dataTableforChart, fordurationTable: AlluserDetailsForTableChart };
|
|
441
468
|
};
|
|
@@ -449,7 +476,15 @@
|
|
|
449
476
|
var inActiveClassRoom = void 0;
|
|
450
477
|
for (var i = 0; i < this.userConsoleData.length; i++) {
|
|
451
478
|
allRoomsDetails.push(this.userConsoleData[i]);
|
|
452
|
-
|
|
479
|
+
console.log("bbb allRoom-->", this.userConsoleData[i]);
|
|
480
|
+
var roomName = this.userConsoleData[i].terminalLocation;
|
|
481
|
+
var roomIP = this.userConsoleData[i].terminalIP;
|
|
482
|
+
if (roomName === "" || roomName === undefined) {
|
|
483
|
+
roomName = "No Name";
|
|
484
|
+
}
|
|
485
|
+
var location = roomName + " - " + roomIP;
|
|
486
|
+
// let userData = [this.userConsoleData[i].terminalIP,this.userConsoleData[i].startTime,this.userConsoleData[i].endTime];
|
|
487
|
+
var userData = [location, this.userConsoleData[i].startTime, this.userConsoleData[i].endTime];
|
|
453
488
|
dataTableforChart.push(userData);
|
|
454
489
|
}
|
|
455
490
|
for (var i = 0; i < this.schoolTerminalData.length; i++) {
|
|
@@ -764,7 +799,7 @@
|
|
|
764
799
|
this.isChartView = true;
|
|
765
800
|
}
|
|
766
801
|
ChartheaderComponent.prototype.ngOnInit = function () {
|
|
767
|
-
this.libVersion = "0.0.
|
|
802
|
+
this.libVersion = "0.0.18";
|
|
768
803
|
// this.myIcon = document.getElementById('myIconImg');
|
|
769
804
|
// this.changeChatType()
|
|
770
805
|
};
|
|
@@ -2435,8 +2470,8 @@
|
|
|
2435
2470
|
HeaderComponent.decorators = [
|
|
2436
2471
|
{ type: i0.Component, args: [{
|
|
2437
2472
|
selector: 'lib-header',
|
|
2438
|
-
template: "<div id=\"pd_header\" class=\"pd_header\">\n \n <div *ngIf=\"message && mydata && (this.todayDate === this.calenderCurrentDate)\" id=\"pd_refeshView\" class=\"pd_refesh_bar\">\n <div class=\"timer_msg\"> This page will be refreshed in</div>\n <div class=\"timer_value\"> {{timeConvert(message)}} min</div>\n <div id=\"pd_refeshBtn\" (click)=\"refreshChart()\"> Refresh </div>\n </div>\n\n <div id=\"pd_exportBtn\" class=\"pd_exportButton\" *ngIf=\"mydata\"\n [ngClass]=\"{'pd_exportButton_shiftRight': this.todayDate != this.calenderCurrentDate}\" (click)=\"exportReport()\"> \n <span class=\"pd_exportButton_text\">
|
|
2439
|
-
styles: [".pd_header{width:100%;background-color:#e0e0e0;height:50px;border-bottom:2px solid #fff}.pd_header_calendar{position:absolute;width:150px;margin:5px 5px 5px 17px}.pd_header_content{position:relative;width:350px;margin:0 auto;color:#000;text-align:center;font-size:30px;line-height:50px;pointer-events:none}.pd_exportButton{position:absolute;display:inline-block;right:144px;padding:0 16px;cursor:pointer;margin:9px 0 0;height:30px;width:160px;line-height:30px;background-color:#
|
|
2473
|
+
template: "<div id=\"pd_header\" class=\"pd_header\">\n \n <div *ngIf=\"message && mydata && (this.todayDate === this.calenderCurrentDate)\" id=\"pd_refeshView\" class=\"pd_refesh_bar\">\n <div class=\"timer_msg\"> This page will be refreshed in</div>\n <div class=\"timer_value\"> {{timeConvert(message)}} min</div>\n <div id=\"pd_refeshBtn\" (click)=\"refreshChart()\"> Refresh </div>\n </div>\n\n <div id=\"pd_exportBtn\" class=\"pd_exportButton\" *ngIf=\"mydata\"\n [ngClass]=\"{'pd_exportButton_shiftRight': this.todayDate != this.calenderCurrentDate}\" (click)=\"exportReport()\"> \n <span class=\"pd_exportButton_text\">Download Report</span>\n <div class=\"pd_download_icon\"></div>\n </div>\n \n <div class=\"pd_header_calendar\">\n <!-- <input type=\"Date\" [max]=\"currentDate\" [value]=\"currentDate\" id=\"myCalendar\" (input)=\"selectDate($event)\" /> -->\n <ngx-datepicker [(ngModel)]=\"date\" [options]=\"options\" (ngModelChange)=\"dateSelected($event)\"></ngx-datepicker>\n </div>\n <div class=\"pd_header_content\" >Realtime usage data</div>\n</div>\n",
|
|
2474
|
+
styles: [".pd_header{width:100%;background-color:#e0e0e0;height:50px;border-bottom:2px solid #fff}.pd_header_calendar{position:absolute;width:150px;margin:5px 5px 5px 17px}.pd_header_content{position:relative;width:350px;margin:0 auto;color:#000;text-align:center;font-size:30px;line-height:50px;pointer-events:none}.pd_exportButton{position:absolute;display:inline-block;right:144px;padding:0 16px;cursor:pointer;margin:9px 0 0;height:30px;width:160px;line-height:30px;background-color:#4285f9;font-size:10pt;font-weight:400;transition:right .5s;border-radius:5px;color:#fff;font-weight:700}.pd_exportButton_shiftRight{right:10px}.pd_download_icon{position:absolute;width:16px;height:16px;background-size:100% 100%;top:8px;background-repeat:no-repeat;display:inline-block;right:5px;background-image:url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABmJLR0QA/wD/AP+gvaeTAAAAY0lEQVRIiWNgGOqAkQS1/8nRy0SCBWSBUQtGLRjiFpQzQDIXDKMDZLl6ch2Abgk2TLbhxFhCseH4LKGa4dgsIdpwZhIsOMoAKUEPMjAwNJLktFGADyDXStgyE8Vm07yoGPoAAH1UItbw1O5lAAAAAElFTkSuQmCC\")}.pd_exportButton_text{position:relative;display:inline-block;width:130px}.pd_refesh_bar{position:absolute;color:#000;width:120px;height:78px;right:15px;top:4px;z-index:2;background-color:#fff;float:right;text-align:center;font-size:12px;border-radius:.25rem;border:1px solid #a09898;box-shadow:0 0 5px 0 rgba(0,0,0,.75);-webkit-box-shadow:0 0 5px 0 rgba(0,0,0,.75);-moz-box-shadow:0 0 5px 0 rgba(0,0,0,.75);-webkit-animation:refreshViewAnimate .6s;animation:refreshViewAnimate .6s}@-webkit-keyframes refreshViewAnimate{0%{opacity:.5;top:-32px}to{opacity:1;top:4px}}@keyframes refreshViewAnimate{0%{opacity:.5;top:-32px}to{opacity:1;top:4px}}.timer_msg{position:absolute;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;line-height:14px;top:2px}.timer_value{font-weight:700;font-size:15px}#pd_refeshBtn,.timer_value{position:relative;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;top:28px}#pd_refeshBtn{background-color:#2172f6;cursor:pointer;width:60px;margin:0 auto;border-radius:3px;color:#fff;height:22px;line-height:20px}#pd_refeshBtn:hover{opacity:.6}::ng-deep.bs-datepicker{margin-left:200px}.bs-datepicker-body table td span.selected,.theme-default .bs-datepicker-body table td.selected span,.theme-default .bs-datepicker-body table td[class*=select-] span:after,.theme-default .bs-datepicker-body table td span[class*=select-]:after{background-color:#000}.bs-datepicker-head{background-color:#000!important}"]
|
|
2440
2475
|
},] }
|
|
2441
2476
|
];
|
|
2442
2477
|
HeaderComponent.ctorParameters = function () { return [
|