From d198f843259f9001262f7d2e3d222545b7c18319 Mon Sep 17 00:00:00 2001
From: 5Amogh <amoghavarsh@navadhiti.com>
Date: Tue, 15 Nov 2022 18:41:38 +0530
Subject: [PATCH] Removed hardcoded report config to get the configurable
report data from the form config
---
.../program-datasets.component.ts | 58 -------------------
1 file changed, 58 deletions(-)
diff --git a/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.ts b/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.ts
index a4c94b2137..5b58f5361a 100644
--- a/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.ts
+++ b/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.ts
@@ -560,64 +560,6 @@ export class DatasetsComponent implements OnInit, OnDestroy {
reportChanged(selectedReportData) {
this.resetConfigFilters();
this.selectedReport = selectedReportData;
- if(this.selectedReport.name === 'Status Report'){
- this.selectedReport['configurableFilters'] = true;
- this.selectedReport['filters'] = [
- {
- "type": "in",
- "dimension": "status_of_project",
- "values": "$status_of_project"
- },
- {
- "type": "equals",
- "dimension": "private_program",
- "value": "false"
- },
- {
- "type": "equals",
- "dimension": "sub_task_deleted_flag",
- "value": "false"
- },
- {
- "type": "equals",
- "dimension": "task_deleted_flag",
- "value": "false"
- },
- {
- "type": "equals",
- "dimension": "project_deleted_flag",
- "value": "false"
- },
- {
- "type": "equals",
- "dimension": "program_id",
- "value": "$programId"
- },
- {
- "type": "equals",
- "dimension": "solution_id",
- "value": "$solutionId"
- },
- {
- "type": "equals",
- "dimension": "district_externalId",
- "value": "$district_externalId"
- },
- {
- "type": "equals",
- "dimension": "organisation_id",
- "value": "$organisation_id"
- }
- ]
- this.selectedReport['uiFilters'] = [
- {
- "label": "Status",
- "controlType": "multi-select",
- "reference": "status_of_project",
- "placeholder":"Select status",
- "options":["started","submitted","inProgress"]
- }]
- }
if(this.selectedReport.configurableFilters){
this.pdFilters = this.selectedReport.uiFilters;
this.pdFilters.map(filter => {
--
GitLab