Merge pull request #300 from pandutibil/development

Break included in the tooltip after location names for the map report
Sunbird-cQube · Jul 28, 2022 · 6989395 · 6989395
2 parents c13c7d7 + 3b5d974
commit 6989395
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 20 deletions.
diff --git a/development/ui/back-end/controller/common/CommonController.js b/development/ui/back-end/controller/common/CommonController.js
@@ -251,6 +251,7 @@ async function getMapReportData(reqBody, reportConfig, rawData) {
 					}
 				}
 
+				data.tooltip += "<br>";
 				dimensions.forEach(dimension => {
 					if (dimension.weightedAverage) {
 						let numeratorSum = 0;
@@ -378,6 +379,8 @@ async function getMapReportData(reqBody, reportConfig, rawData) {
 				}
 			}
 
+			data.tooltip += "<br>";
+
 			dimensions.forEach(dimension => {
 				let value = record[dimension.property] ? record[dimension.property] : 0;
 

diff --git a/development/ui/back-end/core/config/nvsk/pgi_config.js b/development/ui/back-end/core/config/nvsk/pgi_config.js
@@ -3,6 +3,17 @@ const dataSourceInfo = {
         map: {
             pathToFile: 'pgi_all-dashboard.json',
             locations: [
+                {
+                    name: "Location",
+                    property: "State Name",
+                    level: "state",
+                    isState: true,
+                    tooltip: {
+                        name: "State/UT name"
+                        //valueAsName: true,
+                        //property: "Started"
+                    }
+                },
                 {
                     name: "Location",
                     property: "District Name",

diff --git a/development/ui/back-end/core/config/nvsk/udise_config.js b/development/ui/back-end/core/config/nvsk/udise_config.js
@@ -80,26 +80,26 @@ const dataSourceInfo = {
                 //         type: "AVG"
                 //     }
                 // },
-                {
-                    name: "% govt aided schools received textbook",
-                    property: "% govt aided schools received textbook",
-                    tooltip: {
-                        name: "% govt aided schools received textbook"
-                    },
-                    aggegration: {
-                        type: "AVG"
-                    }
-                },
-                {
-                    name: "% schools with Ramp",
-                    property: "% schools with Ramp",
-                    tooltip: {
-                        name: "% schools with Ramp"
-                    },
-                    aggegration: {
-                        type: "AVG"
-                    }
-                },
+                // {
+                //     name: "% govt aided schools received textbook",
+                //     property: "% govt aided schools received textbook",
+                //     tooltip: {
+                //         name: "% govt aided schools received textbook"
+                //     },
+                //     aggegration: {
+                //         type: "AVG"
+                //     }
+                // },
+                // {
+                //     name: "% schools with Ramp",
+                //     property: "% schools with Ramp",
+                //     tooltip: {
+                //         name: "% schools with Ramp"
+                //     },
+                //     aggegration: {
+                //         type: "AVG"
+                //     }
+                // },
                 {
                     name: "state_code",
                     property: "State Code"