Compare commits

...

27 Commits

Author SHA1 Message Date
Konstantinos Triantafyllou a8692acf4e Merge from develop last fixes 2024-10-08 13:18:00 +03:00
Konstantinos Triantafyllou f90d0e7351 [develop]: Fix url in subcategories links in monitor page. Fix isSearch condition. Update library 2024-10-08 13:16:54 +03:00
Konstantinos Triantafyllou 062bb5faf0 Merge from develop 2024-10-07 15:47:25 +03:00
Konstantinos Triantafyllou 18a187a7a5 Update library and version and subscriptions page for monitor 2024-10-07 15:38:43 +03:00
Konstantinos Triantafyllou ad0ffd3c8b Update library 2024-09-23 10:04:37 +03:00
Alex Martzios 70635ae31e [develop | DONE | CHANGED] monitorServiceAPIURL property: move to service file, update submodules 2024-09-12 10:49:56 +03:00
Konstantinos Triantafyllou b28b9a4839 Merge branch 'develop' of code-repo.d4science.org:MaDgIK/monitor-dashboard into develop 2024-09-11 12:36:47 +03:00
Konstantinos Triantafyllou 18cafd8976 [develop]: Update library 2024-09-11 12:36:06 +03:00
Konstantina Galouni 8e19836d71 Updating openaireLibrary & common-assets 2024-09-09 17:38:06 +03:00
Alex Martzios e152350fb6 [develop | DONE | CHANGED] monitorServiceAPIURL: remove duplicate '/' 2024-09-05 13:00:45 +03:00
Konstantinos Triantafyllou ffb9246305 Resolve v1.1.0 2024-07-25 14:19:28 +03:00
Konstantinos Triantafyllou 7ffdd1f3ae Update version to 1.1.0 2024-07-25 14:18:08 +03:00
Konstantinos Triantafyllou 5bf4627917 [develop]: Fix develop page broken links. 2024-07-25 12:04:52 +03:00
Konstantinos Triantafyllou b9e70e047b [develop]: Change note overlay button to button-link 2024-07-25 10:44:47 +03:00
Konstantinos Triantafyllou ec959f1eca [develop]: Tabs of indicator tabs have now specific height and be invisible when there is only one. 2024-07-25 10:32:46 +03:00
Konstantinos Triantafyllou 4accebe43c Update libraries 2024-07-22 10:28:31 +03:00
Konstantinos Triantafyllou cd78117628 Resolve v1.0.2 PR 2024-07-15 20:39:18 +03:00
Konstantinos Triantafyllou e133d51bf0 Update version 2024-07-15 20:31:45 +03:00
Konstantinos Triantafyllou a5a15ee1b7 Update libaries 2024-07-15 20:30:46 +03:00
Konstantinos Triantafyllou d8ffe5e429 [develop]: Update libraries 2024-07-02 15:56:23 +03:00
Konstantinos Triantafyllou 1932723815 Add adminToolsPortalType in beta and prod 2024-06-28 12:36:14 +03:00
Konstantinos Triantafyllou cfb4a33603 [develop]: Update library and fix condition for divContents in app component. 2024-06-28 11:52:56 +03:00
Konstantinos Triantafyllou 7f8a8148bb [develop]: Add banner class help text in app component. 2024-06-27 15:37:18 +03:00
Konstantinos Triantafyllou eabde3c9de [develop]: Fix mobile view in browse stakeholders. 2024-06-26 10:18:32 +03:00
Konstantinos Triantafyllou a352cae5fb Merge branch 'develop' of code-repo.d4science.org:MaDgIK/monitor-dashboard into develop 2024-06-25 15:36:43 +03:00
Konstantinos Triantafyllou b24ace93ca Change position of id in browse stakeholders. 2024-06-25 15:36:32 +03:00
argirok db90f5f900 [develop | DONE | CHANGED] User Menu:show admin links menu only for organizations 2024-06-25 09:44:54 +03:00
14 changed files with 332 additions and 287 deletions

View File

