principal-dashboard-lib-v2 0.0.13 → 0.0.15

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

@@ -228,7 +228,7 @@
                     }
                 }
                 if (userConsole != null && userConsole.length > 0) {
-                    for (var index = 0; index < userConsole.length; index++) {
+                    var _loop_1 = function (index) {
                         var userId = void 0;
                         var startTime = void 0;
                         var endTime = void 0;
@@ -237,7 +237,8 @@
                         var terminalIP = void 0;
                         var userConsoleResources = void 0;
                         var resourceMetadataIDS = void 0;
-                        var resourceMetauserConsoleData = new Array();
+                        var resourceMetauserConsoleData = [];
+                        var resourceDurationFromConsole = [];
                         var userName = void 0;
                         var userSubjects = void 0;
                         var terminalLocation = void 0;
@@ -258,7 +259,7 @@
                         //----------// endTime 
                         if (userConsole[index].endTime !== undefined) {
                             endTime = userConsole[index].endTime; // get name of user w.r.t. ID
-                            this.myEndTime = endTime;
+                            this_1.myEndTime = endTime;
                         }
                         else {
                             endTime = '';
@@ -293,10 +294,16 @@
                         }
                         if (userConsoleResources != null) {
                             if (userConsoleResources.userConsoleResource !== undefined) {
-                                resourceMetauserConsoleData = userConsoleResources.userConsoleResource; // get name of user w.r.t. ID
+                                // satyajit resource wise duration added
+                                userConsoleResources.userConsoleResource.forEach(function (item) {
+                                    resourceMetauserConsoleData.push(item.resourceId); // get name of user w.r.t. ID
+                                    resourceDurationFromConsole.push(item.duration);
+                                });
+                                // resourceMetauserConsoleData = userConsoleResources.userConsoleResource[index]resourceId; // get name of user w.r.t. ID
                             }
                             else {
                                 resourceMetauserConsoleData = [];
+                                resourceDurationFromConsole = [];
                             }
                         }
                         //----------// userName and userSubjects
@@ -315,9 +322,12 @@
                                 break;
                             }
                             else {
-                                terminalLocation = "location";
+                                terminalLocation = '';
                             }
                         }
+                        if (terminalLocation === undefined || terminalLocation === 'undefined') {
+                            terminalLocation = '';
+                        }
                         var userData = {
                             userId: userId,
                             userName: userName,
@@ -325,13 +335,18 @@
                             endTime: new Date(endTime),
                             terminalIP: terminalIP,
                             resourceMetauserConsoleData: resourceMetauserConsoleData,
+                            resourceDurationFromConsole: resourceDurationFromConsole,
                             duration: duration,
                             terminalLocation: terminalLocation,
                             userSubjects: userSubjects
                         };
                         userConsoleMatrix.push(userData);
-                        this.userConsoleData = userConsoleMatrix;
-                        this.isUserReqiuredDataReady.next(true);
+                        this_1.userConsoleData = userConsoleMatrix;
+                        this_1.isUserReqiuredDataReady.next(true);
+                    };
+                    var this_1 = this;
+                    for (var index = 0; index < userConsole.length; index++) {
+                        _loop_1(index);
                     }
                 }
             }
@@ -359,12 +374,12 @@
             var dataTableforChart = new Array();
             dataTableforChart = [];
             if (this.userConsoleData) {
-                console.log("this.userConsoleData", this.userConsoleData);
                 for (var i = 0; i < this.userConsoleData.length; i++) {
                     var userData = [this.userConsoleData[i].terminalIP, this.userConsoleData[i].startTime, this.userConsoleData[i].endTime];
                     dataTableforChart.push(userData);
                 }
             }
+            console.log("this.classRoomWiseChartData", dataTableforChart);
             return dataTableforChart;
         };
         PrincipalDashboardLibV2Service.prototype.allUserChartData = function () {
@@ -427,20 +442,21 @@
                 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];
