Merge pull request #301 from pandutibil/development

Tooltip property changed to new property name in the cQube info card …
Sunbird-cQube · Jul 28, 2022 · 4acc3e1 · 4acc3e1
2 parents 6989395 + 5d62525
commit 4acc3e1
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 35 deletions.
diff --git a/development/ui/back-end/core/config/nvsk/pgi_config.js b/development/ui/back-end/core/config/nvsk/pgi_config.js
@@ -5,13 +5,11 @@ const dataSourceInfo = {
             locations: [
                 {
                     name: "Location",
-                    property: "State Name",
+                    property: "state Name",
                     level: "state",
                     isState: true,
                     tooltip: {
                         name: "State/UT name"
-                        //valueAsName: true,
-                        //property: "Started"
                     }
                 },
                 {

diff --git a/development/ui/front-end/package-lock.json b/development/ui/front-end/package-lock.json
diff --git a/development/ui/front-end/package.json b/development/ui/front-end/package.json
@@ -31,7 +31,7 @@
     "@ngx-translate/http-loader": "^7.0.0",
     "@project-sunbird/sb-themes": "^0.0.78",
     "color2k": "^2.0.0",
-    "cqube-library": "^4.10.24",
+    "cqube-library": "^4.10.25",
     "crypto-js": "^4.1.1",
     "highcharts": "^10.1.0",
     "leaflet": "^1.6.0",

diff --git a/...pment/ui/front-end/src/app/views/curriculum-framework/curriculum-framework.component.html b/...pment/ui/front-end/src/app/views/curriculum-framework/curriculum-framework.component.html
@@ -3,7 +3,7 @@
     <div class="grid gap-4 xs:grid-cols-2 xmd:grid-cols-4 md:grid-cols-5 lg:grid-cols-6">
         <ng-container>
             <div class="col-span-1 xs:py-2 md:py-4" *ngFor="let metric of NCFMetrics">
-                <sb-cqube-info-card [name]="metric?.name" [value]="metric?.value" [tooltip]="metric?.tooltip"></sb-cqube-info-card>
+                <sb-cqube-info-card [name]="metric?.name" [value]="metric?.value" [tooltipName]="metric?.tooltip"></sb-cqube-info-card>
             </div>
         </ng-container>
     </div>

diff --git a/development/ui/front-end/src/app/views/digital-learning/digital-learning.component.html b/development/ui/front-end/src/app/views/digital-learning/digital-learning.component.html
@@ -7,7 +7,7 @@
         <!-- <button class="bg-blue-500">Access to ETB Program</button> -->
         <ng-container *ngIf="ETBMetrics">
             <div class="" *ngFor="let metric of ETBMetrics">
-                <sb-cqube-info-card [name]="metric?.name" [value]="metric?.value" [tooltip]="metric?.tooltip"></sb-cqube-info-card>
+                <sb-cqube-info-card [name]="metric?.name" [value]="metric?.value" [tooltipName]="metric?.tooltip"></sb-cqube-info-card>
             </div>
         </ng-container>
     </div>

diff --git a/...rc/app/views/foundational-literacy-numeracy/foundational-literacy-numeracy.component.html b/...rc/app/views/foundational-literacy-numeracy/foundational-literacy-numeracy.component.html
@@ -3,7 +3,7 @@
     <div class="grid gap-4 cQ-Grid">
         <ng-container>
             <div class="" *ngFor="let metric of nipunBharathMetrics">
-                <sb-cqube-info-card [name]="metric?.name" [value]="metric?.value" [tooltip]="metric?.tooltip"></sb-cqube-info-card>
+                <sb-cqube-info-card [name]="metric?.name" [value]="metric?.value" [tooltipName]="metric?.tooltip"></sb-cqube-info-card>
             </div>
         </ng-container>
     </div>

diff --git a/...lopment/ui/front-end/src/app/views/improvement-program/improvement-program.component.html b/...lopment/ui/front-end/src/app/views/improvement-program/improvement-program.component.html
@@ -3,7 +3,7 @@
     <div class="grid gap-4 cQ-Grid">
         <ng-container>
             <div class="" *ngFor="let metric of microImprovementMetricsData">
-                <sb-cqube-info-card [name]="metric?.name" [value]="metric?.value" [tooltip]="metric?.tooltip"></sb-cqube-info-card>
+                <sb-cqube-info-card [name]="metric?.name" [value]="metric?.value" [tooltipName]="metric?.tooltip"></sb-cqube-info-card>
             </div>
         </ng-container>
     </div>

diff --git a/development/ui/front-end/src/app/views/nishtha/nishtha.component.html b/development/ui/front-end/src/app/views/nishtha/nishtha.component.html
@@ -5,7 +5,7 @@
     <div class="grid gap-4 cQ-Grid">
         <ng-container>
             <div class="" *ngFor="let metric of nisithaMetrics">
-                <sb-cqube-info-card [name]="metric?.name" [value]="metric?.value" [tooltip]="metric?.tooltip"></sb-cqube-info-card>
+                <sb-cqube-info-card [name]="metric?.name" [value]="metric?.value" [tooltipName]="metric?.tooltip"></sb-cqube-info-card>
             </div>
         </ng-container>
     </div>

diff --git a/development/ui/front-end/src/app/views/nutrition-health/nutrition-health.component.html b/development/ui/front-end/src/app/views/nutrition-health/nutrition-health.component.html
@@ -3,9 +3,9 @@
     <div class="grid gap-4 cQ-Grid">
         <ng-container *ngIf="pmposhanMetricsData">
             <div class="" *ngFor="let metric of pmposhanMetricsData">
-                <!-- <app-metric-card [name]="metric?.name" [value]="metric?.value" [tooltip]="metric?.tooltip">
+                <!-- <app-metric-card [name]="metric?.name" [value]="metric?.value" [tooltipName]="metric?.tooltip">
                 </app-metric-card> -->
-                <sb-cqube-info-card [name]="metric?.name" [value]="metric?.value" [tooltip]="metric?.tooltip">
+                <sb-cqube-info-card [name]="metric?.name" [value]="metric?.value" [tooltipName]="metric?.tooltip">
                 </sb-cqube-info-card>
             </div>
         </ng-container>

diff --git a/development/ui/front-end/src/app/views/quiz/quiz.component.html b/development/ui/front-end/src/app/views/quiz/quiz.component.html
@@ -3,9 +3,9 @@
     <div class="grid gap-4 cQ-Grid">
         <ng-container *ngIf="quizzesMetricsData">
             <div class="" *ngFor="let metric of quizzesMetricsData">
-                <!--<app-metric-card [name]="metric?.name" [value]="metric?.value" [tooltip]="metric?.tooltip">
+                <!--<app-metric-card [name]="metric?.name" [value]="metric?.value" [tooltipName]="metric?.tooltip">
                 </app-metric-card>-->
-                <sb-cqube-info-card [name]="metric?.name" [value]="metric?.value" [tooltip]="metric?.tooltip"></sb-cqube-info-card>
+                <sb-cqube-info-card [name]="metric?.name" [value]="metric?.value" [tooltipName]="metric?.tooltip"></sb-cqube-info-card>
             </div>
         </ng-container>
     </div>

diff --git a/development/ui/front-end/src/app/views/school-education/school-education.component.html b/development/ui/front-end/src/app/views/school-education/school-education.component.html
@@ -3,9 +3,9 @@
     <div class="grid gap-4 cQ-Grid">
         <ng-container *ngIf="pgiMetricsData">
             <div class="" *ngFor="let metric of pgiMetricsData">
-                <!-- <app-metric-card [name]="metric?.name" [value]="metric?.value" [tooltip]="metric?.tooltip">
+                <!-- <app-metric-card [name]="metric?.name" [value]="metric?.value" [tooltipName]="metric?.tooltip">
                 </app-metric-card> -->
-                <sb-cqube-info-card [name]="metric?.name" [value]="metric?.value" [tooltip]="metric?.tooltip"></sb-cqube-info-card>
+                <sb-cqube-info-card [name]="metric?.name" [value]="metric?.value" [tooltipName]="metric?.tooltip"></sb-cqube-info-card>
             </div>
         </ng-container>
     </div>

diff --git a/development/ui/front-end/src/app/views/school-registry/school-registry.component.html b/development/ui/front-end/src/app/views/school-registry/school-registry.component.html
@@ -3,9 +3,9 @@
     <div class="grid gap-4 cQ-Grid">
         <ng-container *ngIf="udiseMetricsData">
             <div class="" *ngFor="let metric of udiseMetricsData">
-                <!--<app-metric-card [name]="metric?.name" [value]="metric?.value" [tooltip]="metric?.tooltip">
+                <!--<app-metric-card [name]="metric?.name" [value]="metric?.value" [tooltipName]="metric?.tooltip">
                 </app-metric-card>-->
-                <sb-cqube-info-card [name]="metric?.name" [value]="metric?.value" [tooltip]="metric?.tooltip"></sb-cqube-info-card>
+                <sb-cqube-info-card [name]="metric?.name" [value]="metric?.value" [tooltipName]="metric?.tooltip"></sb-cqube-info-card>
             </div>
         </ng-container>
     </div>

diff --git a/...ui/front-end/src/app/views/student-learning-survey/student-learning-survey.component.html b/...ui/front-end/src/app/views/student-learning-survey/student-learning-survey.component.html
@@ -3,9 +3,9 @@
     <div class="grid gap-4 cQ-Grid">
         <ng-container *ngIf="NASMetrics">
             <div class="" *ngFor="let metric of NASMetrics">
-                <!--<app-metric-card [name]="metric?.name" [value]="metric?.value" [tooltip]="metric?.tooltip">
+                <!--<app-metric-card [name]="metric?.name" [value]="metric?.value" [tooltipName]="metric?.tooltip">
                 </app-metric-card>-->
-                <sb-cqube-info-card [name]="metric?.name" [value]="metric?.value" [tooltip]="metric?.tooltip"></sb-cqube-info-card>
+                <sb-cqube-info-card [name]="metric?.name" [value]="metric?.value" [tooltipName]="metric?.tooltip"></sb-cqube-info-card>
             </div>
         </ng-container>
     </div>
@@ -16,7 +16,7 @@
         <mat-tab label="Implementation Status">
             <app-implementation-status></app-implementation-status>
         </mat-tab>
-        <mat-tab label="State Wise Performance ">
+        <mat-tab label="State Wise Performance">
             <div class="grid grid-cols-1">
                 <div class="col" *ngIf="NasStateData">
                     <div class="grid grid-cols-12">

diff --git a/development/ui/front-end/src/app/views/vidyanjali/vidyanjali.component.html b/development/ui/front-end/src/app/views/vidyanjali/vidyanjali.component.html
@@ -3,7 +3,7 @@
     <div class="grid gap-4 cQ-Grid">
         <ng-container *ngIf="vidyanjaliMetricsData">
             <div class="" *ngFor="let metric of vidyanjaliMetricsData">
-                <sb-cqube-info-card [name]="metric?.name" [value]="metric?.value" [tooltip]="metric?.tooltip"></sb-cqube-info-card>
+                <sb-cqube-info-card [name]="metric?.name" [value]="metric?.value" [tooltipName]="metric?.tooltip"></sb-cqube-info-card>
             </div>
         </ng-container>
     </div>