principal-dashboard-lib-v2 0.0.9 → 0.0.12

package/README.md

@@ -1,24 +1,24 @@
-# PrincipalDashboardLibV2
-
-This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 11.2.14.
-
-## Code scaffolding
-
-Run `ng generate component component-name --project principal-dashboard-lib-v2` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module --project principal-dashboard-lib-v2`.
-> Note: Don't forget to add `--project principal-dashboard-lib-v2` or else it will be added to the default project in your `angular.json` file. 
-
-## Build
-
-Run `ng build principal-dashboard-lib-v2` to build the project. The build artifacts will be stored in the `dist/` directory.
-
-## Publishing
-
-After building your library with `ng build principal-dashboard-lib-v2`, go to the dist folder `cd dist/principal-dashboard-lib-v2` and run `npm publish`.
-
-## Running unit tests
-
-Run `ng test principal-dashboard-lib-v2` to execute the unit tests via [Karma](https://karma-runner.github.io).
-
-## Further help
-
-To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.
+# PrincipalDashboardLibV2
+
+This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 11.2.14.
+
+## Code scaffolding
+
+Run `ng generate component component-name --project principal-dashboard-lib-v2` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module --project principal-dashboard-lib-v2`.
+> Note: Don't forget to add `--project principal-dashboard-lib-v2` or else it will be added to the default project in your `angular.json` file. 
+
+## Build
+
+Run `ng build principal-dashboard-lib-v2` to build the project. The build artifacts will be stored in the `dist/` directory.
+
+## Publishing
+
+After building your library with `ng build principal-dashboard-lib-v2`, go to the dist folder `cd dist/principal-dashboard-lib-v2` and run `npm publish`.
+
+## Running unit tests
+
+Run `ng test principal-dashboard-lib-v2` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Further help
+
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.

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

@@ -96,7 +96,7 @@
                         }
                         //----------//type
                         if (resourceMetadata[i].type != undefined) {
-                            type = resourceMetadata[i].type;
+                            type = this.getDisplaytypeValue(resourceMetadata[i].type);
                         }
                         else {
                             type = '';
@@ -210,7 +210,9 @@
                         }
                         //----------//location
                         if (schoolTerminal[i].metadata !== undefined) {
-                            location = schoolTerminal[i].metadata; // get name of user w.r.t. ID
+                            var metadataJSON = JSON.parse(schoolTerminal[i].metadata);
+                            location = metadataJSON.location; // get name of user w.r.t. ID
+                            console.log("metadataJSON", location);
                         }
                         else {
                             location = '';
@@ -306,9 +308,13 @@
                         }
                         //----------// terminalIP and terminalLocation
                         for (var i_3 = 0; i_3 < schoolTerminalMatrix.length; i_3++) {
+                            console.log("schoolTerminalMatrix[i].terminalKey", terminalIP, schoolTerminalMatrix[i_3].terminalKey);
                             if (terminalIP === schoolTerminalMatrix[i_3].terminalKey) {
                                 terminalLocation = schoolTerminalMatrix[i_3].location;
                             }
+                            else {
+                                terminalLocation = "location";
+                            }
                         }
                         var userData = {
                             userId: userId,
@@ -351,6 +357,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);
@@ -475,7 +482,7 @@
                 if ((userConsoleMatrix[i].startTime != undefined && userConsoleMatrix[i].startTime != "") && (userConsoleMatrix[i].endTime != undefined && userConsoleMatrix[i].endTime != "")) {
                     startTime = userConsoleMatrix[i].startTime.toLocaleTimeString('en-US', { hour12: true });
                     endTime = userConsoleMatrix[i].endTime.toLocaleTimeString('en-US', { hour12: true });
-                    currentDate = userConsoleMatrix[i].startTime.getDate() + '/' + userConsoleMatrix[i].startTime.getMonth() + '/' + userConsoleMatrix[i].startTime.getFullYear();
+                    currentDate = userConsoleMatrix[i].startTime.getDate() + '/' + (userConsoleMatrix[i].startTime.getMonth() + 1) + '/' + userConsoleMatrix[i].startTime.getFullYear();
                 }
                 //----------------- for duration
                 duration = Math.floor(userConsoleMatrix[i].duration);
