principal-dashboard-lib-v2 0.0.18 → 0.0.20

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

@@ -177,7 +177,9 @@
                 for (var i = 0; i < usermetadataMatrixUpdated.length; i++) {
                     // const randomNumber = document.createElement('span');
                     // randomNumber.innerHTML = i.toString();
-                    usermetadataMatrixUpdated[i].userName = usermetadataMatrixUpdated[i].userName + " " + i;
+                    //usermetadataMatrixUpdated[i].userName = usermetadataMatrixUpdated[i].userName + " --- " + i;
+                    //satyajit 28 aug 2024 removed count from userName
+                    usermetadataMatrixUpdated[i].userName = usermetadataMatrixUpdated[i].userName;
                     usersMetadataMatrix.push(usermetadataMatrixUpdated[i]); //adding same name users in usermetadataMatrix with some random charators
                     this.usersMetaData = usersMetadataMatrix;
                 }
@@ -365,12 +367,13 @@
             if (this.userConsoleData) {
                 if (this.userConsoleData.length > 0) {
                     for (var i = 0; i < this.userConsoleData.length; i++) {
-                        console.log("chartDataUserWise-->>", this.userConsoleData[i].userName);
+                        console.log("chartDataUserWiseNew-->>", this.userConsoleData[i].userName);
                         if (this.userConsoleData[i].userName === undefined) {
                             this.userConsoleData[i].userName = "-";
                         }
                         var userData = [this.userConsoleData[i].userName, this.userConsoleData[i].startTime, this.userConsoleData[i].endTime];
                         dataTableforChart.push(userData);
+                        //console.log("chartDataUserWiseNewNew-->>",userData)
                     }
                 }
             }
@@ -381,12 +384,13 @@
             dataTableforChart = [];
             if (this.userConsoleData) {
                 for (var i = 0; i < this.userConsoleData.length; i++) {
-                    console.log('bbb-->', this.userConsoleData[i].terminalLocation);
+                    //console.log('bbb-->',this.userConsoleData[i].terminalLocation)
                     var roomName = this.userConsoleData[i].terminalLocation;
                     if (roomName === "") {
-                        roomName = "No Name";
+                        //roomName = "No Name"
                     }
                     var location = roomName + " - " + this.userConsoleData[i].terminalIP;
+                    console.log('bbblocation-->', location);
                     var userData = [location, this.userConsoleData[i].startTime, this.userConsoleData[i].endTime];
                     dataTableforChart.push(userData);
                 }
@@ -394,6 +398,26 @@
             console.log("this.classRoomWiseChartData", dataTableforChart);
             return dataTableforChart;
         };
+        PrincipalDashboardLibV2Service.prototype.newGetCurrentClassroomData = function () {
+            var dataTableforChart = new Array();
+            dataTableforChart = [];
+            if (this.userConsoleData) {
+                for (var i = 0; i < this.userConsoleData.length; i++) {
+                    //console.log('bbb-->',this.userConsoleData[i].terminalLocation)
+                    var roomName = this.userConsoleData[i].terminalLocation;
+                    var location = roomName + " - " + this.userConsoleData[i].terminalIP;
+                    console.log('bbblocation-->', location);
+                    //let userData = [location];
+                    dataTableforChart.push(location);
+                }
+            }
+            console.log("this.classRoomWiseChartData", dataTableforChart);
+            dataTableforChart = this.uniq(dataTableforChart);
+            return dataTableforChart;
+        };
+        PrincipalDashboardLibV2Service.prototype.uniq = function (a) {
+            return Array.from(new Set(a));
+        };
         PrincipalDashboardLibV2Service.prototype.allUserChartData = function () {
             var dataTableforChart = new Array();
             dataTableforChart = [];
@@ -483,13 +507,16 @@
                         roomName = "No Name";
                     }
                     var location = roomName + " - " + roomIP;
+                    console.log('bbbbRoom', location);
                     // let userData = [this.userConsoleData[i].terminalIP,this.userConsoleData[i].startTime,this.userConsoleData[i].endTime];
                     var userData = [location, this.userConsoleData[i].startTime, this.userConsoleData[i].endTime];
                     dataTableforChart.push(userData);
                 }
