diff --git a/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.html b/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.html
index ad08e64e264a965e4206adb1ba68ad8a6213d1f9..705b1b1275f3d96c968de32ee9811b5d00504c8d 100644
--- a/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.html
+++ b/src/app/client/src/app/modules/program-dashboard/components/program-datasets/program-datasets.component.html
@@ -121,9 +121,12 @@
<mat-datepicker #picker></mat-datepicker>
</mat-form-field>
</div>
- <ng-container *ngFor="let filter of pdFilters">
- <app-pd-filters [pdFilter]="filter" (filterChanged)="filterChanged($event)"></app-pd-filters>
+ <ng-container *ngIf="pdFilters.length">
+ <ng-container *ngFor="let filter of pdFilters">
+ <app-pd-filters [pdFilter]="filter" (filterChanged)="pdFilterChanged($event)"></app-pd-filters>
+ </ng-container>
</ng-container>
+
<div class="d-flex flex-dc ml-auto mt-12">
<button type="button" class="sb-field sb-btn sb-btn-normal sb-btn-primary reset-filter flex-as-flex-end" (click)="resetFilter()">{{resourceService?.frmelmnts?.btn?.resetFilters}}</button>
<mat-form-field *ngIf="!noResult && (tabIndex == 1)" appearance="fill" class="sb-mat__dropdown custom_mat_dd">
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 792bb8f8b305cc235fa9576788bc734bb7cd65b8..0f5ab778e02f11167cc47e760030eba004786bbe 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
@@ -13,6 +13,7 @@ import * as moment from 'moment';
import html2canvas from 'html2canvas';
import * as jspdf from 'jspdf';
const PRE_DEFINED_PARAMETERS = ['$slug', 'hawk-eye'];
+
@Component({
selector: 'app-datasets',
templateUrl: './program-datasets.component.html',
@@ -94,28 +95,7 @@ export class DatasetsComponent implements OnInit, OnDestroy {
maxStartDate: any; //Start date - has to be one day less than end date
displayFilters:any = {};
loadash = _;
- pdFilters = [{
- 'label':'Minimum no. of tasks in the project',
- 'placeholder':'Minimum no. of tasks in the project',
- 'controlType':'number',
- 'reference':'minTaskNumber',
- 'defaultValue':'5',
- },
- {
- 'label':'Minimum no. of task evidence',
- 'placeholder':'Minimum no. of task evidence',
- 'controlType':'number',
- 'reference':'minTaskEvidence',
- 'defaultValue':'2',
- },
- {
- 'label':'Minimum no. of project evidence',
- 'placeholder':'Minimum no. of project evidence',
- 'controlType':'number',
- 'reference':'minProjectEvidence',
- 'defaultValue':'1',
- }
-]
+ pdFilters:object[] = [];
configuredFilters:any = {}
constructor(
activatedRoute: ActivatedRoute,
@@ -567,23 +547,22 @@ export class DatasetsComponent implements OnInit, OnDestroy {
reportChanged(selectedReportData) {
this.selectedReport = selectedReportData;
+ console.log('Selected report',this.selectedReport)
+ if(this.selectedReport.configurableFilters){
+ this.pdFilters = this.selectedReport.uiFilters;
+ this.pdFilters.map(filter => {
+ this.configuredFilters[filter['reference']] = filter['defaultValue'] as number -1
+ })
+ }
}
- filterChanged($event){
- //this event will conatain data emitted by pd-filter method and will have only one property thus there will be only one key and value
- let reference:string| unknown = Object.keys($event);
- let value:number | unknown = Object.values($event);
- this.configuredFilters[`${reference[0]}`] = value[0]-1;
- // if(this.reportForm.contains(`${reference[0]}`)){
- // let updateControl = {};
- // updateControl[`${reference[0]}`] = value[0]-1
- // this.reportForm.patchValue(updateControl);
- // }else{
- // this.reportForm.addControl(`${reference[0]}`, new FormControl(value[0]-1))
- // }
+ pdFilterChanged($event){
+ const [reference, value]= [Object.keys($event),Object.values($event)] ;
+ this.configuredFilters[reference[0]] = [0,null].includes(value[0] as number) ? 0 : value[0] as number -1;
console.log('from event emitter',Object.keys($event),Object.values($event))
- console.log('configuredFilters',this.configuredFilters)
+ console.log('configuredFilters',this.configuredFilters);
}
+
addFilters() {
let filterKeysObj = {
program_id: _.get(this.reportForm, 'controls.programName.value'),
@@ -594,7 +573,10 @@ export class DatasetsComponent implements OnInit, OnDestroy {
organisation_id: _.get(this.reportForm, 'controls.organisationName.value') || undefined,
...this.configuredFilters
}
+
let keys = Object.keys(filterKeysObj);
+ console.log('filterKeysObj','keys',filterKeysObj,keys)
+
this.selectedReport['filters'].map(data => {
keys.filter(key => {
return data.dimension == key && (data.value = filterKeysObj[key]);
@@ -603,6 +585,7 @@ export class DatasetsComponent implements OnInit, OnDestroy {
this.filter.push(data);
}
});
+ console.log('Filters to be sent',this.filter);
}
submitRequest() {
this.addFilters();
@@ -700,6 +683,7 @@ export class DatasetsComponent implements OnInit, OnDestroy {
this.formService.getFormConfig(formServiceInputParams).subscribe((formData) => {
if (formData) {
this.formData = formData;
+ console.log('Form Data',this.formData)
}
}, error => {
this.toasterService.error(this.resourceService.messages.emsg.m0005);
diff --git a/src/app/client/src/app/modules/program-dashboard/shared/pd-filters/pd-filters.component.html b/src/app/client/src/app/modules/program-dashboard/shared/pd-filters/pd-filters.component.html
index 37808aa6b51c812b78f26ed01dc55b4a992cecb9..3c7dabd4d169846562d2a11149019633af64ff5f 100644
--- a/src/app/client/src/app/modules/program-dashboard/shared/pd-filters/pd-filters.component.html
+++ b/src/app/client/src/app/modules/program-dashboard/shared/pd-filters/pd-filters.component.html
@@ -1,5 +1,4 @@
<form class="d-flex flex-dr" [formGroup]="pdFiltersFormGroup">
- <!-- <ng-container *ngFor="let filter of pdFilters"> -->
<div class="d-flex flex-dc">
<label>{{ pdFilter.label }}</label>
<ng-container *ngIf="pdFilter.controlType === 'number'">
@@ -11,12 +10,10 @@
matInput
type="number"
[formControlName]="pdFilter.reference"
- [placeholder]="pdFilter.placeholder"
[value]="pdFilter.defaultValue"
(input)="inputChange()"
/>
</mat-form-field>
</ng-container>
</div>
- <!-- </ng-container> -->
</form>
diff --git a/src/app/client/src/app/modules/program-dashboard/shared/pd-filters/pd-filters.component.scss b/src/app/client/src/app/modules/program-dashboard/shared/pd-filters/pd-filters.component.scss
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/src/app/client/src/app/modules/program-dashboard/shared/pd-filters/pd-filters.component.ts b/src/app/client/src/app/modules/program-dashboard/shared/pd-filters/pd-filters.component.ts
index f708b3bde4e34ddb105586b70cb5762b9c4b1a88..ff2bbb7f10df1fd2c9e12801aaa1e13c8c71fc15 100644
--- a/src/app/client/src/app/modules/program-dashboard/shared/pd-filters/pd-filters.component.ts
+++ b/src/app/client/src/app/modules/program-dashboard/shared/pd-filters/pd-filters.component.ts
@@ -4,8 +4,7 @@ import * as _ from "lodash-es";
@Component({
selector: "app-pd-filters",
- templateUrl: "./pd-filters.component.html",
- styleUrls: ["./pd-filters.component.scss"],
+ templateUrl: "./pd-filters.component.html"
})
export class PdFiltersComponent implements OnInit {
@Input() pdFilter: any;