principal-dashboard-lib-v2 0.0.9 → 0.0.10

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

@@ -307,6 +307,7 @@
                         //----------// terminalIP and terminalLocation
                         for (var i_3 = 0; i_3 < schoolTerminalMatrix.length; i_3++) {
                             if (terminalIP === schoolTerminalMatrix[i_3].terminalKey) {
+                                // console.log("schoolTerminalMatrix[i].terminalKey",terminalIP,schoolTerminalMatrix[i]);
                                 terminalLocation = schoolTerminalMatrix[i_3].location;
                             }
                         }
@@ -351,6 +352,7 @@
             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].terminalLocation, this.userConsoleData[i].startTime, this.userConsoleData[i].endTime];
                     dataTableforChart.push(userData);
@@ -646,7 +648,7 @@
             this.isChartView = true;
         }
         ChartheaderComponent.prototype.ngOnInit = function () {
-            this.libVersion = "0.0.18";
+            this.libVersion = "0.0.19";
             // this.myIcon = document.getElementById('myIconImg');
             // this.changeChatType() 
         };
@@ -1288,6 +1290,7 @@
         };
         ChartviewComponent.prototype.userWiseCurrentData = function () {
             var chartDataUserWise = this.pdService.userWiseChartData();
+            console.log("chartDataUserWise", chartDataUserWise);
             if (chartDataUserWise.length > 0) {
                 this.myChartDataMatrix = chartDataUserWise;
                 this.updateChart();
@@ -1306,6 +1309,7 @@
         };
         ChartviewComponent.prototype.classRoomWiseCurrentData = function () {
             var classRoomdata = this.pdService.classRoomWiseChartData();
+            console.log("classRoomdata", classRoomdata);
             if (classRoomdata && classRoomdata.length > 0) {
                 this.myChartDataMatrix = classRoomdata;
                 this.updateChart();
@@ -1884,13 +1888,19 @@
                                 // FOR EXCEL
                                 resourceArrayForExcel = [teacherName, teacherSubject, currentDate, startTime, endTime, duration, locationName, terminalIPAddress, subject, grade, chapter, teachingpoint, resourceTitle, resourceType, userID];
                                 resourceMatrixForExcel.push(resourceArrayForExcel);
+                                teacherName = '';
+                                teacherSubject = '';
+                                currentDate = '';
+                                startTime = '';
+                                endTime = '';
+                                locationName = '';
+                                terminalIPAddress = '';
+                                duration = '';
                             }
                         }
                     }
                 }
             }
-            // console.log("resourceMatrixForExcel",[...new Set(resourceMatrixForExcel)]);
-            // console.log("resourceMatrixForExcel",resourceMatrixForExcel);
             return resourceMatrixForExcel;
         };
         ExceldataService.prototype.deatilUsage_Excel = function (resourceMatrixForExcel) {
@@ -1905,7 +1915,7 @@
                         Date: resourceMatrixForExcel[i][2],
                         startTime: resourceMatrixForExcel[i][3],
                         endTime: resourceMatrixForExcel[i][4],
-                        duration: resourceMatrixForExcel[i][5],
+                        "duration(mins)": resourceMatrixForExcel[i][5],
                         location: resourceMatrixForExcel[i][6],
                         IP: resourceMatrixForExcel[i][7],
                         subjectTitle: resourceMatrixForExcel[i][8],
@@ -1941,6 +1951,8 @@
                 grades = [];
                 subjectTought = [];
                 duration = 0;
+                // console.log("userMetadataList[i]",userMetadataList);
+                // console.log("resourceMatrixForExcel[i]",[...new Set(resourceMatrixForExcel)]);
                 for (var j = 0; j < resourceMatrixForExcel.length; j++) {
                     if (userMetadataList[i].userId === resourceMatrixForExcel[j][14]) {
                         if (resourceMatrixForExcel[j][12] != '') {
@@ -1949,7 +1961,9 @@
                         if (resourceMatrixForExcel[j][13] != '') {
                             resourceTypeList.push(resourceMatrixForExcel[j][13]);
                         }
-                        duration = duration + resourceMatrixForExcel[j][5];
+                        if (resourceMatrixForExcel[j][5] != '') {
+                            duration = duration + resourceMatrixForExcel[j][5];
+                        }
                         classRooms.push(resourceMatrixForExcel[j][6]);
                         datesAccess.push(resourceMatrixForExcel[j][2]);
                         grades.push(resourceMatrixForExcel[j][9]);
@@ -2031,7 +2045,7 @@
                     // Sr_No: i+1,
                     Name: userObjectList[i].Name,
                     Subjects_taught: userObjectList[i].Subjects,
-                    Duration: userObjectList[i].duration,
+                    " Duration(mins)": userObjectList[i].duration,
                     ClassRooms: userObjectList[i].ClassRooms,
                     DaysAccsessed: userObjectList[i].DayAccess,
                     DatesAccess: userObjectList[i].DatesAccess,