@ -1,6 +1,6 @@
{
"name": "monitor-dashboard",
"version": "1.0.2",
"version": "1.1.1",
"scripts": {
"ng": "ng",
"start": "ng serve --port 4600 --disable-host-check --host 0.0.0.0",

View File

@ -81,7 +81,7 @@ export function app() {
}));
if (userinfoRes.status === 200) {
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,
headers: headers
}).catch(error => {

View File

@ -4,6 +4,9 @@
<div *ngIf="!loading" [class.monitor]="isFrontPage">
<div id="modal-container"></div>
<ng-container *ngIf="!isHidden">
<div *ngIf="divContents && divContents['banner']" class="uk-tile uk-tile-default uk-padding uk-border-bottom">
<helper [texts]="divContents['banner']"></helper>
</div>
<navbar *ngIf="hasHeader" portal="monitor_dashboard" [header]="menuHeader" [userMenuItems]=userMenuItems
[menuItems]="menuItems" [user]="user"
[notificationConfiguration]="isMobile && user && notificationGroupsInitialized?notificationConfiguration:null"></navbar>

View File

@ -27,6 +27,7 @@ import {
import {SidebarBaseComponent} from "./openaireLibrary/dashboard/sharedComponents/sidebar/sidebar-base.component";
import {Breadcrumb} from './openaireLibrary/utils/breadcrumbs/breadcrumbs.component';
import {OpenaireEntities} from './openaireLibrary/utils/properties/searchFields';
import {HelperService} from "./openaireLibrary/utils/helper/helper.service";
@Component({
@ -73,6 +74,7 @@ export class AppComponent extends SidebarBaseComponent implements OnInit {
paramsSubscription: Subscription;
openaireEntities = OpenaireEntities;
activeType: StakeholderType;
divContents: any;
constructor(protected _route: ActivatedRoute,
protected _router: Router,
@ -82,16 +84,18 @@ export class AppComponent extends SidebarBaseComponent implements OnInit {
private smoothScroll: SmoothScroll,
private stakeholderService: StakeholderService,
private configurationService: ConfigurationService,
private helper: HelperService,
private resourcesService: ResourcesService) {
super();
this.initRouterParams(_route, event => {
this.isBrowse = event.url.includes('browse');
this.isSearch = event.url.includes('search');
this.isSearch = event.url.includes('search/find');
});
}
ngOnInit() {
super.ngOnInit();
this.getDivContents();
if (typeof document !== 'undefined' && window) {
this.innerWidth = window.innerWidth;
}
@ -220,7 +224,7 @@ export class AppComponent extends SidebarBaseComponent implements OnInit {
this.notificationConfiguration.availableGroups.push({value: Role.typeMember(type.value), label: type.label + ' Members'});
}
}
this.subscriptions.push(this.stakeholderService.getMyStakeholders(this.properties.monitorServiceAPIURL).subscribe(manageStakeholder => {
this.subscriptions.push(this.stakeholderService.getMyStakeholders().subscribe(manageStakeholder => {
let stakeholders = manageStakeholder.standalone;
stakeholders.concat(manageStakeholder.umbrella);
stakeholders.concat(manageStakeholder.dependent);
@ -266,7 +270,13 @@ export class AppComponent extends SidebarBaseComponent implements OnInit {
this.configurationService.clearSubscriptions();
this.smoothScroll.clearSubscriptions();
}
private getDivContents() {
this.subscriptions.push(this.helper.getDivHelpContents(this.properties, 'monitor', '/').subscribe(contents => {
this.divContents = contents;
}));
}
private navigateToError() {
this._router.navigate([this.properties.errorLink], {queryParams: {'page': this.properties.baseLink + this._router.url}});
}
@ -299,7 +309,7 @@ export class AppComponent extends SidebarBaseComponent implements OnInit {
if(this.isChild) {
return this.stakeholder.parent.alias + '/browse/' + this.stakeholder.type + '/';
} else {
return '';
return '/';
}
}
@ -433,6 +443,7 @@ export class AppComponent extends SidebarBaseComponent implements OnInit {
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("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) {
this.adminMenuItems = [];
this.backItem = null;

View File

@ -34,6 +34,7 @@ import {CustomRouteReuseStrategy} from "./openaireLibrary/shared/custom-route-re
import {RouteReuseStrategy} from "@angular/router";
import {LogoUrlPipeModule} from './openaireLibrary/utils/pipes/logoUrlPipe.module';
import {BreadcrumbsModule} from './openaireLibrary/utils/breadcrumbs/breadcrumbs.module';
import {HelperModule} from "./openaireLibrary/utils/helper/helper.module";
@NgModule({
@ -51,7 +52,7 @@ import {BreadcrumbsModule} from './openaireLibrary/utils/breadcrumbs/breadcrumbs
AppRoutingModule,
SideBarModule, Schema2jsonldModule, RoleVerificationModule, LoadingModule, NotificationsSidebarModule, IconsModule, CacheIndicatorsModule,
LogoUrlPipeModule,
BreadcrumbsModule
BreadcrumbsModule, HelperModule
],
declarations: [AppComponent, OpenaireErrorPageComponent],
exports: [AppComponent],

View File

@ -23,7 +23,7 @@
</div>
</div>
</div>
<div class="uk-flex uk-flex-middle uk-flex-between uk-margin-large-top">
<div class="uk-grid uk-flex-middle uk-flex-between@m uk-flex-center uk-margin-large-top" [id]="id" uk-grid>
<div class="uk-flex uk-flex-middle">
<div *ngIf="sortOptions?.length > 0" class="uk-width-small uk-margin-medium-right">
<div input
@ -46,7 +46,7 @@
</paging-no-load>
</div>
</div>
<div class="uk-margin-large-top" id="target">
<div class="uk-margin-large-top">
<div *ngIf="!filteredStakeholders || filteredStakeholders?.length == 0" class="uk-flex uk-flex-center">
<div class="uk-alert uk-alert-primary uk-text-center uk-width-2-3@m uk-width-1-1">
No {{entities.stakeholders}} available
@ -106,7 +106,7 @@
</div>
</td>
<td>
<div class="uk-text-truncate uk-text-capitalize uk-text-italic uk-text-small uk-text-bold" [title]="item.name">
<div class="uk-width-large uk-text-truncate uk-text-capitalize uk-text-italic uk-text-small uk-text-bold" [title]="item.name">
{{item.name}}
</div>
</td>

View File

@ -26,12 +26,12 @@ import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
</div>
<h3>For {{openaireEntities.RESULTS | lowercase}}</h3>
<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 Selective Access APIs 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 Graph API by adding the funder parameter.
</div>
<a class="uk-display-inline-block uk-button uk-button-text"
href="https://graph.openaire.eu/develop/api.html" target="_blank">
href="https://graph.openaire.eu/docs/apis/search-api/research-products" target="_blank">
<span class="uk-flex uk-flex-middle">
<span>Selective Access APIs</span>
<span>Graph API</span>
</span>
</a>
</div>
@ -44,17 +44,17 @@ import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
</div>
<h3>For {{openaireEntities.PROJECTS | lowercase}}</h3>
<div class="uk-margin-bottom">
For {{openaireEntities.PROJECTS | lowercase}} you can use the Selective Access APIs and the Bulk Access APIs.
For {{openaireEntities.PROJECTS | lowercase}} you can use the Graph API and the Bulk Access APIs.
</div>
<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"
href="https://graph.openaire.eu/develop/api.html" target="_blank">
href="https://graph.openaire.eu/docs/apis/search-api/projects" target="_blank">
<span class="uk-flex uk-flex-middle">
<span>Selective Access APIs</span>
<span>Graph API</span>
</span>
</a>
<a class="uk-display-inline-block uk-button uk-button-text"
href="https://graph.openaire.eu/develop/bulk-projects.html" target="_blank">
href="https://graph.openaire.eu/docs/apis/dspace-eprints-api" target="_blank">
<span class="uk-flex uk-flex-middle">
<span>Bulk Access APIs</span>
</span>
@ -110,9 +110,9 @@ import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
<li>
<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-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-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>
</ul>
</div>

View File

@ -1,316 +1,344 @@
<ng-template #selected_filters_pills>
<div class="uk-slider filters-slider" uk-slider="finite: true">
<div [class.uk-invisible]="list.children.length === 0" class="uk-position-relative">
<div class="uk-slider-container" style="height: 40px">
<ul #list class="uk-slider-items uk-grid uk-grid-small uk-margin-small-right uk-flex-nowrap">
<li *ngIf="periodFilter.selectedFromAndToValues.length > 0">
<div class="uk-slider filters-slider" uk-slider="finite: true">
<div [class.uk-invisible]="list.children.length === 0" class="uk-position-relative">
<div class="uk-slider-container" style="height: 40px">
<ul #list class="uk-slider-items uk-grid uk-grid-small uk-margin-small-right uk-flex-nowrap">
<li *ngIf="periodFilter.selectedFromAndToValues.length > 0">
<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">{{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"
[disabled]="loading">
<icon name="close" flex="true" ratio="0.7"></icon>
</button>
</span>
</li>
<ng-container *ngFor="let filter of filters">
<ng-container *ngIf="filter.countSelectedValues > 0">
<ng-container *ngFor="let value of filter.values; let i = index;">
<ng-container *ngIf="value.selected">
<li>
</li>
<ng-container *ngFor="let filter of filters">
<ng-container *ngIf="filter.countSelectedValues > 0">
<ng-container *ngFor="let value of filter.values; let i = index;">
<ng-container *ngIf="value.selected">
<li>
<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)"
class="uk-close uk-icon" [disabled]="loading">
<icon name="close" flex="true" ratio="0.7"></icon>
</button>
</span>
</li>
</ng-container>
</ng-container>
</ng-container>
</ng-container>
</ul>
</div>
<slider-arrow type="previous"></slider-arrow>
<slider-arrow type="next"></slider-arrow>
</li>
</ng-container>
</ng-container>
</ng-container>
</ng-container>
</ul>
</div>
<slider-arrow type="previous"></slider-arrow>
<slider-arrow type="next"></slider-arrow>
</div>
</div>
</div>
</ng-template>
<div page-content [border]="isMobile">
<div header>
<div *ngIf="stakeholder" class="uk-hidden">
<h1 class="uk-h6 uk-margin-remove">{{stakeholder.name}}</h1>
<div header>
<div *ngIf="stakeholder" class="uk-hidden">
<h1 class="uk-h6 uk-margin-remove">{{ stakeholder.name }}</h1>
</div>
</div>
</div>
<div actions>
<sidebar-mobile-toggle *ngIf="isMobile" [class.uk-margin-bottom]="!activeCategory || countSubCategoriesToShow(activeCategory) <= 1" class="uk-margin-top uk-display-block"></sidebar-mobile-toggle>
<div *ngIf="activeCategory && countSubCategoriesToShow(activeCategory) > 1"
[class.uk-margin-bottom]="isMobile" class="uk-margin-medium-top">
<slider-tabs *ngIf="stakeholder && !loading && activeTopic" [border]="!isMobile"
[tabsClass]="isMobile?'uk-subnav uk-subnav-pill-alt uk-text-small':'uk-tab'" [type]="'dynamic'">
<ng-template ngFor [ngForOf]="activeCategory.subCategories" let-subCategory>
<slider-tab *ngIf="hasPermission(subCategory.visibility)" [tabTitle]="subCategory.name"
[queryParams]="queryParams" customClass="uk-text-uppercase"
[routerLink]="['/', stakeholder.alias, activeTopic.alias, activeCategory.alias, subCategory.alias]"
[active]="subCategory.alias === activeSubCategory.alias"></slider-tab>
</ng-template>
</slider-tabs>
<div actions>
<sidebar-mobile-toggle *ngIf="isMobile"
[class.uk-margin-bottom]="!activeCategory || countSubCategoriesToShow(activeCategory) <= 1"
class="uk-margin-top uk-display-block"></sidebar-mobile-toggle>
<div *ngIf="activeCategory && countSubCategoriesToShow(activeCategory) > 1"
[class.uk-margin-bottom]="isMobile" class="uk-margin-medium-top">
<slider-tabs *ngIf="stakeholder && !loading && activeTopic" [border]="!isMobile"
[tabsClass]="isMobile?'uk-subnav uk-subnav-pill-alt uk-text-small':'uk-tab'"
[type]="'dynamic'">
<ng-template ngFor [ngForOf]="activeCategory.subCategories" let-subCategory>
<slider-tab *ngIf="hasPermission(subCategory.visibility)" [tabTitle]="subCategory.name"
[queryParams]="queryParams" customClass="uk-text-uppercase"
[routerLink]="[aliasPrefix, stakeholder.alias, activeTopic.alias, activeCategory.alias, subCategory.alias]"
[active]="subCategory.alias === activeSubCategory.alias"></slider-tab>
</ng-template>
</slider-tabs>
</div>
</div>
</div>
<div inner>
<div *ngIf="privateStakeholder" class="message">
<div class="uk-text-center">
<h3 class="uk-flex uk-flex-middle">
<icon name="incognito" ratio="2" visuallyHidden="private"></icon>
<span class="uk-margin-left">Private data</span>
</h3>
</div>
</div>
<div *ngIf="!privateStakeholder && stakeholder" class="uk-section">
<div *ngIf="activeSubCategory?.description" class="uk-margin-medium-bottom">
{{activeSubCategory.description}}
</div>
<div *ngIf="(activeSubCategory && (activeSubCategory.charts.length == 0 || countSectionsWithIndicatorsToShow(activeSubCategory.charts) == 0))
<div inner>
<div *ngIf="privateStakeholder" class="message">
<div class="uk-text-center">
<h3 class="uk-flex uk-flex-middle">
<icon name="incognito" ratio="2" visuallyHidden="private"></icon>
<span class="uk-margin-left">Private data</span>
</h3>
</div>
</div>
<div *ngIf="!privateStakeholder && stakeholder" class="uk-section">
<div *ngIf="activeSubCategory?.description" class="uk-margin-medium-bottom">
{{ activeSubCategory.description }}
</div>
<div *ngIf="(activeSubCategory && (activeSubCategory.charts.length == 0 || countSectionsWithIndicatorsToShow(activeSubCategory.charts) == 0))
&& ((activeSubCategory && activeSubCategory.description && activeSubCategory.description.length > 0) ||
(activeCategory && activeCategory.description && activeCategory.description.length > 0) ||
(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">
{{activeSubCategory && activeSubCategory.description && activeSubCategory.description.length > 0 ? activeSubCategory.description
: (activeCategory && activeCategory.description && activeCategory.description.length > 0 ? activeCategory.description :
(activeTopic.description && activeTopic.description.length > 0 ? activeTopic.description : ""))}}
</div>
</div>
<ng-template [ngIf]="!loading && !privateStakeholder &&
<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
: (activeCategory && activeCategory.description && activeCategory.description.length > 0 ? activeCategory.description :
(activeTopic.description && activeTopic.description.length > 0 ? activeTopic.description : ""))
}}
</div>
</div>
<ng-template [ngIf]="!loading && !privateStakeholder &&
(!activeSubCategory ||
((activeSubCategory.numbers.length == 0 || countSectionsWithIndicatorsToShow(activeSubCategory.numbers) == 0) &&
(activeSubCategory.charts.length == 0 || countSectionsWithIndicatorsToShow(activeSubCategory.charts) == 0))
|| !activeTopic || !activeCategory || !activeSubCategory)" [ngIfElse]="content">
<div class="message uk-text-center">
<h3>
Nothing to see here!
</h3>
</div>
</ng-template>
<ng-template #content>
<div *ngIf="countSectionsWithIndicatorsToShow(activeSubCategory.numbers) > 0" class="uk-margin-medium-bottom">
<ng-container *ngFor="let number of activeSubCategory.numbers; let i = index;">
<ng-container *ngIf="!isMobile && countIndicatorsToShow(number.indicators) > 0">
<div class="uk-grid uk-grid-small uk-grid-match uk-margin-medium-bottom" uk-grid
uk-height-match="target: .uk-card">
<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">
<div *ngIf="hasPermission(indicator.visibility)" [ngClass]="getNumberClassBySize(indicator.width)">
<div class="uk-card uk-card-default uk-padding-small number-card uk-position-relative"
[class.semiFiltered]="indicator.indicatorPaths[0].filtersApplied < countSelectedFilters()">
<div *ngIf="!indicator.overlay">
<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="message uk-text-center">
<h3>
Nothing to see here!
</h3>
</div>
</ng-template>
<ng-template #content>
<div *ngIf="countSectionsWithIndicatorsToShow(activeSubCategory.numbers) > 0"
class="uk-margin-medium-bottom">
<ng-container *ngFor="let number of activeSubCategory.numbers; let i = index;">
<ng-container *ngIf="!isMobile && countIndicatorsToShow(number.indicators) > 0">
<div class="uk-grid uk-grid-small uk-grid-match uk-margin-medium-bottom" uk-grid
uk-height-match="target: .uk-card">
<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">
<div *ngIf="hasPermission(indicator.visibility)"
[ngClass]="getNumberClassBySize(indicator.width)">
<div class="uk-card uk-card-default uk-padding-small number-card uk-position-relative"
[class.semiFiltered]="indicator.indicatorPaths[0].filtersApplied < countSelectedFilters()">
<div *ngIf="!indicator.overlay">
<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">
<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>
<span *ngIf="!numberResults.get(i + '-' + j + '-' + 0)">--</span>
</div>
<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">
<a class="uk-display-inline-block uk-button uk-button-link" uk-tooltip="Note"
(click)="changeOverlay($event, indicator, 'description')">
<span *ngIf="!numberResults.get(i + '-' + j + '-' + 0)">--</span>
</div>
<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">
<a class="uk-display-inline-block uk-button uk-button-link"
uk-tooltip="Note"
(click)="changeOverlay($event, indicator, 'description')">
<span class="uk-flex uk-flex-middle">
<icon name="analytics" type="outlined" [flex]="true"></icon>
</span>
</a>
</div>
</div>
<div
*ngIf="indicator.overlay && (indicator.description || indicator.additionalDescription)"
click-outside-or-esc class="uk-overflow-auto"
(clickOutside)="closeOverlay($event, indicator)">
<div class="uk-position-top-right uk-text-center uk-margin-small-top uk-margin-small-right">
<a class="uk-display-inline-block uk-button uk-button-link"
(click)="changeOverlay($event, indicator, false)">
</a>
</div>
</div>
<div
*ngIf="indicator.overlay && (indicator.description || indicator.additionalDescription)"
click-outside-or-esc class="uk-overflow-auto"
(clickOutside)="closeOverlay($event, indicator)">
<div class="uk-position-top-right uk-text-center uk-margin-small-top uk-margin-small-right">
<a class="uk-display-inline-block uk-button uk-button-link"
(click)="changeOverlay($event, indicator, false)">
<span class="uk-flex uk-flex-middle">
<icon name="close" type="outlined" [flex]="true"></icon>
</span>
</a>
</div>
<div class="uk-margin-small-top uk-margin-right">
<p *ngIf="indicator.description">
{{indicator.description}}
</p>
<p *ngIf="indicator.additionalDescription">
{{indicator.additionalDescription}}
</p>
</div>
</div>
</div>
</div>
</ng-template>
</div>
</ng-container>
<ng-container *ngIf="isMobile && countIndicatorsToShow(number.indicators) > 0">
<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-grid uk-grid-small uk-child-width-1-1" uk-grid>
<ng-template ngFor [ngForOf]="number.indicators" let-indicator let-j="index">
<div *ngIf="hasPermission(indicator.visibility)" [ngClass]="getNumberClassBySize(indicator.width)">
<div [class.semiFiltered]="indicator.indicatorPaths[0].filtersApplied < countSelectedFilters()">
<div *ngIf="!indicator.overlay">
<div
class="uk-text-xsmall uk-text-truncate uk-margin-xsmall-bottom uk-margin-right">{{indicator.name}}</div>
<div class="number uk-text-small uk-text-bold">
</a>
</div>
<div class="uk-margin-small-top uk-margin-right">
<p *ngIf="indicator.description">
{{ indicator.description }}
</p>
<p *ngIf="indicator.additionalDescription">
{{ indicator.additionalDescription }}
</p>
</div>
</div>
</div>
</div>
</ng-template>
</div>
</ng-container>
<ng-container *ngIf="isMobile && countIndicatorsToShow(number.indicators) > 0">
<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-grid uk-grid-small uk-child-width-1-1" uk-grid>
<ng-template ngFor [ngForOf]="number.indicators" let-indicator let-j="index">
<div *ngIf="hasPermission(indicator.visibility)"
[ngClass]="getNumberClassBySize(indicator.width)">
<div [class.semiFiltered]="indicator.indicatorPaths[0].filtersApplied < countSelectedFilters()">
<div *ngIf="!indicator.overlay">
<div
class="uk-text-xsmall uk-text-truncate uk-margin-xsmall-bottom uk-margin-right">{{ indicator.name }}
</div>
<div class="number uk-text-small uk-text-bold">
<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>
<span *ngIf="!numberResults.get(i + '-' + j + '-' + 0)">--</span>
</div>
</div>
</div>
</div>
</ng-template>
<span *ngIf="!numberResults.get(i + '-' + j + '-' + 0)">--</span>
</div>
</div>
</div>
</div>
</ng-template>
</div>
</div>
</ng-container>
</ng-container>
</div>
</div>
</ng-container>
</ng-container>
</div>
<ng-container *ngFor="let chart of activeSubCategory.charts; let i = index;">
<div *ngIf="countIndicatorsToShow(chart.indicators) > 0"
class="uk-grid uk-grid-small uk-grid-match uk-margin-medium-bottom uk-flex uk-flex-middle" uk-grid
uk-height-match="target: .uk-card">
<h5 *ngIf="chart.title && !isMobile" class="uk-width-1-1 uk-margin-bottom">{{chart.title}}</h5>
<h6 *ngIf="chart.title && isMobile" class="uk-width-1-1">{{chart.title}}</h6>
<ng-template ngFor [ngForOf]="chart.indicators" let-indicator let-j="index">
<div *ngIf="hasPermission(indicator.visibility)"
[ngClass]="getChartClassBySize(indicator.width)">
<div class="uk-card uk-card-default uk-position-relative"
[class.semiFiltered]="getActiveIndicatorPath(indicator).filtersApplied < countSelectedFilters()">
<div class="uk-card-body uk-margin-small-bottom">
<h6 class="uk-margin-bottom chartTitle uk-flex uk-flex-bottom">
{{indicator.name + " "}}
</h6>
<iframe [class.uk-blend-multiply]="!isFullscreen"
*ngIf=" !properties.disableFrameLoad && getActiveIndicatorPath(indicator).source !== 'image'"
[src]="getActiveIndicatorPath(indicator).safeResourceUrl"
class="uk-width-1-1" allowfullscreen="true" mozallowfullscreen="true"
[ngClass]="'uk-height-' + (indicator.height?indicator.height.toLowerCase():'medium')"></iframe>
<div *ngIf="properties.disableFrameLoad && getActiveIndicatorPath(indicator).source !== 'image'">
<img class="uk-width-1-1 uk-blend-multiply"
[ngClass]="'uk-height-' + (indicator.height?indicator.height.toLowerCase():'medium')"
src="assets/chart-placeholder.png">
<ng-container *ngFor="let chart of activeSubCategory.charts; let i = index;">
<div *ngIf="countIndicatorsToShow(chart.indicators) > 0"
class="uk-grid uk-grid-small uk-grid-match uk-margin-medium-bottom uk-flex uk-flex-middle"
uk-grid
uk-height-match="target: .uk-card">
<h5 *ngIf="chart.title && !isMobile"
class="uk-width-1-1 uk-margin-bottom">{{ chart.title }}</h5>
<h6 *ngIf="chart.title && isMobile" class="uk-width-1-1">{{ chart.title }}</h6>
<ng-container *ngFor="let indicator of chart.indicators; let j=index">
<div *ngIf="hasPermission(indicator.visibility)"
[ngClass]="getChartClassBySize(indicator.width)">
<div class="uk-card uk-card-default uk-position-relative"
[class.semiFiltered]="getActiveIndicatorPath(indicator).filtersApplied < countSelectedFilters()">
<div class="uk-card-body uk-margin-small-bottom">
<!-- Main content-->
<div>
<h6 class="uk-margin-bottom chartTitle uk-flex uk-flex-bottom">
{{ indicator.name + " " }}
</h6>
<iframe [class.uk-blend-multiply]="!isFullscreen"
*ngIf=" !properties.disableFrameLoad && getActiveIndicatorPath(indicator).source !== 'image'"
[src]="getActiveIndicatorPath(indicator).safeResourceUrl"
class="uk-width-1-1" allowfullscreen="true"
mozallowfullscreen="true"
[ngClass]="'uk-height-' + (indicator.height?indicator.height.toLowerCase():'medium')"></iframe>
<div *ngIf="properties.disableFrameLoad && getActiveIndicatorPath(indicator)?.source !=='image'">
<img class="uk-width-1-1 uk-blend-multiply"
[ngClass]="'uk-height-' + (indicator.height?indicator.height.toLowerCase():'medium')"
src="assets/chart-placeholder.png">
</div>
<img *ngIf="getActiveIndicatorPath(indicator).source === 'image'"
[src]="getActiveIndicatorPath(indicator).url"
class="uk-width-1-1 uk-blend-multiply"
[ngClass]="'uk-height-' + (indicator.height?indicator.height.toLowerCase():'medium')">
</div>
<!-- Tabs -->
<slider-tabs [type]="'dynamic'" [flexPosition]="'right'"
(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"
[invisible]="indicator.indicatorPaths.length < 2"
[tabId]="i" [active]="getActivePathIndex(indicator) == i">
</slider-tab>
</slider-tabs>
<div class="uk-position-bottom-left uk-margin-left uk-margin-small-bottom uk-visible@m">
<a *ngIf="indicator.description || indicator.additionalDescription"
class="uk-display-inline-block uk-button uk-button-link"
(click)="changeOverlay($event, indicator, 'description')">
<span class="uk-flex uk-flex-middle">
<icon name="analytics" type="outlined" [flex]="true"></icon>
<span class="uk-margin-xsmall-left">Note</span>
</span>
</a>
</div>
<div *ngIf="indicator.overlay"
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
(clickOutside)="closeOverlay($event, indicator)">
<div class="uk-padding-small">
<div class="uk-flex uk-flex-right">
<button class="uk-close uk-icon"
(click)="changeOverlay($event, indicator, false)">
<icon name="close" ratio="1"></icon>
</button>
</div>
<div class="uk-padding-small uk-padding-remove-horizontal">
<p *ngIf="indicator.description">
{{ indicator.description }}
</p>
<p *ngIf="indicator.additionalDescription">
{{ indicator.additionalDescription }}
</p>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="printGap uk-hidden"></div>
</ng-container>
</div>
<img *ngIf="getActiveIndicatorPath(indicator).source === 'image'"
[src]="getActiveIndicatorPath(indicator).safeResourceUrl"
class="uk-width-1-1 uk-blend-multiply"
[ngClass]="'uk-height-' + (indicator.height?indicator.height.toLowerCase():'medium')">
<slider-tabs *ngIf="indicator.indicatorPaths.length > 1" [type]="'dynamic'" [flexPosition]="'right'" (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"
[tabId]="i" [active]="(!indicator.activePath && i == 0) || indicator.activePath == i">
</slider-tab>
</slider-tabs>
</div>
<div class="uk-position-bottom-left uk-margin-left uk-margin-small-bottom uk-visible@m">
<a *ngIf="indicator.description || indicator.additionalDescription"
class="uk-display-inline-block uk-button uk-button-text"
(click)="changeOverlay($event, indicator, 'description')">
<span class="uk-flex uk-flex-middle">
<icon name="analytics" type="outlined" [flex]="true"></icon>
<span class="uk-margin-small-left">Note</span>
</span>
</a>
</div>
<div *ngIf="indicator.overlay" 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
(clickOutside)="closeOverlay($event, indicator)">
<div class="uk-padding-small">
<div class="uk-flex uk-flex-right">
<button class="uk-close uk-icon" (click)="changeOverlay($event, indicator, false)">
<icon name="close" ratio="1"></icon>
</button>
</div>
<div class="uk-padding-small uk-padding-remove-horizontal">
<p *ngIf="indicator.description">
{{indicator.description}}
</p>
<p *ngIf="indicator.additionalDescription">
{{indicator.additionalDescription}}
</p>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="printGap uk-hidden"></div>
</ng-container>
</ng-template>
</div>
</ng-container>
</ng-template>
</div>
</div>
</div>
<div sticky_footer class="uk-visible@m">
<ng-container *ngTemplateOutlet="graph_and_feedback_template"></ng-container>
</div>
<ng-template #graph_and_feedback_template>
<div *ngIf="!view" class="uk-margin-small-top uk-margin-small-bottom uk-grid uk-grid-small uk-text-small hideInfo"
uk-grid>
<!-- Last Stats Date-->
<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">
<img src="assets/common-assets/openaire-badge-1.png" alt="Powered by OpenAIRE graph" style="height: 16px;">
</a>
<span *ngIf="statsUpdateDate" class="uk-text-baseline uk-text-meta">
<div sticky_footer class="uk-visible@m">
<ng-container *ngTemplateOutlet="graph_and_feedback_template"></ng-container>
</div>
<ng-template #graph_and_feedback_template>
<div *ngIf="!view"
class="uk-margin-small-top uk-margin-small-bottom uk-grid uk-grid-small uk-text-small hideInfo"
uk-grid>
<!-- Last Stats Date-->
<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">
<img src="assets/common-assets/openaire-badge-1.png" alt="Powered by OpenAIRE graph"
style="height: 16px;">
</a>
<span *ngIf="statsUpdateDate" class="uk-text-baseline uk-text-meta">
<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>
</div>
<!--Feedback-->
<div class="uk-width-auto@m uk-width-1-1">
<span class="uk-text-meta">Send us your </span>
<a class="uk-link" [href]="feedback" target="_self">feedback</a>
<span class="uk-text-meta">.</span>
</div>
</div>
</ng-template>
</div>
<!--Feedback-->
<div class="uk-width-auto@m uk-width-1-1">
<span class="uk-text-meta">Send us your </span>
<a class="uk-link" [href]="feedback" target="_self">feedback</a>
<span class="uk-text-meta">.</span>
</div>
</div>
</ng-template>
</div>
<a *ngIf="stakeholder && !privateStakeholder " href="#style_switcher" uk-toggle="" id="filters_switcher_toggle"
class="uk-offcanvas-switcher uk-flex uk-flex-center uk-flex-middle uk-link-reset">
<icon name="filters" ratio="1.5" visuallyHidden="Filters" gradient="filters_icon"></icon>
<span [class.uk-hidden]="countSelectedFilters() === 0"
class="uk-offcanvas-count uk-flex uk-flex-middle uk-flex-center">
{{countSelectedFilters()}}
class="uk-offcanvas-switcher uk-flex uk-flex-center uk-flex-middle uk-link-reset">
<icon name="filters" ratio="1.5" visuallyHidden="Filters" gradient="filters_icon"></icon>
<span [class.uk-hidden]="countSelectedFilters() === 0"
class="uk-offcanvas-count uk-flex uk-flex-middle uk-flex-center">
{{ countSelectedFilters() }}
</span>
</a>
<div *ngIf="stakeholder && !privateStakeholder" id="style_switcher" class="uk-offcanvas"
uk-offcanvas="flip:true; overlay: true">
<div class="uk-offcanvas-bar">
<div class="uk-float-right">
<button class="uk-offcanvas-close uk-close uk-icon" type="button">
<icon name="close" ratio="1.5" visuallyHidden="close"></icon>
</button>
<div class="uk-offcanvas-bar">
<div class="uk-float-right">
<button class="uk-offcanvas-close uk-close uk-icon" type="button">
<icon name="close" ratio="1.5" visuallyHidden="close"></icon>
</button>
</div>
<div>
<div class="uk-flex uk-flex-middle uk-margin-bottom">
<h4 class="uk-margin-remove-bottom">Filters</h4>
<a *ngIf="countSelectedFilters() > 1" class="uk-text-small uk-margin-left" (click)="clearAll()"> Clear
All </a>
</div>
<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>
<ul *ngIf="user" class="uk-list uk-list-xlarge uk-list-divider uk-margin-top">
<li>
<range-filter #rangeFilter [filter]="periodFilter" [yearMin]="minYear" [yearMax]="maxYear"
[mandatoryRange]="true" (onFilterChange)="filter()"></range-filter>
</li>
<ng-container *ngFor="let filter of filters ">
<li *ngIf="filter.values.length >0">
<search-filter [filter]="filter" [showResultCount]=false
(onFilterChange)="filterChanged($event)"></search-filter>
</li>
</ng-container>
</ul>
<i *ngIf="user || countSelectedFilters() > 0 " class="uk-margin-medium-top uk-text-small uk-display-block">
<sup>*</sup> If your filter selection cannot be applied to a chart, that chart will appear grayed-out.
</i>
</div>
</div>
<div>
<div class="uk-flex uk-flex-middle uk-margin-bottom">
<h4 class="uk-margin-remove-bottom">Filters</h4>
<a *ngIf="countSelectedFilters() > 1" class="uk-text-small uk-margin-left" (click)="clearAll()"> Clear All </a>
</div>
<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>
<ul *ngIf="user" class="uk-list uk-list-xlarge uk-list-divider uk-margin-top">
<li>
<range-filter #rangeFilter [filter]="periodFilter"[yearMin]="minYear" [yearMax]="maxYear"
[mandatoryRange]="true" (onFilterChange)="filter()"></range-filter>
</li>
<ng-container *ngFor="let filter of filters ">
<li *ngIf="filter.values.length >0">
<search-filter [filter]="filter" [showResultCount]=false
(onFilterChange)="filterChanged($event)"></search-filter>
</li>
</ng-container>
</ul>
<i *ngIf="user || countSelectedFilters() > 0 " class="uk-margin-medium-top uk-text-small uk-display-block">
<sup>*</sup> If your filter selection cannot be applied to a chart, that chart will appear grayed-out.
</i>
</div>
</div>
</div>
<!-- <div *ngIf="stakeholder && !loading && activeTopic" id="print_toggle"

@ -1 +1 @@
Subproject commit 4396999ce03bb96543f258f64e64459546b86e19
Subproject commit 2b8725e1fbe954bbde4f75baee710f4cc7029255

View File

@ -8,7 +8,7 @@
<ul class="uk-tab uk-margin-remove-bottom uk-margin-medium-top">
<li [class.uk-active]="tab === 'manager'"><a routerLink="../manager">Managers</a></li>
<li [class.uk-active]="tab === 'member'"><a routerLink="../member">Members</a></li>
<li *ngIf="properties.environment != 'production'" ><a routerLink="../links">Links</a></li>
<li *ngIf="stakeholder.type == 'organization' && properties.environment != 'production'" ><a routerLink="../links">Links</a></li>
</ul>
</role-users>

@ -1 +1 @@
Subproject commit 5026b8b38fcae493ec7bcdc272bf167798c18fa3
Subproject commit a4d8923b82a59ac1cc41e9c0574f1d64a61c0c1b

@ -1 +1 @@
Subproject commit 6524ee362c8fc8fa6e482144920e305198e54fc8
Subproject commit 55765bf0829910661a55337e0e7ca7b1262b7298

View File

@ -3,6 +3,7 @@ import {common, commonBeta} from "../app/openaireLibrary/utils/properties/enviro
let props: EnvProperties = {
dashboard: 'monitor',
adminToolsPortalType: "monitor",
isDashboard: true,
enablePiwikTrack: true,
monitorStatsFrameUrl:"https://beta.services.openaire.eu/stats-tool/",

View File

@ -3,6 +3,7 @@ import {common, commonProd} from "../app/openaireLibrary/utils/properties/enviro
let props: EnvProperties = {
dashboard: 'monitor',
adminToolsPortalType: "monitor",
isDashboard: true,
enablePiwikTrack: true,
monitorStatsFrameUrl: "https://services.openaire.eu/stats-tool/",