MaDgIK
/
monitor
13
0
Fork 0
Code Issues Pull Requests Projects Releases 12 Wiki Activity

add StakeholderEntities as enumeration

This commit is contained in:
Alex Martzios 2022-06-08 14:01:10 +03:00
parent 804933a148
commit 8b55f2273d
13 changed files with 56 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/app.component.ts
View File

@ -19,6 +19,7 @@ import {EmailService} from "./openaireLibrary/utils/email/email.service";
import {StringUtils} from "./openaireLibrary/utils/string-utils.class";
import {QuickContactComponent} from "./openaireLibrary/sharedComponents/quick-contact/quick-contact.component";
import {AlertModal} from "./openaireLibrary/utils/modal/alert";
import {StakeholderEntities} from './openaireLibrary/monitor/entities/stakeholder';
@Component({
selector: 'app-root',
@ -90,6 +91,7 @@ export class AppComponent {
@ViewChild('modal') modal: AlertModal;
@ViewChild('quickContact') quickContact: QuickContactComponent;
private subscriptions: any[] = [];
public stakeholderEntities = StakeholderEntities;
constructor(private route: ActivatedRoute, private propertiesService: EnvironmentSpecificService,
private router: Router, private stakeholderService: StakeholderService, private smoothScroll: SmoothScroll,
@ -152,7 +154,7 @@ export class AppComponent {
items: []
});
this.menuItems.push({
rootItem: new MenuItem("stakeholders", "Browse Dashboards", "", "/browse", false, [], null, {}),
rootItem: new MenuItem("stakeholders", "Browse " + this.stakeholderEntities.STAKEHOLDERS, "", "/browse", false, [], null, {}),
items: []
});
this.bottomMenuItems = [
@ -171,7 +173,7 @@ export class AppComponent {
this.userMenuItems.push(new MenuItem("", "Manage profiles",
this.properties.domain + properties.baseLink + "/dashboard/admin", "", false, [], [], {}))
}
this.userMenuItems.push(new MenuItem("", "My Dashboards", "", "/my-dashboards", false, [], [], {}));
this.userMenuItems.push(new MenuItem("", "My " + this.stakeholderEntities.STAKEHOLDERS, "", "/my-dashboards", false, [], [], {}));
this.userMenuItems.push(new MenuItem("", "User information", "", "/user-info", false, [], [], {}));
}
}

2
src/app/get-started/get-started.component.html
View File

@ -9,7 +9,7 @@
<h1 class="uk-width-3-4@m" uk-scrollspy-class>Get started with <br> OpenAIRE Monitor Dashboard <span class="uk-text-primary">.</span></h1>
<div class="uk-text-large uk-width-2-3@m" uk-scrollspy-class>
The OpenAIRE Monitor Dashboard is an <span class="uk-text-bold">open tracking platform</span> with all the tools you need
to understand and make insightful decisions — whether you are a <span class="uk-text-bold">funder</span>, a <span class="uk-text-bold">research institution</span>
to understand and make insightful decisions — whether you are a <span class="uk-text-bold">{{stakeholderEntities.FUNDER | lowercase}}</span>, a <span class="uk-text-bold">{{stakeholderEntities.RI | lowercase}}</span>
or a <span class="uk-text-bold">community</span>, and want to measure or increase uptake
of Open Science, understand your costs, gaps and strengths, or build a community around it.
</div>

2
src/app/get-started/get-started.component.ts
View File

@ -13,6 +13,7 @@ import {properties} from "../../environments/environment";
import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
import {NotificationHandler} from "../openaireLibrary/utils/notification-handler";
import {StringUtils} from "../openaireLibrary/utils/string-utils.class";
import {StakeholderEntities} from '../openaireLibrary/monitor/entities/stakeholder';
@Component({
selector: 'get-started',
@ -36,6 +37,7 @@ export class GetStartedComponent implements OnInit {
public contactForm: FormGroup;
@ViewChild('modal') modal;
private subscriptions = [];
public stakeholderEntities = StakeholderEntities;
constructor(private route: ActivatedRoute,
private _router: Router,

22
src/app/home/home.component.html
View File

@ -54,7 +54,7 @@
<div class="uk-section uk-section-secondary">
<div class="uk-container uk-container-large">
<div class="uk-width-1-1">
<span class="uk-h6 uk-text-primary">Funders. Universities. Research Institutions. Communities.</span>
<span class="uk-h6 uk-text-primary">{{stakeholderEntities.FUNDERS}}. Universities. {{stakeholderEntities.RIS | titlecase}}. Communities.</span>
<h2 class="uk-h1 uk-margin-remove-top uk-width-1-2@m">Simplify Open Science tracking & monitoring<span
class="uk-text-primary">.</span></h2>
</div>
@ -131,27 +131,27 @@
</a>
</ng-template>
<div *ngIf="publicationsSize">
<ng-container *ngTemplateOutlet="numberCard; context: {numberSize: publicationsSize, name: entities.PUBLICATIONS,
<ng-container *ngTemplateOutlet="numberCard; context: {numberSize: publicationsSize, name: openaireEntities.PUBLICATIONS,
url: 'https://explore.openaire.eu/search/find/research-outcomes?type=publications'}">
</ng-container>
</div>
<div *ngIf="datasetsSize">
<ng-container *ngTemplateOutlet="numberCard; context: {numberSize: datasetsSize, name: entities.DATASETS,
<ng-container *ngTemplateOutlet="numberCard; context: {numberSize: datasetsSize, name: openaireEntities.DATASETS,
url: 'https://explore.openaire.eu/search/find/research-outcomes?type=datasets'}">
</ng-container>
</div>
<div *ngIf="softwareSize">
<ng-container *ngTemplateOutlet="numberCard; context: {numberSize: softwareSize, name: entities.SOFTWARE,
<ng-container *ngTemplateOutlet="numberCard; context: {numberSize: softwareSize, name: openaireEntities.SOFTWARE,
url: 'https://explore.openaire.eu/search/find/research-outcomes?type=software'}">
</ng-container>
</div>
<div *ngIf="otherSize">
<ng-container *ngTemplateOutlet="numberCard; context: {numberSize: otherSize, name: entities.OTHER,
<ng-container *ngTemplateOutlet="numberCard; context: {numberSize: otherSize, name: openaireEntities.OTHER,
url: 'https://explore.openaire.eu/search/find/research-outcomes?type=other'}">
</ng-container>
</div>
<div *ngIf="fundersSize">
<ng-container *ngTemplateOutlet="numberCard; context: {numberSize: fundersSize, name: 'Funders',
<ng-container *ngTemplateOutlet="numberCard; context: {numberSize: fundersSize, name: stakeholderEntities.FUNDERS,
url: 'https://explore.openaire.eu/search/find/projects'}">
</ng-container>
</div>
@ -219,9 +219,9 @@
</div>
<div class="uk-section uk-container uk-container-large uk-margin-large-bottom">
<div class="uk-width-1-2@m uk-margin-bottom">
<h2 class="uk-heading-xlarge">Dashboards in action<span class="uk-text-primary">.</span></h2>
<h2 class="uk-heading-xlarge">{{stakeholderEntities.STAKEHOLDERS}} in action<span class="uk-text-primary">.</span></h2>
<div class="uk-text-large">
View existing dashboards from collaborating organizations. Get a preview on how they work and how our service can be customized to serve you.
View existing {{stakeholderEntities.STAKEHOLDERS | lowercase}} from collaborating organizations. Get a preview on how they work and how our service can be customized to serve you.
</div>
</div>
<a class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text"
@ -237,9 +237,9 @@
<ng-container *ngIf="!loading">
<ul class="uk-tab" uk-tab>
<li><a>All</a></li>
<li><a>Funders</a></li>
<li><a>Research Initiatives</a></li>
<li><a>Research Institutions</a></li>
<li><a>{{stakeholderEntities.FUNDERS | titlecase}}</a></li>
<li><a>{{stakeholderEntities.RIS | titlecase}}</a></li>
<li><a>{{stakeholderEntities.ORGANIZATIONS | titlecase}}</a></li>
</ul>
<ul class="uk-switcher">
<li>

5
src/app/home/home.component.ts
View File

@ -22,7 +22,7 @@ import {NumberUtils} from "../openaireLibrary/utils/number-utils.class";
import {SearchResearchResultsService} from "../openaireLibrary/services/searchResearchResults.service";
import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service";
import {LocalStorageService} from "../openaireLibrary/services/localStorage.service";
import {Stakeholder, StakeholderInfo} from "../openaireLibrary/monitor/entities/stakeholder";
import {Stakeholder, StakeholderEntities, StakeholderInfo} from "../openaireLibrary/monitor/entities/stakeholder";
import {User} from "../openaireLibrary/login/utils/helper.class";
import {UserManagementService} from "../openaireLibrary/services/user-management.service";
import {properties} from "../../environments/environment";
@ -55,7 +55,8 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit, IDeactiv
public loading: boolean = true;
public errorCodes: ErrorCodes;
public properties: EnvProperties = properties;
public entities = OpenaireEntities;
public openaireEntities = OpenaireEntities;
public stakeholderEntities = StakeholderEntities;
public directLink: boolean = true;
public publicationsSize: any = null;
public datasetsSize: any = null;

4
src/app/learn-how/learn-how.component.html
View File

@ -27,7 +27,7 @@
Starting from the OpenAIRE RESEARCH GRAPH
</div>
<div>
<a href="https://graph.openaire.eu/" class="graph" target="_blank">OpenAIRE Research Graph</a> is a comprehensive research graph (meta research) that links all types of {{entities.RESULTS | lowercase}} to funders, {{entities.ORGANIZATIONS | lowercase}}, researchers, {{entities.COMMUNITIES | lowercase}} and publishers. With information from global databases, disambiguated and interlinked using semantic AI technologies.
<a href="https://graph.openaire.eu/" class="graph" target="_blank">OpenAIRE Research Graph</a> is a comprehensive research graph (meta research) that links all types of {{openaireEntities.RESULTS | lowercase}} to {{stakeholderEntities.FUNDERS | lowercase}}, {{openaireEntities.ORGANIZATIONS | lowercase}}, researchers, {{openaireEntities.COMMUNITIES | lowercase}} and publishers. With information from global databases, disambiguated and interlinked using semantic AI technologies.
</div>
</div>
</div>
@ -40,7 +40,7 @@
Provide us some information
</div>
<div>
You give us some simple (meta)data related to your organization function: e.g., funding database, repositories, related {{entities.PROJECTS | lowercase}}, registry of people… All under confidential agreements.
You give us some simple (meta)data related to your organization function: e.g., funding database, repositories, related {{openaireEntities.PROJECTS | lowercase}}, registry of people… All under confidential agreements.
</div>
</div>
</div>

7
src/app/learn-how/learn-how.component.ts
View File

@ -9,6 +9,7 @@ import {properties} from "../../environments/environment";
import {Subscriber} from "rxjs";
import {Breadcrumb} from '../openaireLibrary/utils/breadcrumbs/breadcrumbs.component';
import {OpenaireEntities} from "../openaireLibrary/utils/properties/searchFields";
import {StakeholderEntities} from '../openaireLibrary/monitor/entities/stakeholder';
@Component({
selector: 'learn-how',
@ -23,9 +24,11 @@ export class LearnHowComponent {
public pageTitle: string = "OpenAIRE - Monitor | About";
public description: string = "Learn the process: Use the Monitor Dashboard to view your research results, open science. See how it works. Simplify research tracking & monitoring ";
public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'About'}];
public entities = OpenaireEntities;
public openaireEntities = OpenaireEntities;
public stakeholderEntities = StakeholderEntities;
public properties: EnvProperties = properties;
subscriptions = [];
constructor(
private route: ActivatedRoute,
private _router: Router,
@ -44,7 +47,7 @@ export class LearnHowComponent {
this.seoService.createLinkForCanonicalURL(this.url);
this.updateUrl(this.url);
this.updateTitle(this.pageTitle);
this.updateDescription("OpenAIRE - Monitor, Funders, Statistics, EC - Learn How");``
this.updateDescription("OpenAIRE - Monitor, " + this.stakeholderEntities.FUNDERS+ ", Statistics, EC - Learn How");``
//this.getDivContents();
//this.getPageContents();

2
src/app/my-stakeholders/my-stakeholders.component.html
View File

@ -92,7 +92,7 @@
<div class="uk-flex uk-flex-center uk-margin-large-bottom">
<div class="uk-card uk-card-default">
<div class="uk-card-body uk-text-bold uk-text-center ">
You are not yet member in any Dashboards.<br>
You are not yet member in any {{stakeholderEntities.STAKEHOLDERS}}.<br>
Start by browsing and subscribing in those that you are interested in.
</div>
</div>

9
src/app/my-stakeholders/my-stakeholders.component.ts
View File

@ -16,7 +16,7 @@ import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.compo
import {properties} from "../../environments/environment";
import {Subscriber} from "rxjs";
import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service";
import {StakeholderInfo} from "../openaireLibrary/monitor/entities/stakeholder";
import {StakeholderEntities, StakeholderInfo} from "../openaireLibrary/monitor/entities/stakeholder";
@Component({
selector: 'my-stakeholders',
@ -24,8 +24,9 @@ import {StakeholderInfo} from "../openaireLibrary/monitor/entities/stakeholder";
})
export class MyStakeholdersComponent {
public pageTitle = "OpenAIRE | My Dashboards";
public description = "OpenAIRE - Monitor, A new era of monitoring research. Open data. Open methodologies | My managing and member of Dashboards";
public stakeholderEntities = StakeholderEntities;
public pageTitle = "OpenAIRE | My " + this.stakeholderEntities.STAKEHOLDERS;
public description = "OpenAIRE - Monitor, A new era of monitoring research. Open data. Open methodologies | My managing and member of " + this.stakeholderEntities.STAKEHOLDERS;
public stakeholders: StakeholderInfo[] = [];
public pageContents = null;
public divContents = null;
@ -35,7 +36,7 @@ export class MyStakeholdersComponent {
public subscriberErrorMessage: string = "";
public errorCodes: ErrorCodes;
private errorMessages: ErrorMessagesComponent;
public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'My Dashboards'}];
public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'My ' + this.stakeholderEntities.STAKEHOLDERS}];
public properties: EnvProperties = properties;
private user: User;
private subscriptions = [];

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit f9f9a6d5eadbf0efb1cdb9afb74f65d074c92e83
Subproject commit f3af762dab9b3d489dd4f78c46f3537aff840efd

33
src/app/search-stakeholders/search-stakeholders.component.ts
View File

@ -11,25 +11,26 @@ import {StringUtils} from "../openaireLibrary/utils/string-utils.class";
import {UserManagementService} from "../openaireLibrary/services/user-management.service";
import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service";
import {NewSearchPageComponent} from "../openaireLibrary/searchPages/searchUtils/newSearchPage.component";
import {StakeholderInfo} from "../openaireLibrary/monitor/entities/stakeholder";
import {StakeholderEntities, StakeholderInfo} from "../openaireLibrary/monitor/entities/stakeholder";
import {properties} from "../../environments/environment";
import {Subscriber} from "rxjs";
import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
import {TitleCasePipe} from "@angular/common";
@Component({
selector: 'search-stakeholders',
template: `
<new-search-page pageTitle="OpenAIRE-Monitor | Browse Dashboards"
[hasPrefix]=false [piwikSiteId]="piwikSiteId"
[formPlaceholderText]="'Search OpenAIRE Monitor Dashboards'"
[type]="(results.length > 1)?'dashboards':'dashboard'" entityType="stakeholder"
[results]="results" [searchUtils]="searchUtils"
[showResultCount]=true
[disableForms]="disableForms"
[showIndexInfo]=false
[simpleView]="true"
[fieldIds]="fieldIds" [fieldIdsMap]="fieldIdsMap" [selectedFields]="selectedFields" [showBreadcrumb]="true" [breadcrumbs]="breadcrumbs"
[simpleSearchLink]="searchLink" [entitiesSelection]="false">
<new-search-page pageTitle="OpenAIRE-Monitor | Browse {{this.stakeholderEntities.STAKEHOLDERS}}"
[hasPrefix]=false [piwikSiteId]="piwikSiteId"
[formPlaceholderText]="'Search OpenAIRE Monitor ' + this.stakeholderEntities.STAKEHOLDERS"
[type]="(results.length > 1) ? this.stakeholderEntities.STAKEHOLDERS:this.stakeholderEntities.STAKEHOLDER" entityType="stakeholder"
[results]="results" [searchUtils]="searchUtils"
[showResultCount]=true
[disableForms]="disableForms"
[showIndexInfo]=false
[simpleView]="true"
[fieldIds]="fieldIds" [fieldIdsMap]="fieldIdsMap" [selectedFields]="selectedFields" [showBreadcrumb]="true" [breadcrumbs]="breadcrumbs"
[simpleSearchLink]="searchLink" [entitiesSelection]="false">
</new-search-page>
`
})
@ -60,14 +61,16 @@ export class SearchStakeholdersComponent {
};
public keyword = "";
public searchLink;
public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'Browse Dashboards'}];
public stakeholderEntities = StakeholderEntities;
public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'Browse ' + this.stakeholderEntities.STAKEHOLDERS}];
properties: EnvProperties = properties;
@ViewChild(NewSearchPageComponent, {static: true}) searchPage: NewSearchPageComponent;
private user: User;
constructor(private route: ActivatedRoute,
private _stakeholderService: StakeholderService,
private userManagementService: UserManagementService) {
private userManagementService: UserManagementService,
public titleCasePipe: TitleCasePipe) {
this.errorCodes = new ErrorCodes();
this.errorMessages = new ErrorMessagesComponent();
this.searchUtils.status = this.errorCodes.LOADING;
@ -438,7 +441,7 @@ export class SearchStakeholdersComponent {
let value_original_ids = [];
filter_names.push("Type");
filter_ids.push("type");
value_names.push(["Funders", "Research Initiatives", "Institutions"]);
value_names.push([this.stakeholderEntities.FUNDERS, this.titleCasePipe.transform(this.stakeholderEntities.RIS), this.titleCasePipe.transform(this.stakeholderEntities.ORGANIZATIONS)]);
value_original_ids.push(["funder", "ri", "organization"]);
filter_names.push("Accessibility");
filter_ids.push("access");

4
src/app/search-stakeholders/search-stakeholders.module.ts
View File

@ -1,5 +1,5 @@
import {NgModule} from "@angular/core";
import {CommonModule} from "@angular/common";
import {CommonModule, TitleCasePipe} from "@angular/common";
import {FormsModule} from "@angular/forms";
import {SearchStakeholdersComponent} from "./search-stakeholders.component";
import {SearchFormModule} from "../openaireLibrary/searchPages/searchUtils/searchForm.module";
@ -16,7 +16,7 @@ import {NewSearchPageModule} from "../openaireLibrary/searchPages/searchUtils/ne
declarations: [
SearchStakeholdersComponent
],
providers:[ PreviousRouteRecorder],
providers:[ PreviousRouteRecorder, TitleCasePipe],
exports: [
SearchStakeholdersComponent
]

2
src/assets/openaire-theme

@ -1 +1 @@
Subproject commit b2911eeaaf5f1a04a55353a3df5bf4d42a5fa7ca
Subproject commit accd757bca96e58296a5ab4863bddae73e650aba