Compare commits
No commits in common. "master" and "v1.0.3" have entirely different histories.
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "monitor-dashboard",
|
"name": "monitor-dashboard",
|
||||||
"version": "1.1.1",
|
"version": "1.0.3",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"ng": "ng",
|
"ng": "ng",
|
||||||
"start": "ng serve --port 4600 --disable-host-check --host 0.0.0.0",
|
"start": "ng serve --port 4600 --disable-host-check --host 0.0.0.0",
|
||||||
|
|
|
||||||
|
|
@ -81,7 +81,7 @@ export function app() {
|
||||||
}));
|
}));
|
||||||
if (userinfoRes.status === 200) {
|
if (userinfoRes.status === 200) {
|
||||||
let user = new User(userinfoRes.data);
|
let user = new User(userinfoRes.data);
|
||||||
let stakeholderRes = (await axios.get<Stakeholder>(properties.monitorServiceAPIURL + 'stakeholder/' + encodeURIComponent(req.params.alias), {
|
let stakeholderRes = (await axios.get<Stakeholder>(properties.monitorServiceAPIURL + '/stakeholder/' + encodeURIComponent(req.params.alias), {
|
||||||
withCredentials: true,
|
withCredentials: true,
|
||||||
headers: headers
|
headers: headers
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
|
|
|
||||||
|
|
@ -89,7 +89,7 @@ export class AppComponent extends SidebarBaseComponent implements OnInit {
|
||||||
super();
|
super();
|
||||||
this.initRouterParams(_route, event => {
|
this.initRouterParams(_route, event => {
|
||||||
this.isBrowse = event.url.includes('browse');
|
this.isBrowse = event.url.includes('browse');
|
||||||
this.isSearch = event.url.includes('search/find');
|
this.isSearch = event.url.includes('search');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -224,7 +224,7 @@ export class AppComponent extends SidebarBaseComponent implements OnInit {
|
||||||
this.notificationConfiguration.availableGroups.push({value: Role.typeMember(type.value), label: type.label + ' Members'});
|
this.notificationConfiguration.availableGroups.push({value: Role.typeMember(type.value), label: type.label + ' Members'});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this.subscriptions.push(this.stakeholderService.getMyStakeholders().subscribe(manageStakeholder => {
|
this.subscriptions.push(this.stakeholderService.getMyStakeholders(this.properties.monitorServiceAPIURL).subscribe(manageStakeholder => {
|
||||||
let stakeholders = manageStakeholder.standalone;
|
let stakeholders = manageStakeholder.standalone;
|
||||||
stakeholders.concat(manageStakeholder.umbrella);
|
stakeholders.concat(manageStakeholder.umbrella);
|
||||||
stakeholders.concat(manageStakeholder.dependent);
|
stakeholders.concat(manageStakeholder.dependent);
|
||||||
|
|
@ -309,7 +309,7 @@ export class AppComponent extends SidebarBaseComponent implements OnInit {
|
||||||
if(this.isChild) {
|
if(this.isChild) {
|
||||||
return this.stakeholder.parent.alias + '/browse/' + this.stakeholder.type + '/';
|
return this.stakeholder.parent.alias + '/browse/' + this.stakeholder.type + '/';
|
||||||
} else {
|
} else {
|
||||||
return '/';
|
return '';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -443,7 +443,6 @@ export class AppComponent extends SidebarBaseComponent implements OnInit {
|
||||||
this.resourcesService.setResources(this.menuItems, '', this.monitorLink);
|
this.resourcesService.setResources(this.menuItems, '', this.monitorLink);
|
||||||
this.menuItems.push(new MenuItem("support", "Support", this.monitorLink + '/support/', "", false, [], null, {}, null, null, null, null, "_self"));
|
this.menuItems.push(new MenuItem("support", "Support", this.monitorLink + '/support/', "", false, [], null, {}, null, null, null, null, "_self"));
|
||||||
this.menuItems.push(new MenuItem("about", "About", this.monitorLink + '/about/', "", false, [], null, {}, null, null, null, null, "_self"));
|
this.menuItems.push(new MenuItem("about", "About", this.monitorLink + '/about/', "", false, [], null, {}, null, null, null, null, "_self"));
|
||||||
this.menuItems.push(new MenuItem("subscriptions", "Subscriptions", this.monitorLink + "/subscriptions", "", false, [], null, {}, null, null, null, null, "_self"));
|
|
||||||
if (this.hasAdminMenu) {
|
if (this.hasAdminMenu) {
|
||||||
this.adminMenuItems = [];
|
this.adminMenuItems = [];
|
||||||
this.backItem = null;
|
this.backItem = null;
|
||||||
|
|
|
||||||
|
|
@ -26,12 +26,12 @@ import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
|
||||||
</div>
|
</div>
|
||||||
<h3>For {{openaireEntities.RESULTS | lowercase}}</h3>
|
<h3>For {{openaireEntities.RESULTS | lowercase}}</h3>
|
||||||
<div class="uk-margin-bottom">
|
<div class="uk-margin-bottom">
|
||||||
For {{openaireEntities.RESULTS | lowercase}} ({{openaireEntities.PUBLICATIONS | lowercase}}, {{openaireEntities.DATASETS | lowercase}}, {{openaireEntities.SOFTWARE | lowercase}} and {{openaireEntities.OTHER | lowercase}}) you can use the Graph API by adding the funder parameter.
|
For {{openaireEntities.RESULTS | lowercase}} ({{openaireEntities.PUBLICATIONS | lowercase}}, {{openaireEntities.DATASETS | lowercase}}, {{openaireEntities.SOFTWARE | lowercase}} and {{openaireEntities.OTHER | lowercase}}) you can use the Selective Access APIs by adding the funder parameter.
|
||||||
</div>
|
</div>
|
||||||
<a class="uk-display-inline-block uk-button uk-button-text"
|
<a class="uk-display-inline-block uk-button uk-button-text"
|
||||||
href="https://graph.openaire.eu/docs/apis/search-api/research-products" target="_blank">
|
href="https://graph.openaire.eu/develop/api.html" target="_blank">
|
||||||
<span class="uk-flex uk-flex-middle">
|
<span class="uk-flex uk-flex-middle">
|
||||||
<span>Graph API</span>
|
<span>Selective Access APIs</span>
|
||||||
</span>
|
</span>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -44,17 +44,17 @@ import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
|
||||||
</div>
|
</div>
|
||||||
<h3>For {{openaireEntities.PROJECTS | lowercase}}</h3>
|
<h3>For {{openaireEntities.PROJECTS | lowercase}}</h3>
|
||||||
<div class="uk-margin-bottom">
|
<div class="uk-margin-bottom">
|
||||||
For {{openaireEntities.PROJECTS | lowercase}} you can use the Graph API and the Bulk Access APIs.
|
For {{openaireEntities.PROJECTS | lowercase}} you can use the Selective Access APIs and the Bulk Access APIs.
|
||||||
</div>
|
</div>
|
||||||
<div class="uk-flex uk-flex-column uk-flex-center uk-flex-middle">
|
<div class="uk-flex uk-flex-column uk-flex-center uk-flex-middle">
|
||||||
<a class="uk-display-inline-block uk-button uk-button-text uk-margin-bottom"
|
<a class="uk-display-inline-block uk-button uk-button-text uk-margin-bottom"
|
||||||
href="https://graph.openaire.eu/docs/apis/search-api/projects" target="_blank">
|
href="https://graph.openaire.eu/develop/api.html" target="_blank">
|
||||||
<span class="uk-flex uk-flex-middle">
|
<span class="uk-flex uk-flex-middle">
|
||||||
<span>Graph API</span>
|
<span>Selective Access APIs</span>
|
||||||
</span>
|
</span>
|
||||||
</a>
|
</a>
|
||||||
<a class="uk-display-inline-block uk-button uk-button-text"
|
<a class="uk-display-inline-block uk-button uk-button-text"
|
||||||
href="https://graph.openaire.eu/docs/apis/dspace-eprints-api" target="_blank">
|
href="https://graph.openaire.eu/develop/bulk-projects.html" target="_blank">
|
||||||
<span class="uk-flex uk-flex-middle">
|
<span class="uk-flex uk-flex-middle">
|
||||||
<span>Bulk Access APIs</span>
|
<span>Bulk Access APIs</span>
|
||||||
</span>
|
</span>
|
||||||
|
|
@ -110,9 +110,9 @@ import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
|
||||||
<li>
|
<li>
|
||||||
<span>For the </span><span class="uk-text-bolder">Bulk Access</span><br>
|
<span>For the </span><span class="uk-text-bolder">Bulk Access</span><br>
|
||||||
<span class="uk-text-bold uk-text-nowrap">DSpace endpoint:</span>
|
<span class="uk-text-bold uk-text-nowrap">DSpace endpoint:</span>
|
||||||
<span class="uk-text-break uk-margin-small-left">https://api.openaire.eu/projects/dspace/{{stakeholder.index_shortName}}/ALL/ALL</span><br>
|
<span class="uk-text-break uk-margin-small-left">https://api.openaire.eu/projects/dspace/{{stakeholder.index_shortName}}/ALL/ ALL</span><br>
|
||||||
<span class="uk-text-bold uk-text-nowrap">ePrints endpoint:</span>
|
<span class="uk-text-bold uk-text-nowrap">ePrints endpoint:</span>
|
||||||
<span class="uk-text-break uk-margin-small-left">https://api.openaire.eu/projects/eprints/{{stakeholder.index_shortName}}/ALL/ALL</span>
|
<span class="uk-text-break uk-margin-small-left">https://api.openaire.eu/projects/eprints/{{stakeholder.index_shortName}}/ALL/ ALL</span>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
<li *ngIf="periodFilter.selectedFromAndToValues.length > 0">
|
<li *ngIf="periodFilter.selectedFromAndToValues.length > 0">
|
||||||
<span class="uk-label uk-label-small uk-label-primary uk-flex uk-flex-middle">
|
<span class="uk-label uk-label-small uk-label-primary uk-flex uk-flex-middle">
|
||||||
<span
|
<span
|
||||||
class="uk-margin-small-right uk-width-expand uk-text-truncate">{{ periodFilter.selectedFromAndToValues }}</span>
|
class="uk-margin-small-right uk-width-expand uk-text-truncate">{{periodFilter.selectedFromAndToValues}}</span>
|
||||||
<button [class.uk-disabled]="loading" (click)="clearPeriodFilter()" class="uk-close uk-icon"
|
<button [class.uk-disabled]="loading" (click)="clearPeriodFilter()" class="uk-close uk-icon"
|
||||||
[disabled]="loading">
|
[disabled]="loading">
|
||||||
<icon name="close" flex="true" ratio="0.7"></icon>
|
<icon name="close" flex="true" ratio="0.7"></icon>
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
<ng-container *ngIf="value.selected">
|
<ng-container *ngIf="value.selected">
|
||||||
<li>
|
<li>
|
||||||
<span class="uk-label uk-label-small uk-label-primary uk-flex uk-flex-middle">
|
<span class="uk-label uk-label-small 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">{{value.name}}</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>
|
||||||
|
|
@ -40,22 +40,19 @@
|
||||||
<div page-content [border]="isMobile">
|
<div page-content [border]="isMobile">
|
||||||
<div header>
|
<div header>
|
||||||
<div *ngIf="stakeholder" class="uk-hidden">
|
<div *ngIf="stakeholder" class="uk-hidden">
|
||||||
<h1 class="uk-h6 uk-margin-remove">{{ stakeholder.name }}</h1>
|
<h1 class="uk-h6 uk-margin-remove">{{stakeholder.name}}</h1>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div actions>
|
<div actions>
|
||||||
<sidebar-mobile-toggle *ngIf="isMobile"
|
<sidebar-mobile-toggle *ngIf="isMobile" [class.uk-margin-bottom]="!activeCategory || countSubCategoriesToShow(activeCategory) <= 1" class="uk-margin-top uk-display-block"></sidebar-mobile-toggle>
|
||||||
[class.uk-margin-bottom]="!activeCategory || countSubCategoriesToShow(activeCategory) <= 1"
|
|
||||||
class="uk-margin-top uk-display-block"></sidebar-mobile-toggle>
|
|
||||||
<div *ngIf="activeCategory && countSubCategoriesToShow(activeCategory) > 1"
|
<div *ngIf="activeCategory && countSubCategoriesToShow(activeCategory) > 1"
|
||||||
[class.uk-margin-bottom]="isMobile" class="uk-margin-medium-top">
|
[class.uk-margin-bottom]="isMobile" class="uk-margin-medium-top">
|
||||||
<slider-tabs *ngIf="stakeholder && !loading && activeTopic" [border]="!isMobile"
|
<slider-tabs *ngIf="stakeholder && !loading && activeTopic" [border]="!isMobile"
|
||||||
[tabsClass]="isMobile?'uk-subnav uk-subnav-pill-alt uk-text-small':'uk-tab'"
|
[tabsClass]="isMobile?'uk-subnav uk-subnav-pill-alt uk-text-small':'uk-tab'" [type]="'dynamic'">
|
||||||
[type]="'dynamic'">
|
|
||||||
<ng-template ngFor [ngForOf]="activeCategory.subCategories" let-subCategory>
|
<ng-template ngFor [ngForOf]="activeCategory.subCategories" let-subCategory>
|
||||||
<slider-tab *ngIf="hasPermission(subCategory.visibility)" [tabTitle]="subCategory.name"
|
<slider-tab *ngIf="hasPermission(subCategory.visibility)" [tabTitle]="subCategory.name"
|
||||||
[queryParams]="queryParams" customClass="uk-text-uppercase"
|
[queryParams]="queryParams" customClass="uk-text-uppercase"
|
||||||
[routerLink]="[aliasPrefix, stakeholder.alias, activeTopic.alias, activeCategory.alias, subCategory.alias]"
|
[routerLink]="['/', stakeholder.alias, activeTopic.alias, activeCategory.alias, subCategory.alias]"
|
||||||
[active]="subCategory.alias === activeSubCategory.alias"></slider-tab>
|
[active]="subCategory.alias === activeSubCategory.alias"></slider-tab>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
</slider-tabs>
|
</slider-tabs>
|
||||||
|
|
@ -72,18 +69,16 @@
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="!privateStakeholder && stakeholder" class="uk-section">
|
<div *ngIf="!privateStakeholder && stakeholder" class="uk-section">
|
||||||
<div *ngIf="activeSubCategory?.description" class="uk-margin-medium-bottom">
|
<div *ngIf="activeSubCategory?.description" class="uk-margin-medium-bottom">
|
||||||
{{ activeSubCategory.description }}
|
{{activeSubCategory.description}}
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="(activeSubCategory && (activeSubCategory.charts.length == 0 || countSectionsWithIndicatorsToShow(activeSubCategory.charts) == 0))
|
<div *ngIf="(activeSubCategory && (activeSubCategory.charts.length == 0 || countSectionsWithIndicatorsToShow(activeSubCategory.charts) == 0))
|
||||||
&& ((activeSubCategory && activeSubCategory.description && activeSubCategory.description.length > 0) ||
|
&& ((activeSubCategory && activeSubCategory.description && activeSubCategory.description.length > 0) ||
|
||||||
(activeCategory && activeCategory.description && activeCategory.description.length > 0) ||
|
(activeCategory && activeCategory.description && activeCategory.description.length > 0) ||
|
||||||
(activeTopic && activeTopic.description && activeTopic.description.length > 0))" class="uk-text-center">
|
(activeTopic && activeTopic.description && activeTopic.description.length > 0))" class="uk-text-center">
|
||||||
<div class="uk-height-small uk-margin-large-top uk-margin-xlarge-right uk-margin-xlarge-left">
|
<div class="uk-height-small uk-margin-large-top uk-margin-xlarge-right uk-margin-xlarge-left">
|
||||||
{{
|
{{activeSubCategory && activeSubCategory.description && activeSubCategory.description.length > 0 ? activeSubCategory.description
|
||||||
activeSubCategory && activeSubCategory.description && activeSubCategory.description.length > 0 ? activeSubCategory.description
|
|
||||||
: (activeCategory && activeCategory.description && activeCategory.description.length > 0 ? activeCategory.description :
|
: (activeCategory && activeCategory.description && activeCategory.description.length > 0 ? activeCategory.description :
|
||||||
(activeTopic.description && activeTopic.description.length > 0 ? activeTopic.description : ""))
|
(activeTopic.description && activeTopic.description.length > 0 ? activeTopic.description : ""))}}
|
||||||
}}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<ng-template [ngIf]="!loading && !privateStakeholder &&
|
<ng-template [ngIf]="!loading && !privateStakeholder &&
|
||||||
|
|
@ -98,20 +93,18 @@
|
||||||
</div>
|
</div>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
<ng-template #content>
|
<ng-template #content>
|
||||||
<div *ngIf="countSectionsWithIndicatorsToShow(activeSubCategory.numbers) > 0"
|
<div *ngIf="countSectionsWithIndicatorsToShow(activeSubCategory.numbers) > 0" class="uk-margin-medium-bottom">
|
||||||
class="uk-margin-medium-bottom">
|
|
||||||
<ng-container *ngFor="let number of activeSubCategory.numbers; let i = index;">
|
<ng-container *ngFor="let number of activeSubCategory.numbers; let i = index;">
|
||||||
<ng-container *ngIf="!isMobile && countIndicatorsToShow(number.indicators) > 0">
|
<ng-container *ngIf="!isMobile && countIndicatorsToShow(number.indicators) > 0">
|
||||||
<div class="uk-grid uk-grid-small uk-grid-match uk-margin-medium-bottom" uk-grid
|
<div class="uk-grid uk-grid-small uk-grid-match uk-margin-medium-bottom" uk-grid
|
||||||
uk-height-match="target: .uk-card">
|
uk-height-match="target: .uk-card">
|
||||||
<h5 *ngIf="number.title" class="uk-width-1-1 uk-margin-bottom">{{ number.title }}</h5>
|
<h5 *ngIf="number.title" class="uk-width-1-1 uk-margin-bottom">{{number.title}}</h5>
|
||||||
<ng-template ngFor [ngForOf]="number.indicators" let-indicator let-j="index">
|
<ng-template ngFor [ngForOf]="number.indicators" let-indicator let-j="index">
|
||||||
<div *ngIf="hasPermission(indicator.visibility)"
|
<div *ngIf="hasPermission(indicator.visibility)" [ngClass]="getNumberClassBySize(indicator.width)">
|
||||||
[ngClass]="getNumberClassBySize(indicator.width)">
|
|
||||||
<div class="uk-card uk-card-default uk-padding-small number-card uk-position-relative"
|
<div class="uk-card uk-card-default uk-padding-small number-card uk-position-relative"
|
||||||
[class.semiFiltered]="indicator.indicatorPaths[0].filtersApplied < countSelectedFilters()">
|
[class.semiFiltered]="indicator.indicatorPaths[0].filtersApplied < countSelectedFilters()">
|
||||||
<div *ngIf="!indicator.overlay">
|
<div *ngIf="!indicator.overlay">
|
||||||
<div class="uk-text-small uk-text-truncate uk-margin-xsmall-bottom uk-margin-right">{{ indicator.name }}</div>
|
<div class="uk-text-small uk-text-truncate uk-margin-xsmall-bottom uk-margin-right">{{indicator.name}}</div>
|
||||||
<div class="number uk-text-small uk-text-bold">
|
<div class="number uk-text-small uk-text-bold">
|
||||||
<span *ngIf="numberResults.get(i + '-' + j + '-' + 0)"
|
<span *ngIf="numberResults.get(i + '-' + j + '-' + 0)"
|
||||||
[innerHTML]="(indicator.indicatorPaths[0].format == 'NUMBER'?(numberResults.get(i + '-' + j + '-' + 0) | numberRound: 2:1:stakeholder.locale):(numberResults.get(i + '-' + j + '-' + 0) | numberPercentage: stakeholder.locale))"></span>
|
[innerHTML]="(indicator.indicatorPaths[0].format == 'NUMBER'?(numberResults.get(i + '-' + j + '-' + 0) | numberRound: 2:1:stakeholder.locale):(numberResults.get(i + '-' + j + '-' + 0) | numberPercentage: stakeholder.locale))"></span>
|
||||||
|
|
@ -119,8 +112,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="indicator.description || indicator.additionalDescription"
|
<div *ngIf="indicator.description || indicator.additionalDescription"
|
||||||
class="uk-position-top-right uk-text-center uk-margin-small-top uk-margin-small-right uk-visible@m">
|
class="uk-position-top-right uk-text-center uk-margin-small-top uk-margin-small-right uk-visible@m">
|
||||||
<a class="uk-display-inline-block uk-button uk-button-link"
|
<a class="uk-display-inline-block uk-button uk-button-link" uk-tooltip="Note"
|
||||||
uk-tooltip="Note"
|
|
||||||
(click)="changeOverlay($event, indicator, 'description')">
|
(click)="changeOverlay($event, indicator, 'description')">
|
||||||
<span class="uk-flex uk-flex-middle">
|
<span class="uk-flex uk-flex-middle">
|
||||||
<icon name="analytics" type="outlined" [flex]="true"></icon>
|
<icon name="analytics" type="outlined" [flex]="true"></icon>
|
||||||
|
|
@ -142,10 +134,10 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="uk-margin-small-top uk-margin-right">
|
<div class="uk-margin-small-top uk-margin-right">
|
||||||
<p *ngIf="indicator.description">
|
<p *ngIf="indicator.description">
|
||||||
{{ indicator.description }}
|
{{indicator.description}}
|
||||||
</p>
|
</p>
|
||||||
<p *ngIf="indicator.additionalDescription">
|
<p *ngIf="indicator.additionalDescription">
|
||||||
{{ indicator.additionalDescription }}
|
{{indicator.additionalDescription}}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -155,17 +147,15 @@
|
||||||
</div>
|
</div>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
<ng-container *ngIf="isMobile && countIndicatorsToShow(number.indicators) > 0">
|
<ng-container *ngIf="isMobile && countIndicatorsToShow(number.indicators) > 0">
|
||||||
<h6 *ngIf="number.title" class="uk-width-1-1 uk-margin-bottom">{{ number.title }}</h6>
|
<h6 *ngIf="number.title" class="uk-width-1-1 uk-margin-bottom">{{number.title}}</h6>
|
||||||
<div class="uk-card uk-card-default uk-padding-small number-card">
|
<div class="uk-card uk-card-default uk-padding-small number-card">
|
||||||
<div class="uk-grid uk-grid-small uk-child-width-1-1" uk-grid>
|
<div class="uk-grid uk-grid-small uk-child-width-1-1" uk-grid>
|
||||||
<ng-template ngFor [ngForOf]="number.indicators" let-indicator let-j="index">
|
<ng-template ngFor [ngForOf]="number.indicators" let-indicator let-j="index">
|
||||||
<div *ngIf="hasPermission(indicator.visibility)"
|
<div *ngIf="hasPermission(indicator.visibility)" [ngClass]="getNumberClassBySize(indicator.width)">
|
||||||
[ngClass]="getNumberClassBySize(indicator.width)">
|
|
||||||
<div [class.semiFiltered]="indicator.indicatorPaths[0].filtersApplied < countSelectedFilters()">
|
<div [class.semiFiltered]="indicator.indicatorPaths[0].filtersApplied < countSelectedFilters()">
|
||||||
<div *ngIf="!indicator.overlay">
|
<div *ngIf="!indicator.overlay">
|
||||||
<div
|
<div
|
||||||
class="uk-text-xsmall uk-text-truncate uk-margin-xsmall-bottom uk-margin-right">{{ indicator.name }}
|
class="uk-text-xsmall uk-text-truncate uk-margin-xsmall-bottom uk-margin-right">{{indicator.name}}</div>
|
||||||
</div>
|
|
||||||
<div class="number uk-text-small uk-text-bold">
|
<div class="number uk-text-small uk-text-bold">
|
||||||
<span *ngIf="numberResults.get(i + '-' + j + '-' + 0)"
|
<span *ngIf="numberResults.get(i + '-' + j + '-' + 0)"
|
||||||
[innerHTML]="(indicator.indicatorPaths[0].format == 'NUMBER'?(numberResults.get(i + '-' + j + '-' + 0) | numberRound: 2:1:stakeholder.locale):(numberResults.get(i + '-' + j + '-' + 0) | numberPercentage: stakeholder.locale))"></span>
|
[innerHTML]="(indicator.indicatorPaths[0].format == 'NUMBER'?(numberResults.get(i + '-' + j + '-' + 0) | numberRound: 2:1:stakeholder.locale):(numberResults.get(i + '-' + j + '-' + 0) | numberPercentage: stakeholder.locale))"></span>
|
||||||
|
|
@ -182,79 +172,66 @@
|
||||||
</div>
|
</div>
|
||||||
<ng-container *ngFor="let chart of activeSubCategory.charts; let i = index;">
|
<ng-container *ngFor="let chart of activeSubCategory.charts; let i = index;">
|
||||||
<div *ngIf="countIndicatorsToShow(chart.indicators) > 0"
|
<div *ngIf="countIndicatorsToShow(chart.indicators) > 0"
|
||||||
class="uk-grid uk-grid-small uk-grid-match uk-margin-medium-bottom uk-flex uk-flex-middle"
|
class="uk-grid uk-grid-small uk-grid-match uk-margin-medium-bottom uk-flex uk-flex-middle" uk-grid
|
||||||
uk-grid
|
|
||||||
uk-height-match="target: .uk-card">
|
uk-height-match="target: .uk-card">
|
||||||
<h5 *ngIf="chart.title && !isMobile"
|
<h5 *ngIf="chart.title && !isMobile" class="uk-width-1-1 uk-margin-bottom">{{chart.title}}</h5>
|
||||||
class="uk-width-1-1 uk-margin-bottom">{{ chart.title }}</h5>
|
<h6 *ngIf="chart.title && isMobile" class="uk-width-1-1">{{chart.title}}</h6>
|
||||||
<h6 *ngIf="chart.title && isMobile" class="uk-width-1-1">{{ chart.title }}</h6>
|
<ng-template ngFor [ngForOf]="chart.indicators" let-indicator let-j="index">
|
||||||
<ng-container *ngFor="let indicator of chart.indicators; let j=index">
|
|
||||||
<div *ngIf="hasPermission(indicator.visibility)"
|
<div *ngIf="hasPermission(indicator.visibility)"
|
||||||
[ngClass]="getChartClassBySize(indicator.width)">
|
[ngClass]="getChartClassBySize(indicator.width)">
|
||||||
<div class="uk-card uk-card-default uk-position-relative"
|
<div class="uk-card uk-card-default uk-position-relative"
|
||||||
[class.semiFiltered]="getActiveIndicatorPath(indicator).filtersApplied < countSelectedFilters()">
|
[class.semiFiltered]="getActiveIndicatorPath(indicator).filtersApplied < countSelectedFilters()">
|
||||||
<div class="uk-card-body uk-margin-small-bottom">
|
<div class="uk-card-body uk-margin-small-bottom">
|
||||||
<!-- Main content-->
|
|
||||||
<div>
|
|
||||||
<h6 class="uk-margin-bottom chartTitle uk-flex uk-flex-bottom">
|
<h6 class="uk-margin-bottom chartTitle uk-flex uk-flex-bottom">
|
||||||
{{ indicator.name + " " }}
|
{{indicator.name + " "}}
|
||||||
</h6>
|
</h6>
|
||||||
<iframe [class.uk-blend-multiply]="!isFullscreen"
|
<iframe [class.uk-blend-multiply]="!isFullscreen"
|
||||||
*ngIf=" !properties.disableFrameLoad && getActiveIndicatorPath(indicator).source !== 'image'"
|
*ngIf=" !properties.disableFrameLoad && getActiveIndicatorPath(indicator).source !== 'image'"
|
||||||
[src]="getActiveIndicatorPath(indicator).safeResourceUrl"
|
[src]="getActiveIndicatorPath(indicator).safeResourceUrl"
|
||||||
class="uk-width-1-1" allowfullscreen="true"
|
class="uk-width-1-1" allowfullscreen="true" mozallowfullscreen="true"
|
||||||
mozallowfullscreen="true"
|
|
||||||
[ngClass]="'uk-height-' + (indicator.height?indicator.height.toLowerCase():'medium')"></iframe>
|
[ngClass]="'uk-height-' + (indicator.height?indicator.height.toLowerCase():'medium')"></iframe>
|
||||||
<div *ngIf="properties.disableFrameLoad && getActiveIndicatorPath(indicator)?.source !=='image'">
|
<div *ngIf="properties.disableFrameLoad && getActiveIndicatorPath(indicator).source !== 'image'">
|
||||||
<img class="uk-width-1-1 uk-blend-multiply"
|
<img class="uk-width-1-1 uk-blend-multiply"
|
||||||
[ngClass]="'uk-height-' + (indicator.height?indicator.height.toLowerCase():'medium')"
|
[ngClass]="'uk-height-' + (indicator.height?indicator.height.toLowerCase():'medium')"
|
||||||
src="assets/chart-placeholder.png">
|
src="assets/chart-placeholder.png">
|
||||||
</div>
|
</div>
|
||||||
<img *ngIf="getActiveIndicatorPath(indicator).source === 'image'"
|
<img *ngIf="getActiveIndicatorPath(indicator).source === 'image'"
|
||||||
[src]="getActiveIndicatorPath(indicator).url"
|
[src]="getActiveIndicatorPath(indicator).safeResourceUrl"
|
||||||
class="uk-width-1-1 uk-blend-multiply"
|
class="uk-width-1-1 uk-blend-multiply"
|
||||||
[ngClass]="'uk-height-' + (indicator.height?indicator.height.toLowerCase():'medium')">
|
[ngClass]="'uk-height-' + (indicator.height?indicator.height.toLowerCase():'medium')">
|
||||||
</div>
|
<slider-tabs *ngIf="indicator.indicatorPaths.length > 1" [type]="'dynamic'" [flexPosition]="'right'" (activeEmitter)="indicator.activePath = $event"
|
||||||
<!-- Tabs -->
|
tabsClass="uk-subnav uk-subnav-pill uk-subnav-small" containerClass="uk-margin-top uk-margin-bottom" [border]="false">
|
||||||
<slider-tabs [type]="'dynamic'" [flexPosition]="'right'"
|
<slider-tab *ngFor="let indicatorPath of indicator.indicatorPaths; let i=index"
|
||||||
(activeEmitter)="indicator.activePath = $event"
|
|
||||||
tabsClass="uk-subnav uk-subnav-pill uk-subnav-small"
|
|
||||||
containerClass="uk-margin-top uk-margin-bottom" [border]="false">
|
|
||||||
<slider-tab
|
|
||||||
*ngFor="let indicatorPath of indicator.indicatorPaths; let i=index"
|
|
||||||
[tabTitle]="indicatorPath.parameters.tab ? indicatorPath.parameters.tab : indicatorPath.parameters.title"
|
[tabTitle]="indicatorPath.parameters.tab ? indicatorPath.parameters.tab : indicatorPath.parameters.title"
|
||||||
[invisible]="indicator.indicatorPaths.length < 2"
|
[tabId]="i" [active]="(!indicator.activePath && i == 0) || indicator.activePath == i">
|
||||||
[tabId]="i" [active]="getActivePathIndex(indicator) == i">
|
|
||||||
</slider-tab>
|
</slider-tab>
|
||||||
</slider-tabs>
|
</slider-tabs>
|
||||||
|
</div>
|
||||||
<div class="uk-position-bottom-left uk-margin-left uk-margin-small-bottom uk-visible@m">
|
<div class="uk-position-bottom-left uk-margin-left uk-margin-small-bottom uk-visible@m">
|
||||||
<a *ngIf="indicator.description || indicator.additionalDescription"
|
<a *ngIf="indicator.description || indicator.additionalDescription"
|
||||||
class="uk-display-inline-block uk-button uk-button-link"
|
class="uk-display-inline-block uk-button uk-button-text"
|
||||||
(click)="changeOverlay($event, indicator, 'description')">
|
(click)="changeOverlay($event, indicator, 'description')">
|
||||||
<span class="uk-flex uk-flex-middle">
|
<span class="uk-flex uk-flex-middle">
|
||||||
<icon name="analytics" type="outlined" [flex]="true"></icon>
|
<icon name="analytics" type="outlined" [flex]="true"></icon>
|
||||||
<span class="uk-margin-xsmall-left">Note</span>
|
<span class="uk-margin-small-left">Note</span>
|
||||||
</span>
|
</span>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="indicator.overlay"
|
<div *ngIf="indicator.overlay" class="indicator-overlay uk-card uk-card-default uk-flex uk-flex-middle uk-flex-center">
|
||||||
class="indicator-overlay uk-card uk-card-default uk-flex uk-flex-middle uk-flex-center">
|
<div *ngIf="indicator.overlay == 'description'" class="inner" click-outside-or-esc
|
||||||
<div *ngIf="indicator.overlay == 'description'" class="inner"
|
|
||||||
click-outside-or-esc
|
|
||||||
(clickOutside)="closeOverlay($event, indicator)">
|
(clickOutside)="closeOverlay($event, indicator)">
|
||||||
<div class="uk-padding-small">
|
<div class="uk-padding-small">
|
||||||
<div class="uk-flex uk-flex-right">
|
<div class="uk-flex uk-flex-right">
|
||||||
<button class="uk-close uk-icon"
|
<button class="uk-close uk-icon" (click)="changeOverlay($event, indicator, false)">
|
||||||
(click)="changeOverlay($event, indicator, false)">
|
|
||||||
<icon name="close" ratio="1"></icon>
|
<icon name="close" ratio="1"></icon>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="uk-padding-small uk-padding-remove-horizontal">
|
<div class="uk-padding-small uk-padding-remove-horizontal">
|
||||||
<p *ngIf="indicator.description">
|
<p *ngIf="indicator.description">
|
||||||
{{ indicator.description }}
|
{{indicator.description}}
|
||||||
</p>
|
</p>
|
||||||
<p *ngIf="indicator.additionalDescription">
|
<p *ngIf="indicator.additionalDescription">
|
||||||
{{ indicator.additionalDescription }}
|
{{indicator.additionalDescription}}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -262,9 +239,8 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
<div class="printGap uk-hidden"></div>
|
<div class="printGap uk-hidden"></div>
|
||||||
</ng-container>
|
</ng-template>
|
||||||
</div>
|
</div>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
|
|
@ -274,18 +250,16 @@
|
||||||
<ng-container *ngTemplateOutlet="graph_and_feedback_template"></ng-container>
|
<ng-container *ngTemplateOutlet="graph_and_feedback_template"></ng-container>
|
||||||
</div>
|
</div>
|
||||||
<ng-template #graph_and_feedback_template>
|
<ng-template #graph_and_feedback_template>
|
||||||
<div *ngIf="!view"
|
<div *ngIf="!view" class="uk-margin-small-top uk-margin-small-bottom uk-grid uk-grid-small uk-text-small hideInfo"
|
||||||
class="uk-margin-small-top uk-margin-small-bottom uk-grid uk-grid-small uk-text-small hideInfo"
|
|
||||||
uk-grid>
|
uk-grid>
|
||||||
<!-- Last Stats Date-->
|
<!-- Last Stats Date-->
|
||||||
<div class="uk-width-expand@m uk-width-1-1">
|
<div class="uk-width-expand@m uk-width-1-1">
|
||||||
<a href="https://graph.openaire.eu" target="_blank" class="uk-width-1-1 uk-width-auto@m">
|
<a href="https://graph.openaire.eu" target="_blank" class="uk-width-1-1 uk-width-auto@m">
|
||||||
<img src="assets/common-assets/openaire-badge-1.png" alt="Powered by OpenAIRE graph"
|
<img src="assets/common-assets/openaire-badge-1.png" alt="Powered by OpenAIRE graph" style="height: 16px;">
|
||||||
style="height: 16px;">
|
|
||||||
</a>
|
</a>
|
||||||
<span *ngIf="statsUpdateDate" class="uk-text-baseline uk-text-meta">
|
<span *ngIf="statsUpdateDate" class="uk-text-baseline uk-text-meta">
|
||||||
<span class="uk-margin-xsmall-left uk-margin-xsmall-right">-</span>
|
<span class="uk-margin-xsmall-left uk-margin-xsmall-right">-</span>
|
||||||
<span>Last update of statistics in OpenAIRE: {{ statsUpdateDate | date: 'MMM dd, yyyy' }}</span>
|
<span>Last update of statistics in OpenAIRE: {{statsUpdateDate | date: 'MMM dd, yyyy'}}</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<!--Feedback-->
|
<!--Feedback-->
|
||||||
|
|
@ -302,7 +276,7 @@
|
||||||
<icon name="filters" ratio="1.5" visuallyHidden="Filters" gradient="filters_icon"></icon>
|
<icon name="filters" ratio="1.5" visuallyHidden="Filters" gradient="filters_icon"></icon>
|
||||||
<span [class.uk-hidden]="countSelectedFilters() === 0"
|
<span [class.uk-hidden]="countSelectedFilters() === 0"
|
||||||
class="uk-offcanvas-count uk-flex uk-flex-middle uk-flex-center">
|
class="uk-offcanvas-count uk-flex uk-flex-middle uk-flex-center">
|
||||||
{{ countSelectedFilters() }}
|
{{countSelectedFilters()}}
|
||||||
</span>
|
</span>
|
||||||
</a>
|
</a>
|
||||||
<div *ngIf="stakeholder && !privateStakeholder" id="style_switcher" class="uk-offcanvas"
|
<div *ngIf="stakeholder && !privateStakeholder" id="style_switcher" class="uk-offcanvas"
|
||||||
|
|
@ -316,15 +290,13 @@
|
||||||
<div>
|
<div>
|
||||||
<div class="uk-flex uk-flex-middle uk-margin-bottom">
|
<div class="uk-flex uk-flex-middle uk-margin-bottom">
|
||||||
<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
|
<a *ngIf="countSelectedFilters() > 1" class="uk-text-small uk-margin-left" (click)="clearAll()"> Clear All </a>
|
||||||
All </a>
|
|
||||||
</div>
|
</div>
|
||||||
<ng-container *ngTemplateOutlet="selected_filters_pills"></ng-container>
|
<ng-container *ngTemplateOutlet="selected_filters_pills"></ng-container>
|
||||||
<div *ngIf="!user" class="uk-margin-top"><a class="uk-link" (click)="logIn()"> Sign in</a> to apply filters.
|
<div *ngIf="!user" class="uk-margin-top"><a class="uk-link" (click)="logIn()"> Sign in</a> to apply filters.</div>
|
||||||
</div>
|
|
||||||
<ul *ngIf="user" class="uk-list uk-list-xlarge uk-list-divider uk-margin-top">
|
<ul *ngIf="user" class="uk-list uk-list-xlarge uk-list-divider uk-margin-top">
|
||||||
<li>
|
<li>
|
||||||
<range-filter #rangeFilter [filter]="periodFilter" [yearMin]="minYear" [yearMax]="maxYear"
|
<range-filter #rangeFilter [filter]="periodFilter"[yearMin]="minYear" [yearMax]="maxYear"
|
||||||
[mandatoryRange]="true" (onFilterChange)="filter()"></range-filter>
|
[mandatoryRange]="true" (onFilterChange)="filter()"></range-filter>
|
||||||
</li>
|
</li>
|
||||||
<ng-container *ngFor="let filter of filters ">
|
<ng-container *ngFor="let filter of filters ">
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
Subproject commit 2b8725e1fbe954bbde4f75baee710f4cc7029255
|
Subproject commit 9b1e662f4b64d4f4c6eb7a4d82657a0fe3ea8391
|
||||||
|
|
@ -1 +1 @@
|
||||||
Subproject commit a4d8923b82a59ac1cc41e9c0574f1d64a61c0c1b
|
Subproject commit 014adfe4588975e499c72b284ce7368fc2cb5d14
|
||||||
Loading…
Reference in New Issue