@@ -504,7 +511,7 @@
                                 grade = resourceMetadataMatrix[i_4].grade;
                                 chapter = resourceMetadataMatrix[i_4].chapter;
                                 teachingpoint = resourceMetadataMatrix[i_4].teachingpoint;
-                                AssestDetail = resourceMetadataMatrix[i_4].type + ": " + resourceMetadataMatrix[i_4].title;
+                                AssestDetail = this.getDisplaytypeValue(resourceMetadataMatrix[i_4].type) + ": " + resourceMetadataMatrix[i_4].title;
                                 resourceArrayForTableChart = [teacherName, teacherSubject, currentDate, startTime, endTime, duration, roomDetail, subject, grade, chapter, teachingpoint, AssestDetail];
                                 resourceMatrixForTableChart.push(resourceArrayForTableChart);
                                 teacherName = undefined;
@@ -586,6 +593,74 @@
             }
             return { userDetails: detailedView_UserDataMatrix, resourceDetails: detailedView_ResourceDataMatrix };
         };
+        // To GET DISPLAY TYPE
+        PrincipalDashboardLibV2Service.prototype.getDisplaytypeValue = function (key) {
+            var assetTypeConfig = [
+                {
+                    type: "asset_media",
+                    display: "Media"
+                },
+                {
+                    type: "asset_print",
+                    display: "Print"
+                },
+                {
+                    type: "quiz",
+                    display: "Quiz"
+                },
+                {
+                    type: "question",
+                    display: "Question"
+                },
+                {
+                    type: "chapter",
+                    display: "Chapter"
+                },
+                {
+                    type: "tp",
+                    display: "Topic"
+                },
+                {
+                    type: "whiteboard",
+                    display: "Whiteboard"
+                },
+                {
+                    type: "widget",
+                    display: "Widget"
+                },
+                {
+                    type: "casset_media",
+                    display: "cMedia"
+                },
+                {
+                    type: "casset_print",
+                    display: "cPrint"
+                },
+                {
+                    type: "cquiz",
+                    display: "cQuiz"
+                },
+                {
+                    type: "cquestion",
+                    display: "cQuestion"
+                },
+                {
+                    type: "image",
+                    display: "Image"
+                },
+                {
+                    type: "video",
+                    display: "Video"
+                },
+            ];
+            var displayValue = key;
+            assetTypeConfig.forEach(function (value) {
+                if (value.type === key) {
+                    displayValue = value.display;
+                }
+            });
+            return displayValue;
+        };
         return PrincipalDashboardLibV2Service;
     }());
     PrincipalDashboardLibV2Service.ɵprov = i0.ɵɵdefineInjectable({ factory: function PrincipalDashboardLibV2Service_Factory() { return new PrincipalDashboardLibV2Service(); }, token: PrincipalDashboardLibV2Service, providedIn: "root" });
@@ -646,7 +721,7 @@
             this.isChartView = true;
         }
         ChartheaderComponent.prototype.ngOnInit = function () {
-            this.libVersion = "0.0.18";
+            this.libVersion = "0.0.20";
             // this.myIcon = document.getElementById('myIconImg');
             // this.changeChatType() 
         };
@@ -1115,6 +1190,7 @@
                 labels.removeChild(labels.lastChild);
             }
             this.chartDataTable = this.myChartDataMatrix;