+                var inactiveRoonName = void 0;
                 for (var i = 0; i < this.schoolTerminalData.length; i++) {
                     console.log("schoolTerminalData", this.schoolTerminalData);
-                    inActiveClassRoom = this.schoolTerminalData[i].terminalKey;
+                    inActiveClassRoom = this.schoolTerminalData[i].location + ' - ' + this.schoolTerminalData[i].terminalKey;
+                    //inactiveRoonName = this.schoolTerminalData[i].location;
                     myChartRowData = {
                         userId: "",
                         userName: "",
@@ -576,10 +603,13 @@
                                 chapter = resourceMetadataMatrix[i_4].chapter;
                                 teachingpoint = resourceMetadataMatrix[i_4].teachingpoint;
                                 if (resourceMetadataMatrix[i_4].title.toLowerCase() === 'whiteboard' || resourceMetadataMatrix[i_4].title.toLowerCase() === 'question') {
-                                    AssestDetail = this.getDisplaytypeValue(resourceMetadataMatrix[i_4].type) + ' : ' + resourceMetadataIDsDuration[k] + ' sec';
+                                    //AssestDetail = this.getDisplaytypeValue(resourceMetadataMatrix[i].type) + ' : ' + resourceMetadataIDsDuration[k] + ' sec';
+                                    AssestDetail = this.getDisplaytypeValue(resourceMetadataMatrix[i_4].type) + ' : ' + this.convertSeconds(resourceMetadataIDsDuration[k]);
+                                    //convertSeconds
                                 }
                                 else {
-                                    AssestDetail = this.getDisplaytypeValue(resourceMetadataMatrix[i_4].type) + " : " + resourceMetadataMatrix[i_4].title + ' : ' + resourceMetadataIDsDuration[k] + ' sec';
+                                    //AssestDetail = this.getDisplaytypeValue(resourceMetadataMatrix[i].type) + " : " + resourceMetadataMatrix[i].title + ' : ' + resourceMetadataIDsDuration[k] + ' sec';
+                                    AssestDetail = this.getDisplaytypeValue(resourceMetadataMatrix[i_4].type) + " : " + resourceMetadataMatrix[i_4].title + ' : ' + this.convertSeconds(resourceMetadataIDsDuration[k]);
                                 }
                                 //AssestDetail = this.getDisplaytypeValue(resourceMetadataMatrix[i].type) + " : " + resourceMetadataMatrix[i].title + ' : ' + resourceMetadataIDsDuration[k];
                                 resourceArrayForTableChart = [teacherName, teacherSubject, currentDate, startTime, endTime, duration, roomDetail, subject, grade, chapter, teachingpoint, AssestDetail];
@@ -658,10 +688,13 @@
                             chapter = resourceMetadataMatrix[i].chapter;
                             teachingpoint = resourceMetadataMatrix[i].teachingpoint;
                             if (resourceMetadataMatrix[i].title.toLowerCase() === 'whiteboard' || resourceMetadataMatrix[i].title.toLowerCase() === 'question') {
-                                AssestDetail = resourceMetadataMatrix[i].type + ": " + resourceMetadataIDsduration[k] + ' sec';
+                                //AssestDetail = resourceMetadataMatrix[i].type + ": " + resourceMetadataIDsduration[k] + ' sec';
+                                AssestDetail = resourceMetadataMatrix[i].type + ": " + this.convertSeconds(resourceMetadataIDsduration[k]);
+                                //convertSeconds
                             }
                             else {
-                                AssestDetail = resourceMetadataMatrix[i].type + ": " + resourceMetadataMatrix[i].title + ": " + resourceMetadataIDsduration[k] + ' sec';
+                                //AssestDetail = resourceMetadataMatrix[i].type + ": " + resourceMetadataMatrix[i].title + ": " + resourceMetadataIDsduration[k] + ' sec';
+                                AssestDetail = resourceMetadataMatrix[i].type + ": " + resourceMetadataMatrix[i].title + ": " + this.convertSeconds(resourceMetadataIDsduration[k]);
                             }
                             resourceArrayForTableChart = [subject, grade, chapter, teachingpoint, AssestDetail];
                             detailedView_ResourceDataMatrix.push(resourceArrayForTableChart);
@@ -739,6 +772,11 @@
             });
             return displayValue;
         };
