principal-dashboard-lib-v2 0.0.6 → 0.0.10

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

@@ -33,7 +33,7 @@
         PrincipalDashboardLibV2Service.prototype.genarateResourseReqiuredData = function (data) {
             this.isResoureMetaDataReady.next(false);
             var resourceMetadataMatrix = new Array();
-            if (data) {
+            if (data && data !== null) {
                 var resouseID = void 0;
                 var title = void 0;
                 var subject = void 0;
@@ -132,7 +132,7 @@
             var usermetadataMatrixUpdated = new Array();
             var schoolTerminalMatrix = new Array();
             var userConsoleMatrix = new Array();
-            if (data) {
+            if (data && data !== null) {
                 var userConsole = data.usersConsole.userConsole;
                 var usersMetadata = data.usersMetadata.userMetadata;
                 var schoolTerminal = data.schoolTerminals.schoolTerminal;
@@ -307,6 +307,7 @@
                         //----------// terminalIP and terminalLocation
                         for (var i_3 = 0; i_3 < schoolTerminalMatrix.length; i_3++) {
                             if (terminalIP === schoolTerminalMatrix[i_3].terminalKey) {
+                                // console.log("schoolTerminalMatrix[i].terminalKey",terminalIP,schoolTerminalMatrix[i]);
                                 terminalLocation = schoolTerminalMatrix[i_3].location;
                             }
                         }
@@ -335,36 +336,40 @@
             };
         };
         PrincipalDashboardLibV2Service.prototype.userWiseChartData = function () {
+            var dataTableforChart = new Array();
+            dataTableforChart = [];
             if (this.userConsoleData) {
-                var dataTableforChart = new Array();
                 if (this.userConsoleData.length > 0) {
                     for (var i = 0; i < this.userConsoleData.length; i++) {
                         var userData = [this.userConsoleData[i].userName, this.userConsoleData[i].startTime, this.userConsoleData[i].endTime];
                         dataTableforChart.push(userData);
                     }
                 }
-                return dataTableforChart;
             }
+            return dataTableforChart;
         };
         PrincipalDashboardLibV2Service.prototype.classRoomWiseChartData = function () {
+            var dataTableforChart = new Array();
+            dataTableforChart = [];
             if (this.userConsoleData) {
-                var dataTableforChart = new Array();
+                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];
                     dataTableforChart.push(userData);
                 }
-                return dataTableforChart;
             }
+            return dataTableforChart;
         };
         PrincipalDashboardLibV2Service.prototype.allUserChartData = function () {
+            var dataTableforChart = new Array();
+            dataTableforChart = [];
+            var AlluserDetailsForTableChart = new Array();
+            AlluserDetailsForTableChart = [];
             if (this.userConsoleData && this.usersMetaData) {
-                var dataTableforChart = new Array();
                 var inActiveuserName = void 0;
                 var userSubjects = void 0;
                 var myID = void 0;
                 var AlluserDetails = new Array();
-                var AlluserDetailsForTableChart = new Array();
-                AlluserDetailsForTableChart = [];
                 for (var index = 0; index < this.userConsoleData.length; index++) {
                     AlluserDetails.push(this.userConsoleData[index]);
                     AlluserDetailsForTableChart.push(this.userConsoleData[index]);
@@ -402,17 +407,17 @@
                     var userData = [AlluserDetails[i].userName, AlluserDetails[i].startTime, AlluserDetails[i].endTime];
                     dataTableforChart.push(userData);
                 }
-                return { forChartData: dataTableforChart, fordurationTable: AlluserDetailsForTableChart };
             }
+            return { forChartData: dataTableforChart, fordurationTable: AlluserDetailsForTableChart };
         };
         PrincipalDashboardLibV2Service.prototype.allRoomsData = function () {
+            var dataTableforChart = new Array();
+            dataTableforChart = [];
+            var allRoomsDetails = new Array();
+            allRoomsDetails = [];
             if (this.userConsoleData && this.schoolTerminalData) {
-                var dataTableforChart = new Array();
                 var myChartRowData = {};
                 var inActiveClassRoom = void 0;
-                var allRoomsDetails = new Array();
-                allRoomsDetails = [];
-                dataTableforChart = [];
                 for (var i = 0; i < this.userConsoleData.length; i++) {
                     allRoomsDetails.push(this.userConsoleData[i]);
                     var userData = [this.userConsoleData[i].terminalLocation, this.userConsoleData[i].startTime, this.userConsoleData[i].endTime];
@@ -435,97 +440,16 @@
                     var myChartRowuserConsoleData = [inActiveClassRoom, new Date(this.myEndTime), new Date(this.myEndTime)];
                     dataTableforChart.push(myChartRowuserConsoleData);
                 }
-                return { forChartData: dataTableforChart, fordurationTable: allRoomsDetails };
             }
+            return { forChartData: dataTableforChart, fordurationTable: allRoomsDetails };
         };
-        PrincipalDashboardLibV2Service.prototype.dataForTableView = function () {
-            if (this.userConsoleData && this.resoureMetaData) {
-                var currentDate = void 0;
-                var resourceMatrixForTableChart = new Array();
-                var resourceMatrixForExcel = new Array();
-                resourceMatrixForTableChart = [];
-                resourceMatrixForExcel = [];
-                for (var i = 0; i < this.userConsoleData.length; i++) {
-                    var startTime = void 0;
-                    var endTime = void 0;
-                    var duration = void 0;
-                    var terminalIP = void 0;
-                    var subject = void 0;
-                    var grade = void 0;
-                    var chapter = void 0;
-                    var AssestDetail = void 0;
-                    var resourceType = void 0;
-                    var resourceTitle = void 0;
-                    var teachingpoint = void 0;
-                    var location = void 0;
-                    var teacherName = void 0;
-                    var teacherSubject = void 0;
-                    var resourceMetadataIDs = void 0;
-                    var resourceArrayForExcel = new Array();
-                    var resourceArrayForTableChart = new Array();
-                    var userConsoleDataMatrix = new Array();
-                    resourceArrayForTableChart = [];
-                    userConsoleDataMatrix = [];
-                    //----------------- for subject and Name
-                    teacherSubject = this.userConsoleData[i].userSubjects;
-                    teacherName = this.userConsoleData[i].userName;
-                    //----------------- for start Time  and EndTime 
-                    if ((this.userConsoleData[i].startTime != undefined && this.userConsoleData[i].startTime != "") && (this.userConsoleData[i].endTime != undefined && this.userConsoleData[i].endTime != "")) {
-                        startTime = this.userConsoleData[i].startTime.toLocaleTimeString('en-US', { hour12: true });
-                        endTime = this.userConsoleData[i].endTime.toLocaleTimeString('en-US', { hour12: true });
-                        currentDate = this.userConsoleData[i].startTime.getDate() + '/' + this.userConsoleData[i].startTime.getMonth() + '/' + this.userConsoleData[i].startTime.getFullYear();
-                    }
-                    //----------------- for duration
-                    duration = Math.floor(this.userConsoleData[i].duration);
-                    //----------------- for Terminal loaction and terminal IP
-                    location = this.userConsoleData[i].terminalLocation;
-                    terminalIP = this.userConsoleData[i].terminalIP;
-                    var roomDetail = location + ' ' + terminalIP;
-                    resourceMetadataIDs = this.userConsoleData[i].resourceMetauserConsoleData;
-                    if (resourceMetadataIDs.length == 0) {
-                        subject = undefined;
-                        grade = undefined;
-                        chapter = undefined;
-                        teachingpoint = undefined;
-                        AssestDetail = undefined;
-                        resourceTitle = undefined;
-                        resourceType = undefined;
-                        resourceArrayForTableChart = [teacherName, teacherSubject, currentDate, startTime, endTime, duration, roomDetail, subject, grade, chapter, teachingpoint, AssestDetail];
-                        resourceMatrixForTableChart.push(resourceArrayForTableChart);
-                    }
-                    else {
-                        //resourceMetadataMatrix = [resouseID,subject,grade,chapter,teachingpoint,type,title]
-                        for (var k = 0; k < resourceMetadataIDs.length; k++) {
-                            for (var i_4 = 0; i_4 < this.resoureMetaData.length; i_4++) {
-                                if (resourceMetadataIDs[k] === this.resoureMetaData[i_4].resouseID) {
-                                    subject = this.resoureMetaData[i_4].subject;
-                                    grade = this.resoureMetaData[i_4].grade;
-                                    chapter = this.resoureMetaData[i_4].chapter;
-                                    teachingpoint = this.resoureMetaData[i_4].teachingpoint;
-                                    AssestDetail = this.resoureMetaData[i_4].type + ": " + this.resoureMetaData[i_4].title;
-                                    resourceArrayForTableChart = [teacherName, teacherSubject, currentDate, startTime, endTime, duration, roomDetail, subject, grade, chapter, teachingpoint, AssestDetail];
-                                    resourceMatrixForTableChart.push(resourceArrayForTableChart);
-                                    teacherName = undefined;
-                                    teacherSubject = undefined;
-                                    currentDate = undefined;
-                                    startTime = undefined;
-                                    endTime = undefined;
-                                    duration = undefined;
-                                    roomDetail = undefined;
-                                }
-                            }
-                        }
-                    }
-                }
-                return resourceMatrixForTableChart;
-            }
-        };
-        PrincipalDashboardLibV2Service.prototype.dataForDetailedView = function (rowLabel) {
-            if (this.userConsoleData && this.resoureMetaData) {
-                var detailedView_UserDataMatrix = new Array();
-                detailedView_UserDataMatrix = [];
-                var detailedView_ResourceDataMatrix = new Array();
-                detailedView_ResourceDataMatrix = [];
+        PrincipalDashboardLibV2Service.prototype.dataForTableView = function (userConsoleMatrix, resourceMetadataMatrix) {
+            var currentDate;
+            var resourceMatrixForTableChart = new Array();
+            var resourceMatrixForExcel = new Array();
+            resourceMatrixForTableChart = [];
+            resourceMatrixForExcel = [];
+            for (var i = 0; i < userConsoleMatrix.length; i++) {
                 var startTime = void 0;
                 var endTime = void 0;
                 var duration = void 0;
@@ -534,58 +458,135 @@
                 var grade = void 0;
                 var chapter = void 0;
                 var AssestDetail = void 0;
+                var resourceType = void 0;
+                var resourceTitle = void 0;
                 var teachingpoint = void 0;
                 var location = void 0;
                 var teacherName = void 0;
                 var teacherSubject = void 0;
-                var currentDate = void 0;
                 var resourceMetadataIDs = void 0;
+                var resourceArrayForExcel = new Array();
                 var resourceArrayForTableChart = new Array();
+                var userConsoleDataMatrix = new Array();
                 resourceArrayForTableChart = [];
+                userConsoleDataMatrix = [];
                 //----------------- for subject and Name
-                teacherSubject = this.userConsoleData[rowLabel].userSubjects;
-                teacherName = this.userConsoleData[rowLabel].userName;
-                //----------------- for start Time  and EndTime
-                if ((this.userConsoleData[rowLabel].startTime != undefined && this.userConsoleData[rowLabel].startTime != "") && (this.userConsoleData[rowLabel].endTime != undefined && this.userConsoleData[rowLabel].endTime != "")) {
-                    startTime = this.userConsoleData[rowLabel].startTime.toLocaleTimeString('en-US', { hour12: true });
-                    endTime = this.userConsoleData[rowLabel].endTime.toLocaleTimeString('en-US', { hour12: true });
-                    currentDate = this.userConsoleData[rowLabel].startTime.getDate() + '/' + this.userConsoleData[rowLabel].startTime.getMonth() + '/' + this.userConsoleData[rowLabel].startTime.getFullYear();
+                teacherSubject = userConsoleMatrix[i].userSubjects;
+                teacherName = userConsoleMatrix[i].userName;
+                //----------------- for start Time  and EndTime 
+                if ((userConsoleMatrix[i].startTime != undefined && userConsoleMatrix[i].startTime != "") && (userConsoleMatrix[i].endTime != undefined && userConsoleMatrix[i].endTime != "")) {
+                    startTime = userConsoleMatrix[i].startTime.toLocaleTimeString('en-US', { hour12: true });
+                    endTime = userConsoleMatrix[i].endTime.toLocaleTimeString('en-US', { hour12: true });
+                    currentDate = userConsoleMatrix[i].startTime.getDate() + '/' + userConsoleMatrix[i].startTime.getMonth() + '/' + userConsoleMatrix[i].startTime.getFullYear();
                 }
                 //----------------- for duration
-                duration = Math.floor(this.userConsoleData[rowLabel].duration);
+                duration = Math.floor(userConsoleMatrix[i].duration);
                 //----------------- for Terminal loaction and terminal IP
-                location = this.userConsoleData[rowLabel].terminalLocation;
-                terminalIP = this.userConsoleData[rowLabel].terminalIP;
+                location = userConsoleMatrix[i].terminalLocation;
+                terminalIP = userConsoleMatrix[i].terminalIP;
                 var roomDetail = location + ' ' + terminalIP;
-                resourceMetadataIDs = this.userConsoleData[rowLabel].resourceMetauserConsoleData;
-                detailedView_UserDataMatrix = [teacherName, startTime, teacherSubject, endTime, roomDetail];
+                resourceMetadataIDs = userConsoleMatrix[i].resourceMetauserConsoleData;
                 if (resourceMetadataIDs.length == 0) {
                     subject = undefined;
                     grade = undefined;
                     chapter = undefined;
                     teachingpoint = undefined;
                     AssestDetail = undefined;
-                    resourceArrayForTableChart = [subject, grade, chapter, teachingpoint, AssestDetail];
-                    detailedView_ResourceDataMatrix.push(resourceArrayForTableChart);
+                    resourceTitle = undefined;
+                    resourceType = undefined;
+                    resourceArrayForTableChart = [teacherName, teacherSubject, currentDate, startTime, endTime, duration, roomDetail, subject, grade, chapter, teachingpoint, AssestDetail];
+                    resourceMatrixForTableChart.push(resourceArrayForTableChart);
                 }
                 else {
                     //resourceMetadataMatrix = [resouseID,subject,grade,chapter,teachingpoint,type,title]
                     for (var k = 0; k < resourceMetadataIDs.length; k++) {
-                        for (var i = 0; i < this.resoureMetaData.length; i++) {
-                            if (resourceMetadataIDs[k] === this.resoureMetaData[i].resouseID) {
-                                subject = this.resoureMetaData[i].subject;
-                                grade = this.resoureMetaData[i].grade;
-                                chapter = this.resoureMetaData[i].chapter;
-                                teachingpoint = this.resoureMetaData[i].teachingpoint;
-                                AssestDetail = this.resoureMetaData[i].type + ": " + this.resoureMetaData[i].title;
-                                resourceArrayForTableChart = [subject, grade, chapter, teachingpoint, AssestDetail];
-                                detailedView_ResourceDataMatrix.push(resourceArrayForTableChart);
+                        for (var i_4 = 0; i_4 < resourceMetadataMatrix.length; i_4++) {
+                            if (resourceMetadataIDs[k] === resourceMetadataMatrix[i_4].resouseID) {
+                                subject = resourceMetadataMatrix[i_4].subject;
+                                grade = resourceMetadataMatrix[i_4].grade;
+                                chapter = resourceMetadataMatrix[i_4].chapter;
+                                teachingpoint = resourceMetadataMatrix[i_4].teachingpoint;
+                                AssestDetail = resourceMetadataMatrix[i_4].type + ": " + resourceMetadataMatrix[i_4].title;
+                                resourceArrayForTableChart = [teacherName, teacherSubject, currentDate, startTime, endTime, duration, roomDetail, subject, grade, chapter, teachingpoint, AssestDetail];
+                                resourceMatrixForTableChart.push(resourceArrayForTableChart);
+                                teacherName = undefined;
+                                teacherSubject = undefined;
+                                currentDate = undefined;
+                                startTime = undefined;
+                                endTime = undefined;
+                                duration = undefined;
+                                roomDetail = undefined;
                             }
                         }
                     }
                 }
-                return { userDetails: detailedView_UserDataMatrix, resourceDetails: detailedView_ResourceDataMatrix };
             }
+            return resourceMatrixForTableChart;
+        };
+        PrincipalDashboardLibV2Service.prototype.dataForDetailedView = function (userConsoleMatrix, resourceMetadataMatrix, rowLabel) {
+            var detailedView_UserDataMatrix = new Array();
+            detailedView_UserDataMatrix = [];
+            var detailedView_ResourceDataMatrix = new Array();
+            detailedView_ResourceDataMatrix = [];
+            var startTime;
+            var endTime;
+            var duration;
+            var terminalIP;
+            var subject;
+            var grade;
+            var chapter;
+            var AssestDetail;
+            var teachingpoint;
+            var location;
+            var teacherName;
+            var teacherSubject;
+            var currentDate;
+            var resourceMetadataIDs;
+            var resourceArrayForTableChart = new Array();
+            resourceArrayForTableChart = [];
+            //----------------- for subject and Name
+            teacherSubject = userConsoleMatrix[rowLabel].userSubjects;
+            teacherName = userConsoleMatrix[rowLabel].userName;
+            //----------------- for start Time  and EndTime
+            if ((userConsoleMatrix[rowLabel].startTime != undefined && userConsoleMatrix[rowLabel].startTime != "") && (userConsoleMatrix[rowLabel].endTime != undefined && userConsoleMatrix[rowLabel].endTime != "")) {
+                startTime = userConsoleMatrix[rowLabel].startTime.toLocaleTimeString('en-US', { hour12: true });
+                endTime = userConsoleMatrix[rowLabel].endTime.toLocaleTimeString('en-US', { hour12: true });
+                currentDate = userConsoleMatrix[rowLabel].startTime.getDate() + '/' + userConsoleMatrix[rowLabel].startTime.getMonth() + '/' + userConsoleMatrix[rowLabel].startTime.getFullYear();
+            }
+            //----------------- for duration
+            duration = Math.floor(userConsoleMatrix[rowLabel].duration);
+            //----------------- for Terminal loaction and terminal IP
+            location = userConsoleMatrix[rowLabel].terminalLocation;
+            terminalIP = userConsoleMatrix[rowLabel].terminalIP;
+            var roomDetail = location + ' ' + terminalIP;
+            resourceMetadataIDs = userConsoleMatrix[rowLabel].resourceMetauserConsoleData;
+            detailedView_UserDataMatrix = [teacherName, startTime, teacherSubject, endTime, roomDetail];
+            if (resourceMetadataIDs.length == 0) {
+                subject = undefined;
+                grade = undefined;
+                chapter = undefined;
+                teachingpoint = undefined;
+                AssestDetail = undefined;
+                // resourceArrayForTableChart = [subject,grade,chapter,teachingpoint,AssestDetail];
+                // detailedView_ResourceDataMatrix.push(resourceArrayForTableChart);
+            }
+            else {
+                //resourceMetadataMatrix = [resouseID,subject,grade,chapter,teachingpoint,type,title]
+                for (var k = 0; k < resourceMetadataIDs.length; k++) {
+                    for (var i = 0; i < resourceMetadataMatrix.length; i++) {
+                        if (resourceMetadataIDs[k] === resourceMetadataMatrix[i].resouseID) {
+                            subject = resourceMetadataMatrix[i].subject;
+                            grade = resourceMetadataMatrix[i].grade;
+                            chapter = resourceMetadataMatrix[i].chapter;
+                            teachingpoint = resourceMetadataMatrix[i].teachingpoint;
+                            AssestDetail = resourceMetadataMatrix[i].type + ": " + resourceMetadataMatrix[i].title;
+                            resourceArrayForTableChart = [subject, grade, chapter, teachingpoint, AssestDetail];
+                            detailedView_ResourceDataMatrix.push(resourceArrayForTableChart);
+                        }
+                    }
+                }
+            }
+            return { userDetails: detailedView_UserDataMatrix, resourceDetails: detailedView_ResourceDataMatrix };
         };
         return PrincipalDashboardLibV2Service;
     }());
@@ -647,7 +648,7 @@
             this.isChartView = true;
         }
         ChartheaderComponent.prototype.ngOnInit = function () {
-            this.libVersion = "0.0.16";
+            this.libVersion = "0.0.19";
             // this.myIcon = document.getElementById('myIconImg');
             // this.changeChatType() 
         };
@@ -1019,10 +1020,10 @@
             this.totalChartDataMatrix = new Array();
         }
         Object.defineProperty(ChartviewComponent.prototype, "data", {
-            // @HostListener('window:resize', ['$event'])
             set: function (res) {
-                // console.log(' IN --> 7 @Input');
-                this.loadChart(res);
+                if (res !== null) {
+                    this.loadChart(res);
+                }
             },
             enumerable: false,
             configurable: true
@@ -1072,7 +1073,7 @@
         ChartviewComponent.prototype.myChartReady = function () {
             this.createDivforTotalDurartion();
             this.setHeightofDivforTotalDurartion();
-            this.removeBlankEntryBar();
+            // this.removeBlankEntryBar();
         };
         ChartviewComponent.prototype.updateChartType = function (dataType) {
             if (this.chartview != null && this.chartview != undefined) {
@@ -1181,7 +1182,7 @@
             }
         };
         ChartviewComponent.prototype.timeConvert = function (n) {
-            var num = n;
+            var num = Math.floor(n);
             var hours = num / 60;
             var rhours = Math.floor(hours);
             var minutes = (hours - rhours) * 60;
@@ -1257,13 +1258,15 @@
         ChartviewComponent.prototype.onSelectRowData = function (event) {
             var _a = event.selection[0], row = _a.row, column = _a.column;
             if (this.isAllUsers) {
-                this.selectedUserData = this.pdService.dataForDetailedView(row);
+                this.selectedUserData = this.pdService.dataForDetailedView(this.alluserList.fordurationTable, this.resourceDataList, row);
             }
             else {
-                this.selectedUserData = this.pdService.dataForDetailedView(row);
+                this.selectedUserData = this.pdService.dataForDetailedView(this.currentdataList.userConsoleData, this.resourceDataList, row);
             }
+            //  console.log("this.selectedUserData",this.selectedUserData);
             this.pdService.detailedviewData.next(this.selectedUserData);
             this.updateChart();
+            // alluserList
         };
         ChartviewComponent.prototype.showAllUser = function () {
             this.pdService.isAllUsers.next(true);
@@ -1286,25 +1289,44 @@
             }
         };
         ChartviewComponent.prototype.userWiseCurrentData = function () {
-            this.myChartDataMatrix = this.pdService.userWiseChartData();
-            this.updateChart();
-            this.calulateTotalDuration(this.currentdataList.userConsoleData);
+            var chartDataUserWise = this.pdService.userWiseChartData();
+            console.log("chartDataUserWise", chartDataUserWise);
+            if (chartDataUserWise.length > 0) {
+                this.myChartDataMatrix = chartDataUserWise;
+                this.updateChart();
+                if (this.currentdataList.userConsoleData.length > 0) {
+                    this.calulateTotalDuration(this.currentdataList.userConsoleData);
+                }
+            }
         };
         ChartviewComponent.prototype.userWiseAllData = function () {
-            this.myChartDataMatrix = this.alluserList.forChartData;
-            this.updateChart();
-            this.calulateTotalDuration(this.alluserList.fordurationTable);
+            var chartDataUserWise = this.alluserList.forChartData;
+            if (chartDataUserWise.length > 0) {
+                this.myChartDataMatrix = chartDataUserWise;
+                this.updateChart();
+                this.calulateTotalDuration(this.alluserList.fordurationTable);
+            }
         };
         ChartviewComponent.prototype.classRoomWiseCurrentData = function () {
-            this.myChartDataMatrix = this.pdService.classRoomWiseChartData();
-            this.updateChart();
-            this.calulateTotalDuration(this.currentdataList.userConsoleData);
+            var classRoomdata = this.pdService.classRoomWiseChartData();
+            console.log("classRoomdata", classRoomdata);
+            if (classRoomdata && classRoomdata.length > 0) {
+                this.myChartDataMatrix = classRoomdata;
+                this.updateChart();
+                if (this.currentdataList.userConsoleData.length > 0) {
+                    this.calulateTotalDuration(this.currentdataList.userConsoleData);
+                }
+            }
         };
         ChartviewComponent.prototype.classRoomWiseAllData = function () {
             var allclassRoomList = this.pdService.allRoomsData();
-            this.myChartDataMatrix = allclassRoomList.forChartData;
-            this.updateChart();
-            this.calulateTotalDuration(allclassRoomList.fordurationTable);
+            if (allclassRoomList.forChartData && allclassRoomList.forChartData.length > 0) {
+                this.myChartDataMatrix = allclassRoomList.forChartData;
+                this.updateChart();
+            }
+            if (allclassRoomList.fordurationTable && allclassRoomList.fordurationTable.length > 0) {
+                this.calulateTotalDuration(allclassRoomList.fordurationTable);
+            }
         };
         ChartviewComponent.prototype.findCurrentUserCount = function () {
             var userConsoleData = this.currentdataList.userConsoleData;
@@ -1359,8 +1381,15 @@
             this.deatilViewTable = document.getElementById('pd-deatilViewTable');
             this.closeButton = document.getElementById('pd-closeButton');
             this.pdService.detailedviewData.subscribe(function (data) {
-                _this.createTable(data.userDetails);
-                _this.createResourcesTable(data.resourceDetails);
+                if (data) {
+                    if (data.userDetails.length > 0) {
+                        _this.createTable(data.userDetails);
+                    }
+                    if (data.resourceDetails.length > 0) {
+                        // console.log("data.resourceDetails",data.resourceDetails);
+                        _this.createResourcesTable(data.resourceDetails);
+                    }
+                }
             });
             this.deatilViewContainer.style.display = 'none';
         };
@@ -1480,7 +1509,8 @@
     var EXCEL_EXTENSION = '.xlsx';
     var ExceldataService = /** @class */ (function () {
         function ExceldataService() {
-            this.tabName = [{ "name": "School" }, { "name": "User Summary" }, { "name": "Terminal Summary" }, { "name": "'Usage Details" }];
+            this.resourceTypes = new Array();
+            this.tabName = [{ "name": "School" }, { "name": "User Summary" }, { "name": "Terminal Summary" }, { "name": "Usage Details" }];
         }
         ExceldataService.prototype.exportAsExcelFile = function (json, excelFileName) {
             var excelBuffer;
@@ -1587,8 +1617,10 @@
                         title: title
                     };
                     resourceMetadataMatrix.push(resourceMetauserConsoleData);
+                    this.resourceTypes.push(type);
                 }
             }
+            this.resourceTypes = __spread(new Set(this.resourceTypes));
             return resourceMetadataMatrix;
         };
         ExceldataService.prototype.genarateUserReqiuredData_Excel = function (data) {
@@ -1827,12 +1859,12 @@
                 var terminalIPAddress = terminalIP;
                 resourceMetadataIDs = userConsoleMatrix[i].resourceMetauserConsoleData;
                 if (resourceMetadataIDs.length == 0) {
-                    subject = undefined;
-                    grade = undefined;
-                    chapter = undefined;
-                    teachingpoint = undefined;
-                    resourceTitle = undefined;
-                    resourceType = undefined;
+                    subject = '';
+                    grade = '';
+                    chapter = '';
+                    teachingpoint = '';
+                    resourceTitle = '';
+                    resourceType = '';
                     resourceArrayForExcel = [teacherName, teacherSubject, currentDate, startTime, endTime, duration, locationName, terminalIPAddress, subject, grade, chapter, teachingpoint, resourceTitle, resourceType, userID];
                     resourceMatrixForExcel.push(resourceArrayForExcel);
                 }
@@ -1856,23 +1888,24 @@
                                 // FOR EXCEL
                                 resourceArrayForExcel = [teacherName, teacherSubject, currentDate, startTime, endTime, duration, locationName, terminalIPAddress, subject, grade, chapter, teachingpoint, resourceTitle, resourceType, userID];
                                 resourceMatrixForExcel.push(resourceArrayForExcel);
-                                teacherName = undefined;
-                                teacherSubject = undefined;
-                                currentDate = undefined;
-                                startTime = undefined;
-                                endTime = undefined;
-                                duration = 0;
-                                roomDetail = undefined;
+                                teacherName = '';
+                                teacherSubject = '';
+                                currentDate = '';
+                                startTime = '';
+                                endTime = '';
+                                locationName = '';
+                                terminalIPAddress = '';
+                                duration = '';
                             }
                         }
                     }
                 }
             }