+            console.log("this.myChartDataMatrix", this.myChartDataMatrix);
             (this.myChartOptions = {
                 tooltip: {
                     trigger: 'none',
@@ -1288,6 +1364,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 +1383,7 @@
         };
         ChartviewComponent.prototype.classRoomWiseCurrentData = function () {
             var classRoomdata = this.pdService.classRoomWiseChartData();
+            //  console.log("classRoomdata",classRoomdata);
             if (classRoomdata && classRoomdata.length > 0) {
                 this.myChartDataMatrix = classRoomdata;
                 this.updateChart();
@@ -1335,7 +1413,7 @@
             this.currentUsers = uniqueUserName.length;
         };
         ChartviewComponent.prototype.ngOnDestroy = function () {
-            console.log('ngOnDestroy >>');
+            // console.log('ngOnDestroy >>');
         };
         return ChartviewComponent;
     }());
@@ -1591,7 +1669,7 @@
                     }
                     //----------//type
                     if (resourceMetadata[i].type != undefined) {
-                        type = resourceMetadata[i].type;
+                        type = this.getDisplaytypeValue(resourceMetadata[i].type);
                     }
                     else {
                         type = '';
@@ -1843,7 +1921,7 @@
                 if ((userConsoleMatrix[i].startTime != undefined && userConsoleMatrix[i].startTime != "") && (userConsoleMatrix[i].endTime != undefined && userConsoleMatrix[i].endTime != "")) {
                     startTime = userConsoleMatrix[i].startTime.toLocaleTimeString('en-US', { hour12: true });
                     endTime = userConsoleMatrix[i].endTime.toLocaleTimeString('en-US', { hour12: true });
-                    currentDate = userConsoleMatrix[i].startTime.getDate() + '/' + userConsoleMatrix[i].startTime.getMonth() + '/' + userConsoleMatrix[i].startTime.getFullYear();
+                    currentDate = userConsoleMatrix[i].startTime.getDate() + '/' + (userConsoleMatrix[i].startTime.getMonth() + 1) + '/' + userConsoleMatrix[i].startTime.getFullYear();
                 }
                 //----------------- for duration
                 duration = Math.floor(userConsoleMatrix[i].duration);
@@ -1880,17 +1958,23 @@
                                 chapter = resourceMetadataMatrix[i_4].chapter;
                                 teachingpoint = resourceMetadataMatrix[i_4].teachingpoint;
                                 resourceTitle = resourceMetadataMatrix[i_4].title;
-                                resourceType = resourceMetadataMatrix[i_4].type;
+                                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];
                                 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 +1989,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 +2025,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 +2035,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 +2119,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,
@@ -2048,6 +2136,74 @@
             //  console.log("userSummaryList",userSummaryList);
             return userSummaryList;
         };
+        // To GET DISPLAY TYPE
+        ExceldataService.prototype.getDisplaytypeValue = function (key) {
+            var assetTypeConfig = [
+                {
+                    type: "asset_media",
+                    display: "Media"
+                },
+                {
+                    type: "asset_print",
+                    display: "Print"
+                },
+                {
+                    type: "quiz",
+                    display: "Quiz"
+                },
+                {
+                    type: "question",
+                    display: "Question"
+                },
+                {
+                    type: "chapter",
+                    display: "Chapter"
+                },
+                {
+                    type: "tp",
+                    display: "Topic"
+                },
+                {
+                    type: "whiteboard",
+                    display: "Whiteboard"
+                },
+                {
+                    type: "widget",
+                    display: "Widget"
+                },
+                {
+                    type: "casset_media",
+                    display: "cMedia"
+                },
+                {
+                    type: "casset_print",
+                    display: "cPrint"
+                },
+                {
+                    type: "cquiz",
+                    display: "cQuiz"
+                },
+                {
+                    type: "cquestion",
+                    display: "cQuestion"
+                },
+                {
+                    type: "image",
+                    display: "Image"
+                },
+                {
+                    type: "video",
+                    display: "Video"
+                },
+            ];
+            var displayValue = key;
+            assetTypeConfig.forEach(function (value) {
+                if (value.type === key) {
+                    displayValue = value.display;
+                }
+            });
+            return displayValue;
+        };
         return ExceldataService;
     }());
     ExceldataService.ɵprov = i0.ɵɵdefineInjectable({ factory: function ExceldataService_Factory() { return new ExceldataService(); }, token: ExceldataService, providedIn: "root" });