diff --git a/development/ui/back-end/core/config/vsk/etb_config.js b/development/ui/back-end/core/config/vsk/etb_config.js index 69e712ed..dda77858 100644 --- a/development/ui/back-end/core/config/vsk/etb_config.js +++ b/development/ui/back-end/core/config/vsk/etb_config.js @@ -1,4 +1,163 @@ const dataSourceInfo = { + statesEnergizedTextBooks: { + map: { + mainFilter: 'State Code', + pathToFile: 'diksha_etb_program-started.json', + locations: [ + { + name: "Location", + property: "State", + level: "district", + isState: true, + tooltip: { + name: "State/UT name" + } + } + ], + dimensions: [ + { + name: "indicator", + property: "Energised textbooks (State & NCERT adopted)", + tooltip: { + name: "Textbooks Energized" + } + }, + ], + filters: [], + options: { + legend: { + title: 'Textbooks Energized' + } + } + }, + loTable: { + mainFilter: 'State Code', + pathToFile: 'diksha_etb_etb-coverage.json', + gaugeChart: { + title: 'Overall ETB Coverage', + aggegration: { + type: 'AVG', + column: 'State energised (ETB)', + against: "Total Physical textbooks excluding adopted (Curriculum+Supplementary)" + }, + valueSuffix: "%" + }, + columns: [ + { + name: "State/UT name", + property: "State Name" + }, + { + name: "Total Curriculum Textbooks", + property: "Total Physical textbooks excluding adopted (Curriculum+Supplementary)", + class: "text-center" + }, + { + name: "Total Energized Textbooks", + property: "Total Energised (Live ETB)", + class: "text-center" + }, + { + name: "% Energized Textbooks", + property: "ETB Coverage", + isHeatMapRequired: true, + color: '#002966' + } + ], + filters: [] + } + }, + qrCodeCoverageAcrossStates: { + map: { + pathToFile: 'diksha_etb_qr-coverage.json', + locations: [ + { + name: "Location", + property: "State Name", + level: "district", + isState: true, + tooltip: { + name: "State/UT name" + } + } + ], + dimensions: [ + { + name: "indicator", + property: "QR Coverage", + tooltip: { + name: "QR Code Content Coverage" + }, + } + ], + filters: [], + options: { + legend: { + title: 'QR Coverage' + }, + tooltip: { + reportTypeIndicator: 'percent' + } + } + }, + barChart: { + pathToFile: 'diksha_etb_qr-coverage.json', + mainFilter: 'State Code', + gaugeChart: { + title: 'Overall QR Coverage', + aggegration: { + type: 'AVG', + column: 'QR covered', + against: "Total QR Count" + }, + valueSuffix: "%" + }, + columns: [ + { + name: "State/UT name", + property: "State Name", + isLocationName: true + }, + { + name: "QR Coverage", + property: "QR Coverage" + } + ], + filters: [] + } + }, + totalPlaysPerCapita: { + map: { + pathToFile: 'diksha_etb_plays-per-capita.json', + mainFilter: 'State Code', + locations: [ + { + name: "Location", + property: "State Name", + level: "district", + isState: true, + tooltip: { + name: "State/UT name" + } + } + ], + dimensions: [ + { + name: "indicator", + property: "Plays per capita ( 1st April 2020)", + tooltip: { + name: "Learning Sessions per Capita" + }, + } + ], + filters: [], + options: { + legend: { + title: 'Learning Sessions on Potential Users' + } + } + } + }, totalLearningSessions: { barChart: { pathToFile: 'diksha_etb_learning-session.json', 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 index 83f804fe..bc2d191e 100644 --- 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 @@ -15,7 +15,7 @@
- +
@@ -28,16 +28,16 @@

Loading...

- + - + - + diff --git a/development/ui/front-end/src/app/views/digital-learning/digital-learning.component.ts b/development/ui/front-end/src/app/views/digital-learning/digital-learning.component.ts index 341b5abc..097912e5 100644 --- a/development/ui/front-end/src/app/views/digital-learning/digital-learning.component.ts +++ b/development/ui/front-end/src/app/views/digital-learning/digital-learning.component.ts @@ -80,9 +80,7 @@ export class DigitalLearningComponent implements OnInit { this.stateWiseEnrollmentData = res.result; }); - if(this.NVSK){ - this.getETBData(this.filters); - } + this.getETBData(this.filters); } ngOnInit(): void { diff --git a/development/ui/front-end/src/app/views/nishtha/pages/nisitha-stacked-bar/nisitha-stacked-bar.component.ts b/development/ui/front-end/src/app/views/nishtha/pages/nisitha-stacked-bar/nisitha-stacked-bar.component.ts index 4fa4f874..2ff2172a 100644 --- a/development/ui/front-end/src/app/views/nishtha/pages/nisitha-stacked-bar/nisitha-stacked-bar.component.ts +++ b/development/ui/front-end/src/app/views/nishtha/pages/nisitha-stacked-bar/nisitha-stacked-bar.component.ts @@ -89,7 +89,7 @@ export class NisithaStackedBarComponent implements OnInit { { type: 'bar', color: "rgb(239,243,255)", - name: '% Total Target-Enrollment', + name: '% Total Target-Enrolment', data: result.map((record: any) => { return { y: Number(Number(100 - record['% Target Achieved- Enrolment']).toFixed(2)), @@ -100,7 +100,7 @@ export class NisithaStackedBarComponent implements OnInit { { type: 'bar', color: "rgb(33,113,181)", - name: '% Target Achieved-Enrollment', + name: '% Target Achieved-Enrolment', data: result.map((record: any) => { return record['% Target Achieved- Enrolment']; })