-            // console.log("resourceMatrixForExcel",[...new Set(resourceMatrixForExcel)]);
             return resourceMatrixForExcel;
         };
         ExceldataService.prototype.deatilUsage_Excel = function (resourceMatrixForExcel) {
             var userList = [];
+            // console.log("resourceMatrixForExcel>>>>>>>>>>>>>>>>>>>",resourceMatrixForExcel);
             if (resourceMatrixForExcel.length > 0) {
                 for (var i = 0; i < resourceMatrixForExcel.length; i++) {
                     var data = {
@@ -1882,7 +1915,7 @@
                         Date: resourceMatrixForExcel[i][2],
                         startTime: resourceMatrixForExcel[i][3],
                         endTime: resourceMatrixForExcel[i][4],
-                        duration: resourceMatrixForExcel[i][5],
+                        "duration(mins)": resourceMatrixForExcel[i][5],
                         location: resourceMatrixForExcel[i][6],
                         IP: resourceMatrixForExcel[i][7],
                         subjectTitle: resourceMatrixForExcel[i][8],
@@ -1895,9 +1928,11 @@
                     userList.push(data);
                 }
             }
+            // console.log("userList",userList);
             return userList;
         };
         ExceldataService.prototype.userSummary_Excel = function (data, resourceMatrixForExcel) {
+            // console.log("resourceMatrixForExcel",resourceMatrixForExcel)
             var userMetadataList = data.usersMetadata.userMetadata;
             var resourcelist = new Array();
             var resourceTypeList = new Array();
@@ -1906,7 +1941,7 @@
             var datesAccess = new Array();
             var grades = new Array();
             var subjectTought = new Array();
-            var unique_resourceTypeList = [];
+            // let unique_resourceTypeList = []; 
             var duration = 0;
             for (var i = 0; i < userMetadataList.length; i++) {
                 resourcelist = [];
@@ -1916,11 +1951,19 @@
                 grades = [];
                 subjectTought = [];
                 duration = 0;
+                // console.log("userMetadataList[i]",userMetadataList);
+                // console.log("resourceMatrixForExcel[i]",[...new Set(resourceMatrixForExcel)]);
                 for (var j = 0; j < resourceMatrixForExcel.length; j++) {
                     if (userMetadataList[i].userId === resourceMatrixForExcel[j][14]) {
-                        resourcelist.push(resourceMatrixForExcel[j][12]);
-                        resourceTypeList.push(resourceMatrixForExcel[j][13]);
-                        duration = duration + resourceMatrixForExcel[j][5];
+                        if (resourceMatrixForExcel[j][12] != '') {
+                            resourcelist.push(resourceMatrixForExcel[j][12]);
+                        }
+                        if (resourceMatrixForExcel[j][13] != '') {
+                            resourceTypeList.push(resourceMatrixForExcel[j][13]);
+                        }
+                        if (resourceMatrixForExcel[j][5] != '') {
+                            duration = duration + resourceMatrixForExcel[j][5];
+                        }
                         classRooms.push(resourceMatrixForExcel[j][6]);
                         datesAccess.push(resourceMatrixForExcel[j][2]);
                         grades.push(resourceMatrixForExcel[j][9]);
@@ -1962,9 +2005,10 @@
                 else {
                     SubjectTought = '';
                 }
-                if (resourceTypeList.length > 0) {
-                    unique_resourceTypeList = __spread(new Set(resourceTypeList));
-                }
+                // if(resourceTypeList.length>0){
+                //   unique_resourceTypeList = [...new Set(resourceTypeList)];
+                // }
+                //  console.log("this.resourceTypes",this.resourceTypes)
                 var user = {
                     Name: userMetadataList[i].fullName,
                     Subjects: userMetadataList[i].userSubjects,
@@ -1979,55 +2023,43 @@
                 };
                 userObjectList.push(user);
             }
-            var asset_mediaList = new Array();
-            var questionList = new Array();
-            var whiteBoardList = new Array();
-            var asset_printList = new Array();
+            // console.log("userObjectList",userObjectList)
             var userSummaryList = new Array();
-            var userAssetList = new Array();
-            var asset_list = new Array();
-            for (var i = 0; i < userObjectList.length; i++) {
-                asset_mediaList = [];
-                questionList = [];
-                whiteBoardList = [];
-                asset_printList = [];
-                // const counts = {};
-                // const sampleArray =userObjectList[i].AssetType
-                // sampleArray.forEach(function (x) { counts[x] = (counts[x] || 0) + 1; });
-                // console.log(counts)
-                // console.log("userObjectList",userObjectList);
-                for (var j = 0; j < userObjectList[i].AssetType.length; j++) {
-                    if (userObjectList[i].AssetType[j] === "asset_media") {
-                        asset_mediaList.push(userObjectList[i].AssetType[j]);
-                    }
-                    else if (userObjectList[i].AssetType[j] === "asset_print") {
-                        asset_printList.push(userObjectList[i].AssetType[j]);
-                    }
-                    else if (userObjectList[i].AssetType[j] === "whiteboard") {
-                        whiteBoardList.push(userObjectList[i].AssetType[j]);
-                    }
-                    else if (userObjectList[i].AssetType[j] === "question") {
-                        questionList.push(userObjectList[i].AssetType[j]);
-                    }
-                }
+            var _loop_1 = function (i) {
+                var Assetcounts = [];
+                //find count of present asset type
+                var presentAsset = userObjectList[i].AssetType;
+                presentAsset = __spread(new Set(presentAsset));
+                //  console.log("presentAsset",presentAsset)
+                //find count of present asset count
+                var sampleArray = userObjectList[i].AssetType;
+                sampleArray.forEach(function (x) { Assetcounts[x] = (Assetcounts[x] || 0) + 1; });
+                // find missing assets
+                var missingAssets = this_1.resourceTypes.filter(function (n) { return !presentAsset.includes(n); });
+                // adding missing asset with count 0 in list
+                missingAssets.forEach(function (element) {
+                    Assetcounts[element] = 0;
+                });
+                // console.log(Assetcounts);
                 var asset_media = {
                     // Sr_No: i+1,
                     Name: userObjectList[i].Name,
                     Subjects_taught: userObjectList[i].Subjects,
-                    Duration: userObjectList[i].duration,
+                    " Duration(mins)": userObjectList[i].duration,
                     ClassRooms: userObjectList[i].ClassRooms,
                     DaysAccsessed: userObjectList[i].DayAccess,
                     DatesAccess: userObjectList[i].DatesAccess,
                     Grades: userObjectList[i].Grades,
-                    Subjects: userObjectList[i].SubjectTought,
-                    asset_media_usage: asset_mediaList.length,
-                    asset_print_usage: asset_printList.length,
-                    whiteBoard_usage: whiteBoardList.length,
-                    question_usage: questionList.length
+                    Subjects: userObjectList[i].SubjectTought
                 };
-                userSummaryList.push(asset_media);
+                var returnedTarget = Object.assign(asset_media, Assetcounts);
+                userSummaryList.push(returnedTarget);
+            };
+            var this_1 = this;
+            for (var i = 0; i < userObjectList.length; i++) {
+                _loop_1(i);
             }
-            console.log("userSummaryList", userSummaryList);
+            //  console.log("userSummaryList",userSummaryList);
             return userSummaryList;
         };
         return ExceldataService;
@@ -2059,7 +2091,9 @@
         }
         Object.defineProperty(HeaderComponent.prototype, "data", {
             set: function (res) {
-                this.loadData(res);
+                if (res !== null) {
+                    this.loadData(res);
+                }
             },
             enumerable: false,
             configurable: true
@@ -2115,7 +2149,9 @@
         HeaderComponent.prototype.refreshChart = function () {
             this.stopTimer();
             this.refreshTimer = 0;
-            this.countDown();
+            if (this.calenderCurrentDate === this.todayDate) {
+                this.countDown();
+            }
             this.userSelectedDate.emit(this.calenderCurrentDate);
         };
         HeaderComponent.prototype.startTimer = function () {
@@ -2131,6 +2167,7 @@
         };
         HeaderComponent.prototype.countDown = function () {
             var _this = this;
+            console.log("countDown");
             this.clearTimer();
             this.intervalId = window.setInterval(function () {
                 _this.refreshTimer -= 1;
@@ -2171,6 +2208,10 @@
                     var schoolDetails = this.mydata.schoolMetadata.school;
                     var userDetails = userDetails_data;
                     var terminalDetails = this.mydata.schoolTerminals.schoolTerminal;
+                    // console.log("schoolDetails",schoolDetails);
+                    // console.log("UserSummary",UserSummary);
+                    // console.log("terminalDetails",terminalDetails);
+                    // console.log("userDetails",userDetails);
                     this.dataList = [
                         [schoolDetails],
                         UserSummary,
@@ -2214,7 +2255,9 @@
         }
         Object.defineProperty(TableviewComponent.prototype, "data", {
             set: function (res) {
-                this.loadTable(res);
+                if (res !== null) {
+                    this.loadTable(res);
+                }
             },
             enumerable: false,
             configurable: true
@@ -2228,10 +2271,10 @@
             if (response) {
                 this.myXmlData = JSON.parse(response);
                 if (this.myXmlData) {
-                    //get current data list
+                    // get current data list
                     var genarateUserReqiuredData = this.pdService.genarateUserReqiuredData(this.myXmlData);
                     this.currentdataList = genarateUserReqiuredData.userConsoleData;
-                    // get all user list 
+                    //  get all user list 
                     var fetchAlluserList = this.pdService.allUserChartData();
                     this.alluserList = fetchAlluserList.fordurationTable;
                     // resoureMetadata list
@@ -2260,13 +2303,13 @@
             });
         };
         TableviewComponent.prototype.showCurrentDataUser = function () {
-            this.tableViewData = this.pdService.dataForTableView();
+            this.tableViewData = this.pdService.dataForTableView(this.currentdataList, this.currentResoursedataList);
             if (this.tableViewData) {
                 this.ueserWiseTableView(this.tableViewData);
             }
         };
         TableviewComponent.prototype.showAllUser = function () {
-            this.tableViewData = this.pdService.dataForTableView();
+            this.tableViewData = this.pdService.dataForTableView(this.alluserList, this.currentResoursedataList);
             if (this.tableViewData) {
                 this.ueserWiseTableView(this.tableViewData);
             }