MaDgIK
/
monitor-dashboard
13
0
Fork 0
Code Issues Pull Requests Projects Releases 17 Wiki Activity

[MonitorDashboard]: Sidebar: add activeItem and subItem to check which element is active 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57805 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
Konstantinos Triantafyllou 2019-12-04 11:47:20 +00:00
parent 2feb26dc63
commit bcdb3e4708
5 changed files with 293 additions and 288 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/library/sharedComponents/sidebar/sideBar.component.html
View File

@ -1,9 +1,5 @@
<aside id="sidebar_main"> <aside id="sidebar_main">
<div *ngIf= "showHeader" class="sidebar_main_header"> <div *ngIf= "showHeader" class="sidebar_main_header">
<div *ngIf="name" class="uk-padding-small">
<div class="uk-text-bold">{{name}}</div>
<div>Monitor Dashboard</div>
</div>
<div *ngIf="header" class="uk-padding-small"> <div *ngIf="header" class="uk-padding-small">
<img *ngIf="header.logoUrl" [src]="header.logoUrl"> <img *ngIf="header.logoUrl" [src]="header.logoUrl">
<div class="uk-text-bold uk-margin-top">{{header.name}}</div> <div class="uk-text-bold uk-margin-top">{{header.name}}</div>
@ -13,11 +9,11 @@
<div class="menu_section uk-margin-top"> <div class="menu_section uk-margin-top">
<ul> <ul>
<ng-template ngFor [ngForOf]="items" let-item let-i="index"> <ng-template ngFor [ngForOf]="items" let-item let-i="index">
<li [class.current_section]="isTheActiveMenu(item.route)" <li [class.current_section]="isTheActiveMenuItem(item)"
[class.act_section]="item.open" [class.act_section]="item.open"
[title]="item.name" [title]="item.name"
[class.submenu_trigger]="item.items.length > 1"> [class.submenu_trigger]="item.items.length > 1">
<a *ngIf="item.items.length <= 1 && item.route" [routerLink]="item.route"> <a *ngIf="item.items.length <= 1 && item.route" [routerLink]="!isTheActiveMenuItem(item)?item.route:null">
<span *ngIf="item.icon" class="menu_icon"><i class="material-icons">{{item.icon}}</i></span> <span *ngIf="item.icon" class="menu_icon"><i class="material-icons">{{item.icon}}</i></span>
<span class="menu_title">{{item.name}}</span> <span class="menu_title">{{item.name}}</span>
</a> </a>
@ -28,8 +24,8 @@
</a> </a>
<ul [style.display]="(item.open?'block':'none')"> <ul [style.display]="(item.open?'block':'none')">
<ng-template ngFor [ngForOf]="item.items" let-subItem let-j="index"> <ng-template ngFor [ngForOf]="item.items" let-subItem let-j="index">
<li *ngIf="subItem.route" [class.act_item]="isTheActiveMenu(subItem.route)"> <li *ngIf="subItem.route" [class.act_item]="isTheActiveMenuItem(subItem, true)">
<a [routerLink]="subItem.route"> <a [routerLink]="!isTheActiveMenuItem(subItem, true)?subItem.route:null">
<span *ngIf="subItem.icon" class="menu_icon"><i class="material-icons">{{subItem.icon}}</i></span> <span *ngIf="subItem.icon" class="menu_icon"><i class="material-icons">{{subItem.icon}}</i></span>
<span class="menu_title">{{subItem.name}}</span> <span class="menu_title">{{subItem.name}}</span>
</a> </a>

12
src/app/library/sharedComponents/sidebar/sideBar.component.ts
View File