+                    var userData = [this.userConsoleData[i].terminalIP, 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;
+                    console.log("schoolTerminalData", this.schoolTerminalData);
+                    inActiveClassRoom = this.schoolTerminalData[i].terminalKey;
                     myChartRowData = {
                         userId: "",
                         userName: "",
                         startTime: new Date(this.myEndTime),
                         endTime: new Date(this.myEndTime),
-                        terminalIP: "",
+                        terminalIP: inActiveClassRoom,
                         resourceMetauserConsoleData: [],
                         duration: 0,
-                        terminalLocation: inActiveClassRoom,
+                        terminalLocation: "",
                         userSubjects: ""
                     };
                     allRoomsDetails.push(myChartRowData);
@@ -451,6 +467,7 @@
             return { forChartData: dataTableforChart, fordurationTable: allRoomsDetails };
         };
         PrincipalDashboardLibV2Service.prototype.dataForTableView = function (userConsoleMatrix, resourceMetadataMatrix) {
+            console.log("AAA userConsoleMatrix", userConsoleMatrix);
             var currentDate;
             var resourceMatrixForTableChart = new Array();
             var resourceMatrixForExcel = new Array();
@@ -472,6 +489,7 @@
                 var teacherName = void 0;
                 var teacherSubject = void 0;
                 var resourceMetadataIDs = void 0;
+                var resourceMetadataIDsDuration = void 0;
                 var resourceArrayForExcel = new Array();
                 var resourceArrayForTableChart = new Array();
                 var userConsoleDataMatrix = new Array();
@@ -493,7 +511,8 @@
                 terminalIP = userConsoleMatrix[i].terminalIP;
                 var roomDetail = location + ' ' + terminalIP;
                 resourceMetadataIDs = userConsoleMatrix[i].resourceMetauserConsoleData;
-                if (resourceMetadataIDs.length == 0) {
+                resourceMetadataIDsDuration = userConsoleMatrix[i].resourceDurationFromConsole;
+                if (resourceMetadataIDs.length === 0) {
                     subject = undefined;
                     grade = undefined;
                     chapter = undefined;
@@ -509,11 +528,18 @@
                     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) {
+                                // satyajit
                                 subject = resourceMetadataMatrix[i_4].subject;
                                 grade = resourceMetadataMatrix[i_4].grade;
                                 chapter = resourceMetadataMatrix[i_4].chapter;
                                 teachingpoint = resourceMetadataMatrix[i_4].teachingpoint;
-                                AssestDetail = this.getDisplaytypeValue(resourceMetadataMatrix[i_4].type) + ": " + resourceMetadataMatrix[i_4].title;
+                                if (resourceMetadataMatrix[i_4].title.toLowerCase() === 'whiteboard' || resourceMetadataMatrix[i_4].title.toLowerCase() === 'question') {
+                                    AssestDetail = this.getDisplaytypeValue(resourceMetadataMatrix[i_4].type) + ' : ' + resourceMetadataIDsDuration[k] + ' sec';
+                                }
+                                else {
+                                    AssestDetail = this.getDisplaytypeValue(resourceMetadataMatrix[i_4].type) + " : " + resourceMetadataMatrix[i_4].title + ' : ' + resourceMetadataIDsDuration[k] + ' sec';
+                                }
+                                //AssestDetail = this.getDisplaytypeValue(resourceMetadataMatrix[i].type) + " : " + resourceMetadataMatrix[i].title + ' : ' + resourceMetadataIDsDuration[k];
                                 resourceArrayForTableChart = [teacherName, teacherSubject, currentDate, startTime, endTime, duration, roomDetail, subject, grade, chapter, teachingpoint, AssestDetail];
                                 resourceMatrixForTableChart.push(resourceArrayForTableChart);
                                 teacherName = undefined;
@@ -549,6 +575,7 @@
             var teacherSubject;
             var currentDate;
             var resourceMetadataIDs;
+            var resourceMetadataIDsduration;
             var resourceArrayForTableChart = new Array();
             resourceArrayForTableChart = [];
             //----------------- for subject and Name
@@ -567,6 +594,7 @@
             terminalIP = userConsoleMatrix[rowLabel].terminalIP;
             var roomDetail = location + ' ' + terminalIP;
             resourceMetadataIDs = userConsoleMatrix[rowLabel].resourceMetauserConsoleData;
+            resourceMetadataIDsduration = userConsoleMatrix[rowLabel].resourceDurationFromConsole;
             detailedView_UserDataMatrix = [teacherName, startTime, teacherSubject, endTime, roomDetail];
             if (resourceMetadataIDs.length == 0) {
                 subject = undefined;
@@ -578,6 +606,7 @@
                 // detailedView_ResourceDataMatrix.push(resourceArrayForTableChart);
             }
             else {
+                //satyajit
                 //resourceMetadataMatrix = [resouseID,subject,grade,chapter,teachingpoint,type,title]
                 for (var k = 0; k < resourceMetadataIDs.length; k++) {
                     for (var i = 0; i < resourceMetadataMatrix.length; i++) {
@@ -586,7 +615,12 @@
                             grade = resourceMetadataMatrix[i].grade;
                             chapter = resourceMetadataMatrix[i].chapter;
                             teachingpoint = resourceMetadataMatrix[i].teachingpoint;
-                            AssestDetail = resourceMetadataMatrix[i].type + ": " + resourceMetadataMatrix[i].title;
+                            if (resourceMetadataMatrix[i].title.toLowerCase() === 'whiteboard' || resourceMetadataMatrix[i].title.toLowerCase() === 'question') {
+                                AssestDetail = resourceMetadataMatrix[i].type + ": " + resourceMetadataIDsduration[k] + ' sec';
+                            }
+                            else {
+                                AssestDetail = resourceMetadataMatrix[i].type + ": " + resourceMetadataMatrix[i].title + ": " + resourceMetadataIDsduration[k] + ' sec';
+                            }
                             resourceArrayForTableChart = [subject, grade, chapter, teachingpoint, AssestDetail];
                             detailedView_ResourceDataMatrix.push(resourceArrayForTableChart);
                         }
@@ -723,7 +757,7 @@
             this.isChartView = true;
         }
         ChartheaderComponent.prototype.ngOnInit = function () {
-            this.libVersion = "0.0.13";
+            this.libVersion = "0.0.15";
             // this.myIcon = document.getElementById('myIconImg');
             // this.changeChatType() 
         };
@@ -1228,8 +1262,9 @@
             }
             else {
                 for (var i = 0; i < detailViewMatrix.length; i++) {
+                    // console.log("detailViewMatrix[i]",detailViewMatrix[i]);
                     id_durationArray = {
-                        name: detailViewMatrix[i].terminalLocation,
+                        name: detailViewMatrix[i].terminalIP,
                         value: parseInt(detailViewMatrix[i].duration),
                     };
                     id_durationMatrix.push(id_durationArray);
@@ -1793,7 +1828,7 @@
                 }
             }
             if (userConsole != null && userConsole.length > 0) {
-                for (var index = 0; index < userConsole.length; index++) {
+                var _loop_1 = function (index) {
                     var userId = void 0;
                     var startTime = void 0;
                     var endTime = void 0;
@@ -1802,7 +1837,8 @@
                     var terminalIP = void 0;
                     var userConsoleResources = void 0;
                     var resourceMetadataIDS = void 0;
-                    var resourceMetauserConsoleData = new Array();
+                    var resourceMetauserConsoleData = [];
+                    var resourceDurationFromConsole = [];
                     var userName = void 0;
                     var userSubjects = void 0;
                     var terminalLocation = void 0;
@@ -1823,7 +1859,7 @@
                     //----------// endTime 
                     if (userConsole[index].endTime !== undefined) {
                         endTime = userConsole[index].endTime; // get name of user w.r.t. ID
-                        this.myEndTime = endTime;
+                        this_1.myEndTime = endTime;
                     }
                     else {
                         endTime = '';
@@ -1858,10 +1894,16 @@
                     }
                     if (userConsoleResources != null) {
                         if (userConsoleResources.userConsoleResource !== undefined) {
-                            resourceMetauserConsoleData = userConsoleResources.userConsoleResource; // get name of user w.r.t. ID
+                            // satyajit resource wise duration added
+                            userConsoleResources.userConsoleResource.forEach(function (item) {
+                                resourceMetauserConsoleData.push(item.resourceId); // get name of user w.r.t. ID
+                                resourceDurationFromConsole.push(item.duration);
+                            });
+                            // resourceMetauserConsoleData = userConsoleResources.userConsoleResource; // get name of user w.r.t. ID
                         }
                         else {
                             resourceMetauserConsoleData = [];
+                            resourceDurationFromConsole = [];
                         }
                     }
                     //----------// userName and userSubjects
@@ -1886,9 +1928,14 @@
                         resourceMetauserConsoleData: resourceMetauserConsoleData,
                         duration: duration,
                         terminalLocation: terminalLocation,
-                        userSubjects: userSubjects
+                        userSubjects: userSubjects,
+                        resourceDurationFromConsole: resourceDurationFromConsole
                     };
                     userConsoleMatrix.push(userData);
+                };
+                var this_1 = this;
+                for (var index = 0; index < userConsole.length; index++) {
+                    _loop_1(index);
                 }
             }
             return { usersMetadata: usersMetadataMatrix, schoolTerminalData: schoolTerminalMatrix, userConsoleData: userConsoleMatrix };
@@ -1914,6 +1961,7 @@
                 var teacherName = void 0;
                 var teacherSubject = void 0;
                 var resourceMetadataIDs = void 0;
+                var resourceMetadataIDsDuration = void 0;
                 var resourceArrayForExcel = new Array();
                 userID = userConsoleMatrix[i].userId;
                 //----------------- for subject and Name
@@ -1934,6 +1982,7 @@
                 var locationName = location;
                 var terminalIPAddress = terminalIP;
                 resourceMetadataIDs = userConsoleMatrix[i].resourceMetauserConsoleData;
+                resourceMetadataIDsDuration = userConsoleMatrix[i].resourceDurationFromConsole;
                 if (resourceMetadataIDs.length == 0) {
                     subject = '';
                     grade = '';
@@ -1962,7 +2011,7 @@
                                 resourceTitle = resourceMetadataMatrix[i_4].title;
                                 resourceType = this.getDisplaytypeValue(resourceMetadataMatrix[i_4].type);
                                 // FOR EXCEL
-                                resourceArrayForExcel = [teacherName, teacherSubject, currentDate, startTime, endTime, duration, locationName, terminalIPAddress, subject, grade, chapter, teachingpoint, resourceTitle, resourceType, userID];
+                                resourceArrayForExcel = [teacherName, teacherSubject, currentDate, startTime, endTime, duration, locationName, terminalIPAddress, subject, grade, chapter, teachingpoint, resourceTitle, resourceType, userID, resourceMetadataIDsDuration[k]];
                                 resourceMatrixForExcel.push(resourceArrayForExcel);
                                 teacherName = '';
                                 teacherSubject = '';
@@ -2000,6 +2049,7 @@
                         tpTitle: resourceMatrixForExcel[i][11],
                         resourceTitle: resourceMatrixForExcel[i][12],
                         resourceType: resourceMatrixForExcel[i][13],
+                        'resourceDuration(sec)': resourceMatrixForExcel[i][15],
                     };
                     userList.push(data);
                 }
@@ -2101,7 +2151,7 @@
             }
             // console.log("userObjectList",userObjectList)
             var userSummaryList = new Array();
-            var _loop_1 = function (i) {
+            var _loop_2 = function (i) {
                 var Assetcounts = [];
                 //find count of present asset type
                 var presentAsset = userObjectList[i].AssetType;
@@ -2111,7 +2161,7 @@
                 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); });