+        PrincipalDashboardLibV2Service.prototype.convertSeconds = function (seconds) {
+            var minutes = Math.floor(seconds / 60);
+            var remainingSeconds = seconds % 60;
+            return minutes + "m " + remainingSeconds + "s";
+        };
         return PrincipalDashboardLibV2Service;
     }());
     PrincipalDashboardLibV2Service.ɵprov = i0.ɵɵdefineInjectable({ factory: function PrincipalDashboardLibV2Service_Factory() { return new PrincipalDashboardLibV2Service(); }, token: PrincipalDashboardLibV2Service, providedIn: "root" });
@@ -778,8 +816,8 @@
     PrincipalDashboardLibV2Component.decorators = [
         { type: i0.Component, args: [{
                     selector: 'lib-principal-dashboard-lib-v2',
-                    template: "<div id=\"reprtModule\">\n    <div id=\"pd-mainDiv\" class=\"pd-mainContainer\">\n      <lib-header [data]=\"data\" (userSelectedDate)=\"onUserSelectDate($event)\">\n      </lib-header>\n      <lib-chartheader></lib-chartheader>\n       \n      <div id=\"pd-preloader\" class=\"pd-preloaderDiv\" *ngIf=\"responseStatus !== 'true' && !data\">\n      {{messageForUser}}\n      </div>\n      <lib-chartview *ngIf=\"data\" [data]=\"data\"></lib-chartview>\n      <lib-tableview *ngIf=\"data\" [data]=\"data\"></lib-tableview>\n      <lib-detailedview *ngIf=\"data\" [data]=\"data\"></lib-detailedview>\n      \n    </div>\n</div>\n  ",
-                    styles: [".pd-mainContainer{width:100%;height:100%}.pd-mainContainer .pd-preloaderDiv{text-align:center;line-height:27;position:absolute;width:100%;height:87%;top:33px;z-index:2}.bs-datepicker-head{background-color:#000!important}"]
+                    template: "<div id=\"reprtModule\">\n    <div id=\"pd-mainDiv\" class=\"pd-mainContainer\">\n      <lib-header [data]=\"data\" (userSelectedDate)=\"onUserSelectDate($event)\">\n      </lib-header>\n      <lib-chartheader></lib-chartheader>\n       \n      <div id=\"pd-preloader\" class=\"pd-preloaderDiv\" *ngIf=\"responseStatus !== 'true' && !data\">\n      {{messageForUser}} \n      </div>\n      <lib-chartview *ngIf=\"data\" [data]=\"data\"></lib-chartview>\n      <lib-tableview *ngIf=\"data\" [data]=\"data\"></lib-tableview>\n      <lib-detailedview *ngIf=\"data\" [data]=\"data\"></lib-detailedview>\n      \n    </div>\n</div>\n  ",
+                    styles: [".pd-mainContainer{width:100%;height:100%}.pd-mainContainer .pd-preloaderDiv{text-align:center;line-height:27;position:absolute;width:100%;height:87%;z-index:2}.bs-datepicker-head{background-color:#000!important}"]
                 },] }
     ];
     PrincipalDashboardLibV2Component.ctorParameters = function () { return []; };
@@ -799,7 +837,7 @@
             this.isChartView = true;
         }
         ChartheaderComponent.prototype.ngOnInit = function () {
-            this.libVersion = "0.0.18";
+            this.libVersion = "0.0.20";
             // this.myIcon = document.getElementById('myIconImg');
             // this.changeChatType() 
         };
@@ -1206,6 +1244,9 @@
                 this.alluserList = this.pdService.allUserChartData();
                 this.resourceDataList = this.pdService.genarateResourseReqiuredData(this.myXmlData);
                 this.totalUsers = this.currentdataList.usersMetadata.length;
