MaDgIK
/
irish-monitor
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Merge from develop before release of 1.0.2

This commit is contained in:
Konstantinos Triantafyllou 2024-09-18 13:08:33 +03:00
parent e965d4c918 21adb8493a
commit f7cc26519e
10 changed files with 53 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -14,6 +14,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- *Fixed (for any bug fixes)*
- *Security (in case of vulnerabilities)*
## v1.0.2 - 18.09.2024
### Changed
Texts in home and about.
### Added
Add info for publicly-funded filter.
Add engagement tag for engagement-training page.
## v1.0.1 - 25.07.2024
### Fixed
Problem with ORCID KPIs regarding a researcher.

2
server.ts
View File

@ -111,7 +111,7 @@ export function app(): express.Express {
}));
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 => {

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

@ -7,8 +7,9 @@
<div class="uk-text-large uk-width-1-1 uk-width-medium@m uk-flex-last@m">
<div>
Enhance your approach to Open Science. Explore insights thoughtfully designed to support your
strategy and contribute to the future of Irish Open Science. Our current pilot phase, aimed at
enhancing data integrity and broadening functionality, continues until June 2024.
strategy and contribute to the future of Irish Open Science. In our current pilot phase we are
aiming at at enhancing data integrity, broadening functionality and embedding the Monitor into the
Irish scholarly ecosystem.
</div>
<a routerLink="/national" class="uk-button uk-button-secondary uk-margin-top">Take a look</a>
</div>
@ -54,17 +55,22 @@
<div class="uk-section uk-background-secondary dark">
<div class="uk-container">
<h2 class="uk-text-center uk-light">All in one platform</h2>
<div class="uk-margin-large-top uk-grid uk-grid-small uk-child-width-1-1 uk-child-width-1-2@m" uk-height-match=".column" uk-grid>
<div class="uk-margin-large-top uk-grid uk-grid-small uk-child-width-1-1 uk-child-width-1-2@m"
uk-height-match=".column" uk-grid>
<div>
<div class="uk-card uk-card-default uk-card-body column uk-flex uk-flex-column">
<div class="uk-text-primary uk-text-large">National Monitor</div>
<h3 class="uk-margin-remove-top uk-width-large">Explore Ireland’s Research Overview</h3>
<div class="uk-width-large uk-width-expand uk-margin-medium-bottom uk-text-large">
Dive into the National Dashboard for a comprehensive view of Ireland’s Open Access landscape or explore our other four types of tailor-made dashboards. </div>
Dive into the National Dashboard for a comprehensive view of Ireland’s Open Access landscape or
explore our other four types of tailor-made dashboards.
</div>
<div class="uk-flex uk-flex-right">
<a routerLink="/national" class="uk-link-reset uk-text-large uk-text-bolder uk-flex uk-flex-middle">
<a routerLink="/national"
class="uk-link-reset uk-text-large uk-text-bolder uk-flex uk-flex-middle">
<span>National Monitor</span>
<button class="uk-icon-button uk-button-primary uk-margin-left" [class.uk-icon-button-small]="isMobile">
<button class="uk-icon-button uk-button-primary uk-margin-left"
[class.uk-icon-button-small]="isMobile">
<icon name="north_east" [flex]="true" [ratio]="isMobile?1:1.5"></icon>
</button>
</a>
@ -75,7 +81,8 @@
<div class="uk-grid column uk-grid-small uk-child-width-1-1 uk-child-width-1-2@s" uk-grid>
<div>
<div class="uk-card uk-card-default uk-flex uk-flex-column uk-padding-small uk-height-1-1">
<h6 class="uk-margin-remove-top uk-width-expand">Research Performing Organisations Monitors</h6>
<h6 class="uk-margin-remove-top uk-width-expand">Research Performing Organisations
Monitors</h6>
<div class="uk-flex uk-flex-right uk-margin-top organization">
<a routerLink="/rpo">
<button class="uk-icon-button uk-icon-button-small uk-button-primary uk-margin-left">
@ -99,7 +106,8 @@
</div>
<div>
<div class="uk-card uk-card-default uk-flex uk-flex-column uk-padding-small uk-height-1-1">
<h6 class="uk-margin-remove-top uk-width-expand">Research Funding Organisations Monitors</h6>
<h6 class="uk-margin-remove-top uk-width-expand">Research Funding Organisations
Monitors</h6>
<div class="uk-flex uk-flex-right funder">
<a routerLink="/rfo">
<button class="uk-icon-button uk-icon-button-small uk-button-primary uk-margin-left">
@ -131,11 +139,14 @@
Enhancing data quality through user engagement
</h3>
<div class="uk-light uk-margin-medium-bottom">
We encourage active participation from our users to refine and improve the data quality on our platform. Collaborate with us, utilize the tools provided, and contribute to shaping a robust Open Access environment.
We encourage active participation from our users to refine and improve the data quality on our
platform. Collaborate with us, utilize the tools provided, and contribute to shaping a robust Open
Access environment.
</div>
<a class="uk-button uk-button-secondary" routerLink="/how-it-works/user-actions">Learn More</a>
</div>
<div class="uk-grid uk-grid-small uk-child-width-1-1 uk-child-width-1-2@s" uk-height-match="target: .uk-card; row: false" uk-grid>
<div class="uk-grid uk-grid-small uk-child-width-1-1 uk-child-width-1-2@s"
uk-height-match="target: .uk-card; row: false" uk-grid>
<div>
<div class="uk-card uk-card-default uk-flex uk-flex-column uk-padding-small">
<h6>Add to ORCID</h6>
@ -159,7 +170,8 @@
Connect research results with projects, research communities, or other research outcomes.
</div>
<div class="uk-flex uk-flex-right">
<a routerLink="/participate/claim" class="uk-link-reset uk-text-bolder uk-flex uk-flex-middle">
<a routerLink="/participate/claim"
class="uk-link-reset uk-text-bolder uk-flex uk-flex-middle">
<span>Link</span>
<button class="uk-icon-button uk-icon-button-small uk-button-secondary uk-margin-left">
<icon name="north_east" [flex]="true"></icon>
@ -197,7 +209,9 @@
</div>
<div class="uk-width-1-1 uk-width-2-3@s">
<h3>We Value Your Feedback.</h3>
<div class="uk-width-large">Your insights and feedback are crucial. Reach out with questions, comments, or to collaborate on data quality.</div>
<div class="uk-width-large">Your insights and feedback are crucial. Reach out with questions, comments, or
to collaborate on data quality.
</div>
</div>
<div class="uk-width-1-1 uk-width-expand@s uk-flex uk-flex-center">
<a routerLink="/contact-us" class="uk-button uk-button-secondary">Contact us</a>

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit 78bcd9c80a93073a3d5a6f157514589ab6547ff2
Subproject commit 42d6430cc433a8e2094b2ab954d3ba3873e5bd51

1
src/app/resources/how-it-works/about.component.html
View File

@ -15,7 +15,6 @@
<ng-template #pilot>
This platform is currently in its <span class="uk-text-bold">pilot</span> phase.
Over the next few months, we are dedicatedly working on enhancing data quality and expanding functionalities.
Our goal is to deliver the final product by June 2024.
This period is crucial for refining our services and ensuring that the platform meets the highest standards of excellence
and user satisfaction, please <a routerLink="/contact-us">contact us</a> with any questions or comments.
</ng-template>

6
src/app/shared/irish-monitor.service.ts
View File

@ -20,14 +20,14 @@ export class IrishMonitorService {
}
public getStakeholder(id: string): Observable<StakeholderExtended> {
return this.http.get<StakeholderExtended>(properties.monitorServiceAPIURL + '/extended/' + id, CustomOptions.registryOptions()).pipe(map(stakeholder => {
return this.http.get<StakeholderExtended>(properties.monitorServiceAPIURL + 'extended/' + id, CustomOptions.registryOptions()).pipe(map(stakeholder => {
return HelperFunctions.copy(Stakeholder.checkIsUpload(stakeholder));
}));
}
public getStakeholders(type: StakeholderType): Observable<StakeholderExtended[]> {
return this.http.get<StakeholderExtended[]>(properties.monitorServiceAPIURL + '/extended?type=' + type, CustomOptions.registryOptions()).pipe(catchError(err => {
return this.stakeholderService.getStakeholders(properties.monitorServiceAPIURL, type, null);
return this.http.get<StakeholderExtended[]>(properties.monitorServiceAPIURL + 'extended?type=' + type, CustomOptions.registryOptions()).pipe(catchError(err => {
return this.stakeholderService.getStakeholders(type, null);
}), map(stakeholders => {
return HelperFunctions.copy(Stakeholder.checkIsUpload(stakeholders));
}));

4
src/app/shared/monitor/monitor.component.html
View File

@ -273,8 +273,8 @@
</li>
</ng-container>
</ul>
<i *ngIf="user || countSelectedFilters() > 0 "
class="uk-margin-medium-top uk-text-small uk-display-block">
<i class="uk-margin-medium-top uk-text-small uk-display-block"><sup>*</sup> Publicly-funded information has been curated for IE only.</i>
<i class="uk-margin-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>

6
src/app/shared/oa-indicator/oa-indicator.component.ts
View File

@ -1,14 +1,10 @@
import {Component, Input, OnInit} from "@angular/core";
import {Stakeholder} from "../../openaireLibrary/monitor/entities/stakeholder";
import {StatisticsService} from "../../openaireLibrary/monitor-admin/utils/services/statistics.service";
import {
IndicatorStakeholderBaseComponent,
StakeholderBaseComponent
} from "../../openaireLibrary/monitor-admin/utils/stakeholder-base.component";
import {IndicatorStakeholderBaseComponent} from "../../openaireLibrary/monitor-admin/utils/stakeholder-base.component";
import {zip} from "rxjs";
import {OAIndicator} from "../../openaireLibrary/monitor-admin/utils/indicator-utils";
import {IrishMonitorService} from "../irish-monitor.service";
import {BaseComponent} from "../../openaireLibrary/sharedComponents/base/base.component";
@Component({
selector: "oa-indicator",

2
src/assets/common-assets

@ -1 +1 @@
Subproject commit 014adfe4588975e499c72b284ce7368fc2cb5d14
Subproject commit a4d8923b82a59ac1cc41e9c0574f1d64a61c0c1b

10
src/styles.less
View File

@ -39,6 +39,7 @@ svg .a {
@training-color: #A8B9FF;
@webinar-color: #E0C44F;
@engagement-color: #dab6ff;
.card {
height: 325px;
@ -53,6 +54,10 @@ svg .a {
background-image: url("~/src/assets/irish-assets/resources/resources-pink-blue.png");
}
&.engagement {
background-image: url("~/src/assets/irish-assets/resources/resources-dark-blue.jpg");
}
.info {
height: 50%;
.set-blur-background(@dark-color, 50%, brightness(0.5) blur(20px));
@ -97,6 +102,11 @@ svg .a {
border-color: @webinar-color;
}
.uk-label.engagement {
background-color: @engagement-color;
border-color: @engagement-color;
}
.uk-label.funder {
background-color: @funder-color;
border-color: @funder-color;