+                var missingAssets = this_2.resourceTypes.filter(function (n) { return !presentAsset.includes(n); });
                 // adding missing asset with count 0 in list
                 missingAssets.forEach(function (element) {
                     Assetcounts[element] = 0;
@@ -2131,9 +2181,9 @@
                 var returnedTarget = Object.assign(asset_media, Assetcounts);
                 userSummaryList.push(returnedTarget);
             };
-            var this_1 = this;
+            var this_2 = this;
             for (var i = 0; i < userObjectList.length; i++) {
-                _loop_1(i);
+                _loop_2(i);
             }
             //  console.log("userSummaryList",userSummaryList);
             return userSummaryList;
@@ -2423,6 +2473,8 @@
                     this.alluserList = fetchAlluserList.fordurationTable;
                     // resoureMetadata list
                     this.currentResoursedataList = this.pdService.genarateResourseReqiuredData(this.myXmlData);
+                    console.log("AAA genarateUserReqiuredData-->>", genarateUserReqiuredData);
+                    console.log("AAA this.currentResoursedataList-->>", this.currentResoursedataList);
                 }
             }
             this.tableViewDiv = document.getElementById('tableViewDiv');
@@ -2471,6 +2523,7 @@
             }
         };
         TableviewComponent.prototype.ueserWiseTableView = function (resoureMetadata) {
+            console.log('AAA resoureMetadata', resoureMetadata);
             //  this.deleterow("tableRow");
             document.getElementById("tblBody").innerHTML = "";
             var labelArray = new Array();
@@ -2506,8 +2559,8 @@
     TableviewComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'lib-tableview',
-                    template: "\r\n  <div id=\"tableViewDiv\" class=\"pd-tableViewDiv\">\r\n   \r\n    <table class=\"table table-bordered\" id=\"tableRow\">\r\n      <thead>\r\n        <tr class=\"table-headerRow\">\r\n          <th scope=\"col\">Teacher Name</th>\r\n          <th scope=\"col\">Subjects</th>\r\n          <th scope=\"col\">Date</th>\r\n          <th scope=\"col\">Start Time</th>\r\n          <th scope=\"col\">End Time</th>\r\n          <th scope=\"col\">Duration (mins)</th>\r\n          <th scope=\"col\">Room</th>\r\n          <th scope=\"col\">Subject</th>\r\n          <th scope=\"col\">Topic of Class</th>\r\n          <th scope=\"col\">Chapter Name</th>\r\n          <th scope=\"col\">Topic Name</th>\r\n          <th scope=\"col\">Assets Details</th>\r\n        </tr>\r\n      </thead>\r\n      <tbody id=\"tblBody\">\r\n       \r\n      </tbody>\r\n    </table>\r\n  </div>\r\n  \r\n",
-                    styles: [".pd-tableViewDiv{width:100%;height:484px;overflow:scroll}.pd-tableViewDiv #tableRow{font-size:small;width:100%;margin-left:24px;margin-top:10px}.pd-tableViewDiv .table-headerRow{font-weight:700}"]
+                    template: "\r\n  <div id=\"tableViewDiv\" class=\"pd-tableViewDiv\">\r\n   \r\n    <table class=\"table table-bordered\" id=\"tableRow\">\r\n      <thead class=\"table-head\">\r\n        <tr class=\"table-headerRow\">\r\n          <th scope=\"col\">Teacher Name</th>\r\n          <th scope=\"col\">Subjects</th>\r\n          <th scope=\"col\">Date</th>\r\n          <th scope=\"col\">Start Time</th>\r\n          <th scope=\"col\">End Time</th>\r\n          <th scope=\"col\">Duration (mins)</th>\r\n          <th scope=\"col\">Room</th>\r\n          <th scope=\"col\">Subject</th>\r\n          <th scope=\"col\">Topic of Class</th>\r\n          <th scope=\"col\">Chapter Name</th>\r\n          <th scope=\"col\">Topic Name</th>\r\n          <th scope=\"col\">Assets Details</th>\r\n        </tr>\r\n      </thead>\r\n      <tbody id=\"tblBody\">\r\n       \r\n      </tbody>\r\n    </table>\r\n  </div>\r\n  \r\n",
+                    styles: [".pd-tableViewDiv{width:100%;height:484px;overflow:scroll}.pd-tableViewDiv #tableRow{font-size:small;width:100%;margin-left:24px;margin-top:10px}.pd-tableViewDiv .table-headerRow{font-weight:700}.pd-tableViewDiv .table-head{position:sticky;top:0;background:#fff}"]
                 },] }
     ];
     TableviewComponent.ctorParameters = function () { return [