+                this.eligibleUsers = this.findEligibleUserCount();
+                this.installedClassrooms = this.findInstalledClassrooms();
+                this.currentRooms = this.findCurrentClassrooms();
                 this.findCurrentUserCount();
             }
             this.pdService.chartType.subscribe(function (data) {
@@ -1462,9 +1503,10 @@
         };
         ChartviewComponent.prototype.classRoomWiseCurrentData = function () {
             var classRoomdata = this.pdService.classRoomWiseChartData();
-            //  console.log("classRoomdata",classRoomdata);
+            console.log("classRoomdata", classRoomdata);
             if (classRoomdata && classRoomdata.length > 0) {
                 this.myChartDataMatrix = classRoomdata;
+                console.log("myChartDataMatrix", this.myChartDataMatrix);
                 this.updateChart();
                 if (this.currentdataList.userConsoleData.length > 0) {
                     this.calulateTotalDuration(this.currentdataList.userConsoleData);
@@ -1491,6 +1533,30 @@
             var uniqueUserName = __spread(new Set(userNameArray));
             this.currentUsers = uniqueUserName.length;
         };
+        ChartviewComponent.prototype.findCurrentClassrooms = function () {
+            //console.log("findCurrentClassrooms", this.currentdataList.schoolTerminalData)
+            var classRoomdata = this.pdService.newGetCurrentClassroomData();
+            console.log("findCurrentClassrooms", classRoomdata);
+            return classRoomdata.length;
+        };
+        ChartviewComponent.prototype.findInstalledClassrooms = function () {
+            var count = 0;
+            console.log("findInstalledClassrooms", this.currentdataList.schoolTerminalData);
+            return this.currentdataList.schoolTerminalData.length;
+        };
+        ChartviewComponent.prototype.findEligibleUserCount = function () {
+            console.log("findEligibleUserCount", this.currentdataList);
+            var count = 0;
+            var userMetaData = this.currentdataList.usersMetadata;
+            for (var index = 0; index < userMetaData.length; index++) {
+                var element = userMetaData[index].userSubjects;
+                if (element !== "") {
+                    // console.log("findEligibleUserCount", element)
+                    count = count + 1;
+                }
+            }
+            return count;
+        };
         ChartviewComponent.prototype.ngOnDestroy = function () {
             // console.log('ngOnDestroy >>');
         };
@@ -2602,7 +2668,7 @@
         { type: i0.Component, args: [{
                     selector: 'lib-tableview',
                     template: "\n  <div id=\"tableViewDiv\" class=\"pd-tableViewDiv\">\n   \n    <table class=\"table table-bordered\" id=\"tableRow\">\n      <thead class=\"table-head\">\n        <tr class=\"table-headerRow\">\n          <th scope=\"col\">Teacher Name</th>\n          <th scope=\"col\">Subjects</th>\n          <th scope=\"col\">Date</th>\n          <th scope=\"col\">Start Time</th>\n          <th scope=\"col\">End Time</th>\n          <th scope=\"col\">Duration (mins)</th>\n          <th scope=\"col\">Room</th>\n          <th scope=\"col\">Subject</th>\n          <th scope=\"col\">Topic of Class</th>\n          <th scope=\"col\">Chapter Name</th>\n          <th scope=\"col\">Topic Name</th>\n          <th scope=\"col\">Assets Details</th>\n        </tr>\n      </thead>\n      <tbody id=\"tblBody\">\n       \n      </tbody>\n    </table>\n  </div>\n  \n",
-                    styles: [".pd-tableViewDiv{width:100%;height:484px;overflow:scroll}.pd-tableViewDiv #tableRow{font-size:small;width:100%;margin-left:24px;margin-top:10px}.pd-tableViewDiv .table-headerRow{font-weight:700}.pd-tableViewDiv .table-head{position:sticky;top:0;background:#fff}"]
+                    styles: [".pd-tableViewDiv{width:100%;height:744px;overflow:scroll}.pd-tableViewDiv #tableRow{font-size:small;width:100%;margin-left:24px;margin-top:10px}.pd-tableViewDiv .table-headerRow{font-weight:700}.pd-tableViewDiv .table-head{position:sticky;top:0;background:#fff}"]
                 },] }
     ];
     TableviewComponent.ctorParameters = function () { return [