Merge Angular 16 Irish Monitor to develop #33

Merged
k.triantafyllou merged 151 commits from angular-16-irish-monitor into develop 2024-02-13 09:32:41 +01:00
1 changed files with 2 additions and 1 deletions
Showing only changes of commit 941db7102a - Show all commits

View File

@ -32,6 +32,7 @@ export abstract class MonitorIndicatorStakeholderBaseComponent extends Indicator
/** Variables */ /** Variables */
public user: User; public user: User;
public requireLogin: boolean = true;
public view: Visibility; public view: Visibility;
public stakeholder: Stakeholder; public stakeholder: Stakeholder;
public activeTopic: Topic = null; public activeTopic: Topic = null;
@ -144,7 +145,7 @@ export abstract class MonitorIndicatorStakeholderBaseComponent extends Indicator
this.queryParams = Object.assign({}, queryParams); this.queryParams = Object.assign({}, queryParams);
this.initializeFilters(); this.initializeFilters();
this.setView(params); this.setView(params);
if(!this.user && (this.filters.filter(filter => this.queryParams[filter.filterId]).length > 0 || this.queryParams['year'])) { if(this.requireLogin && !this.user && (this.filters.filter(filter => this.queryParams[filter.filterId]).length > 0 || this.queryParams['year'])) {
if(queryParams['view']) { if(queryParams['view']) {
this._router.navigate([], {queryParams: {view: queryParams['view']}}); this._router.navigate([], {queryParams: {view: queryParams['view']}});
} else { } else {