principal-dashboard-lib-v2 0.0.21 → 0.0.23

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

@@ -144,7 +144,7 @@
                         var listOfUser = {};
                         if (usersMetadata[i_1].userId != "") {
                             userId = usersMetadata[i_1].userId;
-                            console.log("--chartDataUserWise-->>", usersMetadata[i_1].fullName);
+                            //console.log("--chartDataUserWise-->>",usersMetadata[i].terminalIP)
                             if (usersMetadata[i_1].fullName !== undefined) {
                                 userName = usersMetadata[i_1].fullName; // get name of user w.r.t. ID
                             }
@@ -167,7 +167,9 @@
                     }
                 }
                 for (var i = 0; i < usersMetadataMatrix.length; i++) {
+                    console.log('usersMetadataMatrix-->', usersMetadataMatrix[i].userName);
                     usersMetadataMatrix.forEach(function (element) {
+                        console.log('element.userName-->>', element.userName);
                         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
@@ -246,6 +248,8 @@
                         var userName = void 0;
                         var userSubjects = void 0;
                         var terminalLocation = void 0;
+                        var launchedFrom = [];
+                        console.log('myuserConsole', userConsole[index]);
                         //----------//user iD
                         if (userConsole[index].userId !== undefined) {
                             userId = userConsole[index].userId; // get name of user w.r.t. ID
@@ -300,14 +304,21 @@
                             if (userConsoleResources.userConsoleResource !== undefined) {
                                 // satyajit resource wise duration added
                                 userConsoleResources.userConsoleResource.forEach(function (item) {
+                                    console.log("lookingFor: ", item);
                                     resourceMetauserConsoleData.push(item.resourceId); // get name of user w.r.t. ID
                                     resourceDurationFromConsole.push(item.duration);
+                                    if (item.launchedFrom) {
+                                        launchedFrom.push(item.launchedFrom);
+                                    }
+                                    // 
                                 });
                                 // resourceMetauserConsoleData = userConsoleResources.userConsoleResource[index]resourceId; // get name of user w.r.t. ID
                             }
                             else {
+                                console.log("lookingFor: ELSE ");
                                 resourceMetauserConsoleData = [];
                                 resourceDurationFromConsole = [];
+                                launchedFrom = [];
                             }
                         }
                         //----------// userName and userSubjects
@@ -340,6 +351,7 @@
                             terminalIP: terminalIP,
                             resourceMetauserConsoleData: resourceMetauserConsoleData,
                             resourceDurationFromConsole: resourceDurationFromConsole,
+                            launchedFrom: launchedFrom,
                             duration: duration,
                             terminalLocation: terminalLocation,
                             userSubjects: userSubjects
@@ -365,17 +377,27 @@
             var dataTableforChart = new Array();
             dataTableforChart = [];
             if (this.userConsoleData) {
-                console.log("chartDataUserWiseNew-->>", this.userConsoleData);
                 if (this.userConsoleData.length > 0) {
                     for (var i = 0; i < this.userConsoleData.length; i++) {
+                        console.log("chartDataUserWiseNew-->>", this.userConsoleData);
+                        //console.log("chartDataUserWiseNew-->>",this.userConsoleData.userName)
+                        if (typeof this.userConsoleData[i].userName === undefined) {
+                            this.userConsoleData[i].userName = (Math.floor(Math.random() * 100)).toString();
+                        }
+                        /// SATYAJIT TO CHECK 19 SEPT.
                         if (this.userConsoleData[i].userName === undefined) {
                             this.userConsoleData[i].userName = "-";
+                            //this.userConsoleData.splice(i, 1);
                         }
-                        if (this.userConsoleData[i].userName === "-" || this.userConsoleData[i].userName === "--") {
-                            this.userConsoleData.splice(i, 1); // 2nd parameter means remove one item only
+                        /*
+                        if(this.userConsoleData[i].userName === "-"){
+                          this.userConsoleData.splice(i, 1); // 2nd parameter means remove one item only
+                        }*/
+                        //if(this.userConsoleData[i].userName !== undefined || this.userConsoleData[i].userName !== '-' || this.userConsoleData[i].userName !== '--')
+                        {
+                            var userData = [this.userConsoleData[i].userName, this.userConsoleData[i].startTime, this.userConsoleData[i].endTime];
+                            dataTableforChart.push(userData);
                         }
-                        var userData = [this.userConsoleData[i].userName, this.userConsoleData[i].startTime, this.userConsoleData[i].endTime];
-                        dataTableforChart.push(userData);
                         //console.log("chartDataUserWiseNewNew-->>",userData)
                     }
                 }
@@ -471,16 +493,25 @@
                     AlluserDetails_1.push(myChartRowuserConsoleData);
                 }
                 setTimeout(function () {
-                    for (var i = 0; i < AlluserDetails_1.length; i++) {
-                        console.log("alluser-3->>", AlluserDetails_1[i].userName);
-                        if (AlluserDetails_1[i].userName === undefined) {
-                            AlluserDetails_1[i].userName = "--";
-                        }
-                        if (AlluserDetails_1[i].userName === "--") {
-                            //AlluserDetails.splice(i, 1); // 2nd parameter means remove one item only
+                    var _loop_2 = function (i) {
+                        console.log("alluser-3->>", AlluserDetails_1[i]);
+                        if (AlluserDetails_1[i].userName == undefined) {
+                            //AlluserDetails[i].userName = "--"
+                            AlluserDetails_1.splice(i, 1); // 2nd parameter means remove one item only
+                        }
+                        //if(AlluserDetails[i].userName !== undefined || AlluserDetails[i].userName !== '-' || AlluserDetails[i].userName !== '--')
+                        {
+                            if (AlluserDetails_1[i].userName === "--") {
+                                AlluserDetails_1.splice(i, 1); // 2nd parameter means remove one item only
+                            }
+                            setTimeout(function () {
+                                var userData = [AlluserDetails_1[i].userName, AlluserDetails_1[i].startTime, AlluserDetails_1[i].endTime];
+                                dataTableforChart.push(userData);
+                            }, 300);
                         }
-                        var userData = [AlluserDetails_1[i].userName, AlluserDetails_1[i].startTime, AlluserDetails_1[i].endTime];
-                        dataTableforChart.push(userData);
+                    };
+                    for (var i = 0; i < AlluserDetails_1.length; i++) {
+                        _loop_2(i);
                     }
                 }, 50);
                 /*
@@ -542,7 +573,7 @@
             return { forChartData: dataTableforChart, fordurationTable: allRoomsDetails };
         };
         PrincipalDashboardLibV2Service.prototype.dataForTableView = function (userConsoleMatrix, resourceMetadataMatrix) {
-            console.log("AAA userConsoleMatrix", userConsoleMatrix);
+            console.log("AAA userConsoleMatrix", userConsoleMatrix, "-resourceMetadataMatrix->", resourceMetadataMatrix);
             var currentDate;
             var resourceMatrixForTableChart = new Array();
             var resourceMatrixForExcel = new Array();
@@ -568,6 +599,7 @@
                 var resourceArrayForExcel = new Array();
                 var resourceArrayForTableChart = new Array();
                 var userConsoleDataMatrix = new Array();
+                var launchedFrom = void 0;
                 resourceArrayForTableChart = [];
                 userConsoleDataMatrix = [];
                 //----------------- for subject and Name
@@ -587,6 +619,11 @@
                 var roomDetail = location + ' ' + terminalIP;
                 resourceMetadataIDs = userConsoleMatrix[i].resourceMetauserConsoleData;
                 resourceMetadataIDsDuration = userConsoleMatrix[i].resourceDurationFromConsole;
+                //console.log('mlaunchedFrom-->> ',(typeof userConsoleMatrix[i].launchedFrom));
+                //console.log('mlaunchedFrom-->> ',( userConsoleMatrix[i].launchedFrom));
+                var launchDataArr = Array(userConsoleMatrix[i].launchedFrom);
+                console.log('mlaunchedFrom len-->> ', launchDataArr);
+                launchedFrom = launchDataArr;
                 if (resourceMetadataIDs.length === 0) {
                     subject = undefined;
                     grade = undefined;
@@ -595,7 +632,7 @@
                     AssestDetail = undefined;
                     resourceTitle = undefined;
                     resourceType = undefined;
-                    resourceArrayForTableChart = [teacherName, teacherSubject, currentDate, startTime, endTime, duration, roomDetail, subject, grade, chapter, teachingpoint, AssestDetail];
+                    resourceArrayForTableChart = [teacherName, teacherSubject, currentDate, startTime, endTime, duration, roomDetail, subject, grade, chapter, teachingpoint, AssestDetail, launchedFrom];
                     resourceMatrixForTableChart.push(resourceArrayForTableChart);
                 }
                 else {
@@ -618,7 +655,8 @@
                                     AssestDetail = this.getDisplaytypeValue(resourceMetadataMatrix[i_4].type) + " : " + resourceMetadataMatrix[i_4].title + ' : ' + this.convertSeconds(resourceMetadataIDsDuration[k]);
                                 }
                                 //AssestDetail = this.getDisplaytypeValue(resourceMetadataMatrix[i].type) + " : " + resourceMetadataMatrix[i].title + ' : ' + resourceMetadataIDsDuration[k];
-                                resourceArrayForTableChart = [teacherName, teacherSubject, currentDate, startTime, endTime, duration, roomDetail, subject, grade, chapter, teachingpoint, AssestDetail];
+                                console.log('roomDetail', roomDetail);
+                                resourceArrayForTableChart = [teacherName, teacherSubject, currentDate, startTime, endTime, duration, roomDetail, subject, grade, chapter, teachingpoint, AssestDetail, launchedFrom];
                                 resourceMatrixForTableChart.push(resourceArrayForTableChart);
                                 teacherName = undefined;
                                 teacherSubject = undefined;
@@ -843,7 +881,7 @@
             this.isChartView = true;
         }
         ChartheaderComponent.prototype.ngOnInit = function () {
-            this.libVersion = "0.0.21";
+            this.libVersion = "0.0.23";
             // this.myIcon = document.getElementById('myIconImg');
             // this.changeChatType() 
         };
@@ -1226,7 +1264,7 @@
         ChartviewComponent.prototype.ngOnInit = function () { };
         ChartviewComponent.prototype.loadChart = function (response) {
             var _this = this;
-            // console.log(' IN --> 8 loadChart');
+            console.log(' INloadChart -->', response);
             this.totalUsers = 0;
             this.eligibleUsers = 0;
             this.currentUsers = 0;
@@ -1314,7 +1352,8 @@
             while (labels.firstChild) {
                 labels.removeChild(labels.lastChild);
             }
-            this.chartDataTable = this.myChartDataMatrix;
+            var filteredData = this.myChartDataMatrix.filter(function (node) { return node[0] !== "-" && node[0] !== "--"; });
+            this.chartDataTable = filteredData; //this.myChartDataMatrix;
             console.log("this.myChartDataMatrix", this.myChartDataMatrix);
             (this.myChartOptions = {
                 tooltip: {
@@ -1336,6 +1375,9 @@
             }, 1000);
         };
         ChartviewComponent.prototype.calulateTotalDuration = function (detailViewMatrix) {
+            console.log('detailViewMatrix-->', detailViewMatrix);
+            var filteredData = detailViewMatrix.filter(function (item) { return item.userName !== "-" && item.userName !== "--"; });
+            detailViewMatrix = filteredData;
             var id_durationArray;
             var id_durationMatrix = new Array();
             id_durationMatrix = [];
@@ -1571,7 +1613,7 @@
     ChartviewComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'lib-chartview',
-                    template: "<div id=\"pd-chartview-main-container\" class=\"pd-chartview-main-container\">\n  <div id=\"userSummary\">\n    <table class=\"summaryTable\">\n      <tbody>\n        <tr>\n          <td id=\"totalUsers\" class=\"chartview-navigationbar\">\n            Total users: {{totalUsers}}\n          </td>\n          <td id=\"eligibleUsers\" class=\"chartview-navigationbar\">\n            Eligible users: {{eligibleUsers}}\n          </td>\n          <td id=\"currentUsers\" class=\"chartview-navigationbar\">\n            Current users: {{currentUsers}}\n          </td>\n          <td id=\"totalRooms\" class=\"chartview-navigationbar\">\n            Installed Classrooms: {{installedClassrooms}}\n          </td>\n          <td id=\"currentRooms\" class=\"chartview-navigationbar\">\n            Current Classrooms: {{currentRooms}}\n          </td>\n          <!-- <td\n            id=\"currentRooms\"\n            \n          >\n            <span id=\"totalUsers_list\" class=\"activeAll\">User List</span>\n          </td> -->\n        </tr>\n      </tbody>\n    </table>\n  </div>\n  <div id=\"pd-messageDivContainer\" class='pd-messageDivContainer'>\n    <div id=\"pd-messageDiv\" class='pd-messageDiv'>Click the bars to view details of content accessed by a teacher.</div>\n    <div id=\"pd-toggleContainer\" class=\"pd-toggleContainer\">\n     \n      <div id=\"pd-currentUserBtn\"  class=\"pd-currentUserBtn-div pd-commonStyleBtn\" (click)=\"showCurrentUser()\" [ngStyle]=\"{ color: isAllUsers ? '#000000' : '#ffffff' , backgroundColor: isAllUsers ? '#c4c4c4' : '#000000'}\">\n        {{currentList}}</div>\n      <div id=\"pd-allUserBtn\" class=\"pd-allUserBtn-div pd-commonStyleBtn\" (click)=\"showAllUser()\" [ngStyle]=\"{ color: isAllUsers ? '#ffffff' : '#000000' , backgroundColor: isAllUsers ? '#000000' : '#c4c4c4'}\">\n        {{allList}}</div>\n    </div>\n  </div>\n  <div id=\"pd-chartview\" class=\"pd-chartview\">\n  <div id=\"myChartDiv\">\n    <div id=\"myTimeLine\">\n      <google-chart\n        [type]=\"myChartType\"\n        [data]=\"chartDataTable\"\n        [options]=\"myChartOptions\"\n        [width]=\"myChartwidth\"\n        [height]=\"myChartHeight\"\n        (select)=\"onSelectRowData($event)\"\n        (ready)=\"myChartReady()\"\n      > \n      </google-chart>\n      \n    </div>\n    <div class=\"inline\" id=\"labels\"></div> \n   \n    \n  </div>\n</div>\n",
+                    template: "<div id=\"pd-chartview-main-container\" class=\"pd-chartview-main-container\">\n  <div id=\"userSummary\">\n    <table class=\"summaryTable\">\n      <tbody>\n        <tr>\n          <td id=\"totalUsers\" class=\"chartview-navigationbar\">\n            Total users: {{totalUsers}}\n          </td>\n          <td id=\"eligibleUsers\" class=\"chartview-navigationbar\">\n            Eligible users: {{eligibleUsers}}\n          </td>\n          <td id=\"currentUsers\" class=\"chartview-navigationbar\">\n            Current users: {{currentUsers}}\n          </td>\n          <td id=\"totalRooms\" class=\"chartview-navigationbar\">\n            Installed Classrooms: {{installedClassrooms}}\n          </td>\n          <td id=\"currentRooms\" class=\"chartview-navigationbar\">\n            Current Classrooms: {{currentRooms}}\n          </td>\n          <!-- <td\n            id=\"currentRooms\"\n            \n          >\n            <span id=\"totalUsers_list\" class=\"activeAll\">User List</span>\n          </td> -->\n        </tr>\n      </tbody>\n    </table>\n  </div>\n  <div id=\"pd-messageDivContainer\" class='pd-messageDivContainer'>\n    <div id=\"pd-messageDiv\" class='pd-messageDiv'>Click the bars to view details of content accessed by a teacher.</div>\n    <div id=\"pd-toggleContainer\" class=\"pd-toggleContainer\">\n     \n      <div id=\"pd-currentUserBtn\"  class=\"pd-currentUserBtn-div pd-commonStyleBtn\" (click)=\"showCurrentUser()\" [ngStyle]=\"{ color: isAllUsers ? '#000000' : '#ffffff' , backgroundColor: isAllUsers ? '#c4c4c4' : '#000000'}\">\n        {{currentList}}</div>\n      <div id=\"pd-allUserBtn\" class=\"pd-allUserBtn-div pd-commonStyleBtn\" (click)=\"showAllUser()\" [ngStyle]=\"{ color: isAllUsers ? '#ffffff' : '#000000' , backgroundColor: isAllUsers ? '#000000' : '#c4c4c4'}\">\n        {{allList}}</div>\n    </div>\n  </div>\n  <div id=\"pd-chartview\" class=\"pd-chartview\">\n  <div id=\"myChartDiv\">\n    <div id=\"myTimeLine\">\n      <google-chart\n        [type]=\"myChartType\"\n        [data]=\"chartDataTable\"\n        [options]=\"myChartOptions\"\n        [width]=\"myChartwidth\"\n        [height]=\"myChartHeight\"\n        (select)=\"onSelectRowData($event)\"\n        (ready)=\"myChartReady()\"\n      > \n      </google-chart>\n      \n    </div>\n    <div class=\"inline babloo\" id=\"labels\"></div> \n   \n    \n  </div>\n</div>\n",
                     styles: [".pd-chartview-main-container .pd-chartview{display:block;overflow:scroll;width:100%;height:484px;font-family:Tahoma;font-size:12pt;font-weight:400;color:#666;margin:10 auto;text-align:center;padding-top:1px}.pd-chartview-main-container #userSummary{background:#e0e0e0;margin-top:1px}.pd-chartview-main-container #roomSummary,.pd-chartview-main-container #userSummary{position:relative;width:100%;text-align:center;padding-top:6px;padding-bottom:6px;font-size:13px}.pd-chartview-main-container .pd-messageDivContainer{margin-top:1px}.pd-chartview-main-container .pd-messageDivContainer .pd-messageDiv{width:-webkit-fit-content;width:-moz-fit-content;width:fit-content;position:absolute;margin-left:5px;font-size:13px}.pd-chartview-main-container .pd-messageDivContainer .pd-toggleContainer{line-height:30px;width:-webkit-fit-content;width:-moz-fit-content;width:fit-content;float:right;margin:5px 0}.pd-chartview-main-container .pd-messageDivContainer .pd-allUserBtn-div{border-radius:0 5px 5px 0}.pd-chartview-main-container .pd-messageDivContainer .pd-currentUserBtn-div{border-radius:5px 0 0 5px}.pd-chartview-main-container .pd-messageDivContainer .pd-commonStyleBtn{display:inline-block;cursor:pointer;font-size:12px;width:92px;text-align:center}.pd-chartview-main-container .summaryTable{width:100%;border-collapse:collapse;border-spacing:2px;border-color:grey}.pd-chartview-main-container .activeAll{cursor:pointer;background:none!important;border-radius:13px;border:none;width:64px;height:18px!important;line-height:18px!important;color:#45a1da;margin-right:0!important;padding:1px 5px;vertical-align:sub}.pd-chartview-main-container #myTimeLine{width:89%;height:60%;margin-left:5px;overflow-x:scroll;overflow-y:hidden;float:left}.pd-chartview-main-container #myTimeLine2{width:71px;position:relative;overflow-x:hidden;overflow-y:hidden}.pd-chartview-main-container #myChartDiv{width:100%}.pd-chartview-main-container .chartview-navigationbar{border-collapse:collapse;border-right:1px solid #999;text-align:center}.pd-chartview-main-container #labels{border-right:1px solid #b7b7b7;border-top:1px solid #b7b7b7;width:10%;float:left;font-size:1.2vw;overflow-x:hidden;overflow-y:hidden}.inline{vertical-align:top;position:relative}"]
                 },] }
     ];
@@ -2580,6 +2622,7 @@
                 this.myXmlData = JSON.parse(response);
                 if (this.myXmlData) {
                     // get current data list
+                    console.log("AAA myXmlData-->>", this.myXmlData);
                     var genarateUserReqiuredData = this.pdService.genarateUserReqiuredData(this.myXmlData);
                     this.currentdataList = genarateUserReqiuredData.userConsoleData;
                     //  get all user list 
@@ -2612,14 +2655,71 @@
                 }
             });
         };
+        TableviewComponent.prototype.findAndSimplifyNestedArray = function (data) {
+            console.log('this.tableViewData', data);
+            for (var i = 0; i < data.length; i++) {
+                if (Array.isArray(data[i])) {
+                    var nestedArray = data[i];
+                    if (nestedArray.every(function (item) { return Array.isArray(item) && item.every(function (val) { return val === item[0]; }); })) {
+                        data[i] = [[nestedArray[0][0]]];
+                    }
+                    return data[i];
+                }
+            }
+            return "No nested array found.";
+        };
         TableviewComponent.prototype.showCurrentDataUser = function () {
             this.tableViewData = this.pdService.dataForTableView(this.currentdataList, this.currentResoursedataList);
+            //this.tableViewData = this.findAndSimplifyNestedArray(this.tableViewData);
+            var newTableViewData;
+            for (var i = 0; i < this.tableViewData.length; i++) {
+                newTableViewData = this.findAndSimplifyNestedArray(this.tableViewData[i]);
+                newTableViewData[newTableViewData.length - 1] = newTableViewData[newTableViewData.length - 1][0];
+            }
+            var anotherTableViewData;
+            for (var j = 0; j < this.tableViewData.length; j++) {
+                anotherTableViewData = this.mergerSourceWithRoomData(this.tableViewData[j]);
+            }
             if (this.tableViewData) {
+                //this.ueserWiseTableView(this.tableViewData);
                 this.ueserWiseTableView(this.tableViewData);
             }
+            console.log('AAA mlaunchedFromm tableViewData', this.tableViewData);
+        };
+        TableviewComponent.prototype.mergerSourceWithRoomData = function (tableViewData) {
+            var lastIndexValue = tableViewData[tableViewData.length - 1].join(' ');
+            // Merge last index value into the 6th index
+            console.log('lastIndexValue', lastIndexValue);
+            if (lastIndexValue === 'ce6') {
+                //lastIndexValue = '<span style="color:black;"><i class="fa fa-windows" aria-hidden="true"></i></span>';
+                lastIndexValue = '<span style="color:black;"></span>';
+            }
+            else if (lastIndexValue === 'ce6-a') {
+                lastIndexValue = '<span style="color:#1b60d1;font-weight:bold;font-size:14px;"><i class="fa fa-android" aria-hidden="true"></i></span>';
+            }
+            else if (lastIndexValue === 'c') {
+                lastIndexValue = '<span style="color:#1b60d1;font-weight:bold;font-size:14px; display:flex;"><i style="margin-top:-1px;" class="fa fa-android" aria-hidden="true"></i><i style="margin-left:5px;" class="fa fa-desktop" aria-hidden="true"></i></span>';
+            }
+            //tableViewData[6] = tableViewData[6] + '\n' + lastIndexValue;
+            //tableViewData[6] = '<div style="display: flex;flex-direction: row;align-content: center;justify-content: flex-start;align-items: center;">'+lastIndexValue + '&nbsp;&nbsp;' + '<span style="font-size:11px !important;color:gray;font-weight:600;">'+tableViewData[6]+'</span></div>';
+            tableViewData[6] = '<div style="display: flex;flex-direction: row;align-content: center;justify-content: flex-start;align-items: center;">' + '<span style="font-size:11px !important;color:gray;font-weight:600;">' + tableViewData[6] + '</span>' + '<span style="color:transparent">-</span>' + lastIndexValue + '</div>';
+            // Optional: remove the last element (if no longer needed)
+            tableViewData.pop();
         };
         TableviewComponent.prototype.showAllUser = function () {
             this.tableViewData = this.pdService.dataForTableView(this.alluserList, this.currentResoursedataList);
+            //console.log('AAA userConsoleMatrix tableViewData', this.tableViewData)
+            var newTableViewData;
+            for (var i = 0; i < this.tableViewData.length; i++) {
+                newTableViewData = this.findAndSimplifyNestedArray(this.tableViewData[i]);
+                if (newTableViewData[newTableViewData.length - 1]) {
+                    newTableViewData[newTableViewData.length - 1] = newTableViewData[newTableViewData.length - 1][0];
+                }
+            }
+            var anotherTableViewData;
+            for (var j = 0; j < this.tableViewData.length; j++) {
+                anotherTableViewData = this.mergerSourceWithRoomData(this.tableViewData[j]);
+            }
             if (this.tableViewData) {
                 this.ueserWiseTableView(this.tableViewData);
             }
@@ -2644,15 +2744,30 @@
             var cnt = 0;
             for (var i = 0; i < resoureMetadata.length; i++) {
                 for (var j = 0; j < 12; j++) {
-                    var label = document.createElement('label');
-                    label.appendChild(document.createTextNode(resoureMetadata[i][j]));
-                    if (label.textContent === 'undefined' || label.textContent === undefined) {
+                    //let label = document.createElement('label');
+                    //label.appendChild(document.createTextNode(resoureMetadata[i][j]));
+                    var label = document.createElement('div');
+                    label.innerHTML = (resoureMetadata[i][j]);
+                    console.log('label.textContent', label.textContent);
+                    if (label.textContent === 'undefined' ||
+                        label.textContent === undefined ||
+                        label.textContent === 'undefined\nce6-a' ||
+                        label.textContent === 'undefined\nce6' ||
+                        label.textContent === 'undefined\n' ||
+                        label.textContent === 'undefined\nAndroid' ||
+                        label.textContent === 'undefined\nWeb' ||
+                        label.textContent === 'undefined\n' ||
+                        label.textContent === '\nundefined' ||
+                        label.textContent === ' undefined' ||
+                        label.textContent === 'undefined-' ||
+                        label.textContent === 'undefined-c' ||
+                        label.textContent === 'undefined- ') {
                         label.textContent = '';
                     }
                     labelArray.push(label);
-                    // console.log("label",label);
                 }
             }
+            //console.log("labelArray",labelArray);
             for (var j = 0; j <= resoureMetadata.length; j++) {
                 var row = document.createElement('tr');
                 var cell = void 0;
@@ -2673,8 +2788,8 @@
     TableviewComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'lib-tableview',
-                    template: "\n  <div id=\"tableViewDiv\" class=\"pd-tableViewDiv\">\n   \n    <table class=\"table table-bordered\" id=\"tableRow\">\n      <thead class=\"table-head\">\n        <tr class=\"table-headerRow\">\n          <th scope=\"col\">Teacher Name</th>\n          <th scope=\"col\">Subjects</th>\n          <th scope=\"col\">Date</th>\n          <th scope=\"col\">Start Time</th>\n          <th scope=\"col\">End Time</th>\n          <th scope=\"col\">Duration (mins)</th>\n          <th scope=\"col\">Room</th>\n          <th scope=\"col\">Subject</th>\n          <th scope=\"col\">Topic of Class</th>\n          <th scope=\"col\">Chapter Name</th>\n          <th scope=\"col\">Topic Name</th>\n          <th scope=\"col\">Assets Details</th>\n        </tr>\n      </thead>\n      <tbody id=\"tblBody\">\n       \n      </tbody>\n    </table>\n  </div>\n  \n",
-                    styles: [".pd-tableViewDiv{width:100%;height:744px;overflow:scroll}.pd-tableViewDiv #tableRow{font-size:small;width:100%;margin-left:24px;margin-top:10px}.pd-tableViewDiv .table-headerRow{font-weight:700}.pd-tableViewDiv .table-head{position:sticky;top:0;background:#fff}"]
+                    template: "\n  <div id=\"tableViewDiv\" class=\"pd-tableViewDiv\">\n   \n    <table class=\"table table-bordered\" id=\"tableRow\">\n      <thead class=\"table-head\">\n        <tr class=\"table-headerRow\">\n          <th scope=\"col\">Teacher Name</th>\n          <th scope=\"col\">Subjects</th>\n          <th scope=\"col\">Date</th>\n          <th scope=\"col\">Start Time</th>\n          <th scope=\"col\">End Time</th>\n          <th scope=\"col\">Duration (mins)</th>\n          <th scope=\"col\">Room</th>\n          <th scope=\"col\">Subject</th>\n          <th scope=\"col\">Topic of Class</th>\n          <th scope=\"col\">Chapter Name</th>\n          <th scope=\"col\">Topic Name</th>\n          <th scope=\"col\">Assets Details</th>\n          \n        </tr>\n      </thead>\n      <tbody id=\"tblBody\">\n       \n      </tbody>\n    </table>\n  </div>\n  \n",
+                    styles: [".pd-tableViewDiv{width:100%;height:744px;overflow:scroll}.pd-tableViewDiv #tableRow{font-size:small;width:100%;margin-left:24px;margin-top:10px}.pd-tableViewDiv .table-headerRow{font-weight:700}.pd-tableViewDiv .table-head{position:sticky;top:0;background:#fff}.roomCell{display:flex;flex-direction:row;align-content:center;justify-content:flex-start;align-items:center}"]
                 },] }
     ];
     TableviewComponent.ctorParameters = function () { return [