MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add Indicator Themes in menu item. Fix link in themes page

This commit is contained in:
Konstantinos Triantafyllou 2022-08-05 15:50:53 +03:00
parent f8f606ada7
commit 1bbb064a01
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
monitor/indicators/indicator-themes.component.ts
View File

@ -1,6 +1,6 @@
import {Component, OnInit} from "@angular/core"; import {Component, OnInit} from "@angular/core";
import {properties} from "../../../../environments/environment"; import {properties} from "../../../../environments/environment";
import {Router} from "@angular/router"; import {ActivatedRoute, Router} from "@angular/router";
import {Meta, Title} from "@angular/platform-browser"; import {Meta, Title} from "@angular/platform-browser";
import {SEOService} from "../../sharedComponents/SEO/SEO.service"; import {SEOService} from "../../sharedComponents/SEO/SEO.service";
@ -8,23 +8,27 @@ import {SEOService} from "../../sharedComponents/SEO/SEO.service";
selector: 'indicator-themes-page', selector: 'indicator-themes-page',
template: ` template: `
<div class="uk-section"> <div class="uk-section">
<div class="uk-container uk-container-large"> <div class="uk-container">
<h1>Indicator Themes<span class="uk-text-primary">.</span></h1> <h1>Indicator Themes<span class="uk-text-primary">.</span></h1>
</div> </div>
<div class="uk-section uk-container uk-container-large"> <div class="uk-section uk-container">
<div class="uk-grid uk-grid-large uk-flex-middle" uk-grid> <div class="uk-grid uk-grid-large uk-child-width-1-2@m uk-child-width-1-1 uk-flex-middle" uk-grid>
<div class="uk-width-3-5@m"> <div>
<img src="assets/common-assets/monitor-assets/indicator-themes-circle.png"> <img src="assets/common-assets/monitor-assets/indicator-themes-circle.png">
</div> </div>
<div class="uk-width-2-5@m"> <div>
<div class="uk-width-4-5@m"> <div class="uk-width-4-5@m">
<h5>Indicator themes that we are covering in the Monitor dashboards.</h5> <h5>Indicator themes that we are covering in the Monitor dashboards.</h5>
<div class="uk-margin-bottom"> <p>
Please be aware that this is the current set, which will be enriched as requests and data are coming into the <a href="">OpenAIRE Research Graph</a>. We are in your disposal to add more indicator themes that may fit your needs. Please be aware that this is the current set, which will be enriched as requests and data are coming into the
</div> <a href="https://graph.openaire.eu" class="text-graph" target="_blank">OpenAIRE Research Graph</a>. We are in your disposal to add more indicator themes that may fit your needs.
<div> </p>
Check out the indicator pages (for funders, institutions and research initiatives put hyperlinks for each) for the specific indicators for each type of dashboard, and the <a href="">methodology and terminology</a> page ( hyperlink to terminology) on how we produce the metrics. <p>
</div> Check out the indicator pages (for <a [routerLink]="['../funder']" [relativeTo]="route">funders</a>,
<a [routerLink]="['../organization']" [relativeTo]="route">research institutions</a> and
<a [routerLink]="['../ri']" [relativeTo]="route">research initiatives</a>)
for the specific indicators for each type of dashboard, and the <a [routerLink]="['../../methodology']" [relativeTo]="route">methodology and terminology</a> page on how we produce the metrics.
</p>
</div> </div>
</div> </div>
</div> </div>
@ -38,7 +42,8 @@ export class IndicatorThemesComponent implements OnInit {
constructor(private router: Router, constructor(private router: Router,
private meta: Meta, private meta: Meta,
private title: Title, private title: Title,
private seoService: SEOService) { private seoService: SEOService,
public route: ActivatedRoute) {
} }
ngOnInit() { ngOnInit() {

13
monitor/services/resources.service.ts
View File

@ -36,14 +36,15 @@ export class ResourcesService {
ResourcesService.setLink(new MenuItem("methodology", "See how it works", ResourcesService.setLink(new MenuItem("methodology", "See how it works",
"", "", false, [], null, {}, null, "how", null, null, '_self'), "", "", false, [], null, {}, null, "how", null, null, '_self'),
prefix + "/methodology", portal)]; prefix + "/methodology", portal)];
let indicators = new MenuItem("indicators-page", "Indicators", items.push(new MenuItem("indicators-page", "Indicators",
"", "", false, [], null, {}, null, null, null, null, '_self'); "", "", false, [], null, {}));
let indicatorsItems = []; items.push(ResourcesService.setLink(new MenuItem("indicator-themes", "Indicator Themes",
"", "", false, [], null, {}, null, null, null, null, '_self'), prefix + "/indicators/themes", portal));
let promise = new Promise(resolve => { let promise = new Promise(resolve => {
this.isPagesEnabled().subscribe(status => { this.isPagesEnabled().subscribe(status => {
ResourcesService.types.forEach((type, index) => { ResourcesService.types.forEach((type, index) => {
if (status[index]) { if (status[index]) {
indicatorsItems.push(ResourcesService.setLink( items.push(ResourcesService.setLink(
new MenuItem("indicators-" + type.value, type.label, new MenuItem("indicators-" + type.value, type.label,
"", "", false, [], null, {}, null, null, null, null, '_self'), "", "", false, [], null, {}, null, null, null, null, '_self'),
prefix + "/indicators/" + type.value, portal) prefix + "/indicators/" + type.value, portal)
@ -57,10 +58,6 @@ export class ResourcesService {
}); });
}) })
await promise; await promise;
if (indicatorsItems.length > 0) {
items.push(indicators);
indicatorsItems.forEach(item => items.push(item));
}
return items; return items;
} }