MaDgIK
/
irish-monitor
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Monitor: enable again filtering in indicators, for selected filters include tripplet case

This commit is contained in:
argirok 2024-01-17 15:45:50 +02:00
parent e17778e965
commit 0889cfa45d
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/shared/monitor/monitor.component.html
View File

@ -213,8 +213,7 @@
<h4 class="uk-margin-remove-bottom">Filters</h4> <h4 class="uk-margin-remove-bottom">Filters</h4>
<a *ngIf="countSelectedFilters() > 1" class="uk-text-small uk-margin-left" (click)="clearAll()"> Clear All </a> <a *ngIf="countSelectedFilters() > 1" class="uk-text-small uk-margin-left" (click)="clearAll()"> Clear All </a>
</div> </div>
<div class="uk-alert-warning uk-padding-small">Filtering functionality is under development. Stay tuned!</div> <div>
<div class="uk-disabled semiFiltered"> <!--Remove to enable again-->
<ng-container *ngTemplateOutlet="selected_filters_pills"></ng-container> <ng-container *ngTemplateOutlet="selected_filters_pills"></ng-container>
<ul class="uk-list uk-list-xlarge uk-list-divider uk-margin-top"> <ul class="uk-list uk-list-xlarge uk-list-divider uk-margin-top">
<li> <li>
@ -258,7 +257,16 @@
<ng-container *ngIf="value.selected"> <ng-container *ngIf="value.selected">
<li> <li>
<span class="uk-label uk-label-primary uk-flex uk-flex-middle"> <span class="uk-label uk-label-primary uk-flex uk-flex-middle">
<span class="uk-margin-small-right uk-width-expand uk-text-truncate">{{value.name}}</span> <span class="uk-margin-small-right uk-width-expand uk-text-truncate">
<ng-container *ngIf="filter.type && (filter.type == 'boolean' || filter.type == 'triplet') else noboolean">
{{filter.title}}:
{{(value.name=='true'||value.name=='Yes')?'Yes':'No'}}
</ng-container>
<ng-template #noboolean>
{{value.name}}
</ng-template>
</span>
<button [class.uk-disabled]="loading" (click)="clearFilterValue(filter, value)" <button [class.uk-disabled]="loading" (click)="clearFilterValue(filter, value)"
class="uk-close uk-icon" [disabled]="loading"> class="uk-close uk-icon" [disabled]="loading">
<icon name="close" flex="true" ratio="0.7"></icon> <icon name="close" flex="true" ratio="0.7"></icon>

12
src/app/shared/monitor/monitor.component.ts
View File

@ -57,8 +57,7 @@ export class MonitorComponent extends MonitorIndicatorStakeholderBaseComponent {
if (stakeholder) { if (stakeholder) {
this.stakeholder = stakeholder; this.stakeholder = stakeholder;
this.subscriptions.push(this._route.queryParams.subscribe(queryParams => {
this.handleQueryParams(queryParams, params);
this.subscriptions.push(this.customFilterService.getCustomFilterAsObservable().subscribe(filters => { this.subscriptions.push(this.customFilterService.getCustomFilterAsObservable().subscribe(filters => {
if(filters) { if(filters) {
let customFilterParams = ""; let customFilterParams = "";
@ -72,12 +71,15 @@ export class MonitorComponent extends MonitorIndicatorStakeholderBaseComponent {
this.filters = this.postProcessingFosFilters(res[2]); this.filters = this.postProcessingFosFilters(res[2]);
this.title = this.stakeholder.name; this.title = this.stakeholder.name;
this.description = this.stakeholder.name; this.description = this.stakeholder.name;
this.setMetadata(); this.subscriptions.push(this._route.queryParams.subscribe(queryParams => {
this.setView(params); this.handleQueryParams(queryParams, params);
this.setMetadata();
this.setView(params);
}));
})); }));
} }
}));
})); }));
// } else { // } else {