principal-dashboard-lib-v2 0.0.27 → 0.0.28

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

@@ -39,7 +39,7 @@
                 var subject = void 0;
                 var grade = void 0;
                 var chapter = void 0;
-                var teachingpoint = void 0;
+                var teachingPoint = void 0;
                 var type = void 0;
                 var resourceMetadata = data.resourcesMetadata.resourceMetadata;
                 if (resourceMetadata != undefined && resourceMetadata.length > 0) {
@@ -71,6 +71,7 @@
                             grade = '';
                         }
                         //----------//chapter
+                        //console.log('LOOKCHP',resourceMetadata[i].chapter)
                         if (resourceMetadata[i].chapter != undefined) {
                             if (resourceMetadata[i].chapter.title != undefined) {
                                 chapter = resourceMetadata[i].chapter.title;
@@ -82,17 +83,20 @@
                         else {
                             chapter = '';
                         }
-                        //----------//teachingpoint
-                        if (resourceMetadata[i].teachingpoint != undefined) {
-                            if (resourceMetadata[i].teachingpoint.title != undefined) {
-                                teachingpoint = resourceMetadata[i].teachingpoint.title;
+                        //----------//teachingPoint
+                        //console.log('LOOKTP',resourceMetadata[i].teachingPoint)
+                        if (resourceMetadata[i].teachingPoint != undefined) {
+                            if (resourceMetadata[i].teachingPoint.title != undefined) {
+                                teachingPoint = resourceMetadata[i].teachingPoint.title;
                             }
                             else {
-                                teachingpoint = '';
+                                //teachingPoint = '<span style="color:lightgray;">--</span>';
+                                teachingPoint = '';
                             }
                         }
                         else {
-                            teachingpoint = '';
+                            //teachingPoint = '<span style="color:lightgray;">--</span>';
+                            teachingPoint = '';
                         }
                         //----------//type
                         if (resourceMetadata[i].type != undefined) {
@@ -113,7 +117,7 @@
                             subject: subject,
                             grade: grade,
                             chapter: chapter,
-                            teachingpoint: teachingpoint,
+                            teachingPoint: teachingPoint,
                             type: type,
                             title: title
                         };
@@ -581,7 +585,7 @@
             return { forChartData: dataTableforChart, fordurationTable: allRoomsDetails };
         };
         PrincipalDashboardLibV2Service.prototype.dataForTableView = function (userConsoleMatrix, resourceMetadataMatrix) {
-            //console.log("AAA userConsoleMatrix",userConsoleMatrix, "-resourceMetadataMatrix->",resourceMetadataMatrix);
+            console.log("AAA userConsoleMatrix", userConsoleMatrix, "-resourceMetadataMatrix->", resourceMetadataMatrix);
             var currentDate;
             var resourceMatrixForTableChart = new Array();
             var resourceMatrixForExcel = new Array();
@@ -595,10 +599,11 @@
                 var subject = void 0;
                 var grade = void 0;
                 var chapter = void 0;
+                var topicName = void 0;
                 var AssestDetail = void 0;
                 var resourceType = void 0;
                 var resourceTitle = void 0;
-                var teachingpoint = void 0;
+                var teachingPoint = void 0;
                 var location = void 0;
                 var teacherName = void 0;
                 var teacherSubject = void 0;
@@ -636,15 +641,16 @@
                     subject = undefined;
                     grade = undefined;
                     chapter = undefined;
-                    teachingpoint = undefined;
+                    topicName = undefined;
+                    teachingPoint = undefined;
                     AssestDetail = undefined;
                     resourceTitle = undefined;
                     resourceType = undefined;
-                    resourceArrayForTableChart = [teacherName, teacherSubject, currentDate, startTime, endTime, duration, roomDetail, subject, grade, chapter, teachingpoint, AssestDetail, launchedFrom];
+                    resourceArrayForTableChart = [teacherName, teacherSubject, currentDate, startTime, endTime, duration, roomDetail, subject, grade, chapter, teachingPoint, AssestDetail, launchedFrom];
                     resourceMatrixForTableChart.push(resourceArrayForTableChart);
                 }
                 else {
-                    //resourceMetadataMatrix = [resouseID,subject,grade,chapter,teachingpoint,type,title]
+                    //resourceMetadataMatrix = [resouseID,subject,grade,chapter,teachingPoint,type,title]
                     for (var k = 0; k < resourceMetadataIDs.length; k++) {
                         for (var i_4 = 0; i_4 < resourceMetadataMatrix.length; i_4++) {
                             if (resourceMetadataIDs[k] === resourceMetadataMatrix[i_4].resouseID) {
@@ -652,7 +658,8 @@
                                 subject = resourceMetadataMatrix[i_4].subject;
                                 grade = resourceMetadataMatrix[i_4].grade;
                                 chapter = resourceMetadataMatrix[i_4].chapter;
-                                teachingpoint = resourceMetadataMatrix[i_4].teachingpoint;
+                                topicName = resourceMetadataMatrix[i_4].topicName;
+                                teachingPoint = resourceMetadataMatrix[i_4].teachingPoint;
                                 if (resourceMetadataMatrix[i_4].title.toLowerCase() === 'whiteboard' || resourceMetadataMatrix[i_4].title.toLowerCase() === 'question') {
                                     //AssestDetail = this.getDisplaytypeValue(resourceMetadataMatrix[i].type) + ' : ' + resourceMetadataIDsDuration[k] + ' sec';
                                     AssestDetail = this.getDisplaytypeValue(resourceMetadataMatrix[i_4].type) + ' : ' + this.convertSeconds(resourceMetadataIDsDuration[k]);
@@ -664,7 +671,8 @@
                                 }
                                 //AssestDetail = this.getDisplaytypeValue(resourceMetadataMatrix[i].type) + " : " + resourceMetadataMatrix[i].title + ' : ' + resourceMetadataIDsDuration[k];
                                 //console.log('roomDetail',roomDetail)
-                                resourceArrayForTableChart = [teacherName, teacherSubject, currentDate, startTime, endTime, duration, roomDetail, subject, grade, chapter, teachingpoint, AssestDetail, launchedFrom];
+                                console.log('teachingPoint', teachingPoint);
+                                resourceArrayForTableChart = [teacherName, teacherSubject, currentDate, startTime, endTime, duration, roomDetail, subject, grade, chapter, teachingPoint, AssestDetail, launchedFrom];
                                 resourceMatrixForTableChart.push(resourceArrayForTableChart);
                                 teacherName = undefined;
                                 teacherSubject = undefined;
@@ -693,7 +701,7 @@
             var grade;
             var chapter;
             var AssestDetail;
-            var teachingpoint;
+            var teachingPoint;
             var location;
             var teacherName;
             var teacherSubject;
@@ -724,21 +732,21 @@
                 subject = undefined;
                 grade = undefined;
                 chapter = undefined;
-                teachingpoint = undefined;
+                teachingPoint = undefined;
                 AssestDetail = undefined;
-                // resourceArrayForTableChart = [subject,grade,chapter,teachingpoint,AssestDetail];
+                // resourceArrayForTableChart = [subject,grade,chapter,teachingPoint,AssestDetail];
                 // detailedView_ResourceDataMatrix.push(resourceArrayForTableChart);
             }
             else {
                 //satyajit
-                //resourceMetadataMatrix = [resouseID,subject,grade,chapter,teachingpoint,type,title]
+                //resourceMetadataMatrix = [resouseID,subject,grade,chapter,teachingPoint,type,title]
                 for (var k = 0; k < resourceMetadataIDs.length; k++) {
                     for (var i = 0; i < resourceMetadataMatrix.length; i++) {
                         if (resourceMetadataIDs[k] === resourceMetadataMatrix[i].resouseID) {
                             subject = resourceMetadataMatrix[i].subject;
                             grade = resourceMetadataMatrix[i].grade;
                             chapter = resourceMetadataMatrix[i].chapter;
-                            teachingpoint = resourceMetadataMatrix[i].teachingpoint;
+                            teachingPoint = resourceMetadataMatrix[i].teachingPoint;
                             if (resourceMetadataMatrix[i].title.toLowerCase() === 'whiteboard' || resourceMetadataMatrix[i].title.toLowerCase() === 'question') {
                                 //AssestDetail = resourceMetadataMatrix[i].type + ": " + resourceMetadataIDsduration[k] + ' sec';
                                 AssestDetail = resourceMetadataMatrix[i].type + ": " + this.convertSeconds(resourceMetadataIDsduration[k]);
@@ -748,7 +756,7 @@
                                 //AssestDetail = resourceMetadataMatrix[i].type + ": " + resourceMetadataMatrix[i].title + ": " + resourceMetadataIDsduration[k] + ' sec';
                                 AssestDetail = resourceMetadataMatrix[i].type + ": " + resourceMetadataMatrix[i].title + ": " + this.convertSeconds(resourceMetadataIDsduration[k]);
                             }
-                            resourceArrayForTableChart = [subject, grade, chapter, teachingpoint, AssestDetail];
+                            resourceArrayForTableChart = [subject, grade, chapter, teachingPoint, AssestDetail];
                             detailedView_ResourceDataMatrix.push(resourceArrayForTableChart);
                         }
                     }
@@ -889,7 +897,7 @@
             this.isChartView = true;
         }
         ChartheaderComponent.prototype.ngOnInit = function () {
-            this.libVersion = "0.0.27";
+            this.libVersion = "0.0.28";
             // this.myIcon = document.getElementById('myIconImg');
             // this.changeChatType() 
         };
@@ -1407,7 +1415,7 @@
         ChartviewComponent.prototype.calulateTotalDuration = function (detailViewMatrix) {
             //
             console.log('detailViewMatrix-->', detailViewMatrix);
-            var filteredData = detailViewMatrix.filter(function (item) { return item.userName !== "-" && item.userName !== "--"; });
+            //const filteredData = detailViewMatrix.filter(item => item.userName !== "-" && item.userName !== "--");
             //detailViewMatrix = filteredData;
             var id_durationArray;
             var id_durationMatrix = new Array();
@@ -1684,13 +1692,42 @@
                         _this.createTable(data.userDetails);
                     }
                     if (data.resourceDetails.length > 0) {
-                        // console.log("data.resourceDetails",data.resourceDetails);
+                        data.resourceDetails = _this.replaceLabelChapterAndTopic(data.resourceDetails);
                         _this.createResourcesTable(data.resourceDetails);
+                        console.log("11dec resourceDetails", data.resourceDetails);
                     }
                 }
             });
             this.deatilViewContainer.style.display = 'none';
         };
+        DetailedviewComponent.prototype.replaceLabelChapterAndTopic = function (data) {
+            var htmlStr = "<span style='font-style: italic;color: #3F51B5;'>(selected)</span>";
+            return data.map(function (row) {
+                return row.map(function (cell) {
+                    if (cell.includes("Topic:")) {
+                        return cell.replace(/Topic: .*/, "Topic " + htmlStr);
+                    }
+                    if (cell.includes("Chapter:")) {
+                        return cell.replace(/Chapter: .*/, "Chapter " + htmlStr);
+                    }
+                    return cell;
+                });
+            });
+        };
+        DetailedviewComponent.prototype.replaceLabelChapterAndTopic1 = function (data) {
+            var htmlStr = "<span style='font-style: italic;color: #3F51B5;'>(selected)</span>";
+            return data.map(function (row) {
+                return row.map(function (cell) {
+                    if (cell.includes("Topic: :")) {
+                        return cell.replace(/Topic: :.*$/, "Topic " + htmlStr);
+                    }
+                    if (cell.includes("Chapter:")) {
+                        return cell.replace(/Chapter: .*$/, "Chapter " + htmlStr);
+                    }
+                    return cell;
+                });
+            });
+        };
         DetailedviewComponent.prototype.createTable = function (userMetadata) {
             this.deatilViewContainer.style.display = 'block';
             while (this.deatilViewTable.firstChild) {
@@ -1731,6 +1768,7 @@
                     if (cnt < labelArray.length) {
                         cell.appendChild(labelArray[cnt]);
                         row.appendChild(cell);
+                        //console.log('11dec', cell);
                     }
                     cnt++;
                 }
@@ -1753,7 +1791,8 @@
             for (var i = 0; i < resoureMetadata.length; i++) {
                 for (var j = 0; j < 5; j++) {
                     var label = document.createElement('label');
-                    label.appendChild(document.createTextNode(resoureMetadata[i][j]));
+                    //label.appendChild(document.createTextNode(resoureMetadata[i][j]));
+                    label.innerHTML = resoureMetadata[i][j];
                     if (label.textContent === 'undefined' || label.textContent === undefined) {
                         label.textContent = '';
                     }
@@ -1779,6 +1818,7 @@
                     if (cnt < labelArray.length) {
                         cell.appendChild(labelArray[cnt]);
                         row.appendChild(cell);
+                        //console.log('11dec', cell);
                     }
                     cnt++;
                 }
@@ -2667,6 +2707,7 @@
                     this.alluserList = fetchAlluserList.fordurationTable;
                     // resoureMetadata list
                     this.currentResoursedataList = this.pdService.genarateResourseReqiuredData(this.myXmlData);
+                    console.log('11decc data', this.currentResoursedataList);
                     //console.log("AAA genarateUserReqiuredData-->>",genarateUserReqiuredData)
                     //console.log("AAA this.currentResoursedataList-->>",this.currentResoursedataList)
                 }
@@ -2678,10 +2719,12 @@
             this.pdService.chartType.subscribe(function (data) {
                 if (data) {
                     _this.updateChartType(data);
+                    console.log('11decc data', data);
                 }
             });
             this.pdService.isUserWise_data.subscribe(function (data) {
                 _this.updateDataType(data);
+                console.log('11decc data', data);
             });
             this.pdService.isAllUsers.subscribe(function (data) {
                 if (data) {
@@ -2707,6 +2750,8 @@
         };
         TableviewComponent.prototype.showCurrentDataUser = function () {
             this.tableViewData = this.pdService.dataForTableView(this.currentdataList, this.currentResoursedataList);
+            console.log('11decc tableViewDataBBB', this.replaceTopicAndChapter(this.tableViewData));
+            this.tableViewData = this.replaceTopicAndChapter(this.tableViewData);
             //this.tableViewData = this.findAndSimplifyNestedArray(this.tableViewData);
             var newTableViewData;
             for (var i = 0; i < this.tableViewData.length; i++) {
@@ -2720,9 +2765,28 @@
             if (this.tableViewData) {
                 //this.ueserWiseTableView(this.tableViewData);
                 this.ueserWiseTableView(this.tableViewData);
+                console.log('11decc tableViewData', this.tableViewData);
+                console.log('11decc tableViewDataAAA', this.replaceTopicAndChapter(this.tableViewData));
             }
             //console.log('AAA mlaunchedFromm tableViewData', this.tableViewData)
         };
+        TableviewComponent.prototype.replaceTopicAndChapter = function (data) {
+            var htmlStr = "<span style='font-style: italic;color: #3F51B5;'>(selected)</span>";
+            return data.map(function (row) {
+                if (Array.isArray(row)) {
+                    return row.map(function (item) {
+                        if (typeof item === 'string') {
+                            //item = item.replace(/Topic :\s*(.+?)\s*:\s*0m 0s/, 'Topic: $1 ' + htmlStr);
+                            //item = item.replace(/Chapter :\s*(.+?)\s*:\s*0m 0s/, 'Chapter: $1 ' + htmlStr);
+                            item = item.replace(/Topic :\s*(.+?)\s*:\s*\d+m \d+s/, 'Topic: $1 ' + htmlStr);
+                            item = item.replace(/Chapter :\s*(.+?)\s*:\s*\d+m \d+s/, 'Chapter: $1 ' + htmlStr);
+                        }
+                        return item;
+                    });
+                }
+                return row;
+            });
+        };
         TableviewComponent.prototype.mergerSourceWithRoomData = function (tableViewData) {
             var lastIndexValue = tableViewData[tableViewData.length - 1].join(' ');
             // Merge last index value into the 6th index
@@ -2745,6 +2809,8 @@
         };
         TableviewComponent.prototype.showAllUser = function () {
             this.tableViewData = this.pdService.dataForTableView(this.alluserList, this.currentResoursedataList);
+            console.log('11decc tableViewDataBBB', this.replaceTopicAndChapter(this.tableViewData));
+            this.tableViewData = this.replaceTopicAndChapter(this.tableViewData);
             //console.log('AAA userConsoleMatrix tableViewData', this.tableViewData)
             var newTableViewData;
             for (var i = 0; i < this.tableViewData.length; i++) {
@@ -2785,7 +2851,7 @@
                     //label.appendChild(document.createTextNode(resoureMetadata[i][j]));
                     var label = document.createElement('div');
                     label.innerHTML = (resoureMetadata[i][j]);
-                    //console.log('label.textContent',label.textContent)
+                    //console.log('11dec label.textContent',label.textContent)
                     if (label.textContent === 'undefined' ||
                         label.textContent === undefined ||
                         label.textContent === 'undefined\nce6-a' ||