principal-dashboard-lib-v2 0.0.5 → 0.0.9

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

@@ -1,13 +1,15 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('rxjs'), require('file-saver'), require('xlsx'), require('angular-google-charts'), require('@angular/common'), require('ng2-datepicker')) :
-    typeof define === 'function' && define.amd ? define('principal-dashboard-lib-v2', ['exports', '@angular/core', 'rxjs', 'file-saver', 'xlsx', 'angular-google-charts', '@angular/common', 'ng2-datepicker'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global['principal-dashboard-lib-v2'] = {}, global.ng.core, global.rxjs, global.FileSaver, global.XLSX, global.angularGoogleCharts, global.ng.common, global.ng2Datepicker));
-}(this, (function (exports, i0, rxjs, FileSaver, XLSX, angularGoogleCharts, common, ng2Datepicker) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('rxjs'), require('angular-google-charts'), require('file-saver'), require('xlsx'), require('@angular/common'), require('ng2-datepicker')) :
+    typeof define === 'function' && define.amd ? define('principal-dashboard-lib-v2', ['exports', '@angular/core', 'rxjs', 'angular-google-charts', 'file-saver', 'xlsx', '@angular/common', 'ng2-datepicker'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global['principal-dashboard-lib-v2'] = {}, global.ng.core, global.rxjs, global.angularGoogleCharts, global.FileSaver, global.XLSX, global.ng.common, global.ng2Datepicker));
+}(this, (function (exports, i0, rxjs, angularGoogleCharts, FileSaver, XLSX, common, ng2Datepicker) { 'use strict';
 
-    var EXCEL_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8';
-    var EXCEL_EXTENSION = '.xlsx';
     var PrincipalDashboardLibV2Service = /** @class */ (function () {
         function PrincipalDashboardLibV2Service() {
+            this.isResoureMetaDataReady = new rxjs.ReplaySubject();
+            this.isResoureMetaDataReady$ = this.isResoureMetaDataReady.asObservable();
+            this.isUserReqiuredDataReady = new rxjs.ReplaySubject();
+            this.isUserReqiuredDataReady$ = this.isUserReqiuredDataReady.asObservable();
             this.mychartType = '';
             this.dataType = '';
             this.userAllData = '';
@@ -27,407 +29,415 @@
             //for get details of selected user
             this.detailedviewData = new rxjs.BehaviorSubject(this.userMetadata);
             this.detailedviewData$ = this.detailedviewData.asObservable();
-            this.tabName = [{ "name": "School" }, { "name": "UserSummary" }, { "name": "TerminalSummary" }, { "name": "DeatilUsage" }];
         }
-        PrincipalDashboardLibV2Service.prototype.exportAsExcelFile = function (json, excelFileName) {
-            var excelBuffer;
-            var myobj = { Sheets: {}, SheetNames: [] };
-            for (var i = 0; i < json.length; i++) {
-                var worksheet = XLSX.utils.json_to_sheet(json[i]);
-                myobj.Sheets[this.tabName[i].name] = worksheet;
-                myobj.SheetNames.push(this.tabName[i].name);
-            }
-            var workbook = myobj;
-            excelBuffer = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' });
-            this.saveAsExcelFile(excelBuffer, excelFileName);
-        };
-        PrincipalDashboardLibV2Service.prototype.saveAsExcelFile = function (buffer, fileName) {
-            var data = new Blob([buffer], {
-                type: EXCEL_TYPE
-            });
-            FileSaver.saveAs(data, fileName + EXCEL_EXTENSION);
-        };
-        //_____FOR EXCEL CONVERTOR END
         PrincipalDashboardLibV2Service.prototype.genarateResourseReqiuredData = function (data) {
-            var resouseID;
-            var title;
-            var subject;
-            var grade;
-            var chapter;
-            var teachingpoint;
-            var type;
+            this.isResoureMetaDataReady.next(false);
             var resourceMetadataMatrix = new Array();
-            var resourceMetadata = data.resourcesMetadata.resourceMetadata;
-            if (resourceMetadata != undefined && resourceMetadata.length > 0) {
-                for (var i = 0; i < resourceMetadata.length; i++) {
-                    //----------//resouseID
-                    resouseID = resourceMetadata[i].resourceId;
-                    //----------//subject
-                    if (resourceMetadata[i].subject != undefined) {
-                        if (resourceMetadata[i].subject.title != undefined) {
-                            subject = resourceMetadata[i].subject.title;
+            if (data && data !== null) {
+                var resouseID = void 0;
+                var title = void 0;
+                var subject = void 0;
+                var grade = void 0;
+                var chapter = void 0;
+                var teachingpoint = void 0;
+                var type = void 0;
+                var resourceMetadata = data.resourcesMetadata.resourceMetadata;
+                if (resourceMetadata != undefined && resourceMetadata.length > 0) {
+                    for (var i = 0; i < resourceMetadata.length; i++) {
+                        //----------//resouseID
+                        resouseID = resourceMetadata[i].resourceId;
+                        //----------//subject
+                        if (resourceMetadata[i].subject != undefined) {
+                            if (resourceMetadata[i].subject.title != undefined) {
+                                subject = resourceMetadata[i].subject.title;
+                            }
+                            else {
+                                subject = '';
+                            }
                         }
                         else {
                             subject = '';
                         }
-                    }
-                    else {
-                        subject = '';
-                    }
-                    //----------//grade
-                    if (resourceMetadata[i].grade != undefined) {
-                        if (resourceMetadata[i].grade.title != undefined) {
-                            grade = resourceMetadata[i].grade.title;
+                        //----------//grade
+                        if (resourceMetadata[i].grade != undefined) {
+                            if (resourceMetadata[i].grade.title != undefined) {
+                                grade = resourceMetadata[i].grade.title;
+                            }
+                            else {
+                                grade = '';
+                            }
                         }
                         else {
                             grade = '';
                         }
-                    }
-                    else {
-                        grade = '';
-                    }
-                    //----------//chapter
-                    if (resourceMetadata[i].chapter != undefined) {
-                        if (resourceMetadata[i].chapter.title != undefined) {
-                            chapter = resourceMetadata[i].chapter.title;
+                        //----------//chapter
+                        if (resourceMetadata[i].chapter != undefined) {
+                            if (resourceMetadata[i].chapter.title != undefined) {
+                                chapter = resourceMetadata[i].chapter.title;
+                            }
+                            else {
+                                chapter = '';
+                            }
                         }
                         else {
                             chapter = '';
                         }
-                    }
-                    else {
-                        chapter = '';
-                    }
-                    //----------//teachingpoint
-                    if (resourceMetadata[i].teachingpoint != undefined) {
-                        if (resourceMetadata[i].teachingpoint.title != undefined) {
-                            teachingpoint = resourceMetadata[i].teachingpoint.title;
+                        //----------//teachingpoint
+                        if (resourceMetadata[i].teachingpoint != undefined) {
+                            if (resourceMetadata[i].teachingpoint.title != undefined) {
+                                teachingpoint = resourceMetadata[i].teachingpoint.title;
+                            }
+                            else {
+                                teachingpoint = '';
+                            }
                         }
                         else {
                             teachingpoint = '';
                         }
+                        //----------//type
+                        if (resourceMetadata[i].type != undefined) {
+                            type = resourceMetadata[i].type;
+                        }
+                        else {
+                            type = '';
+                        }
+                        //----------//title
+                        if (resourceMetadata[i].title != undefined) {
+                            title = resourceMetadata[i].title;
+                        }
+                        else {
+                            title = '';
+                        }
+                        var resourceMetauserConsoleData = {
+                            resouseID: resouseID,
+                            subject: subject,
+                            grade: grade,
+                            chapter: chapter,
+                            teachingpoint: teachingpoint,
+                            type: type,
+                            title: title
+                        };
+                        resourceMetadataMatrix.push(resourceMetauserConsoleData);
+                        this.resoureMetaData = resourceMetadataMatrix;
+                        this.isResoureMetaDataReady.next(true);
                     }
-                    else {
-                        teachingpoint = '';
-                    }
-                    //----------//type
-                    if (resourceMetadata[i].type != undefined) {
-                        type = resourceMetadata[i].type;
-                    }
-                    else {
-                        type = '';
-                    }
-                    //----------//title
-                    if (resourceMetadata[i].title != undefined) {
-                        title = resourceMetadata[i].title;
-                    }
-                    else {
-                        title = '';
-                    }
-                    var resourceMetauserConsoleData = {
-                        resouseID: resouseID,
-                        subject: subject,
-                        grade: grade,
-                        chapter: chapter,
-                        teachingpoint: teachingpoint,
-                        type: type,
-                        title: title
-                    };
-                    resourceMetadataMatrix.push(resourceMetauserConsoleData);
                 }
             }
+            // this.resoureMetaData = resourceMetadataMatrix;
             return resourceMetadataMatrix;
         };
         PrincipalDashboardLibV2Service.prototype.genarateUserReqiuredData = function (data) {
-            var userConsole = data.usersConsole.userConsole;
-            var usersMetadata = data.usersMetadata.userMetadata;
-            var schoolTerminal = data.schoolTerminals.schoolTerminal;
+            this.isUserReqiuredDataReady.next(false);
             var usersMetadataMatrix = new Array();
             var usermetadataMatrixUpdated = new Array();
             var schoolTerminalMatrix = new Array();
             var userConsoleMatrix = new Array();
-            if (usersMetadata != null && usersMetadata.length > 0) {
-                for (var i_1 = 0; i_1 < usersMetadata.length; i_1++) {
-                    var userId = void 0;
-                    var userName = void 0;
-                    var userSubjects = void 0;
-                    var listOfUser = {};
-                    if (usersMetadata[i_1].userId != "") {
-                        userId = usersMetadata[i_1].userId;
-                        if (usersMetadata[i_1].fullName !== undefined) {
-                            userName = usersMetadata[i_1].fullName; // get name of user w.r.t. ID
+            if (data && data !== null) {
+                var userConsole = data.usersConsole.userConsole;
+                var usersMetadata = data.usersMetadata.userMetadata;
+                var schoolTerminal = data.schoolTerminals.schoolTerminal;
+                if (usersMetadata != null && usersMetadata.length > 0) {
+                    for (var i_1 = 0; i_1 < usersMetadata.length; i_1++) {
+                        var userId = void 0;
+                        var userName = void 0;
+                        var userSubjects = void 0;
+                        var listOfUser = {};
+                        if (usersMetadata[i_1].userId != "") {
+                            userId = usersMetadata[i_1].userId;
+                            if (usersMetadata[i_1].fullName !== undefined) {
+                                userName = usersMetadata[i_1].fullName; // get name of user w.r.t. ID
+                            }
+                            else {
+                                userName = '';
+                            }
+                            if (usersMetadata[i_1].userSubjects !== undefined) {
+                                userSubjects = usersMetadata[i_1].userSubjects; // get name of user w.r.t. ID
+                            }
+                            else {
+                                userSubjects = '';
+                            }
+                            listOfUser = {
+                                userId: userId,
+                                userName: userName,
+                                userSubjects: userSubjects
+                            };
+                            usersMetadataMatrix.push(listOfUser); // array of all users
+                        }
+                    }
+                }
+                for (var i = 0; i < usersMetadataMatrix.length; i++) {
+                    usersMetadataMatrix.forEach(function (element) {
+                        if (usersMetadataMatrix[i].userName === element.userName) {
+                            usermetadataMatrixUpdated.push(usersMetadataMatrix[i]); //array of same name users
+                            usersMetadataMatrix.splice(i, 1); //delete the same name users from usermetadataMatrix
+                        }
+                    });
+                }
+                for (var i = 0; i < usermetadataMatrixUpdated.length; i++) {
+                    // const randomNumber = document.createElement('span');
+                    // randomNumber.innerHTML = i.toString();
+                    usermetadataMatrixUpdated[i].userName = usermetadataMatrixUpdated[i].userName + " " + i;
+                    usersMetadataMatrix.push(usermetadataMatrixUpdated[i]); //adding same name users in usermetadataMatrix with some random charators
+                    this.usersMetaData = usersMetadataMatrix;
+                }
+                if (schoolTerminal != null && schoolTerminal.length > 0) {
+                    for (var i = 0; i < schoolTerminal.length; i++) {
+                        var schoolId = void 0;
+                        var terminalKey = void 0;
+                        var terminalType = void 0;
+                        var location = void 0;
+                        var schoolTerminalData = {};
+                        //----------//schoolId
+                        if (schoolTerminal[i].schoolId !== undefined) {
+                            schoolId = schoolTerminal[i].schoolId; // get name of user w.r.t. ID
                         }
                         else {
-                            userName = '';
+                            schoolId = '';
                         }
-                        if (usersMetadata[i_1].userSubjects !== undefined) {
-                            userSubjects = usersMetadata[i_1].userSubjects; // get name of user w.r.t. ID
+                        //----------//terminalKey
+                        if (schoolTerminal[i].terminalKey !== undefined) {
+                            terminalKey = schoolTerminal[i].terminalKey; // get name of user w.r.t. ID
                         }
                         else {
-                            userSubjects = '';
+                            terminalKey = '';
                         }
-                        listOfUser = {
-                            userId: userId,
-                            userName: userName,
-                            userSubjects: userSubjects
+                        //----------//terminalType
+                        if (schoolTerminal[i].terminalType !== undefined) {
+                            terminalType = schoolTerminal[i].terminalType; // get name of user w.r.t. ID
+                        }
+                        else {
+                            terminalType = '';
+                        }
+                        //----------//location
+                        if (schoolTerminal[i].metadata !== undefined) {
+                            location = schoolTerminal[i].metadata; // get name of user w.r.t. ID
+                        }
+                        else {
+                            location = '';
+                        }
+                        schoolTerminalData = {
+                            schoolId: schoolId,
+                            terminalKey: terminalKey,
+                            terminalType: terminalType,
+                            location: location
                         };
-                        usersMetadataMatrix.push(listOfUser); // array of all users
+                        schoolTerminalMatrix.push(schoolTerminalData);
+                        this.schoolTerminalData = schoolTerminalMatrix;
                     }
                 }
-            }
-            for (var i = 0; i < usersMetadataMatrix.length; i++) {
-                usersMetadataMatrix.forEach(function (element) {
-                    if (usersMetadataMatrix[i].userName === element.userName) {
-                        usermetadataMatrixUpdated.push(usersMetadataMatrix[i]); //array of same name users
-                        usersMetadataMatrix.splice(i, 1); //delete the same name users from usermetadataMatrix
-                    }
-                });
-            }
-            for (var i = 0; i < usermetadataMatrixUpdated.length; i++) {
-                // const randomNumber = document.createElement('span');
-                // randomNumber.innerHTML = i.toString();
-                usermetadataMatrixUpdated[i].userName = usermetadataMatrixUpdated[i].userName + " " + i;
-                usersMetadataMatrix.push(usermetadataMatrixUpdated[i]); //adding same name users in usermetadataMatrix with some random charators
-            }
-            if (schoolTerminal != null && schoolTerminal.length > 0) {
-                for (var i = 0; i < schoolTerminal.length; i++) {
-                    var schoolId = void 0;
-                    var terminalKey = void 0;
-                    var terminalType = void 0;
-                    var location = void 0;
-                    var schoolTerminalData = {};
-                    //----------//schoolId
-                    if (schoolTerminal[i].schoolId !== undefined) {
-                        schoolId = schoolTerminal[i].schoolId; // get name of user w.r.t. ID
-                    }
-                    else {
-                        schoolId = '';
-                    }
-                    //----------//terminalKey
-                    if (schoolTerminal[i].terminalKey !== undefined) {
-                        terminalKey = schoolTerminal[i].terminalKey; // get name of user w.r.t. ID
-                    }
-                    else {
-                        terminalKey = '';
-                    }
-                    //----------//terminalType
-                    if (schoolTerminal[i].terminalType !== undefined) {
-                        terminalType = schoolTerminal[i].terminalType; // get name of user w.r.t. ID
-                    }
-                    else {
-                        terminalType = '';
-                    }
-                    //----------//location
-                    if (schoolTerminal[i].metadata !== undefined) {
-                        location = schoolTerminal[i].metadata; // get name of user w.r.t. ID
-                    }
-                    else {
-                        location = '';
-                    }
-                    schoolTerminalData = {
-                        schoolId: schoolId,
-                        terminalKey: terminalKey,
-                        terminalType: terminalType,
-                        location: location
-                    };
-                    schoolTerminalMatrix.push(schoolTerminalData);
-                }
-            }
-            if (userConsole != null && userConsole.length > 0) {
-                for (var index = 0; index < userConsole.length; index++) {
-                    var userId = void 0;
-                    var startTime = void 0;
-                    var endTime = void 0;
-                    var duration = void 0;
-                    var selectedDate = void 0;
-                    var terminalIP = void 0;
-                    var userConsoleResources = void 0;
-                    var resourceMetadataIDS = void 0;
-                    var resourceMetauserConsoleData = new Array();
-                    var userName = void 0;
-                    var userSubjects = void 0;
-                    var terminalLocation = void 0;
-                    //----------//user iD
-                    if (userConsole[index].userId !== undefined) {
-                        userId = userConsole[index].userId; // get name of user w.r.t. ID
-                    }
-                    else {
-                        userId = '';
-                    }
-                    //----------// startTime 
-                    if (userConsole[index].startTime !== undefined) {
-                        startTime = userConsole[index].startTime; // get name of user w.r.t. ID
-                    }
-                    else {
-                        startTime = '';
-                    }
-                    //----------// endTime 
-                    if (userConsole[index].endTime !== undefined) {
-                        endTime = userConsole[index].endTime; // get name of user w.r.t. ID
-                        this.myEndTime = endTime;
-                    }
-                    else {
-                        endTime = '';
-                    }
-                    //----------// Date 
-                    if (userConsole[index].selectedDate !== undefined) {
-                        selectedDate = userConsole[index].selectedDate; // get name of user w.r.t. ID
-                    }
-                    else {
-                        selectedDate = '';
-                    }
-                    //----------// Duration
-                    if (userConsole[index].duration !== undefined) {
-                        duration = userConsole[index].duration; // get name of user w.r.t. ID
-                    }
-                    else {
-                        duration = '';
-                    }
-                    //----------// terminalIP
-                    if (userConsole[index].terminalIP !== undefined) {
-                        terminalIP = userConsole[index].terminalIP; // get name of user w.r.t. ID
-                    }
-                    else {
-                        terminalIP = '';
-                    }
-                    //----------// userConsoleResources
-                    if (userConsole[index].userConsoleResources !== undefined) {
-                        userConsoleResources = userConsole[index].userConsoleResources; // get name of user w.r.t. ID
-                    }
-                    else {
-                        userConsoleResources = null;
-                    }
-                    if (userConsoleResources != null) {
-                        if (userConsoleResources.userConsoleResource !== undefined) {
-                            resourceMetauserConsoleData = userConsoleResources.userConsoleResource; // get name of user w.r.t. ID
+                if (userConsole != null && userConsole.length > 0) {
+                    for (var index = 0; index < userConsole.length; index++) {
+                        var userId = void 0;
+                        var startTime = void 0;
+                        var endTime = void 0;
+                        var duration = void 0;
+                        var selectedDate = void 0;
+                        var terminalIP = void 0;
+                        var userConsoleResources = void 0;
+                        var resourceMetadataIDS = void 0;
+                        var resourceMetauserConsoleData = new Array();
+                        var userName = void 0;
+                        var userSubjects = void 0;
+                        var terminalLocation = void 0;
+                        //----------//user iD
+                        if (userConsole[index].userId !== undefined) {
+                            userId = userConsole[index].userId; // get name of user w.r.t. ID
                         }
                         else {
-                            resourceMetauserConsoleData = [];
+                            userId = '';
                         }
-                    }
-                    //----------// userName and userSubjects
-                    for (var i_2 = 0; i_2 < usersMetadataMatrix.length; i_2++) {
-                        if (userId === usersMetadataMatrix[i_2].userId) {
-                            userName = usersMetadataMatrix[i_2].userName;
-                            userSubjects = usersMetadataMatrix[i_2].userSubjects;
+                        //----------// startTime 
+                        if (userConsole[index].startTime !== undefined) {
+                            startTime = userConsole[index].startTime; // get name of user w.r.t. ID
                         }
-                    }
-                    //----------// terminalIP and terminalLocation
-                    for (var i_3 = 0; i_3 < schoolTerminalMatrix.length; i_3++) {
-                        if (terminalIP === schoolTerminalMatrix[i_3].terminalKey) {
-                            terminalLocation = schoolTerminalMatrix[i_3].location;
+                        else {
+                            startTime = '';
+                        }
+                        //----------// endTime 
+                        if (userConsole[index].endTime !== undefined) {
+                            endTime = userConsole[index].endTime; // get name of user w.r.t. ID
+                            this.myEndTime = endTime;
+                        }
+                        else {
+                            endTime = '';
+                        }
+                        //----------// Date 
+                        if (userConsole[index].selectedDate !== undefined) {
+                            selectedDate = userConsole[index].selectedDate; // get name of user w.r.t. ID
+                        }
+                        else {
+                            selectedDate = '';
+                        }
+                        //----------// Duration
+                        if (userConsole[index].duration !== undefined) {
+                            duration = userConsole[index].duration; // get name of user w.r.t. ID
+                        }
+                        else {
+                            duration = '';
                         }
+                        //----------// terminalIP
+                        if (userConsole[index].terminalIP !== undefined) {
+                            terminalIP = userConsole[index].terminalIP; // get name of user w.r.t. ID
+                        }
+                        else {
+                            terminalIP = '';
+                        }
+                        //----------// userConsoleResources
+                        if (userConsole[index].userConsoleResources !== undefined) {
+                            userConsoleResources = userConsole[index].userConsoleResources; // get name of user w.r.t. ID
+                        }
+                        else {
+                            userConsoleResources = null;
+                        }
+                        if (userConsoleResources != null) {
+                            if (userConsoleResources.userConsoleResource !== undefined) {
+                                resourceMetauserConsoleData = userConsoleResources.userConsoleResource; // get name of user w.r.t. ID
+                            }
+                            else {
+                                resourceMetauserConsoleData = [];
+                            }
+                        }
+                        //----------// userName and userSubjects
+                        for (var i_2 = 0; i_2 < usersMetadataMatrix.length; i_2++) {
+                            if (userId === usersMetadataMatrix[i_2].userId) {
+                                userName = usersMetadataMatrix[i_2].userName;
+                                userSubjects = usersMetadataMatrix[i_2].userSubjects;
+                            }
+                        }
+                        //----------// terminalIP and terminalLocation
+                        for (var i_3 = 0; i_3 < schoolTerminalMatrix.length; i_3++) {
+                            if (terminalIP === schoolTerminalMatrix[i_3].terminalKey) {
+                                terminalLocation = schoolTerminalMatrix[i_3].location;
+                            }
+                        }
+                        var userData = {
+                            userId: userId,
+                            userName: userName,
+                            startTime: new Date(startTime),
+                            endTime: new Date(endTime),
+                            terminalIP: terminalIP,
+                            resourceMetauserConsoleData: resourceMetauserConsoleData,
+                            duration: duration,
+                            terminalLocation: terminalLocation,
+                            userSubjects: userSubjects
+                        };
+                        userConsoleMatrix.push(userData);
+                        this.userConsoleData = userConsoleMatrix;
+                        this.isUserReqiuredDataReady.next(true);
                     }
-                    var userData = {
-                        userId: userId,
-                        userName: userName,
-                        startTime: new Date(startTime),
-                        endTime: new Date(endTime),
-                        terminalIP: terminalIP,
-                        resourceMetauserConsoleData: resourceMetauserConsoleData,
-                        duration: duration,
-                        terminalLocation: terminalLocation,
-                        userSubjects: userSubjects
-                    };
-                    userConsoleMatrix.push(userData);
                 }
             }
-            return { usersMetadata: usersMetadataMatrix, schoolTerminalData: schoolTerminalMatrix, userConsoleData: userConsoleMatrix };
+            // console.log(usersMetadataMatrix,schoolTerminalMatrix,userConsoleMatrix);
+            return {
+                usersMetadata: usersMetadataMatrix,
+                schoolTerminalData: schoolTerminalMatrix,
+                userConsoleData: userConsoleMatrix
+            };
         };
-        PrincipalDashboardLibV2Service.prototype.userWiseChartData = function (userConsoleData) {
+        PrincipalDashboardLibV2Service.prototype.userWiseChartData = function () {
             var dataTableforChart = new Array();
-            if (userConsoleData.length > 0) {
-                for (var i = 0; i < userConsoleData.length; i++) {
-                    var userData = [userConsoleData[i].userName, userConsoleData[i].startTime, userConsoleData[i].endTime];
-                    dataTableforChart.push(userData);
+            dataTableforChart = [];
+            if (this.userConsoleData) {
+                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;
         };
-        PrincipalDashboardLibV2Service.prototype.classRoomWiseChartData = function (userConsoleData) {
+        PrincipalDashboardLibV2Service.prototype.classRoomWiseChartData = function () {
             var dataTableforChart = new Array();
-            for (var i = 0; i < userConsoleData.length; i++) {
-                var userData = [userConsoleData[i].terminalLocation, userConsoleData[i].startTime, userConsoleData[i].endTime];
-                dataTableforChart.push(userData);
+            dataTableforChart = [];
+            if (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;
         };
-        PrincipalDashboardLibV2Service.prototype.allUserChartData = function (userConsoleData, usersMetadataMatrix) {
+        PrincipalDashboardLibV2Service.prototype.allUserChartData = function () {
             var dataTableforChart = new Array();
-            var inActiveuserName;
-            var userSubjects;
-            var myID;
-            var AlluserDetails = new Array();
+            dataTableforChart = [];
             var AlluserDetailsForTableChart = new Array();
             AlluserDetailsForTableChart = [];
-            for (var index = 0; index < userConsoleData.length; index++) {
-                AlluserDetails.push(userConsoleData[index]);
-                AlluserDetailsForTableChart.push(userConsoleData[index]);
-            }
-            for (var i = 0; i < usersMetadataMatrix.length; i++) {
-                myID = usersMetadataMatrix[i].userId;
-                inActiveuserName = usersMetadataMatrix[i].userName;
-                userSubjects = usersMetadataMatrix[i].userSubjects;
-                var myChartRowuserConsoleData = {
-                    userId: myID,
-                    userName: inActiveuserName,
-                    startTime: new Date(this.myEndTime),
-                    endTime: new Date(this.myEndTime),
-                    terminalIP: "",
-                    resourceMetauserConsoleData: [],
-                    duration: "0",
-                    terminalLocation: "",
-                    userSubjects: userSubjects
-                };
-                AlluserDetails.push(myChartRowuserConsoleData);
-                var myTableRowuserConsoleData = {
-                    userId: myID,
-                    userName: inActiveuserName,
-                    startTime: "",
-                    endTime: "",
-                    terminalIP: "",
-                    resourceMetauserConsoleData: [],
-                    duration: 0,
-                    terminalLocation: "",
-                    userSubjects: userSubjects
-                };
-                AlluserDetailsForTableChart.push(myTableRowuserConsoleData);
-            }
-            for (var i = 0; i < AlluserDetails.length; i++) {
-                var userData = [AlluserDetails[i].userName, AlluserDetails[i].startTime, AlluserDetails[i].endTime];
-                dataTableforChart.push(userData);
+            if (this.userConsoleData && this.usersMetaData) {
+                var inActiveuserName = void 0;
+                var userSubjects = void 0;
+                var myID = void 0;
+                var AlluserDetails = new Array();
+                for (var index = 0; index < this.userConsoleData.length; index++) {
+                    AlluserDetails.push(this.userConsoleData[index]);
+                    AlluserDetailsForTableChart.push(this.userConsoleData[index]);
+                }
+                for (var i = 0; i < this.usersMetaData.length; i++) {
+                    myID = this.usersMetaData[i].userId;
+                    inActiveuserName = this.usersMetaData[i].userName;
+                    userSubjects = this.usersMetaData[i].userSubjects;
+                    var myChartRowuserConsoleData = {
+                        userId: myID,
+                        userName: inActiveuserName,
+                        startTime: new Date(this.myEndTime),
+                        endTime: new Date(this.myEndTime),
+                        terminalIP: "",
+                        resourceMetauserConsoleData: [],
+                        duration: "0",
+                        terminalLocation: "",
+                        userSubjects: userSubjects
+                    };
+                    AlluserDetails.push(myChartRowuserConsoleData);
+                    var myTableRowuserConsoleData = {
+                        userId: myID,
+                        userName: inActiveuserName,
+                        startTime: "",
+                        endTime: "",
+                        terminalIP: "",
+                        resourceMetauserConsoleData: [],
+                        duration: 0,
+                        terminalLocation: "",
+                        userSubjects: userSubjects
+                    };
+                    AlluserDetailsForTableChart.push(myTableRowuserConsoleData);
+                }
+                for (var i = 0; i < AlluserDetails.length; i++) {
+                    var userData = [AlluserDetails[i].userName, AlluserDetails[i].startTime, AlluserDetails[i].endTime];
+                    dataTableforChart.push(userData);
+                }
             }
             return { forChartData: dataTableforChart, fordurationTable: AlluserDetailsForTableChart };
         };
-        PrincipalDashboardLibV2Service.prototype.allRoomsData = function (userConsoleData, schoolTerminalMatrix) {
+        PrincipalDashboardLibV2Service.prototype.allRoomsData = function () {
             var dataTableforChart = new Array();
-            var myChartRowData = {};
-            var inActiveClassRoom;
-            var endTime;
+            dataTableforChart = [];
             var allRoomsDetails = new Array();
             allRoomsDetails = [];
-            dataTableforChart = [];
-            for (var i = 0; i < userConsoleData.length; i++) {
-                allRoomsDetails.push(userConsoleData[i]);
-                var userData = [userConsoleData[i].terminalLocation, userConsoleData[i].startTime, userConsoleData[i].endTime];
-                dataTableforChart.push(userData);
-            }
-            for (var i = 0; i < schoolTerminalMatrix.length; i++) {
-                inActiveClassRoom = schoolTerminalMatrix[i].location;
-                myChartRowData = {
-                    userId: "",
-                    userName: "",
-                    startTime: new Date(this.myEndTime),
-                    endTime: new Date(this.myEndTime),
-                    terminalIP: "",
-                    resourceMetauserConsoleData: [],
-                    duration: 0,
-                    terminalLocation: inActiveClassRoom,
-                    userSubjects: ""
-                };
-                allRoomsDetails.push(myChartRowData);
-                var myChartRowuserConsoleData = [inActiveClassRoom, new Date(this.myEndTime), new Date(this.myEndTime)];
-                dataTableforChart.push(myChartRowuserConsoleData);
+            if (this.userConsoleData && this.schoolTerminalData) {
+                var myChartRowData = {};
+                var inActiveClassRoom = void 0;
+                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];
+                    dataTableforChart.push(userData);
+                }
+                for (var i = 0; i < this.schoolTerminalData.length; i++) {
+                    inActiveClassRoom = this.schoolTerminalData[i].location;
+                    myChartRowData = {
+                        userId: "",
+                        userName: "",
+                        startTime: new Date(this.myEndTime),
+                        endTime: new Date(this.myEndTime),
+                        terminalIP: "",
+                        resourceMetauserConsoleData: [],
+                        duration: 0,
+                        terminalLocation: inActiveClassRoom,
+                        userSubjects: ""
+                    };
+                    allRoomsDetails.push(myChartRowData);
+                    var myChartRowuserConsoleData = [inActiveClassRoom, new Date(this.myEndTime), new Date(this.myEndTime)];
+                    dataTableforChart.push(myChartRowuserConsoleData);
+                }
             }
             return { forChartData: dataTableforChart, fordurationTable: allRoomsDetails };
         };
@@ -555,8 +565,8 @@
                 chapter = undefined;
                 teachingpoint = undefined;
                 AssestDetail = undefined;
-                resourceArrayForTableChart = [subject, grade, chapter, teachingpoint, AssestDetail];
-                detailedView_ResourceDataMatrix.push(resourceArrayForTableChart);
+                // resourceArrayForTableChart = [subject,grade,chapter,teachingpoint,AssestDetail];
+                // detailedView_ResourceDataMatrix.push(resourceArrayForTableChart);
             }
             else {
                 //resourceMetadataMatrix = [resouseID,subject,grade,chapter,teachingpoint,type,title]
@@ -589,12 +599,24 @@
     var PrincipalDashboardLibV2Component = /** @class */ (function () {
         function PrincipalDashboardLibV2Component() {
             this.userSelectedDate = new i0.EventEmitter();
+            this.messageForUser = "Loding...";
         }
+        Object.defineProperty(PrincipalDashboardLibV2Component.prototype, "responseStatus", {
+            set: function (res) {
+                this.setMessageForUser(res);
+                //  console.log("  @Input() set responseStatus(res: any) >>>>>>>>>>>>.",res);
+            },
+            enumerable: false,
+            configurable: true
+        });
         PrincipalDashboardLibV2Component.prototype.ngOnInit = function () {
-            console.log(" IN --> 7 data", this.data);
+            // console.log(" IN --> 7 data",this.data);
+        };
+        PrincipalDashboardLibV2Component.prototype.setMessageForUser = function (res) {
+            this.messageForUser = res;
         };
         PrincipalDashboardLibV2Component.prototype.onUserSelectDate = function (e) {
-            console.log(" IN --> 1");
+            // console.log(" IN --> 1");
             this.data = null;
             this.userSelectedDate.emit(e);
         };
@@ -603,13 +625,14 @@
     PrincipalDashboardLibV2Component.decorators = [
         { type: i0.Component, args: [{
                     selector: 'lib-principal-dashboard-lib-v2',
-                    template: "<div id=\"reprtModule\">\r\n    <div id=\"pd-mainDiv\" class=\"pd-mainContainer\">\r\n      <lib-header [data]=\"data\" (userSelectedDate)=\"onUserSelectDate($event)\">\r\n      </lib-header>\r\n      <lib-chartheader></lib-chartheader>\r\n       \r\n      <div id=\"pd-preloader\" class=\"pd-preloaderDiv\" *ngIf=\"!data\">\r\n      Loading....\r\n      </div>\r\n      <lib-chartview *ngIf=\"data\" [data]=\"data\"></lib-chartview>\r\n      <lib-tableview *ngIf=\"data\" [data]=\"data\"></lib-tableview>\r\n      <lib-detailedview *ngIf=\"data\" [data]=\"data\"></lib-detailedview>\r\n      \r\n    </div>\r\n</div>\r\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:39px;z-index:2}.bs-datepicker-head{background-color:#000!important}"]
+                    template: "<div id=\"reprtModule\">\r\n    <div id=\"pd-mainDiv\" class=\"pd-mainContainer\">\r\n      <lib-header [data]=\"data\" (userSelectedDate)=\"onUserSelectDate($event)\">\r\n      </lib-header>\r\n      <lib-chartheader></lib-chartheader>\r\n       \r\n      <div id=\"pd-preloader\" class=\"pd-preloaderDiv\" *ngIf=\"responseStatus !== 'true' && !data\">\r\n      {{messageForUser}}\r\n      </div>\r\n      <lib-chartview *ngIf=\"data\" [data]=\"data\"></lib-chartview>\r\n      <lib-tableview *ngIf=\"data\" [data]=\"data\"></lib-tableview>\r\n      <lib-detailedview *ngIf=\"data\" [data]=\"data\"></lib-detailedview>\r\n      \r\n    </div>\r\n</div>\r\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}"]
                 },] }
     ];
     PrincipalDashboardLibV2Component.ctorParameters = function () { return []; };
     PrincipalDashboardLibV2Component.propDecorators = {
         data: [{ type: i0.Input }],
+        responseStatus: [{ type: i0.Input }],
         userSelectedDate: [{ type: i0.Output }]
     };
 
@@ -623,7 +646,7 @@
             this.isChartView = true;
         }
         ChartheaderComponent.prototype.ngOnInit = function () {
-            this.libVersion = "0.0.15";
+            this.libVersion = "0.0.18";
             // this.myIcon = document.getElementById('myIconImg');
             // this.changeChatType() 
         };
@@ -995,10 +1018,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
@@ -1006,7 +1029,7 @@
         ChartviewComponent.prototype.ngOnInit = function () { };
         ChartviewComponent.prototype.loadChart = function (response) {
             var _this = this;
-            console.log(' IN --> 8 loadChart');
+            // console.log(' IN --> 8 loadChart');
             this.totalUsers = 0;
             this.eligibleUsers = 0;
             this.currentUsers = 0;
@@ -1027,7 +1050,7 @@
             }
             if (this.myXmlData) {
                 this.currentdataList = this.pdService.genarateUserReqiuredData(this.myXmlData);
-                this.alluserList = this.pdService.allUserChartData(this.currentdataList.userConsoleData, this.currentdataList.usersMetadata);
+                this.alluserList = this.pdService.allUserChartData();
                 this.resourceDataList = this.pdService.genarateResourseReqiuredData(this.myXmlData);
                 this.totalUsers = this.currentdataList.usersMetadata.length;
                 this.findCurrentUserCount();
@@ -1048,7 +1071,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) {
@@ -1157,7 +1180,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;
@@ -1238,8 +1261,10 @@
             else {
                 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);
@@ -1262,31 +1287,48 @@
             }
         };
         ChartviewComponent.prototype.userWiseCurrentData = function () {
-            this.myChartDataMatrix = this.pdService.userWiseChartData(this.currentdataList.userConsoleData);
-            this.updateChart();
-            this.calulateTotalDuration(this.currentdataList.userConsoleData);
+            var chartDataUserWise = this.pdService.userWiseChartData();
+            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.currentdataList.userConsoleData);
-            this.updateChart();
-            this.calulateTotalDuration(this.currentdataList.userConsoleData);
+            var classRoomdata = this.pdService.classRoomWiseChartData();
+            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.currentdataList.userConsoleData, this.currentdataList.schoolTerminalData);
-            this.myChartDataMatrix = allclassRoomList.forChartData;
-            this.updateChart();
-            this.calulateTotalDuration(allclassRoomList.fordurationTable);
+            var allclassRoomList = this.pdService.allRoomsData();
+            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;
             var userNameArray = new Array();
             for (var index = 0; index < userConsoleData.length; index++) {
-                var element = userConsoleData[index][1];
+                var element = userConsoleData[index].userName;
                 userNameArray.push(element);
             }
             var uniqueUserName = __spread(new Set(userNameArray));
@@ -1335,8 +1377,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';
         };
@@ -1452,9 +1501,32 @@
         { type: PrincipalDashboardLibV2Service }
     ]; };
 
+    var EXCEL_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8';
+    var EXCEL_EXTENSION = '.xlsx';
     var ExceldataService = /** @class */ (function () {
         function ExceldataService() {
+            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;
+            var myobj = { Sheets: {}, SheetNames: [] };
+            for (var i = 0; i < json.length; i++) {
+                var worksheet = XLSX.utils.json_to_sheet(json[i]);
+                myobj.Sheets[this.tabName[i].name] = worksheet;
+                myobj.SheetNames.push(this.tabName[i].name);
+            }
+            var workbook = myobj;
+            excelBuffer = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' });
+            this.saveAsExcelFile(excelBuffer, excelFileName);
+        };
+        ExceldataService.prototype.saveAsExcelFile = function (buffer, fileName) {
+            var data = new Blob([buffer], {
+                type: EXCEL_TYPE
+            });
+            FileSaver.saveAs(data, fileName + EXCEL_EXTENSION);
+        };
+        //_____FOR EXCEL CONVERTOR END
         ExceldataService.prototype.genarateResourseReqiuredData_Excel = function (data) {
             var resouseID;
             var title;
@@ -1541,8 +1613,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) {
@@ -1740,6 +1814,7 @@
             return { usersMetadata: usersMetadataMatrix, schoolTerminalData: schoolTerminalMatrix, userConsoleData: userConsoleMatrix };
         };
         ExceldataService.prototype.deatilData_Excel = function (userConsoleMatrix, resourceMetadataMatrix) {
+            // console.log("resourceMetadataMatrix",resourceMetadataMatrix);
             var currentDate;
             var resourceMatrixForExcel = new Array();
             resourceMatrixForExcel = [];
@@ -1780,12 +1855,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);
                 }
@@ -1809,26 +1884,22 @@
                                 // 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;
                             }
                         }
                     }
                 }
             }
             // console.log("resourceMatrixForExcel",[...new Set(resourceMatrixForExcel)]);
+            // console.log("resourceMatrixForExcel",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 = {
+                        // Sr_No: i+1,
                         Name: resourceMatrixForExcel[i][0],
                         Subjects: resourceMatrixForExcel[i][1],
                         Date: resourceMatrixForExcel[i][2],
@@ -1847,19 +1918,24 @@
                     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();
             var userObjectList = new Array();
             var classRooms = new Array();
             var datesAccess = new Array();
             var grades = new Array();
             var subjectTought = new Array();
+            // let unique_resourceTypeList = []; 
             var duration = 0;
             for (var i = 0; i < userMetadataList.length; i++) {
                 resourcelist = [];
+                resourceTypeList = [];
                 classRooms = [];
                 datesAccess = [];
                 grades = [];
@@ -1867,7 +1943,12 @@
                 duration = 0;
                 for (var j = 0; j < resourceMatrixForExcel.length; j++) {
                     if (userMetadataList[i].userId === resourceMatrixForExcel[j][14]) {
-                        resourcelist.push(resourceMatrixForExcel[j][12]);
+                        if (resourceMatrixForExcel[j][12] != '') {
+                            resourcelist.push(resourceMatrixForExcel[j][12]);
+                        }
+                        if (resourceMatrixForExcel[j][13] != '') {
+                            resourceTypeList.push(resourceMatrixForExcel[j][13]);
+                        }
                         duration = duration + resourceMatrixForExcel[j][5];
                         classRooms.push(resourceMatrixForExcel[j][6]);
                         datesAccess.push(resourceMatrixForExcel[j][2]);
@@ -1910,6 +1991,10 @@
                 else {
                     SubjectTought = '';
                 }
+                // 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,
@@ -1919,35 +2004,31 @@
                     DayAccess: dayAccess,
                     Grades: Grades,
                     SubjectTought: SubjectTought,
-                    AseestUsed: resourcelist
+                    AseestUsed: resourcelist,
+                    AssetType: resourceTypeList
                 };
                 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();
-            for (var i = 0; i < userObjectList.length; i++) {
-                asset_mediaList = [];
-                questionList = [];
-                whiteBoardList = [];
-                asset_printList = [];
-                for (var j = 0; j < userObjectList[i].AseestUsed.length; j++) {
-                    if (userObjectList[i].AseestUsed[j] === "asset_media") {
-                        asset_mediaList.push(userObjectList[i].AseestUsed[j]);
-                    }
-                    else if (userObjectList[i].AseestUsed[j] === "asset_print") {
-                        asset_printList.push(userObjectList[i].AseestUsed[j]);
-                    }
-                    else if (userObjectList[i].AseestUsed[j] === "whiteboard") {
-                        whiteBoardList.push(userObjectList[i].AseestUsed[j]);
-                    }
-                    else if (userObjectList[i].AseestUsed[j] === "question") {
-                        questionList.push(userObjectList[i].AseestUsed[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,
@@ -1955,14 +2036,16 @@
                     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);
             return userSummaryList;
         };
         return ExceldataService;
@@ -1994,7 +2077,9 @@
         }
         Object.defineProperty(HeaderComponent.prototype, "data", {
             set: function (res) {
-                this.loadData(res);
+                if (res !== null) {
+                    this.loadData(res);
+                }
             },
             enumerable: false,
             configurable: true
@@ -2006,6 +2091,7 @@
         HeaderComponent.prototype.getDefaultDate = function () {
             var date = new Date();
             this.getDateFormat(date);
+            this.todayDate = this.calenderCurrentDate;
         };
         HeaderComponent.prototype.dateSelected = function (e) {
             this.getDateFormat(e);
@@ -2032,7 +2118,6 @@
             }
             var today = year + "-" + m + "-" + d;
             this.currentDate = today;
-            this.todayDate = today.split("-").reverse().join("-");
             this.calenderCurrentDate = today.split("-").reverse().join("-");
         };
         // selectDate(e: any) {
@@ -2050,7 +2135,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 () {
@@ -2066,6 +2153,7 @@
         };
         HeaderComponent.prototype.countDown = function () {
             var _this = this;
+            console.log("countDown");
             this.clearTimer();
             this.intervalId = window.setInterval(function () {
                 _this.refreshTimer -= 1;
@@ -2106,6 +2194,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,
@@ -2117,7 +2209,7 @@
         };
         HeaderComponent.prototype.exportReport = function () {
             if (this.mydata) {
-                this.pdService.exportAsExcelFile(this.dataList, 'UsageReport-' + this.calenderCurrentDate);
+                this.excelService.exportAsExcelFile(this.dataList, 'UsageReport-' + this.calenderCurrentDate);
             }
         };
         HeaderComponent.prototype.ngOnDestroy = function () {
@@ -2128,7 +2220,7 @@
     HeaderComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'lib-header',
-                    template: "<div id=\"pd_header\" class=\"pd_header\">\r\n \r\n  <div *ngIf=\"message && (this.todayDate === this.calenderCurrentDate)\" id=\"pd_refeshView\" class=\"pd_refesh_bar\">\r\n   <div class=\"timer_msg\"> This page will be refreshed in</div>\r\n   <div  class=\"timer_value\"> {{timeConvert(message)}} min</div>\r\n   <div id=\"pd_refeshBtn\" (click)=\"refreshChart()\"> Refresh </div>\r\n  </div>\r\n\r\n  <div id=\"pd_exportBtn\" class=\"pd_exportButton\"\r\n   [ngClass]=\"{'pd_exportButton_shiftRight': this.todayDate != this.calenderCurrentDate}\" (click)=\"exportReport()\"> \r\n    <span class=\"pd_exportButton_text\">Export usage report</span>\r\n    <div class=\"pd_download_icon\"></div>\r\n  </div>\r\n  \r\n  <div class=\"pd_header_calendar\">\r\n   <!-- <input type=\"Date\" [max]=\"currentDate\" [value]=\"currentDate\" id=\"myCalendar\" (input)=\"selectDate($event)\" /> -->\r\n    <ngx-datepicker [(ngModel)]=\"date\" [options]=\"options\"  (ngModelChange)=\"dateSelected($event)\"></ngx-datepicker>\r\n  </div>\r\n  <div  class=\"pd_header_content\" >Realtime usage data</div>\r\n</div>\r\n",
+                    template: "<div id=\"pd_header\" class=\"pd_header\">\r\n \r\n  <div *ngIf=\"message && mydata && (this.todayDate === this.calenderCurrentDate)\" id=\"pd_refeshView\" class=\"pd_refesh_bar\">\r\n   <div class=\"timer_msg\"> This page will be refreshed in</div>\r\n   <div  class=\"timer_value\"> {{timeConvert(message)}} min</div>\r\n   <div id=\"pd_refeshBtn\" (click)=\"refreshChart()\"> Refresh </div>\r\n  </div>\r\n\r\n  <div id=\"pd_exportBtn\" class=\"pd_exportButton\" *ngIf=\"mydata\"\r\n   [ngClass]=\"{'pd_exportButton_shiftRight': this.todayDate != this.calenderCurrentDate}\" (click)=\"exportReport()\"> \r\n    <span class=\"pd_exportButton_text\">Export usage report</span>\r\n    <div class=\"pd_download_icon\"></div>\r\n  </div>\r\n  \r\n  <div class=\"pd_header_calendar\">\r\n   <!-- <input type=\"Date\" [max]=\"currentDate\" [value]=\"currentDate\" id=\"myCalendar\" (input)=\"selectDate($event)\" /> -->\r\n    <ngx-datepicker [(ngModel)]=\"date\" [options]=\"options\"  (ngModelChange)=\"dateSelected($event)\"></ngx-datepicker>\r\n  </div>\r\n  <div  class=\"pd_header_content\" >Realtime usage data</div>\r\n</div>\r\n",
                     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:#c4c4c4;font-size:10pt;font-weight:400;transition:right .5s}.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}"]
                 },] }
     ];
@@ -2149,7 +2241,9 @@
         }
         Object.defineProperty(TableviewComponent.prototype, "data", {
             set: function (res) {
-                this.loadTable(res);
+                if (res !== null) {
+                    this.loadTable(res);
+                }
             },
             enumerable: false,
             configurable: true
@@ -2163,11 +2257,11 @@
             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 
-                    var fetchAlluserList = this.pdService.allUserChartData(genarateUserReqiuredData.userConsoleData, genarateUserReqiuredData.usersMetadata);
+                    //  get all user list 
+                    var fetchAlluserList = this.pdService.allUserChartData();
                     this.alluserList = fetchAlluserList.fordurationTable;
                     // resoureMetadata list
                     this.currentResoursedataList = this.pdService.genarateResourseReqiuredData(this.myXmlData);