@ -8,10 +8,10 @@ import {Header, Item} from "../../../utils/entities/sidebar";
}) })
export class SideBarComponent implements OnInit { export class SideBarComponent implements OnInit {
@Input() items: Item[] = []; @Input() items: Item[] = [];
// TODO remove it
@Input() name = null;
@Input() header: Header = null; @Input() header: Header = null;
@Input() showHeader: boolean = true; @Input() showHeader: boolean = true;
@Input() activeItem: string = '';
@Input() activeSubItem: string = '';
constructor(private router: Router) { constructor(private router: Router) {
} }
@ -19,11 +19,9 @@ export class SideBarComponent implements OnInit {
ngOnInit(): void { ngOnInit(): void {
} }
private getCurrentRoute(): string {
return this.router.url.split('?')[0];
}
isTheActiveMenu(route: string): boolean { isTheActiveMenuItem(item: Item, subItem = false): boolean {
return this.getCurrentRoute().indexOf(route) !== -1; return (!subItem && this.activeItem === item.id) ||
(subItem && this.activeSubItem === item.id);
} }
} }

5
src/app/monitor/monitor.component.html
View File

@ -72,8 +72,9 @@
</div> </div>
</nav> </nav>
</div> </div>
<dashboard-sidebar *ngIf="sideBar && stakeholder" [items]="sideBar.items" [name]="stakeholder.index_name" <dashboard-sidebar *ngIf="sideBar && stakeholder" [items]="sideBar.items"
[showHeader]=false [activeItem]="activeCategory?activeCategory.alias:null"
[activeSubItem]="activeSubCategory?activeSubCategory.alias:null" [showHeader]=false
></dashboard-sidebar> ></dashboard-sidebar>
<div *ngIf="activeSubCategory" <div *ngIf="activeSubCategory"
id="page_content" click-outside-or-esc targetId="page_content" [escClose]="false" id="page_content" click-outside-or-esc targetId="page_content" [escClose]="false"

544
src/app/monitor/monitor.component.ts
View File

@ -20,279 +20,291 @@ import {LayoutService} from "../library/sharedComponents/sidebar/layout.service"
import {FormBuilder, FormControl} from "@angular/forms"; import {FormBuilder, FormControl} from "@angular/forms";
@Component({ @Component({
selector: 'monitor', selector: 'monitor',
templateUrl: 'monitor.component.html', templateUrl: 'monitor.component.html',
}) })
export class MonitorComponent implements OnInit, OnDestroy { export class MonitorComponent implements OnInit, OnDestroy {
public piwiksub: any; public piwiksub: any;
public pageContents = null; public pageContents = null;
public divContents = null; public divContents = null;
public status: number; public status: number;
public loading: boolean = true; public loading: boolean = true;
public indicatorUtils: IndicatorUtils = new IndicatorUtils(); public indicatorUtils: IndicatorUtils = new IndicatorUtils();
public stakeholderUtils: StakeholderUtils = new StakeholderUtils(); public stakeholderUtils: StakeholderUtils = new StakeholderUtils();
public activeTopic: Topic = null; public activeTopic: Topic = null;
public activeCategory: Category = null; public activeCategory: Category = null;
public activeSubCategory: SubCategory = null; public activeSubCategory: SubCategory = null;
public sideBar: Sidebar = null; public sideBar: Sidebar = null;
public errorCodes: ErrorCodes; public errorCodes: ErrorCodes;
public stakeholder: Stakeholder; public stakeholder: Stakeholder;
public numberResults: Map<number, number> = new Map<number, number>(); public numberResults: Map<number, number> = new Map<number, number>();
public chartsActiveType: Map<number, IndicatorPath> = new Map<number, IndicatorPath>(); public chartsActiveType: Map<number, IndicatorPath> = new Map<number, IndicatorPath>();
private errorMessages: ErrorMessagesComponent; private errorMessages: ErrorMessagesComponent;
properties: EnvProperties; properties: EnvProperties;
fundingL0; fundingL0;
startYear; startYear;
endYear; endYear;
public keyword:FormControl; public keyword: FormControl;
constructor( constructor(
private route: ActivatedRoute, private route: ActivatedRoute,
private _router: Router, private _router: Router,
private _meta: Meta, private _meta: Meta,
private _title: Title, private _title: Title,
private _piwikService: PiwikService, private _piwikService: PiwikService,
private helper: HelperService, private helper: HelperService,
private stakeholderService: StakeholderService, private stakeholderService: StakeholderService,
private statisticsService: StatisticsService, private statisticsService: StatisticsService,
private layoutService: LayoutService, private layoutService: LayoutService,
private seoService: SEOService, private seoService: SEOService,
private cdr: ChangeDetectorRef, private cdr: ChangeDetectorRef,
private sanitizer: DomSanitizer, private _fb: FormBuilder) { private sanitizer: DomSanitizer, private _fb: FormBuilder) {
this.errorCodes = new ErrorCodes(); this.errorCodes = new ErrorCodes();
this.errorMessages = new ErrorMessagesComponent(); this.errorMessages = new ErrorMessagesComponent();
this.status = this.errorCodes.LOADING; this.status = this.errorCodes.LOADING;
} }
public ngOnInit() { public ngOnInit() {
this.keyword = this._fb.control(''); this.keyword = this._fb.control('');
this.keyword.valueChanges.subscribe(value=>{ this.keyword.valueChanges.subscribe(value => {
console.log("KEyword Changed!"); console.log("KEyword Changed!");
//TODO do a real action //TODO do a real action
}); });
this.layoutService.setHasSidebar(false); this.layoutService.setHasSidebar(false);
this.layoutService.setHasHeader(false); this.layoutService.setHasHeader(false);
this.route.data this.route.data
.subscribe((data: { envSpecific: EnvProperties }) => { .subscribe((data: { envSpecific: EnvProperties }) => {
this.route.params.subscribe(params => { this.route.params.subscribe(params => {
this.properties = data.envSpecific; this.properties = data.envSpecific;
var url = data.envSpecific.baseLink + this._router.url; var url = data.envSpecific.baseLink + this._router.url;
if (!this.stakeholder || this.stakeholder.index_id !== params['stakeholder']) { if (!this.stakeholder || this.stakeholder.index_id !== params['stakeholder']) {
this.status = this.errorCodes.LOADING; this.status = this.errorCodes.LOADING;
this.numberResults = new Map<number, number>(); this.numberResults = new Map<number, number>();
this.chartsActiveType = new Map<number, IndicatorPath>(); this.chartsActiveType = new Map<number, IndicatorPath>();
// this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => { // this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
let stakeholder:Stakeholder = null; let stakeholder: Stakeholder = null;
if(params['stakeholder']=="fwf"){ if (params['stakeholder'] == "fwf") {
stakeholder = new Stakeholder("fwf", "funder", "fwf_________::FWF","Austrian Science Fund (FWF)","FWF", stakeholder = new Stakeholder("fwf", "funder", "fwf_________::FWF", "Austrian Science Fund (FWF)", "FWF",
false,"fwf",true,true, null); false, "fwf", true, true, null);
stakeholder = this.stakeholderUtils. stakeholder = this.stakeholderUtils.createFunderFromDefaultProfile(stakeholder, StakeholderCreator.createFunderDefaultProfile().topics);
createFunderFromDefaultProfile(stakeholder, StakeholderCreator.createFunderDefaultProfile().topics); stakeholder.logoUrl = "./assets/fwf.png";
stakeholder.logoUrl = "./assets/fwf.png"; } else if (params['stakeholder'] == "arc") {
}else if(params['stakeholder']=="arc"){ stakeholder = new Stakeholder("arc", "funder", "arc_________::ARC",
stakeholder = new Stakeholder("arc","funder","arc_________::ARC", "Australian Research Council (ARC)", "ARC",
"Australian Research Council (ARC)","ARC", false, "arc", true, true, null);
false,"arc",true,true, null); stakeholder = this.stakeholderUtils.createFunderFromDefaultProfile(stakeholder, StakeholderCreator.createFunderDefaultProfile().topics);
stakeholder = this.stakeholderUtils. stakeholder.logoUrl = "./assets/arc1.gif";
createFunderFromDefaultProfile(stakeholder, StakeholderCreator.createFunderDefaultProfile().topics); } else {
stakeholder.logoUrl = "./assets/arc1.gif"; stakeholder = new Stakeholder("ec", "funder", "ec__________::EC",
}else{ "European Commission", "EC",
stakeholder = new Stakeholder("ec","funder","ec__________::EC", false, "ec", true, true, null);
"European Commission","EC", stakeholder = this.stakeholderUtils.createFunderFromDefaultProfile(stakeholder, StakeholderCreator.createFunderDefaultProfile().topics);
false,"ec",true,true, null); stakeholder.logoUrl = "./assets/ec.png";
stakeholder = this.stakeholderUtils. }
createFunderFromDefaultProfile(stakeholder, StakeholderCreator.createFunderDefaultProfile().topics); if (stakeholder) {
stakeholder.logoUrl = "./assets/ec.png"; this.stakeholder = stakeholder;
} this.seoService.createLinkForCanonicalURL(url, false);
this._meta.updateTag({content: url}, "property='og:url'");
var description = "Monitor Dashboard | " + this.stakeholder.index_name;
var title = "Monitor Dashboard | " + this.stakeholder.index_shortName;
this._meta.updateTag({content: description}, "name='description'");
this._meta.updateTag({content: description}, "property='og:description'");
this._meta.updateTag({content: title}, "property='og:title'");
this._title.setTitle(title);
if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
this.piwiksub = this._piwikService.trackView(this.properties, title, this.properties.piwikSiteId).subscribe();
}
//this.getDivContents();
this.getPageContents();
this.status = this.errorCodes.DONE;
this.setView(params);
}
// }, error => {
// this.navigateToError();
// })
} else {
this.setView(params);
}
});
});
}
if(stakeholder) { public get open() {
this.stakeholder = stakeholder; return this.layoutService.open;
this.seoService.createLinkForCanonicalURL(url, false); }
this._meta.updateTag({content: url}, "property='og:url'");
var description = "Monitor Dashboard | " + this.stakeholder.index_name; public toggleOpen(event = null) {
var title = "Monitor Dashboard | " + this.stakeholder.index_shortName; if (!event) {
this._meta.updateTag({content: description}, "name='description'"); this.layoutService.setOpen(!this.open);
this._meta.updateTag({content: description}, "property='og:description'"); } else if (event && event['value'] === true) {
this._meta.updateTag({content: title}, "property='og:title'"); this.layoutService.setOpen(false);
this._title.setTitle(title); }
if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) { }
this.piwiksub = this._piwikService.trackView(this.properties, title, this.properties.piwikSiteId).subscribe();
private getPageContents() {
this.helper.getPageHelpContents(this._router.url, this.properties, 'monitor').subscribe(contents => {
this.pageContents = contents;
})
}
private getDivContents() {
this.helper.getDivHelpContents(this._router.url, this.properties, 'monitor').subscribe(contents => {
this.divContents = contents;
})
}
private setView(params: Params) {
if (params && params['topic']) {
this.activeTopic = this.stakeholder.topics.
find(topic => topic.alias === decodeURIComponent(params['topic']) && topic.isPublic && topic.isActive);
if (this.activeTopic) {
if (params['category']) {
this.activeCategory = this.activeTopic.categories.find(category =>
(category.alias === params['category']) && category.isPublic && category.isActive);
} else {
this.activeCategory = this.activeTopic.categories.
find(category => category.isPublic && category.isActive);
if (this.activeCategory) {
this.activeSubCategory = this.activeCategory.subCategories.find(subCategory =>
subCategory.isPublic && subCategory.isActive);
if (this.activeSubCategory) {
this.setSideBar();
this.setIndicators();
} else {
this.navigateToError();
}
} else {
this.navigateToError();
}
return;
}
if (this.activeCategory) {
if (params['subCategory']) {
this.activeSubCategory = this.activeCategory.subCategories.find(subCategory =>
(subCategory.alias === params['subCategory'] && subCategory.isPublic && subCategory.isActive));
} else {
this.activeSubCategory = this.activeCategory.subCategories.find(subCategory =>
subCategory.isPublic && subCategory.isActive);
}
if (this.activeSubCategory) {
this.setSideBar();
this.setIndicators();
} else {
this.navigateToError();
}
return;
} }
//this.getDivContents();
this.getPageContents();
this.status = this.errorCodes.DONE;
this.setView(params);
}
// }, error => {
// this.navigateToError();
// })
} else {
this.setView(params);
}
});
});
}
public get open() {
return this.layoutService.open;
}
public toggleOpen(event = null) {
if(!event) {
this.layoutService.setOpen(!this.open);
} else if(event && event['value'] === true) {
this.layoutService.setOpen(false);
}
}
private getPageContents() {
this.helper.getPageHelpContents(this._router.url, this.properties, 'monitor').subscribe(contents => {
this.pageContents = contents;
})
}
private getDivContents() {
this.helper.getDivHelpContents(this._router.url, this.properties, 'monitor').subscribe(contents => {
this.divContents = contents;
})
}
private setView(params: Params) {
if (params && params['topic']) {
this.activeTopic = this.stakeholder.topics.filter(topic => topic.alias === decodeURIComponent(params['topic']))[0];
if (this.activeTopic) {
if (params['category']) {
this.activeCategory = this.activeTopic.categories.filter(category =>
(category.alias === params['category']) && category.isPublic && category.isActive)[0];
} else {
let category: Category = this.activeTopic.categories[0];
if(category) {
this.navigateTo(this.stakeholder.alias, this.activeTopic.alias, category.alias);
} else {
this.navigateToError();
}
return;
}
if (this.activeCategory) {
if (params['subCategory']) {
this.activeSubCategory = this.activeCategory.subCategories.filter(subCategory =>
(subCategory.alias === params['subCategory'] && subCategory.isPublic && subCategory.isActive))[0];
} else {
this.activeSubCategory = this.activeCategory.subCategories.filter(subCategory =>
!subCategory.alias && subCategory.isPublic && subCategory.isActive)[0];
}
if (this.activeSubCategory) {
this.setSideBar();
this.setIndicators();
return;
} else {
let subCategory: SubCategory = this.activeCategory.subCategories.filter(subCategory =>
subCategory.isPublic && subCategory.isActive)[0];
this.navigateTo(this.stakeholder.alias, this.activeTopic.alias, this.activeCategory.alias, subCategory.alias);
return;
}
}
}
this.navigateToError();
} else {
let topic: Topic = this.stakeholder.topics[0];
let category: Category = topic.categories.filter(category => category.isPublic && category.isActive)[0];
if(topic && category) {
this.navigateTo(this.stakeholder.alias, topic.alias, category.alias);
} else {
this.navigateToError();
}
}
}
private setSideBar() {
let items: Item[] = [];
this.activeTopic.categories.forEach(category => {
if (category.isPublic && category.isActive) {
let subItems: Item[] = [];
category.subCategories.forEach(subCategory => {
if (subCategory.alias != null && subCategory.isPublic && subCategory.isActive) {
subItems.push(new Item(subCategory.name, (
'/' + this.stakeholder.alias + '/' + this.activeTopic.alias + '/' + category.alias + '/' + subCategory.alias),
null, null, false));
}
});
const open = this.activeCategory.alias === category.alias;
items.push(new Item(category.name, (
'/' + this.stakeholder.alias + '/' + this.activeTopic.alias + '/' + category.alias),
subItems, null, open));
}
});
this.sideBar = new Sidebar(items, null);
}
private setIndicators() {
let urls: Map<string, number[]> = new Map<string, number[]>();
this.activeSubCategory.numbers.forEach((number, index) => {
if (number.isActive && number.isPublic) {
let url = number.indicatorPaths[0].url;
//add fundingLevel0 filter in the query
if(this.fundingL0 && number.indicatorPaths[0].filters.get("fundingL0")){
url = url + number.indicatorPaths[0].filters.get("fundingL0").replace(ChartHelper.prefix+'fundingL0'+ChartHelper.suffix,encodeURIComponent(this.fundingL0));
}
const pair = JSON.stringify([number.indicatorPaths[0].source, url]);
const indexes = urls.get(pair) ? urls.get(pair) : [];
indexes.push(index);
urls.set(pair, indexes);
}
});
urls.forEach((indexes, pair) => {
pair = JSON.parse(pair);
this.statisticsService.getNumbers(pair[0], pair[1]).subscribe(response => {
indexes.forEach(index => {
let result = JSON.parse(JSON.stringify(response));
this.activeSubCategory.numbers[index].indicatorPaths[0].jsonPath.forEach(jsonPath => {
if (result) {
result = result[jsonPath];
} }
}); this.navigateToError();
this.numberResults.set(index, result); } else {
}); this.activeTopic = this.stakeholder.topics.find(topic => topic.isPublic && topic.isActive);
}) if(this.activeTopic) {
}); this.activeCategory = this.activeTopic.categories.find(category => category.isPublic && category.isActive);
this.activeSubCategory.charts.forEach((chart, index) => { if (this.activeCategory) {
if (chart.indicatorPaths.length > 0) { this.activeSubCategory = this.activeCategory.subCategories.find(subCategory => subCategory.isPublic && subCategory.isActive);
chart.indicatorPaths[0].safeResourceUrl = this.getUrlByStakeHolder(chart.indicatorPaths[0]); if (this.activeSubCategory) {
this.chartsActiveType.set(index, chart.indicatorPaths[0]); this.setSideBar();
} this.setIndicators();
}); } else {
this.cdr.detectChanges(); this.navigateToError();
} }
} else {
public getUrlByStakeHolder(indicatorPath: IndicatorPath) { this.navigateToError();
return this.sanitizer.bypassSecurityTrustResourceUrl( }
this.statisticsService.getChartUrl(indicatorPath.source, this.indicatorUtils.getFullUrl(indicatorPath, this.fundingL0, this.startYear, this.endYear))); } else {
} this.navigateToError();
}
public setActiveChart(index, type: string) { }
let activeChart = this.activeSubCategory.charts[index].indicatorPaths.filter(indicatorPath => indicatorPath.type === type)[0]; }
activeChart.safeResourceUrl = this.getUrlByStakeHolder(activeChart);
this.chartsActiveType.set(index, activeChart); private setSideBar() {
} let items: Item[] = [];
this.activeTopic.categories.forEach(category => {
private navigateToError() { if (category.isPublic && category.isActive) {
this._router.navigate(['/error'], {queryParams: {'page': this._router.url}}); let subItems: Item[] = [];
} category.subCategories.forEach(subCategory => {
if (subCategory.isPublic && subCategory.isActive) {
public navigateTo(stakeholder: string, topic: string, category: string = null, subcategory: string = null) { subItems.push(new Item(subCategory.alias, subCategory.name, (
let url = stakeholder + '/' + topic + ((category) ? ('/' '/' + this.stakeholder.alias + '/' + this.activeTopic.alias + '/' + category.alias + '/' + subCategory.alias),
+ category) : '') + ((subcategory) ? ('/' + subcategory) : ''); null, null, false));
return this._router.navigate([url]); }
} });
const open = this.activeCategory.alias === category.alias;
public quote(param: string): string { items.push(new Item(category.alias, category.name, (
return StringUtils.quote(param); '/' + this.stakeholder.alias + '/' + this.activeTopic.alias + '/' + category.alias),
} subItems, null, open));
}
public ngOnDestroy() { });
if (this.piwiksub) { this.sideBar = new Sidebar(items, null);
this.piwiksub.unsubscribe(); }
private setIndicators() {
let urls: Map<string, number[]> = new Map<string, number[]>();
this.activeSubCategory.numbers.forEach((number, index) => {
if (number.isActive && number.isPublic) {
let url = number.indicatorPaths[0].url;
//add fundingLevel0 filter in the query
if (this.fundingL0 && number.indicatorPaths[0].filters.get("fundingL0")) {
url = url + number.indicatorPaths[0].filters.get("fundingL0").replace(ChartHelper.prefix + 'fundingL0' + ChartHelper.suffix, encodeURIComponent(this.fundingL0));
}
const pair = JSON.stringify([number.indicatorPaths[0].source, url]);
const indexes = urls.get(pair) ? urls.get(pair) : [];
indexes.push(index);
urls.set(pair, indexes);
}
});
urls.forEach((indexes, pair) => {
pair = JSON.parse(pair);
this.statisticsService.getNumbers(pair[0], pair[1]).subscribe(response => {
indexes.forEach(index => {
let result = JSON.parse(JSON.stringify(response));
this.activeSubCategory.numbers[index].indicatorPaths[0].jsonPath.forEach(jsonPath => {
if (result) {
result = result[jsonPath];
}
});
this.numberResults.set(index, result);
});
})
});
this.activeSubCategory.charts.forEach((chart, index) => {
if (chart.indicatorPaths.length > 0) {
chart.indicatorPaths[0].safeResourceUrl = this.getUrlByStakeHolder(chart.indicatorPaths[0]);
this.chartsActiveType.set(index, chart.indicatorPaths[0]);
}
});
this.cdr.detectChanges();
}
public getUrlByStakeHolder(indicatorPath: IndicatorPath) {
return this.sanitizer.bypassSecurityTrustResourceUrl(
this.statisticsService.getChartUrl(indicatorPath.source, this.indicatorUtils.getFullUrl(indicatorPath, this.fundingL0, this.startYear, this.endYear)));
}
public setActiveChart(index, type: string) {
let activeChart = this.activeSubCategory.charts[index].indicatorPaths.filter(indicatorPath => indicatorPath.type === type)[0];
activeChart.safeResourceUrl = this.getUrlByStakeHolder(activeChart);
this.chartsActiveType.set(index, activeChart);
}
private navigateToError() {
this._router.navigate(['/error'], {queryParams: {'page': this._router.url}});
}
public navigateTo(stakeholder: string, topic: string, category: string = null, subcategory: string = null) {
let url = stakeholder + '/' + topic + ((category) ? ('/'
+ category) : '') + ((subcategory) ? ('/' + subcategory) : '');
return this._router.navigate([url]);
}
public quote(param: string): string {
return StringUtils.quote(param);
}
public ngOnDestroy() {
if (this.piwiksub) {
this.piwiksub.unsubscribe();
}
} }
}
} }

8
src/app/utils/entities/sidebar.ts
View File

@ -1,5 +1,3 @@
import {ElementRef, TemplateRef} from "@angular/core";
export class Header { export class Header {
name: string; name: string;
dashboard: string; dashboard: string;
@ -13,20 +11,20 @@ export class Header {
} }
export class Item { export class Item {
id: string;
name: string; name: string;
route: string; route: string;
items: Item[]; items: Item[];
icon: string; icon: string;
open: boolean; open: boolean;
action: TemplateRef<ElementRef>;
constructor(name: string, route: string, items: Item[], icon, open: boolean, action: TemplateRef<ElementRef> = null) { constructor(id: string, name: string, route: string, items: Item[], icon, open: boolean) {
this.id = id;
this.name = name; this.name = name;
this.route = route; this.route = route;
this.items = items; this.items = items;
this.icon = icon; this.icon = icon;
this.open = open; this.open = open;
this.action = action;
} }
} }