From fe257de7b50aae1a0aef1ea1ea0db24b3fbf5970 Mon Sep 17 00:00:00 2001 From: htvenkatesh <68595990+htvenkatesh@users.noreply.github.com> Date: Wed, 19 Jul 2023 12:03:10 +0530 Subject: [PATCH 01/11] Update tsconfig.json --- tsconfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/tsconfig.json b/tsconfig.json index 55f0e1db..6a3d9c1d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -17,6 +17,7 @@ "moduleResolution": "node", "importHelpers": true, "allowSyntheticDefaultImports": true, + "skipLibCheck": true, "target": "es2020", "module": "es2020", "lib": [ From e03d2328a43259af6988fab226cda5d9089a0c23 Mon Sep 17 00:00:00 2001 From: pandutibil Date: Fri, 13 Oct 2023 19:51:23 +0530 Subject: [PATCH 02/11] PM Shri program reports are added --- src/app/app-routing.module.ts | 8 + src/app/core/config/configMapping.ts | 8 +- .../views/pm-shri/config/pm_shri_config.ts | 135 +++++++++++++++ .../implementation-status-tab.component.html | 25 +++ .../implementation-status-tab.component.scss | 0 ...mplementation-status-tab.component.spec.ts | 23 +++ .../implementation-status-tab.component.ts | 98 +++++++++++ .../bignumber-metrics.component.html | 0 .../bignumber-metrics.component.scss | 0 .../bignumber-metrics.component.spec.ts | 23 +++ .../bignumber-metrics.component.ts | 92 ++++++++++ .../implementation-status.component.html | 9 + .../implementation-status.component.scss | 0 .../implementation-status.component.spec.ts | 23 +++ .../implementation-status.component.ts | 126 ++++++++++++++ .../state-wise-performance.component.html | 9 + .../state-wise-performance.component.scss | 0 .../state-wise-performance.component.spec.ts | 23 +++ .../state-wise-performance.component.ts | 159 ++++++++++++++++++ .../state-wise-performance-tab.component.html | 22 +++ .../state-wise-performance-tab.component.scss | 0 ...ate-wise-performance-tab.component.spec.ts | 23 +++ .../state-wise-performance-tab.component.ts | 94 +++++++++++ .../views/pm-shri/pm-shri-routing.module.ts | 16 ++ src/app/views/pm-shri/pm-shri.component.html | 25 +++ src/app/views/pm-shri/pm-shri.component.scss | 0 .../views/pm-shri/pm-shri.component.spec.ts | 23 +++ src/app/views/pm-shri/pm-shri.component.ts | 83 +++++++++ src/app/views/pm-shri/pm-shri.module.ts | 30 ++++ 29 files changed, 1074 insertions(+), 3 deletions(-) create mode 100644 src/app/views/pm-shri/config/pm_shri_config.ts create mode 100644 src/app/views/pm-shri/pages/implementation-status-tab/implementation-status-tab.component.html create mode 100644 src/app/views/pm-shri/pages/implementation-status-tab/implementation-status-tab.component.scss create mode 100644 src/app/views/pm-shri/pages/implementation-status-tab/implementation-status-tab.component.spec.ts create mode 100644 src/app/views/pm-shri/pages/implementation-status-tab/implementation-status-tab.component.ts create mode 100644 src/app/views/pm-shri/pages/implementation-status-tab/reports/bignumber-metrics/bignumber-metrics.component.html create mode 100644 src/app/views/pm-shri/pages/implementation-status-tab/reports/bignumber-metrics/bignumber-metrics.component.scss create mode 100644 src/app/views/pm-shri/pages/implementation-status-tab/reports/bignumber-metrics/bignumber-metrics.component.spec.ts create mode 100644 src/app/views/pm-shri/pages/implementation-status-tab/reports/bignumber-metrics/bignumber-metrics.component.ts create mode 100644 src/app/views/pm-shri/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html create mode 100644 src/app/views/pm-shri/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.scss create mode 100644 src/app/views/pm-shri/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.spec.ts create mode 100644 src/app/views/pm-shri/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.ts create mode 100644 src/app/views/pm-shri/pages/state-wise-performance-tab/reports/state-wise-performance/state-wise-performance.component.html create mode 100644 src/app/views/pm-shri/pages/state-wise-performance-tab/reports/state-wise-performance/state-wise-performance.component.scss create mode 100644 src/app/views/pm-shri/pages/state-wise-performance-tab/reports/state-wise-performance/state-wise-performance.component.spec.ts create mode 100644 src/app/views/pm-shri/pages/state-wise-performance-tab/reports/state-wise-performance/state-wise-performance.component.ts create mode 100644 src/app/views/pm-shri/pages/state-wise-performance-tab/state-wise-performance-tab.component.html create mode 100644 src/app/views/pm-shri/pages/state-wise-performance-tab/state-wise-performance-tab.component.scss create mode 100644 src/app/views/pm-shri/pages/state-wise-performance-tab/state-wise-performance-tab.component.spec.ts create mode 100644 src/app/views/pm-shri/pages/state-wise-performance-tab/state-wise-performance-tab.component.ts create mode 100644 src/app/views/pm-shri/pm-shri-routing.module.ts create mode 100644 src/app/views/pm-shri/pm-shri.component.html create mode 100644 src/app/views/pm-shri/pm-shri.component.scss create mode 100644 src/app/views/pm-shri/pm-shri.component.spec.ts create mode 100644 src/app/views/pm-shri/pm-shri.component.ts create mode 100644 src/app/views/pm-shri/pm-shri.module.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 6a9f3cbf..06cd7514 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -173,6 +173,14 @@ routes = [ ), canLoad: [AuthGuard] }, + { + path: 'pmShri', + loadChildren: () => + import('./views/pm-shri/pm-shri.module').then( + (module) => module.PmShriModule + ), + canLoad: [AuthGuard] + }, ], }, ]; diff --git a/src/app/core/config/configMapping.ts b/src/app/core/config/configMapping.ts index a3a22474..833ec696 100644 --- a/src/app/core/config/configMapping.ts +++ b/src/app/core/config/configMapping.ts @@ -14,8 +14,7 @@ import {config as ncf } from '../../views/ncf/config/ncf_config'; import {config as quiz} from '../../views/ncert-quiz/config/quiz_config'; import{config as microImprovement} from '../../views/micro-improvements/config/microimprovements_config'; import {config as nipunBharatConfig } from '../../views/nipun-bharat/config/nipun_bharat_config'; - - +import {config as pmShriConfig } from '../../views/pm-shri/config/pm_shri_config'; export const configFiles = { studentAttendance: studentAttendaceConfig, @@ -33,7 +32,8 @@ export const configFiles = { ncf:ncf, quiz:quiz, microImprovement:microImprovement, - nipunBharat:nipunBharatConfig + nipunBharat:nipunBharatConfig, + pmShri: pmShriConfig }; export const programFolderNames = { @@ -50,6 +50,7 @@ export const programFolderNames = { ncf:'ncf', quiz:'quiz', microImprovement:'microImprovement', + pmShri: 'pm_shri' } export const stateProgramsFolderNames = { @@ -66,4 +67,5 @@ export const stateProgramsFolderNames = { ncf:'', quiz:'', microImprovement:'', + pmShri: '' } diff --git a/src/app/views/pm-shri/config/pm_shri_config.ts b/src/app/views/pm-shri/config/pm_shri_config.ts new file mode 100644 index 00000000..2f4e0a31 --- /dev/null +++ b/src/app/views/pm-shri/config/pm_shri_config.ts @@ -0,0 +1,135 @@ +export const config = { + filters: [ + { + "label": "State Wise Performance", + "name": "Metric", + "labelProp": "category_name", + "valueProp": "category_name", + "id": "metric", + "query": "select category_name from dimensions.categorypmshri where category_name in ('total_schools_having_library', 'total_schools_having_handwash_facility', 'total_schools_having_drinking_water_facility', 'total_schools_having_ramp_facility', 'total_schools_having_playground', 'total_schools_having_internet_facility')" + } + ], + implementation_status: { + "label": "Implementation Status", + "filters": [ + { + "name": "National", + "hierarchyLevel": "0", + "actions": { + "queries": { + "map": "select d.latitude, d.longitude, t.state_id, state_name ,t.status from dimensions.state as d join (select state_id , case when sum > 0 then 'YES' else 'NO' end as status from datasets.pm_shri_started_state) as t on d.state_id = t.state_id order by d.state_name asc" + }, + "level": "state", + "nextLevel": "district" + } + } + ], + "options": { + "downloadConfig": { + "fileName": "Implementation Status", + "excludeColumns": ['indicator', 'tooltip', 'Latitude', 'Longitude'] + }, + "map": { + "metricFilterNeeded": false, + "indicator": "status", + "legend": { + "title": "Implemented PM Shri" + }, + "tooltipMetrics": [ + { + "valuePrefix": "State/ UT Name: ", + "value": "state_name", + "valueSuffix": "\n" + }, + { + "valuePrefix": "Implemented PM Shri: ", + "value": "status", + "valueSuffix": "\n" + } + ] + } + } + }, + state_wise_performance: { + "label": "State Wise Performance", + "filters": + [ + { + "name": "National", + "hierarchyLevel": "0", + "actions": + { + "queries": + { + "map": "select t1.state_id, t1.state_id as level, t2.state_name, t1.category_name, sum(t3.sum) as total_schools, round(cast(sum(t1.sum) / sum(t3.sum) as numeric) * 100, 2) as percentage, t2.latitude, t2.longitude from datasets.pm_shri_pm_shri_category_h21fc2hyav9wqkf0yxrl as t1 join dimensions.state as t2 on t2.state_id = t1.state_id join datasets.pm_shri_total_schools_state as t3 on t3.state_id = t1.state_id where category_name in ('total_schools_having_library', 'total_schools_having_handwash_facility', 'total_schools_having_drinking_water_facility', 'total_schools_having_ramp_facility', 'total_schools_having_playground', 'total_schools_having_internet_facility') group by t1.state_id, t2.state_name, t1.category_name, t2.latitude, t2.longitude" + }, + "level": "state", + "nextLevel": "district" + } + } + ], + "options": + { + "downloadConfig": { + "fileName": "State Wise Performance", + "excludeColumns": ['indicator', 'tooltip', 'category_name', 'level', 'percentage', 'Latitude', 'Longitude'] + }, + "map": + { + "indicatorType": "percent", + "metricLabelProp": "category_name", + "metricValueProp": "percentage", + "groupByColumn": "level", + "metricFilterNeeded": true, + "legend": { "title": "State Wise Performance" }, + "drillDownConfig": { + "enableDrillDown": true, + "allowedLevels": [0] + }, + "tooltipMetrics": [ + { + "valuePrefix": "State/UT name: ", + "value": "state_name", + "valueSuffix": "\n" + }, + { + "valuePrefix": "Total schools: ", + "value": "total_schools", + "valueSuffix": "\n" + }, + { + "valuePrefix": "", + "value": "category_name", + "valueSuffix": "\n" + } + ] + } + } + }, + pmShri_metrics: { + "label": "District Wise Performance", + "filters": [ + { + "name": "National", + "hierarchyLevel": "0", + "actions": { + "queries": { + "bigNumber1": "select SUM(count) as total_states from datasets.pm_shri_started_state", + "bigNumber2": "select SUM(sum) as total_schools from datasets.pm_shri_total_schools_state", + "bigNumber3": "select sum(sum) as only_boys_schools from datasets.pm_shri_pm_shri_category_state0categorypmshri where category_name = 'only_boys_school'", + "bigNumber4": "select sum(sum) as only_girls_schools from datasets.pm_shri_pm_shri_category_state0categorypmshri where category_name = 'only_girls_school'", + "bigNumber5": "select sum(sum) as co_ed_schools from datasets.pm_shri_pm_shri_category_state0categorypmshri where category_name = 'co-ed_school'" + }, + "level": "state" + } + } + ], + "options": { + "bigNumber": { + "title": ['Total states/UTs', 'Total schools', 'Only boys schools', 'Only girls schools', 'Co-ed schools'], + "valueSuffix": ['', '', '', '', ''], + "property": ['total_states', 'total_schools', 'only_boys_schools', 'only_girls_schools', 'co_ed_schools'] + } + } + } +} \ No newline at end of file diff --git a/src/app/views/pm-shri/pages/implementation-status-tab/implementation-status-tab.component.html b/src/app/views/pm-shri/pages/implementation-status-tab/implementation-status-tab.component.html new file mode 100644 index 00000000..fc54a6b1 --- /dev/null +++ b/src/app/views/pm-shri/pages/implementation-status-tab/implementation-status-tab.component.html @@ -0,0 +1,25 @@ +
+
+
+ +
+
+ + +
+
+
+
+
+
+ +
+
+
+
+ +
+
+
\ No newline at end of file diff --git a/src/app/views/pm-shri/pages/implementation-status-tab/implementation-status-tab.component.scss b/src/app/views/pm-shri/pages/implementation-status-tab/implementation-status-tab.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/views/pm-shri/pages/implementation-status-tab/implementation-status-tab.component.spec.ts b/src/app/views/pm-shri/pages/implementation-status-tab/implementation-status-tab.component.spec.ts new file mode 100644 index 00000000..924d8d7d --- /dev/null +++ b/src/app/views/pm-shri/pages/implementation-status-tab/implementation-status-tab.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ImplementationStatusTabComponent } from './implementation-status-tab.component'; + +describe('ImplementationStatusTabComponent', () => { + let component: ImplementationStatusTabComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ImplementationStatusTabComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(ImplementationStatusTabComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/views/pm-shri/pages/implementation-status-tab/implementation-status-tab.component.ts b/src/app/views/pm-shri/pages/implementation-status-tab/implementation-status-tab.component.ts new file mode 100644 index 00000000..56427bbc --- /dev/null +++ b/src/app/views/pm-shri/pages/implementation-status-tab/implementation-status-tab.component.ts @@ -0,0 +1,98 @@ +import { AfterViewInit, Component, Input, OnInit, ViewChild } from '@angular/core'; +import { RbacService } from 'src/app/core/services/rbac-service.service'; +import { WrapperService } from 'src/app/core/services/wrapper.service'; +import { config } from '../../config/pm_shri_config'; +import { ImplementationStatusComponent } from './reports/implementation-status/implementation-status.component'; +import { environment } from 'src/environments/environment'; + +@Component({ + selector: 'app-implementation-status-tab', + templateUrl: './implementation-status-tab.component.html', + styleUrls: ['./implementation-status-tab.component.scss'] +}) +export class ImplementationStatusTabComponent implements OnInit { + + bigNumberReports: any = {}; + minYear: any; + maxYear: any; + minMonth: any; + maxMonth: any; + academicYear: any = []; + months: any = []; + filters: any; + reportsToBeShown: any = []; + rbacDetails: any; + reportsData: any = []; + startDate: any; + endDate: any; + defaultSelectedDays: any; + hasTimeSeriesFilters: boolean = false; + hasCommonFilters: boolean = true; + tabLabel: any = "Implementation Status"; + NVSK: boolean = true; + + @ViewChild('implementationStatus') implementationStatus: ImplementationStatusComponent; + @Input() bigNumberMetrics: any = []; + + constructor(private _wrapperService: WrapperService, private _rbacService: RbacService) { + this._rbacService.getRbacDetails().subscribe((rbacDetails: any) => { + this.rbacDetails = rbacDetails; + }) + if(environment.config === 'VSK') { + this.NVSK = false + } + } + + async ngOnInit(): Promise { + // this.renderReports(); + } + + async ngAfterViewInit(): Promise { + if (this.hasCommonFilters) { + this.filters = await this._wrapperService.constructCommonFilters(config.filters, this.tabLabel); + this.implementationStatus?.getReportData({ filterValues: this.filters.map((filter) => { return { ...filter, columnName: filter.valueProp, filterType: filter.id } }) }); + } + if (this.startDate === undefined && this.endDate === undefined && this.hasTimeSeriesFilters) { + let endDate = new Date(); + let days = endDate.getDate() - this.defaultSelectedDays; + let startDate = new Date(); + startDate.setDate(days); + this.implementationStatus?.getReportData({ timeSeriesValues: { startDate: startDate?.toISOString().split('T')[0], endDate: endDate?.toISOString().split('T')[0] } }); + } + } + + checkReport(key: string, reportType: string): Boolean { + let reportConfig = config; + let flag = false; + reportConfig[key]?.filters?.forEach((filter: any) => { + if (Number(filter.hierarchyLevel) === Number(this.rbacDetails?.role) && Object.keys(filter?.actions?.queries).includes(reportType)) { + flag = true + } + }) + return flag + } + + csvDownload(csvData: any) { + if (csvData) { + this.reportsData.push(csvData) + } + } + + filtersUpdated(filters: any) { + this.reportsData = []; + this.implementationStatus?.getReportData({ filterValues: filters.map((filter) => { return { ...filter, columnName: filter.valueProp, filterType: filter.id } }) }); + } + + timeSeriesUpdated(event: any): void { + this.startDate = event?.startDate?.toDate().toISOString().split('T')[0] + this.endDate = event?.endDate?.toDate().toISOString().split('T')[0] + if (event?.startDate !== null && event?.endDate !== null) { + this.reportsData = []; + this.implementationStatus?.getReportData({ timeSeriesValues: { startDate: this.startDate, endDate: this.endDate } }); + } + } + + importBigNumberMetrics(bigNumberMetric: any) { + this.bigNumberMetrics[bigNumberMetric.ind] = bigNumberMetric.data + } +} diff --git a/src/app/views/pm-shri/pages/implementation-status-tab/reports/bignumber-metrics/bignumber-metrics.component.html b/src/app/views/pm-shri/pages/implementation-status-tab/reports/bignumber-metrics/bignumber-metrics.component.html new file mode 100644 index 00000000..e69de29b diff --git a/src/app/views/pm-shri/pages/implementation-status-tab/reports/bignumber-metrics/bignumber-metrics.component.scss b/src/app/views/pm-shri/pages/implementation-status-tab/reports/bignumber-metrics/bignumber-metrics.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/views/pm-shri/pages/implementation-status-tab/reports/bignumber-metrics/bignumber-metrics.component.spec.ts b/src/app/views/pm-shri/pages/implementation-status-tab/reports/bignumber-metrics/bignumber-metrics.component.spec.ts new file mode 100644 index 00000000..d3062db3 --- /dev/null +++ b/src/app/views/pm-shri/pages/implementation-status-tab/reports/bignumber-metrics/bignumber-metrics.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { BignumberMetricsComponent } from './udise-bignumber-metrics.component'; + +describe('BignumberMetricsComponent', () => { + let component: BignumberMetricsComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ BignumberMetricsComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(BignumberMetricsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/views/pm-shri/pages/implementation-status-tab/reports/bignumber-metrics/bignumber-metrics.component.ts b/src/app/views/pm-shri/pages/implementation-status-tab/reports/bignumber-metrics/bignumber-metrics.component.ts new file mode 100644 index 00000000..762b9377 --- /dev/null +++ b/src/app/views/pm-shri/pages/implementation-status-tab/reports/bignumber-metrics/bignumber-metrics.component.ts @@ -0,0 +1,92 @@ +import { Component, EventEmitter, OnInit, Output } from '@angular/core'; +import { DataService } from 'src/app/core/services/data.service'; +import { RbacService } from 'src/app/core/services/rbac-service.service'; +import { WrapperService } from 'src/app/core/services/wrapper.service'; +import { buildQuery, parseRbacFilter, parseTimeSeriesQuery } from 'src/app/utilities/QueryBuilder'; +import { config } from 'src/app/views/pm-shri/config/pm_shri_config'; + +@Component({ + selector: 'app-bignumber-metrics', + templateUrl: './bignumber-metrics.component.html', + styleUrls: ['./bignumber-metrics.component.scss'] +}) +export class BignumberMetricsComponent implements OnInit { + reportName: string = 'pmShri_metrics'; + filters: any = []; + levels: any; + reportData: any = []; + title: string = '-------to be filled-------' + selectedYear: any; + selectedMonth: any; + startDate: any; + endDate: any; + config: any; + compareDateRange: any = 30; + filterIndex: any; + rbacDetails: any; + + @Output() exportReportData = new EventEmitter(); + + constructor(private readonly _dataService: DataService, private readonly _wrapperService: WrapperService, private _rbacService: RbacService) { + this._rbacService.getRbacDetails().subscribe((rbacDetails: any) => { + this.rbacDetails = rbacDetails; + }) + } + + ngOnInit(): void { + this.getReportData(); + } + + getReportData(values?: any): void { + let { filterValues, timeSeriesValues } = values ?? {}; + this.startDate = timeSeriesValues?.startDate; + this.endDate = timeSeriesValues?.endDate; + let reportConfig = config + + let { timeSeriesQueries, queries, levels, defaultLevel, filters, options } = reportConfig[this.reportName]; + let onLoadQuery; + let currentLevel; + + if (this.rbacDetails?.role !== null && this.rbacDetails.role !== undefined) { + filters.every((filter: any) => { + if (Number(this.rbacDetails?.role) === Number(filter.hierarchyLevel)) { + queries = { ...filter?.actions?.queries } + currentLevel = filter?.actions?.level; + Object.keys(queries).forEach((key) => { + queries[key] = parseRbacFilter(queries[key], this.rbacDetails) + }); + return false + } + return true + }) + } + Object.keys(queries).forEach(async (key: any, index: any) => { + if (key.toLowerCase().includes('comparison')) { + let endDate = new Date(); + let days = endDate.getDate() - this.compareDateRange; + let startDate = new Date(); + startDate.setDate(days) + onLoadQuery = parseTimeSeriesQuery(queries[key], startDate.toISOString().split('T')[0], endDate.toISOString().split('T')[0]) + } + else { + onLoadQuery = queries[key] + } + let query = buildQuery(onLoadQuery, defaultLevel, this.levels, this.filters, this.startDate, this.endDate, key, this.compareDateRange); + + if (query && key.indexOf('bigNumber') > -1) { + let metricOptions = { + bigNumber: { + title: Array.isArray(options?.bigNumber?.title) ? options?.bigNumber?.title?.[index] : options?.bigNumber?.title, + property: Array.isArray(options?.bigNumber?.property) ? options?.bigNumber?.property?.[index] : options?.bigNumber?.property, + valueSuffix: Array.isArray(options?.bigNumber?.valueSuffix) ? options?.bigNumber?.valueSuffix?.[index] : options?.bigNumber?.valueSuffix + } + } + let metricData = await this._dataService.getBigNumberReportData(query, metricOptions, 'averagePercentage', this.reportData); + metricData = { + ...metricData, + } + this.exportReportData.emit({data: metricData, ind: index}) + } + }) + } +} diff --git a/src/app/views/pm-shri/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html b/src/app/views/pm-shri/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html new file mode 100644 index 00000000..0957f880 --- /dev/null +++ b/src/app/views/pm-shri/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.html @@ -0,0 +1,9 @@ +
+ +

{{title}}


+ + +
+ No Data Found +
+
\ No newline at end of file diff --git a/src/app/views/pm-shri/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.scss b/src/app/views/pm-shri/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/views/pm-shri/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.spec.ts b/src/app/views/pm-shri/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.spec.ts new file mode 100644 index 00000000..c9e8c93b --- /dev/null +++ b/src/app/views/pm-shri/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ImplementationStatusComponent } from './implementation-status.component'; + +describe('ImplementationStatusComponent', () => { + let component: ImplementationStatusComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ImplementationStatusComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(ImplementationStatusComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/views/pm-shri/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.ts b/src/app/views/pm-shri/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.ts new file mode 100644 index 00000000..4cb688ea --- /dev/null +++ b/src/app/views/pm-shri/pages/implementation-status-tab/reports/implementation-status/implementation-status.component.ts @@ -0,0 +1,126 @@ +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { CommonService } from 'src/app/core/services/common/common.service'; +import { DataService } from 'src/app/core/services/data.service'; +import { RbacService } from 'src/app/core/services/rbac-service.service'; +import { WrapperService } from 'src/app/core/services/wrapper.service'; +import { buildQuery, parseFilterToQuery, parseRbacFilter, parseTimeSeriesQuery } from 'src/app/utilities/QueryBuilder'; +import { config } from 'src/app/views/pm-shri/config/pm_shri_config'; + +@Component({ + selector: 'app-implementation-status', + templateUrl: './implementation-status.component.html', + styleUrls: ['./implementation-status.component.scss'] +}) +export class ImplementationStatusComponent implements OnInit { + reportName: string = 'implementation_status'; + filters: any = []; + levels: any; + reportData: any = { + reportName: "Implementation Status" + }; + title: string = 'Implementation Status' + selectedYear: any; + selectedMonth: any; + startDate: any; + endDate: any; + config: any; + compareDateRange: any = 30; + filterIndex: any; + rbacDetails: any; + + @Output() exportReportData = new EventEmitter(); + + constructor(private readonly _dataService: DataService, private readonly _wrapperService: WrapperService, private _rbacService: RbacService) { + this._rbacService.getRbacDetails().subscribe((rbacDetails: any) => { + this.rbacDetails = rbacDetails; + }) + } + + ngOnInit(): void { + } + + getReportData(values: any): void { + let { filterValues, timeSeriesValues } = values ?? {}; + this.startDate = timeSeriesValues?.startDate; + this.endDate = timeSeriesValues?.endDate; + let reportConfig = config + + let { timeSeriesQueries, queries, levels, defaultLevel, filters, options } = reportConfig[this.reportName]; + let onLoadQuery; + let currentLevel; + + if (this.rbacDetails?.role !== null && this.rbacDetails.role !== undefined) { + filters.every((filter: any) => { + if (Number(this.rbacDetails?.role) === Number(filter.hierarchyLevel)) { + queries = { ...filter?.actions?.queries } + currentLevel = filter?.actions?.level; + this.reportData = { + ...this.reportData, + reportName: `% ${currentLevel[0].toUpperCase() + currentLevel.substring(1)}s which conducted meeting` + } + Object.keys(queries).forEach((key) => { + queries[key] = parseRbacFilter(queries[key], this.rbacDetails) + }); + return false + } + return true + }) + } + + Object.keys(queries).forEach(async (key: any) => { + if (key.toLowerCase().includes('comparison')) { + let endDate = new Date(); + let days = endDate.getDate() - this.compareDateRange; + let startDate = new Date(); + startDate.setDate(days) + onLoadQuery = parseTimeSeriesQuery(queries[key], startDate.toISOString().split('T')[0], endDate.toISOString().split('T')[0]) + } + else { + onLoadQuery = queries[key] + } + let query = buildQuery(onLoadQuery, defaultLevel, this.levels, this.filters, this.startDate, this.endDate, key, this.compareDateRange); + + let metricFilter = [...filterValues].filter((filter: any) => { + return filter.filterType === 'metric' + }) + + filterValues = [...filterValues].filter((filter: any) => { + return filter.filterType !== 'metric' + }) + + filterValues.forEach((filterParams: any) => { + query = parseFilterToQuery(query, filterParams) + }); + + if (query && key === 'table') { + this.reportData = await this._dataService.getTableReportData(query, options); + if (this.reportData?.data?.length > 0) { + let reportsData = { reportData: this.reportData.data, reportType: 'table', reportName: this.title } + this.exportReportData.emit(reportsData) + } + } + else if (query && key === 'bigNumber') { + this.reportData = await this._dataService.getBigNumberReportData(query, options, 'averagePercentage', this.reportData); + } + else if (query && key === 'bigNumberComparison') { + this.reportData = await this._dataService.getBigNumberReportData(query, options, 'differencePercentage', this.reportData); + } + else if (query && key === 'barChart') { + let { reportData, config } = await this._dataService.getBarChartReportData(query, options, filters, defaultLevel); + this.reportData = reportData + this.config = config; + if (this.reportData?.values?.length > 0) { + let reportsData = { reportData: this.reportData.values, reportType: 'dashletBar', reportName: this.title } + this.exportReportData.emit(reportsData) + } + } + else if (query && key === 'map') { + this.reportData = await this._dataService.getMapReportData(query, options, metricFilter) + if (this.reportData?.data?.length > 0) { + let reportsData = { reportData: this.reportData.data, reportType: 'map', reportName: this.title, downloadConfig: options?.downloadConfig } + this.exportReportData.emit(reportsData) + } + } + }) + } +} diff --git a/src/app/views/pm-shri/pages/state-wise-performance-tab/reports/state-wise-performance/state-wise-performance.component.html b/src/app/views/pm-shri/pages/state-wise-performance-tab/reports/state-wise-performance/state-wise-performance.component.html new file mode 100644 index 00000000..db50b5e0 --- /dev/null +++ b/src/app/views/pm-shri/pages/state-wise-performance-tab/reports/state-wise-performance/state-wise-performance.component.html @@ -0,0 +1,9 @@ +
+ +

{{title}}


+ + +
+ No Data Found +
+
\ No newline at end of file diff --git a/src/app/views/pm-shri/pages/state-wise-performance-tab/reports/state-wise-performance/state-wise-performance.component.scss b/src/app/views/pm-shri/pages/state-wise-performance-tab/reports/state-wise-performance/state-wise-performance.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/views/pm-shri/pages/state-wise-performance-tab/reports/state-wise-performance/state-wise-performance.component.spec.ts b/src/app/views/pm-shri/pages/state-wise-performance-tab/reports/state-wise-performance/state-wise-performance.component.spec.ts new file mode 100644 index 00000000..9c22c3bc --- /dev/null +++ b/src/app/views/pm-shri/pages/state-wise-performance-tab/reports/state-wise-performance/state-wise-performance.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { StateWisePerformanceComponent } from './state-wise-performance.component'; + +describe('StateWisePerformanceComponent', () => { + let component: StateWisePerformanceComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ StateWisePerformanceComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(StateWisePerformanceComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/views/pm-shri/pages/state-wise-performance-tab/reports/state-wise-performance/state-wise-performance.component.ts b/src/app/views/pm-shri/pages/state-wise-performance-tab/reports/state-wise-performance/state-wise-performance.component.ts new file mode 100644 index 00000000..eff6a10f --- /dev/null +++ b/src/app/views/pm-shri/pages/state-wise-performance-tab/reports/state-wise-performance/state-wise-performance.component.ts @@ -0,0 +1,159 @@ +import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; +import { CommonService } from 'src/app/core/services/common/common.service'; +import { DataService } from 'src/app/core/services/data.service'; +import { RbacService } from 'src/app/core/services/rbac-service.service'; +import { ReportDrilldownService } from 'src/app/core/services/report-drilldown/report-drilldown.service'; +import { WrapperService } from 'src/app/core/services/wrapper.service'; +import { buildQuery, parseFilterToQuery, parseRbacFilter, parseTimeSeriesQuery } from 'src/app/utilities/QueryBuilder'; +import { config } from 'src/app/views/pm-shri/config/pm_shri_config'; + + +@Component({ + selector: 'app-state-wise-performance', + templateUrl: './state-wise-performance.component.html', + styleUrls: ['./state-wise-performance.component.scss'] +}) +export class StateWisePerformanceComponent implements OnInit, OnDestroy { + reportName: string = 'state_wise_performance'; + filters: any = []; + levels: any; + reportData: any = { + reportName: "State Wise Performance" + }; + title: string = 'State Wise Performance' + selectedYear: any; + selectedMonth: any; + startDate: any; + endDate: any; + config: any; + compareDateRange: any = 30; + filterIndex: any; + rbacDetails: any; + currentHierarchyLevel: any; + drillDownSubscription: any; + drillDownLevel: any; + drillDownDetails: any; + metricFilter: any; + commonFilter: any; + + @Output() exportReportData = new EventEmitter(); + + constructor(private readonly _dataService: DataService, private readonly _wrapperService: WrapperService, private _rbacService: RbacService, private _drillDownService: ReportDrilldownService) { + this._rbacService.getRbacDetails().subscribe((rbacDetails: any) => { + this.rbacDetails = rbacDetails; + this.currentHierarchyLevel = rbacDetails.role + }) + this.drillDownSubscription = this._drillDownService.drilldownData.subscribe(async (data) => { + if (data && data !== 'reset') { + this.drillDownLevel = data.hierarchyLevel + // this.drilldownData({ + // ...data + // }) + let result: any = await this._drillDownService.drilldown(data, this.rbacDetails, config[this.reportName], this.startDate, this.endDate, this.drillDownDetails, this.metricFilter, this.commonFilter) + this.drillDownDetails = result?.drillDownDetails + this.reportData = result?.reportData + } + }) + } + + ngOnInit(): void { + } + + async getReportData(values: any): Promise { + let { filterValues, timeSeriesValues } = values ?? {}; + this.startDate = timeSeriesValues?.startDate; + this.endDate = timeSeriesValues?.endDate; + let metricFilter = [...filterValues].filter((filter: any) => { + return filter.filterType === 'metric' + }) + this.metricFilter = metricFilter + + filterValues = [...filterValues].filter((filter: any) => { + return filter.filterType !== 'metric' + }) + + this.commonFilter = filterValues + if (this.drillDownDetails !== undefined) { + let result: any = await this._drillDownService.drilldown({ hierarchyLevel: this.drillDownLevel }, this.rbacDetails, config[this.reportName], this.startDate, this.endDate, this.drillDownDetails, this.metricFilter, this.commonFilter) + this.drillDownDetails = result?.drillDownDetails + this.reportData = result?.reportData + } + else { + let reportConfig = config + + let { timeSeriesQueries, queries, levels, defaultLevel, filters, options } = reportConfig[this.reportName]; + let onLoadQuery; + let currentLevel; + + if (this.rbacDetails?.role !== null && this.rbacDetails !== undefined) { + filters.every((filter: any) => { + if (Number(this.rbacDetails?.role) === Number(filter.hierarchyLevel)) { + queries = { ...filter?.actions?.queries } + currentLevel = filter?.actions?.level; + this.reportData = { + ...this.reportData, + reportName: `% ${currentLevel[0].toUpperCase() + currentLevel.substring(1)}s which conducted meeting` + } + Object.keys(queries).forEach((key) => { + queries[key] = parseRbacFilter(queries[key], this.rbacDetails) + }); + return false + } + return true + }) + } + + Object.keys(queries).forEach(async (key: any) => { + if (key.toLowerCase().includes('comparison')) { + let endDate = new Date(); + let days = endDate.getDate() - this.compareDateRange; + let startDate = new Date(); + startDate.setDate(days) + onLoadQuery = parseTimeSeriesQuery(queries[key], startDate.toISOString().split('T')[0], endDate.toISOString().split('T')[0]) + } + else { + onLoadQuery = queries[key] + } + let query = buildQuery(onLoadQuery, defaultLevel, this.levels, this.filters, this.startDate, this.endDate, key, this.compareDateRange); + + filterValues.forEach((filterParams: any) => { + query = parseFilterToQuery(query, filterParams) + }); + + if (query && key === 'table') { + this.reportData = await this._dataService.getTableReportData(query, options); + if (this.reportData?.data?.length > 0) { + let reportsData = { reportData: this.reportData.data, reportType: 'table', reportName: this.title } + this.exportReportData.emit(reportsData) + } + } + else if (query && key === 'bigNumber') { + this.reportData = await this._dataService.getBigNumberReportData(query, options, 'averagePercentage', this.reportData); + } + else if (query && key === 'bigNumberComparison') { + this.reportData = await this._dataService.getBigNumberReportData(query, options, 'differencePercentage', this.reportData); + } + else if (query && key === 'barChart') { + let { reportData, config } = await this._dataService.getBarChartReportData(query, options, filters, defaultLevel); + this.reportData = reportData + this.config = config; + if (this.reportData?.values?.length > 0) { + let reportsData = { reportData: this.reportData.values, reportType: 'dashletBar', reportName: this.title } + this.exportReportData.emit(reportsData) + } + } + else if (query && key === 'map') { + this.reportData = await this._dataService.getMapReportData(query, options, metricFilter) + if (this.reportData?.data?.length > 0) { + let reportsData = { reportData: this.reportData.data, reportType: 'map', reportName: this.title, downloadConfig: options?.downloadConfig } + this.exportReportData.emit(reportsData) + } + } + }) + } + } + ngOnDestroy(): void { + this._drillDownService.emit('reset') + this.drillDownSubscription.unsubscribe() + } +} diff --git a/src/app/views/pm-shri/pages/state-wise-performance-tab/state-wise-performance-tab.component.html b/src/app/views/pm-shri/pages/state-wise-performance-tab/state-wise-performance-tab.component.html new file mode 100644 index 00000000..5b1e7c0e --- /dev/null +++ b/src/app/views/pm-shri/pages/state-wise-performance-tab/state-wise-performance-tab.component.html @@ -0,0 +1,22 @@ +
+
+
+ +
+
+ +
+
+ +
+
+
+
+
+ +
+
+
+
\ No newline at end of file diff --git a/src/app/views/pm-shri/pages/state-wise-performance-tab/state-wise-performance-tab.component.scss b/src/app/views/pm-shri/pages/state-wise-performance-tab/state-wise-performance-tab.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/views/pm-shri/pages/state-wise-performance-tab/state-wise-performance-tab.component.spec.ts b/src/app/views/pm-shri/pages/state-wise-performance-tab/state-wise-performance-tab.component.spec.ts new file mode 100644 index 00000000..68518df2 --- /dev/null +++ b/src/app/views/pm-shri/pages/state-wise-performance-tab/state-wise-performance-tab.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { StateWisePerformanceTabComponent } from './state-wise-performance-tab.component'; + +describe('StateWisePerformanceTabComponent', () => { + let component: StateWisePerformanceTabComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ StateWisePerformanceTabComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(StateWisePerformanceTabComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/views/pm-shri/pages/state-wise-performance-tab/state-wise-performance-tab.component.ts b/src/app/views/pm-shri/pages/state-wise-performance-tab/state-wise-performance-tab.component.ts new file mode 100644 index 00000000..4b3a02e8 --- /dev/null +++ b/src/app/views/pm-shri/pages/state-wise-performance-tab/state-wise-performance-tab.component.ts @@ -0,0 +1,94 @@ +import { AfterViewInit, Component, OnInit, ViewChild } from '@angular/core'; +import { RbacService } from 'src/app/core/services/rbac-service.service'; +import { WrapperService } from 'src/app/core/services/wrapper.service'; +import { config } from '../../config/pm_shri_config'; +import { StateWisePerformanceComponent } from './reports/state-wise-performance/state-wise-performance.component'; + + +@Component({ + selector: 'app-state-wise-performance-tab', + templateUrl: './state-wise-performance-tab.component.html', + styleUrls: ['./state-wise-performance-tab.component.scss'] +}) +export class StateWisePerformanceTabComponent implements OnInit, AfterViewInit { + + bigNumberReports: any = {}; + minYear: any; + maxYear: any; + minMonth: any; + maxMonth: any; + academicYear: any = []; + months: any = []; + filters: any; + reportsToBeShown: any = []; + rbacDetails: any; + reportsData: any = []; + startDate: any; + endDate: any; + defaultSelectedDays: any; + hasTimeSeriesFilters: boolean = false; + hasCommonFilters: boolean = true; + tabLabel: any = "State Wise Performance"; + bigNumberMetrics: any = []; + +@ViewChild('stateWisePerformance') stateWisePerformance: StateWisePerformanceComponent; + +constructor(private _wrapperService: WrapperService, private _rbacService: RbacService) { + this._rbacService.getRbacDetails().subscribe((rbacDetails: any) => { + this.rbacDetails = rbacDetails; + }) + } + + async ngOnInit(): Promise { + // this.renderReports(); + } + + async ngAfterViewInit(): Promise { + if (this.hasCommonFilters) { + this.filters = await this._wrapperService.constructCommonFilters(config.filters, this.tabLabel); + this.stateWisePerformance?.getReportData({ filterValues: this.filters.map((filter) => { return { ...filter, columnName: filter.valueProp, filterType: filter.id} }) }); + } + if (this.startDate === undefined && this.endDate === undefined && this.hasTimeSeriesFilters) { + let endDate = new Date(); + let days = endDate.getDate() - this.defaultSelectedDays; + let startDate = new Date(); + startDate.setDate(days); + this.stateWisePerformance?.getReportData({ timeSeriesValues: { startDate: startDate?.toISOString().split('T')[0], endDate: endDate?.toISOString().split('T')[0] } }); + } + } + + checkReport(key: string, reportType: string): Boolean { + let reportConfig = config; + let flag = false; + reportConfig[key]?.filters?.forEach((filter: any) => { + if (Number(filter.hierarchyLevel) === Number(this.rbacDetails?.role) && Object.keys(filter?.actions?.queries).includes(reportType)) { + flag = true + } + }) + return flag + } + + csvDownload(csvData: any) { + if (csvData) { + this.reportsData.push(csvData) + } + } + + filtersUpdated(filters: any) { + this.reportsData = []; + this.stateWisePerformance?.getReportData({ filterValues: filters.map((filter) => { return { ...filter, columnName: filter.valueProp, filterType: filter.id} }) }); + } + + timeSeriesUpdated(event: any): void { + this.startDate = event?.startDate?.toDate().toISOString().split('T')[0] + this.endDate = event?.endDate?.toDate().toISOString().split('T')[0] + if (event?.startDate !== null && event?.endDate !== null) { + this.reportsData = []; + this.stateWisePerformance?.getReportData({timeSeriesValues: {startDate: this.startDate, endDate: this.endDate}}); + } + } + + importBigNumberMetrics(bigNumberMetric: any) { + this.bigNumberMetrics[bigNumberMetric.ind] = bigNumberMetric.data + } +} diff --git a/src/app/views/pm-shri/pm-shri-routing.module.ts b/src/app/views/pm-shri/pm-shri-routing.module.ts new file mode 100644 index 00000000..ba1a6f45 --- /dev/null +++ b/src/app/views/pm-shri/pm-shri-routing.module.ts @@ -0,0 +1,16 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { PmShriComponent } from './pm-shri.component'; + +const routes: Routes = [ + { + path:'', + component: PmShriComponent + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class PmShriRoutingModule { } diff --git a/src/app/views/pm-shri/pm-shri.component.html b/src/app/views/pm-shri/pm-shri.component.html new file mode 100644 index 00000000..37e36115 --- /dev/null +++ b/src/app/views/pm-shri/pm-shri.component.html @@ -0,0 +1,25 @@ +
+
+
+

PM Shri

+

PM Shri

+
+
+
+ +
+ +
+ +
+ + + + + + + +
\ No newline at end of file diff --git a/src/app/views/pm-shri/pm-shri.component.scss b/src/app/views/pm-shri/pm-shri.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/views/pm-shri/pm-shri.component.spec.ts b/src/app/views/pm-shri/pm-shri.component.spec.ts new file mode 100644 index 00000000..2f09298f --- /dev/null +++ b/src/app/views/pm-shri/pm-shri.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { PmShriComponent } from './pm-shri.component'; + +describe('PmShriComponent', () => { + let component: PmShriComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ PmShriComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(PmShriComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/views/pm-shri/pm-shri.component.ts b/src/app/views/pm-shri/pm-shri.component.ts new file mode 100644 index 00000000..ce5ad8f7 --- /dev/null +++ b/src/app/views/pm-shri/pm-shri.component.ts @@ -0,0 +1,83 @@ +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { CommonService } from 'src/app/core/services/common/common.service'; +import { RbacService } from 'src/app/core/services/rbac-service.service'; +import { config } from './config/pm_shri_config'; +import { environment } from 'src/environments/environment'; + +@Component({ + selector: 'app-pm-shri', + templateUrl: './pm-shri.component.html', + styleUrls: ['./pm-shri.component.scss'] +}) +export class PmShriComponent implements OnInit { + + loadTabs = false; + rbacDetails: any; + tabIndex; + selectedTabLabel; + tabs: any = []; + programName: any = 'pm_shri'; + bigNumberMetrics: any = []; + NVSK: boolean = true; + + constructor(private route: ActivatedRoute, private _rbacService: RbacService, private _commonService: CommonService) { + this.route.queryParams.subscribe((param: any) => { + this.tabIndex = param.tab ? Number(param.tab) : 0; + }) + this._rbacService.getRbacDetails().subscribe((rbacDetails: any) => { + this.rbacDetails = rbacDetails; + }) + let allTabs = [...Object.keys(config)] + allTabs.forEach((tab: any) => { + config?.[tab]?.filters?.every((filter) => { + if ((Number(filter?.hierarchyLevel) === this.rbacDetails?.role) || this.rbacDetails?.role === 0) { + if (!(this.tabs.includes(config?.[tab]?.label))) { + this.tabs.push(config?.[tab]?.label) + } + return false + } + return true + }) + }) + if(environment.config === 'VSK') { + this.NVSK = false; + } + } + + ngOnInit(): void { + this._commonService.getMetaData(this.programName).subscribe() + } + + ngAfterViewInit(): void { + setTimeout(() => { + this.selectedTabLabel = this.tabs.length > 0 ? this.tabs[0] : undefined + }); + } + + onTabChanged($event: any): void { + this.selectedTabLabel = $event?.tab?.textLabel; + this.tabIndex = $event.index; + setTimeout(() => { + window.dispatchEvent(new Event('resize')); + console.log('resize'); + }, 100); + } + + checkReport(key: string, reportType: string): Boolean { + let reportConfig = config; + let flag = false; + reportConfig[key]?.filters?.forEach((filter: any) => { + if (Number(filter.hierarchyLevel) === Number(this.rbacDetails?.role) && Object.keys(filter?.actions?.queries).includes(reportType)) { + flag = true; + } + }); + + return flag; + } + + importBigNumberMetrics(bigNumberMetric: any) { + this.bigNumberMetrics[bigNumberMetric.ind] = bigNumberMetric.data + } + +} diff --git a/src/app/views/pm-shri/pm-shri.module.ts b/src/app/views/pm-shri/pm-shri.module.ts new file mode 100644 index 00000000..eb11afc9 --- /dev/null +++ b/src/app/views/pm-shri/pm-shri.module.ts @@ -0,0 +1,30 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { MatTabsModule } from '@angular/material/tabs'; +import { SharedModule } from 'src/app/shared/shared.module'; + +import { PmShriRoutingModule } from './pm-shri-routing.module'; +import { PmShriComponent } from './pm-shri.component'; +import { ImplementationStatusTabComponent } from './pages/implementation-status-tab/implementation-status-tab.component'; +import { ImplementationStatusComponent } from './pages/implementation-status-tab/reports/implementation-status/implementation-status.component'; +import { BignumberMetricsComponent } from './pages/implementation-status-tab/reports/bignumber-metrics/bignumber-metrics.component'; +import { StateWisePerformanceTabComponent } from './pages/state-wise-performance-tab/state-wise-performance-tab.component'; +import { StateWisePerformanceComponent } from './pages/state-wise-performance-tab/reports/state-wise-performance/state-wise-performance.component'; + +@NgModule({ + declarations: [ + PmShriComponent, + ImplementationStatusTabComponent, + ImplementationStatusComponent, + BignumberMetricsComponent, + StateWisePerformanceTabComponent, + StateWisePerformanceComponent + ], + imports: [ + CommonModule, + PmShriRoutingModule, + MatTabsModule, + SharedModule + ] +}) +export class PmShriModule { } From 97cc8a5740f456e6d994ecd05ba85371cf7d6aba Mon Sep 17 00:00:00 2001 From: pandutibil Date: Fri, 13 Oct 2023 19:53:37 +0530 Subject: [PATCH 03/11] Query is updated in pm shri report --- src/app/views/pm-shri/config/pm_shri_config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/views/pm-shri/config/pm_shri_config.ts b/src/app/views/pm-shri/config/pm_shri_config.ts index 2f4e0a31..1fb05c94 100644 --- a/src/app/views/pm-shri/config/pm_shri_config.ts +++ b/src/app/views/pm-shri/config/pm_shri_config.ts @@ -61,7 +61,7 @@ export const config = { { "queries": { - "map": "select t1.state_id, t1.state_id as level, t2.state_name, t1.category_name, sum(t3.sum) as total_schools, round(cast(sum(t1.sum) / sum(t3.sum) as numeric) * 100, 2) as percentage, t2.latitude, t2.longitude from datasets.pm_shri_pm_shri_category_h21fc2hyav9wqkf0yxrl as t1 join dimensions.state as t2 on t2.state_id = t1.state_id join datasets.pm_shri_total_schools_state as t3 on t3.state_id = t1.state_id where category_name in ('total_schools_having_library', 'total_schools_having_handwash_facility', 'total_schools_having_drinking_water_facility', 'total_schools_having_ramp_facility', 'total_schools_having_playground', 'total_schools_having_internet_facility') group by t1.state_id, t2.state_name, t1.category_name, t2.latitude, t2.longitude" + "map": "select t1.state_id, t1.state_id as level, t2.state_name, t1.category_name, sum(t3.sum) as total_schools, round(cast(sum(t1.sum) / sum(t3.sum) as numeric) * 100, 2) as percentage, t2.latitude, t2.longitude from datasets.pm_shri_pm_shri_category_state0categorypmshri as t1 join dimensions.state as t2 on t2.state_id = t1.state_id join datasets.pm_shri_total_schools_state as t3 on t3.state_id = t1.state_id where category_name in ('total_schools_having_library', 'total_schools_having_handwash_facility', 'total_schools_having_drinking_water_facility', 'total_schools_having_ramp_facility', 'total_schools_having_playground', 'total_schools_having_internet_facility') group by t1.state_id, t2.state_name, t1.category_name, t2.latitude, t2.longitude" }, "level": "state", "nextLevel": "district" From 2a7f2589cf4875f9ad19978a6729a5d2fd511d62 Mon Sep 17 00:00:00 2001 From: pandutibil Date: Tue, 17 Oct 2023 15:58:50 +0530 Subject: [PATCH 04/11] PM shri logo and description details are added --- src/app/views/pm-shri/pm-shri.component.html | 4 ++-- src/assets/images/pm_shri.png | Bin 0 -> 20347 bytes 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 src/assets/images/pm_shri.png diff --git a/src/app/views/pm-shri/pm-shri.component.html b/src/app/views/pm-shri/pm-shri.component.html index 37e36115..e773c44a 100644 --- a/src/app/views/pm-shri/pm-shri.component.html +++ b/src/app/views/pm-shri/pm-shri.component.html @@ -1,8 +1,8 @@
-

PM Shri

-

PM Shri

+

PM SHRI

+

PM SHRI initiative is intended to develop schools in which every student feels welcomed and cared for, where a safe and stimulating learning environment exists, where a wide range of learning experiences are offered, and where good physical infrastructure and appropriate resources conducive to learning are available to all students.

diff --git a/src/assets/images/pm_shri.png b/src/assets/images/pm_shri.png new file mode 100644 index 0000000000000000000000000000000000000000..479c7d3948de4047b874e8cfe23847f069a32365 GIT binary patch literal 20347 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 Date: Fri, 20 Oct 2023 13:57:32 +0530 Subject: [PATCH 05/11] Static big number metrics are added for PM SHREE --- src/app/core/services/data.service.ts | 32 ++++++++--------- .../big-number/big-number.component.ts | 6 ++-- src/app/utilities/NumberFomatter.ts | 13 +++---- .../views/dashboard/dashboard.component.ts | 36 +++++++++++-------- .../views/pm-shri/config/pm_shri_config.ts | 18 +++++----- .../implementation-status-tab.component.html | 11 +++--- .../bignumber-metrics.component.ts | 3 +- 7 files changed, 65 insertions(+), 54 deletions(-) diff --git a/src/app/core/services/data.service.ts b/src/app/core/services/data.service.ts index ff6e7cdd..261ee484 100644 --- a/src/app/core/services/data.service.ts +++ b/src/app/core/services/data.service.ts @@ -78,35 +78,31 @@ export class DataService { return new Promise((resolve, reject) => { this.spinner.show(); let { bigNumber } = options ?? {}; - let { valueSuffix, property, title } = bigNumber ?? {}; + let { valueSuffix, property, title, formatter } = bigNumber ?? {}; let reportData = { ...prevReportData, - valueSuffix: valueSuffix, - reportName: title + valueSuffix, + reportName: title, + formatter } - if (indicator === 'averagePercentage') { + + if (query === "" || isNaN(Number(query))) { this._commonService.getReportDataNew(query).subscribe((res: any) => { if (res) { let rows = res; reportData = { ...reportData, - averagePercentage: rows[0]?.[property] + [indicator]: rows[0]?.[property] } resolve(reportData) } - }) - } - else if (indicator === 'differencePercentage') { - this._commonService.getReportDataNew(query).subscribe((res: any) => { - if (res) { - let rows = res; - reportData = { - ...reportData, - differencePercentage: rows[0]?.[property] - } - resolve(reportData) - } - }) + }); + } else { + reportData = { + ...reportData, + [indicator]: !isNaN(Number(query)) ? Number(query) : query + } + resolve(reportData) } this.spinner.hide() }); diff --git a/src/app/shared/components/big-number/big-number.component.ts b/src/app/shared/components/big-number/big-number.component.ts index 0aabaeba..dd4e66d8 100644 --- a/src/app/shared/components/big-number/big-number.component.ts +++ b/src/app/shared/components/big-number/big-number.component.ts @@ -13,10 +13,11 @@ export class BigNumberComponent implements OnInit, OnChanges { differenceInPercentage: any; differenceIndicator: any= undefined; valueSuffix: any; + formatter: any; + constructor() { } ngOnInit(): void { - } ngOnChanges(): void { @@ -24,6 +25,7 @@ export class BigNumberComponent implements OnInit, OnChanges { } updateValues(): void { + this.formatter = this.bigNumberReportData?.formatter; this.averagePercentage = this.bigNumberReportData?.averagePercentage; this.valueSuffix = this.bigNumberReportData?.valueSuffix ? this.bigNumberReportData?.valueSuffix : ''; if(this.bigNumberReportData && this.bigNumberReportData.differencePercentage && this.bigNumberReportData.averagePercentage) { @@ -42,7 +44,7 @@ export class BigNumberComponent implements OnInit, OnChanges { } formatNumber(input: any) { - return formatNumberForReport(Number(input)) + return formatNumberForReport(Number(input), this.formatter); } } diff --git a/src/app/utilities/NumberFomatter.ts b/src/app/utilities/NumberFomatter.ts index 5c30cd17..c9695954 100644 --- a/src/app/utilities/NumberFomatter.ts +++ b/src/app/utilities/NumberFomatter.ts @@ -1,9 +1,9 @@ import { environment } from "src/environments/environment"; -function formatNumber(number: number, config: any): string { +function formatNumber(number: number, formatter: any): string { - if (config.format === 'short') { - if (config.locale === 'en-IN') { + if (formatter.format === 'short') { + if (formatter.locale === 'en-IN') { if (number < 1000) { return `${number}`; } else if (number > 999 && number <= 99999) { @@ -26,7 +26,7 @@ function formatNumber(number: number, config: any): string { } } - return new Intl.NumberFormat(config.locale).format(number); + return new Intl.NumberFormat(formatter.locale).format(number); } function numberLabelFormat(number: number, config: any, axisRef?: any): string { @@ -89,8 +89,9 @@ function removeFormat(string, config) { } -export function formatNumberForReport(number: number): string { - return formatNumber(number, environment.numberFormat.reports); +export function formatNumberForReport(number: number, formatter?: any): string { + formatter = formatter ? formatter : environment.numberFormat.reports; + return formatNumber(number, formatter); } export function numberLabelFormatForReport(number: number, axisRef?: any): string { diff --git a/src/app/views/dashboard/dashboard.component.ts b/src/app/views/dashboard/dashboard.component.ts index c9885db8..9f7baf99 100644 --- a/src/app/views/dashboard/dashboard.component.ts +++ b/src/app/views/dashboard/dashboard.component.ts @@ -10,7 +10,7 @@ import { CommonService } from 'src/app/core/services/common/common.service'; import { ConfigService } from 'src/app/core/services/config/config.service'; import { RbacService } from 'src/app/core/services/rbac-service.service'; import { WrapperService } from 'src/app/core/services/wrapper.service'; -import { formatNumberForReport } from 'src/app/utilities/NumberFomatter'; +import { formatNumberForReport, numberLabelFormatForReport } from 'src/app/utilities/NumberFomatter'; import { parseRbacFilter } from 'src/app/utilities/QueryBuilder'; import { environment } from 'src/environments/environment'; @@ -151,20 +151,28 @@ export class DashboardComponent implements OnInit { break; } else if (metricQueriesKeys[k].indexOf('bigNumber') > -1) { - let query = parseRbacFilter(metricQueries[metricQueriesKeys[k]], rbacDetails) - let res = await this._wrapperService.runQuery(query) - if (res && res.length > 0) { - let metricData = { - value: Array.isArray(programConfig[reports[i]]?.options?.bigNumber?.property) ? String(formatNumberForReport(res[0]?.[programConfig[reports[i]]?.options?.bigNumber?.property[k]])) + [programConfig[reports[i]]?.options?.bigNumber?.valueSuffix[k]] : String(formatNumberForReport(res[0]?.[programConfig[reports[i]]?.options?.bigNumber?.property])) + [programConfig[reports[i]]?.options?.bigNumber?.valueSuffix], - name: Array.isArray(programConfig[reports[i]]?.options?.bigNumber?.title) ? programConfig[reports[i]]?.options?.bigNumber?.title[k] : programConfig[reports[i]]?.options?.bigNumber?.title - } - if((Array.isArray(programConfig[reports[i]]?.options?.bigNumber?.property) ? res?.[0]?.[programConfig[reports[i]]?.options?.bigNumber?.property[k]] : res?.[0]?.[programConfig[reports[i]]?.options?.bigNumber?.property]) === null) { - metricData.value = Array.isArray(programConfig[reports[i]]?.options?.bigNumber?.valueSuffix) ? '0' + programConfig[reports[i]]?.options?.bigNumber?.valueSuffix[k] : '0' + programConfig[reports[i]]?.options?.bigNumber?.valueSuffix - } - if (metricData.value !== null && metricData !== undefined) { - metrics.push(metricData) - // console.log(metricData.value) + let query = parseRbacFilter(metricQueries[metricQueriesKeys[k]], rbacDetails); + if (query === "" || isNaN(Number(query))) { + let res = await this._wrapperService.runQuery(query) + if (res && res.length > 0) { + let metricData = { + value: Array.isArray(programConfig[reports[i]]?.options?.bigNumber?.property) ? String(formatNumberForReport(res[0]?.[programConfig[reports[i]]?.options?.bigNumber?.property[k]])) + [programConfig[reports[i]]?.options?.bigNumber?.valueSuffix[k]] : String(formatNumberForReport(res[0]?.[programConfig[reports[i]]?.options?.bigNumber?.property])) + [programConfig[reports[i]]?.options?.bigNumber?.valueSuffix], + name: Array.isArray(programConfig[reports[i]]?.options?.bigNumber?.title) ? programConfig[reports[i]]?.options?.bigNumber?.title[k] : programConfig[reports[i]]?.options?.bigNumber?.title + } + if((Array.isArray(programConfig[reports[i]]?.options?.bigNumber?.property) ? res?.[0]?.[programConfig[reports[i]]?.options?.bigNumber?.property[k]] : res?.[0]?.[programConfig[reports[i]]?.options?.bigNumber?.property]) === null) { + metricData.value = Array.isArray(programConfig[reports[i]]?.options?.bigNumber?.valueSuffix) ? '0' + programConfig[reports[i]]?.options?.bigNumber?.valueSuffix[k] : '0' + programConfig[reports[i]]?.options?.bigNumber?.valueSuffix + } + if (metricData.value !== null && metricData !== undefined) { + metrics.push(metricData) + // console.log(metricData.value) + } } + } else { + const formatter = programConfig[reports[i]]?.options?.bigNumber?.formatter[k] ? programConfig[reports[i]]?.options?.bigNumber?.formatter[k] : programConfig[reports[i]]?.options?.bigNumber?.formatter; + metrics.push({ + value: !isNaN(metricQueries[metricQueriesKeys[k]]) ? formatNumberForReport(metricQueries[metricQueriesKeys[k]], formatter) : metricQueries[metricQueriesKeys[k]], + name: programConfig[reports[i]]?.options?.bigNumber?.title[k] + }); } } } diff --git a/src/app/views/pm-shri/config/pm_shri_config.ts b/src/app/views/pm-shri/config/pm_shri_config.ts index 1fb05c94..b9ba8db8 100644 --- a/src/app/views/pm-shri/config/pm_shri_config.ts +++ b/src/app/views/pm-shri/config/pm_shri_config.ts @@ -114,11 +114,14 @@ export const config = { "hierarchyLevel": "0", "actions": { "queries": { - "bigNumber1": "select SUM(count) as total_states from datasets.pm_shri_started_state", - "bigNumber2": "select SUM(sum) as total_schools from datasets.pm_shri_total_schools_state", - "bigNumber3": "select sum(sum) as only_boys_schools from datasets.pm_shri_pm_shri_category_state0categorypmshri where category_name = 'only_boys_school'", - "bigNumber4": "select sum(sum) as only_girls_schools from datasets.pm_shri_pm_shri_category_state0categorypmshri where category_name = 'only_girls_school'", - "bigNumber5": "select sum(sum) as co_ed_schools from datasets.pm_shri_pm_shri_category_state0categorypmshri where category_name = 'co-ed_school'" + "bigNumber1": "6448", + "bigNumber2": "763", + "bigNumber3": "863", + "bigNumber4": "1533", + "bigNumber5": "1384", + "bigNumber6": "1616", + "bigNumber7": "735", + "bigNumber8": "317" }, "level": "state" } @@ -126,9 +129,8 @@ export const config = { ], "options": { "bigNumber": { - "title": ['Total states/UTs', 'Total schools', 'Only boys schools', 'Only girls schools', 'Co-ed schools'], - "valueSuffix": ['', '', '', '', ''], - "property": ['total_states', 'total_schools', 'only_boys_schools', 'only_girls_schools', 'co_ed_schools'] + "title": ['Total PM SHRI schools', 'Total districts', 'Total districts', 'No. of primary schools', 'No. of upper primary schools', 'No. of secondary schools', 'No. of higher secondary schools', 'KVS', 'NVS'], + "formatter": { locale: 'en-IN', format: "long" } } } } diff --git a/src/app/views/pm-shri/pages/implementation-status-tab/implementation-status-tab.component.html b/src/app/views/pm-shri/pages/implementation-status-tab/implementation-status-tab.component.html index fc54a6b1..3e21fda9 100644 --- a/src/app/views/pm-shri/pages/implementation-status-tab/implementation-status-tab.component.html +++ b/src/app/views/pm-shri/pages/implementation-status-tab/implementation-status-tab.component.html @@ -10,12 +10,13 @@
-
-
- + +
+
+ +
-
+
Date: Fri, 20 Oct 2023 14:38:35 +0530 Subject: [PATCH 06/11] PM SHREE map report indicator updated --- src/app/core/services/data.service.ts | 4 ++++ src/app/views/pm-shri/config/pm_shri_config.ts | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/app/core/services/data.service.ts b/src/app/core/services/data.service.ts index 261ee484..70861713 100644 --- a/src/app/core/services/data.service.ts +++ b/src/app/core/services/data.service.ts @@ -310,6 +310,10 @@ export class DataService { tooltip: row.tooltip ? row.tooltip : this._wrapperService.constructTooltip(tooltipMetrics, row, metricFilter ? metricFilter.value : indicator) }; + if (indicator) { + row.indicator = Number(row[indicator]); + } + return row; }), options: { diff --git a/src/app/views/pm-shri/config/pm_shri_config.ts b/src/app/views/pm-shri/config/pm_shri_config.ts index b9ba8db8..babb019f 100644 --- a/src/app/views/pm-shri/config/pm_shri_config.ts +++ b/src/app/views/pm-shri/config/pm_shri_config.ts @@ -61,7 +61,7 @@ export const config = { { "queries": { - "map": "select t1.state_id, t1.state_id as level, t2.state_name, t1.category_name, sum(t3.sum) as total_schools, round(cast(sum(t1.sum) / sum(t3.sum) as numeric) * 100, 2) as percentage, t2.latitude, t2.longitude from datasets.pm_shri_pm_shri_category_state0categorypmshri as t1 join dimensions.state as t2 on t2.state_id = t1.state_id join datasets.pm_shri_total_schools_state as t3 on t3.state_id = t1.state_id where category_name in ('total_schools_having_library', 'total_schools_having_handwash_facility', 'total_schools_having_drinking_water_facility', 'total_schools_having_ramp_facility', 'total_schools_having_playground', 'total_schools_having_internet_facility') group by t1.state_id, t2.state_name, t1.category_name, t2.latitude, t2.longitude" + "map": "select t1.state_id, t1.state_id as level, t2.state_name, t1.category_name, sum(t1.sum) as category_value, sum(t3.sum) as total_schools, round(cast(sum(t1.sum) / sum(t3.sum) as numeric) * 100, 2) as percentage, t2.latitude, t2.longitude from datasets.pm_shri_pm_shri_category_state0categorypmshri as t1 join dimensions.state as t2 on t2.state_id = t1.state_id join datasets.pm_shri_total_schools_state as t3 on t3.state_id = t1.state_id where category_name in ('total_schools_having_library', 'total_schools_having_handwash_facility', 'total_schools_having_drinking_water_facility', 'total_schools_having_ramp_facility', 'total_schools_having_playground', 'total_schools_having_internet_facility') group by t1.state_id, t2.state_name, t1.category_name, t2.latitude, t2.longitude" }, "level": "state", "nextLevel": "district" @@ -78,7 +78,8 @@ export const config = { { "indicatorType": "percent", "metricLabelProp": "category_name", - "metricValueProp": "percentage", + "metricValueProp": "category_value", + "indicator": "percentage", "groupByColumn": "level", "metricFilterNeeded": true, "legend": { "title": "State Wise Performance" }, From 40a395a9c964c20bbab5f87fcd59ebbfe0be0f85 Mon Sep 17 00:00:00 2001 From: pandutibil Date: Fri, 20 Oct 2023 15:06:54 +0530 Subject: [PATCH 07/11] Bug fixed in map report data implementation --- src/app/core/services/data.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/core/services/data.service.ts b/src/app/core/services/data.service.ts index 70861713..1621e639 100644 --- a/src/app/core/services/data.service.ts +++ b/src/app/core/services/data.service.ts @@ -311,7 +311,7 @@ export class DataService { }; if (indicator) { - row.indicator = Number(row[indicator]); + row.indicator = isNaN(row[indicator]) ? row[indicator] : Number(row[indicator]); } return row; From a3a9151bcd7abf89824681070b81ebbdaa40a95b Mon Sep 17 00:00:00 2001 From: pandutibil Date: Fri, 20 Oct 2023 15:08:58 +0530 Subject: [PATCH 08/11] PM SHRI label updated in the reports --- src/app/views/pm-shri/config/pm_shri_config.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/views/pm-shri/config/pm_shri_config.ts b/src/app/views/pm-shri/config/pm_shri_config.ts index babb019f..2ad03e70 100644 --- a/src/app/views/pm-shri/config/pm_shri_config.ts +++ b/src/app/views/pm-shri/config/pm_shri_config.ts @@ -33,7 +33,7 @@ export const config = { "metricFilterNeeded": false, "indicator": "status", "legend": { - "title": "Implemented PM Shri" + "title": "Implemented PM SHRI" }, "tooltipMetrics": [ { @@ -42,7 +42,7 @@ export const config = { "valueSuffix": "\n" }, { - "valuePrefix": "Implemented PM Shri: ", + "valuePrefix": "Implemented PM SHRI: ", "value": "status", "valueSuffix": "\n" } From 2516223ed7962ec10c31618d95995b2712fca48b Mon Sep 17 00:00:00 2001 From: pandutibil Date: Wed, 25 Oct 2023 17:01:11 +0530 Subject: [PATCH 09/11] Label changes for fiter panel selector and other configurations changes in pm-shri --- .../filter-panel/filter-panel.component.html | 2 +- .../filter-panel/filter-panel.component.ts | 8 ++++++++ src/app/views/pm-shri/config/pm_shri_config.ts | 14 ++++++++++++-- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/app/shared/components/filter-panel/filter-panel.component.html b/src/app/shared/components/filter-panel/filter-panel.component.html index 0f853b46..f331a5d4 100644 --- a/src/app/shared/components/filter-panel/filter-panel.component.html +++ b/src/app/shared/components/filter-panel/filter-panel.component.html @@ -8,7 +8,7 @@ [name]="'filter-'+filter.name" [multiple]="isFilterMulti()" [closeOnSelect]="false" placeholder="Select {{filter.name}}" [clearable]="resetOthers" [(ngModel)]="filter.value" (ngModelChange)="onSelectOption($event, i, selectRef)"> - {{ option.label }} + {{ convertNativeMetricLabelToReadable(option.label) }}
diff --git a/src/app/shared/components/filter-panel/filter-panel.component.ts b/src/app/shared/components/filter-panel/filter-panel.component.ts index fbff54ed..5c364093 100644 --- a/src/app/shared/components/filter-panel/filter-panel.component.ts +++ b/src/app/shared/components/filter-panel/filter-panel.component.ts @@ -61,4 +61,12 @@ export class FilterPanelComponent implements OnInit, OnChanges { isFilterMulti(): boolean { return this.isMulti; } + + convertNativeMetricLabelToReadable(label: string): string { + if (typeof label !== 'string') { + return label; + } + + return label.split('_').map(word => word[0]?.toUpperCase() + word?.substring(1).toLowerCase()).join(' ') + } } diff --git a/src/app/views/pm-shri/config/pm_shri_config.ts b/src/app/views/pm-shri/config/pm_shri_config.ts index 2ad03e70..2babb0e6 100644 --- a/src/app/views/pm-shri/config/pm_shri_config.ts +++ b/src/app/views/pm-shri/config/pm_shri_config.ts @@ -61,7 +61,7 @@ export const config = { { "queries": { - "map": "select t1.state_id, t1.state_id as level, t2.state_name, t1.category_name, sum(t1.sum) as category_value, sum(t3.sum) as total_schools, round(cast(sum(t1.sum) / sum(t3.sum) as numeric) * 100, 2) as percentage, t2.latitude, t2.longitude from datasets.pm_shri_pm_shri_category_state0categorypmshri as t1 join dimensions.state as t2 on t2.state_id = t1.state_id join datasets.pm_shri_total_schools_state as t3 on t3.state_id = t1.state_id where category_name in ('total_schools_having_library', 'total_schools_having_handwash_facility', 'total_schools_having_drinking_water_facility', 'total_schools_having_ramp_facility', 'total_schools_having_playground', 'total_schools_having_internet_facility') group by t1.state_id, t2.state_name, t1.category_name, t2.latitude, t2.longitude" + "map": "select t1.state_id, t1.state_id as level, t2.state_name, t1.category_name, t4.sum as total_girls_in_schools, t5.sum as total_boys_in_schools, sum(t1.sum) as category_value, sum(t3.sum) as total_schools, round(cast(sum(t1.sum) / sum(t3.sum) as numeric) * 100, 2) as percentage, t2.latitude, t2.longitude from datasets.pm_shri_pm_shri_category_state0categorypmshri as t1 join dimensions.state as t2 on t2.state_id = t1.state_id join datasets.pm_shri_total_schools_state as t3 on t3.state_id = t1.state_id join datasets.pm_shri_total_boys_in_schools_state as t4 on t4.state_id = t1.state_id join datasets.pm_shri_total_girls_in_schools_state as t5 on t5.state_id = t1.state_id where category_name in ('total_schools_having_library', 'total_schools_having_handwash_facility', 'total_schools_having_drinking_water_facility', 'total_schools_having_ramp_facility', 'total_schools_having_playground', 'total_schools_having_internet_facility') group by t1.state_id, t2.state_name, t1.category_name, t2.latitude, t2.longitude, t4.sum, t5.sum" }, "level": "state", "nextLevel": "district" @@ -98,6 +98,16 @@ export const config = { "value": "total_schools", "valueSuffix": "\n" }, + { + "valuePrefix": "Total Boys in schools: ", + "value": "total_boys_in_schools", + "valueSuffix": "\n" + }, + { + "valuePrefix": "Total Girls in schools: ", + "value": "total_girls_in_schools", + "valueSuffix": "\n" + }, { "valuePrefix": "", "value": "category_name", @@ -130,7 +140,7 @@ export const config = { ], "options": { "bigNumber": { - "title": ['Total PM SHRI schools', 'Total districts', 'Total districts', 'No. of primary schools', 'No. of upper primary schools', 'No. of secondary schools', 'No. of higher secondary schools', 'KVS', 'NVS'], + "title": ['Total PM SHRI schools', 'Total districts', 'No. of primary schools', 'No. of upper primary schools', 'No. of secondary schools', 'No. of higher secondary schools', 'KVS', 'NVS'], "formatter": { locale: 'en-IN', format: "long" } } } From a07dcdbae21ee18b7763364e2df420802a5c8fcd Mon Sep 17 00:00:00 2001 From: pandutibil Date: Thu, 2 Nov 2023 15:58:16 +0530 Subject: [PATCH 10/11] Tooltip and marker issues are fixed in the map and PM SHRI reports --- src/app/core/services/data.service.ts | 19 +++++++++---------- .../views/pm-shri/config/pm_shri_config.ts | 11 ++++++++--- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/app/core/services/data.service.ts b/src/app/core/services/data.service.ts index 1621e639..56bc853b 100644 --- a/src/app/core/services/data.service.ts +++ b/src/app/core/services/data.service.ts @@ -451,9 +451,8 @@ export class DataService { mapGroupBy(data: any, groupByLabel: any, metricLabelProp: string, metricValueProp: string, tooltipMetrics: any, metricFilterValue: any) { let result = _.chain(data).groupBy(groupByLabel).map((objs, key) => { - data = { - [groupByLabel]: key, - } + let row = objs.find(obj => obj.category_name === metricFilterValue) + objs?.forEach((obj: any, index: any) => { let modifiedTooltipMetrics = tooltipMetrics.filter(metric => metricLabelProp === metric.value).map((metric: any) => { return { @@ -462,18 +461,18 @@ export class DataService { value: obj[metricLabelProp] } }) - data = { - ...data, - ...obj, - // district_code: obj['district_id'] ? Number(obj['district_id']) : null, + + row = { + ...row, [obj[metricLabelProp]]: obj[metricValueProp] } + if (index === 0) { - data['tooltip'] = this._wrapperService.constructTooltip(tooltipMetrics.filter(metric => metricLabelProp !== metric.value), data, metricFilterValue) + row['tooltip'] = this._wrapperService.constructTooltip(tooltipMetrics.filter(metric => metricLabelProp !== metric.value), row, metricFilterValue) } - data['tooltip'] += this._wrapperService.constructTooltip(modifiedTooltipMetrics, data, metricFilterValue) + row['tooltip'] += this._wrapperService.constructTooltip(modifiedTooltipMetrics, row, metricFilterValue) }); - return data; + return row; }).value() return result; } diff --git a/src/app/views/pm-shri/config/pm_shri_config.ts b/src/app/views/pm-shri/config/pm_shri_config.ts index 2babb0e6..afba5464 100644 --- a/src/app/views/pm-shri/config/pm_shri_config.ts +++ b/src/app/views/pm-shri/config/pm_shri_config.ts @@ -6,7 +6,7 @@ export const config = { "labelProp": "category_name", "valueProp": "category_name", "id": "metric", - "query": "select category_name from dimensions.categorypmshri where category_name in ('total_schools_having_library', 'total_schools_having_handwash_facility', 'total_schools_having_drinking_water_facility', 'total_schools_having_ramp_facility', 'total_schools_having_playground', 'total_schools_having_internet_facility')" + "query": "select category_name from dimensions.categorypmshri where category_name not in ('total_instructional_classrooms')" } ], implementation_status: { @@ -61,7 +61,7 @@ export const config = { { "queries": { - "map": "select t1.state_id, t1.state_id as level, t2.state_name, t1.category_name, t4.sum as total_girls_in_schools, t5.sum as total_boys_in_schools, sum(t1.sum) as category_value, sum(t3.sum) as total_schools, round(cast(sum(t1.sum) / sum(t3.sum) as numeric) * 100, 2) as percentage, t2.latitude, t2.longitude from datasets.pm_shri_pm_shri_category_state0categorypmshri as t1 join dimensions.state as t2 on t2.state_id = t1.state_id join datasets.pm_shri_total_schools_state as t3 on t3.state_id = t1.state_id join datasets.pm_shri_total_boys_in_schools_state as t4 on t4.state_id = t1.state_id join datasets.pm_shri_total_girls_in_schools_state as t5 on t5.state_id = t1.state_id where category_name in ('total_schools_having_library', 'total_schools_having_handwash_facility', 'total_schools_having_drinking_water_facility', 'total_schools_having_ramp_facility', 'total_schools_having_playground', 'total_schools_having_internet_facility') group by t1.state_id, t2.state_name, t1.category_name, t2.latitude, t2.longitude, t4.sum, t5.sum" + "map": "select t1.state_id, t2.state_name, t1.category_name, SUM(t4.sum) as total_girls_in_schools, SUM(t5.sum) as total_boys_in_schools, SUM(t6.sum) as total_instructional_classrooms, sum(t1.sum) as category_value, sum(t3.sum) as total_schools, round(cast(sum(t1.sum) / sum(t3.sum) as numeric) * 100, 2) as percentage, t2.latitude, t2.longitude from datasets.pm_shri_pm_shri_category_state0categorypmshri as t1 join dimensions.state as t2 on t2.state_id = t1.state_id join datasets.pm_shri_total_schools_state as t3 on t3.state_id = t1.state_id join datasets.pm_shri_total_boys_in_schools_state as t4 on t4.state_id = t1.state_id join datasets.pm_shri_total_girls_in_schools_state as t5 on t5.state_id = t1.state_id join datasets.pm_shri_total_instructional_classrooms_state as t6 on t6.state_id = t1.state_id where category_name not in ('total_instructional_classrooms') group by t1.state_id, t2.state_name, t1.category_name, t2.latitude, t2.longitude" }, "level": "state", "nextLevel": "district" @@ -80,7 +80,7 @@ export const config = { "metricLabelProp": "category_name", "metricValueProp": "category_value", "indicator": "percentage", - "groupByColumn": "level", + "groupByColumn": "state_id", "metricFilterNeeded": true, "legend": { "title": "State Wise Performance" }, "drillDownConfig": { @@ -108,6 +108,11 @@ export const config = { "value": "total_girls_in_schools", "valueSuffix": "\n" }, + { + "valuePrefix": "Total Instructional classrooms: ", + "value": "total_instructional_classrooms", + "valueSuffix": "\n" + }, { "valuePrefix": "", "value": "category_name", From f4f0548a444ac9e762bab407cb9b06d55106ca81 Mon Sep 17 00:00:00 2001 From: pandutibil Date: Fri, 3 Nov 2023 14:21:52 +0530 Subject: [PATCH 11/11] Issue fixed in the map group by in data service --- src/app/core/services/data.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/core/services/data.service.ts b/src/app/core/services/data.service.ts index 56bc853b..cf0108be 100644 --- a/src/app/core/services/data.service.ts +++ b/src/app/core/services/data.service.ts @@ -451,7 +451,7 @@ export class DataService { mapGroupBy(data: any, groupByLabel: any, metricLabelProp: string, metricValueProp: string, tooltipMetrics: any, metricFilterValue: any) { let result = _.chain(data).groupBy(groupByLabel).map((objs, key) => { - let row = objs.find(obj => obj.category_name === metricFilterValue) + let row = objs.find(obj => obj[metricLabelProp] === metricFilterValue) objs?.forEach((obj: any, index: any) => { let modifiedTooltipMetrics = tooltipMetrics.filter(metric => metricLabelProp === metric.value).map((metric: any) => {