Compare commits
No commits in common. "master" and "1.0.1" have entirely different histories.
12
CHANGELOG.md
12
CHANGELOG.md
|
|
@ -14,18 +14,6 @@ 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.3 - 30.10.2024
|
||||
### Changed
|
||||
Open Access Indicator changed to show open access for the last full year. (e.g. 2023)
|
||||
|
||||
## 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.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "irish-monitor",
|
||||
"version": "1.0.3",
|
||||
"version": "1.0.1",
|
||||
"scripts": {
|
||||
"ng": "ng",
|
||||
"start": "ng serve --port 5500 --disable-host-check --host 0.0.0.0",
|
||||
|
|
|
|||
|
|
@ -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 => {
|
||||
|
|
|
|||
|
|
@ -20,11 +20,9 @@ import {Irish} from "../shared/irish";
|
|||
[class.sidebar_main_active]="open && (hasSidebar || hasInternalSidebar || hasAdminMenu)"
|
||||
[class.sidebar_mini]="!open && (hasSidebar || hasInternalSidebar || hasAdminMenu)"
|
||||
[class.sidebar_hover]="hover">
|
||||
<dashboard-sidebar *ngIf="hasSidebar && !hasInternalSidebar && sideBarItems.length > 0"
|
||||
[logoURL]="stakeholder | logoUrl"
|
||||
<dashboard-sidebar *ngIf="hasSidebar && !hasInternalSidebar && sideBarItems.length > 0" [logoURL]="stakeholder | logoUrl"
|
||||
[items]="sideBarItems" [backItem]="backItem"></dashboard-sidebar>
|
||||
<dashboard-sidebar *ngIf="hasAdminMenu && !hasInternalSidebar" [items]="adminMenuItems"
|
||||
[backItem]="backItem"></dashboard-sidebar>
|
||||
<dashboard-sidebar *ngIf="hasAdminMenu && !hasInternalSidebar" [items]="adminMenuItems" [backItem]="backItem"></dashboard-sidebar>
|
||||
<div class="uk-width-1-1">
|
||||
<router-outlet></router-outlet>
|
||||
</div>
|
||||
|
|
@ -71,10 +69,19 @@ export class AdminComponent extends SidebarBaseComponent implements OnInit {
|
|||
if (this.isAdmin && this.stakeholder.defaultId) {
|
||||
this.sideBarItems.push(new MenuItem("admin-tools", "Pages & Entities", "", "/admin/" + this.stakeholder.alias + "/admin-tools/pages", false, [], [], {}, {name: 'description'}, null, "uk-visible@m", "/admin/" + this.stakeholder.alias + "/admin-tools"));
|
||||
}
|
||||
this.backItem = null;
|
||||
if (this.hasAdminMenu) {
|
||||
this.setAdminMenuItems();
|
||||
this.adminMenuItems = [];
|
||||
this.backItem = null;
|
||||
this.adminMenuItems.push(new MenuItem("stakeholders", "Manage profiles", "", "/admin", false, [], [], {}, {name: 'settings'}));
|
||||
if (Session.isPortalAdministrator(this.user)) {
|
||||
this.adminMenuItems.push(new MenuItem("adminOptions", "Super Admin options", "", "/admin/admin-tools/portals", false, [], [], {}, {name: 'settings'}, null, "uk-visible@m", '/admin/admin-tools'));
|
||||
}
|
||||
if (Session.isPortalAdministrator(this.user) || Session.isMonitorCurator(this.user)) {
|
||||
this.adminMenuItems.push(new MenuItem("irishOptions", "Irish options", "", "/admin/irish/admin-tools/pages", false, [], [], {}, {name: 'settings'}, null, "uk-visible@m", '/admin/irish/admin-tools'));
|
||||
}
|
||||
this.hasAdminMenu = this.hasAdminMenu && this.adminMenuItems.length > 1;
|
||||
}
|
||||
|
||||
this.backItem = new MenuItem("back", "Manage profiles", "", "/admin", false, [], null, {}, {name: 'west'});
|
||||
this.loading = false;
|
||||
}));
|
||||
|
|
@ -85,7 +92,16 @@ export class AdminComponent extends SidebarBaseComponent implements OnInit {
|
|||
this.hasSidebar = false;
|
||||
this.loading = false;
|
||||
if (this.hasAdminMenu) {
|
||||
this.setAdminMenuItems();
|
||||
this.adminMenuItems = [];
|
||||
this.backItem = null;
|
||||
this.adminMenuItems.push(new MenuItem("stakeholders", "Manage profiles", "", "/admin", false, [], [], {}, {name: 'settings'}));
|
||||
if (Session.isPortalAdministrator(this.user)) {
|
||||
this.adminMenuItems.push(new MenuItem("adminOptions", "Super Admin options", "", "/admin/admin-tools/portals", false, [], [], {}, {name: 'settings'}, null, "uk-visible@m", '/admin/admin-tools'));
|
||||
}
|
||||
if (Session.isPortalAdministrator(this.user) || Session.isMonitorCurator(this.user)) {
|
||||
this.adminMenuItems.push(new MenuItem("irishOptions", "Irish options", "", "/admin/irish/admin-tools/pages", false, [], [], {}, {name: 'settings'}, null, "uk-visible@m", '/admin/irish/admin-tools'));
|
||||
}
|
||||
this.hasAdminMenu = this.hasAdminMenu && this.adminMenuItems.length > 1;
|
||||
}
|
||||
}
|
||||
}));
|
||||
|
|
@ -109,18 +125,6 @@ export class AdminComponent extends SidebarBaseComponent implements OnInit {
|
|||
this.configurationService.initPortal(this.properties, this.properties.adminToolsCommunity);
|
||||
}
|
||||
|
||||
private setAdminMenuItems() {
|
||||
this.adminMenuItems = [];
|
||||
this.adminMenuItems.push(new MenuItem("stakeholders", "Manage profiles", "", "/admin", false, [], [], {}, {name: 'settings'}));
|
||||
if (Session.isPortalAdministrator(this.user)) {
|
||||
this.adminMenuItems.push(new MenuItem("adminOptions", "Super Admin options", "", "/admin/admin-tools/portals", false, [], [], {}, {name: 'settings'}, null, "uk-visible@m", '/admin/admin-tools'));
|
||||
}
|
||||
if (Session.isPortalAdministrator(this.user) || Session.isMonitorCurator(this.user)) {
|
||||
this.adminMenuItems.push(new MenuItem("irishOptions", "Irish options", "", "/admin/irish/admin-tools/pages", false, [], [], {}, {name: 'settings'}, null, "uk-visible@m", '/admin/irish/admin-tools'));
|
||||
}
|
||||
this.hasAdminMenu = this.hasAdminMenu && this.adminMenuItems.length > 1;
|
||||
}
|
||||
|
||||
public get isAdmin() {
|
||||
return Session.isPortalAdministrator(this.user) || Session.isCurator(this.stakeholder.type, this.user);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,9 +7,8 @@
|
|||
<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. In our current pilot phase we are
|
||||
aiming at enhancing data integrity, broadening functionality and embedding the Monitor into the
|
||||
Irish scholarly ecosystem.
|
||||
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.
|
||||
</div>
|
||||
<a routerLink="/national" class="uk-button uk-button-secondary uk-margin-top">Take a look</a>
|
||||
</div>
|
||||
|
|
@ -55,22 +54,17 @@
|
|||
<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>
|
||||
|
|
@ -81,8 +75,7 @@
|
|||
<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">
|
||||
|
|
@ -106,8 +99,7 @@
|
|||
</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">
|
||||
|
|
@ -139,14 +131,11 @@
|
|||
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>
|
||||
|
|
@ -170,8 +159,7 @@
|
|||
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>
|
||||
|
|
@ -209,9 +197,7 @@
|
|||
</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>
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit bb9f4dfc9afa90438256d105a6da206d3ddb3dd9
|
||||
Subproject commit 78bcd9c80a93073a3d5a6f157514589ab6547ff2
|
||||
|
|
@ -15,6 +15,7 @@
|
|||
<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>
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@
|
|||
<div class="uk-grid" class="uk-child-width-1-4@l uk-child-width-1-3@m uk-child-width-1-1"
|
||||
uk-grid uk-height-match="target: .top-info;">
|
||||
<div *ngFor="let item of filteredStakeholders.slice((currentPage-1)*pageSize, currentPage*pageSize)">
|
||||
<a [routerLink]="['./', item.alias]" class="uk-link-reset">
|
||||
<a routerLink="./{{item.alias}}" class="uk-link-reset">
|
||||
<div class="uk-card uk-card-default uk-card-hover">
|
||||
<div class="uk-padding-small top-info">
|
||||
<!-- logo -->
|
||||
|
|
@ -91,7 +91,7 @@
|
|||
<!-- when OA badges are re-introduced, the below if-statement will have to be moved on its correct div -->
|
||||
<div *ngIf="item.funderType || item.openAccess"
|
||||
class="uk-card-footer uk-padding-small uk-background-muted">
|
||||
<div class="uk-grid uk-grid-small uk-grid-divider uk-flex-center uk-flex-middle uk-child-width-1-2@m"
|
||||
<div class="uk-grid uk-grid-divider uk-flex-center uk-flex-middle uk-child-width-1-2@m"
|
||||
uk-grid>
|
||||
<div *ngIf="item.funderType">
|
||||
<div class="uk-text-xsmall">
|
||||
|
|
@ -109,10 +109,10 @@
|
|||
<progress
|
||||
class="uk-progress open-access uk-margin-xsmall-top uk-margin-xsmall-bottom"
|
||||
[value]="item.openAccess" max="100"></progress>
|
||||
<div class="uk-flex uk-text-center uk-flex-middle" [attr.uk-tooltip]="'Open Access with Licence (' + year + ')'">
|
||||
<div class="uk-flex uk-flex-middle" uk-tooltip="Open Access with Licence">
|
||||
<icon [name]="'open_access'" [flex]="true" [ratio]="0.8"
|
||||
class="open-access"></icon>
|
||||
<span class="uk-text-xsmall uk-margin-xsmall-left">Open Access ({{year}})</span>
|
||||
<span class="uk-text-xsmall uk-margin-xsmall-left">Open Access</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -134,13 +134,13 @@
|
|||
<th *ngIf="hasPublications"># of Publications</th>
|
||||
<th *ngIf="hasOpenAccess" class="uk-flex uk-flex-middle">
|
||||
<icon [name]="'open_access'" [flex]="true" [ratio]="0.8" class="open-access"></icon>
|
||||
<span class="uk-margin-xsmall-left">Open Access with Licence ({{year}})</span>
|
||||
<span class="uk-margin-xsmall-left">Open Access with Licence</span>
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr *ngFor="let item of filteredStakeholders.slice((currentPage-1)*pageSize, currentPage*pageSize)"
|
||||
class="clickable" [routerLink]="['./', item.alias]">
|
||||
class="clickable" routerLink="./{{item.alias}}">
|
||||
<td>
|
||||
<div class="uk-flex uk-flex-middle uk-height-xsmall uk-margin-left">
|
||||
<img *ngIf="item.logoUrl; else elseBlock" [src]="item | logoUrl"
|
||||
|
|
|
|||
|
|
@ -66,8 +66,4 @@ export class BrowseStakeholdersComponent extends BrowseStakeholderBaseComponent<
|
|||
break;
|
||||
}
|
||||
}
|
||||
|
||||
get year() {
|
||||
return (new Date().getFullYear() - 1).toString();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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(type, null);
|
||||
return this.http.get<StakeholderExtended[]>(properties.monitorServiceAPIURL + '/extended?type=' + type, CustomOptions.registryOptions()).pipe(catchError(err => {
|
||||
return this.stakeholderService.getStakeholders(properties.monitorServiceAPIURL, type, null);
|
||||
}), map(stakeholders => {
|
||||
return HelperFunctions.copy(Stakeholder.checkIsUpload(stakeholders));
|
||||
}));
|
||||
|
|
|
|||
|
|
@ -273,8 +273,8 @@
|
|||
</li>
|
||||
</ng-container>
|
||||
</ul>
|
||||
<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">
|
||||
<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>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,14 @@
|
|||
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} from "../../openaireLibrary/monitor-admin/utils/stakeholder-base.component";
|
||||
import {
|
||||
IndicatorStakeholderBaseComponent,
|
||||
StakeholderBaseComponent
|
||||
} 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",
|
||||
|
|
@ -15,7 +19,7 @@ import {IrishMonitorService} from "../irish-monitor.service";
|
|||
[style]="'--percentage:' + percentage.toFixed(1)"></div>
|
||||
<div class="uk-flex uk-flex-middle uk-margin-small-top">
|
||||
<icon class="open-access" [name]="'open_access'" [flex]="true"></icon>
|
||||
<span class="uk-margin-xsmall-left uk-text-small">Open Access with Licence ({{year}})</span>
|
||||
<span class="uk-margin-xsmall-left uk-text-small">Open Access with Licence</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -47,8 +51,8 @@ export class OaIndicatorComponent extends IndicatorStakeholderBaseComponent impl
|
|||
let OAIndicator: OAIndicator = this.stakeholderUtils.openAccess.get(this.stakeholder.type);
|
||||
if(OAIndicator) {
|
||||
this.subscriptions.push(zip(
|
||||
this.statisticsService.getNumbers(this.indicatorUtils.getSourceType(OAIndicator.numerator.source), this.indicatorUtils.getFullUrlWithFilters(this.stakeholder, OAIndicator.numerator, null, this.year, this.year)),
|
||||
this.statisticsService.getNumbers(this.indicatorUtils.getSourceType(OAIndicator.denominator.source), this.indicatorUtils.getFullUrlWithFilters(this.stakeholder, OAIndicator.denominator, null, this.year, this.year))).subscribe(res => {
|
||||
this.statisticsService.getNumbers(this.indicatorUtils.getSourceType(OAIndicator.numerator.source), this.indicatorUtils.getFullUrl(this.stakeholder, OAIndicator.numerator)),
|
||||
this.statisticsService.getNumbers(this.indicatorUtils.getSourceType(OAIndicator.denominator.source), this.indicatorUtils.getFullUrl(this.stakeholder, OAIndicator.denominator))).subscribe(res => {
|
||||
let numerator = this.calculate(res[0], OAIndicator.numerator.jsonPath);
|
||||
let denominator = this.calculate(res[1], OAIndicator.denominator.jsonPath);
|
||||
if (denominator > 0) {
|
||||
|
|
@ -58,10 +62,6 @@ export class OaIndicatorComponent extends IndicatorStakeholderBaseComponent impl
|
|||
}
|
||||
}
|
||||
|
||||
get year() {
|
||||
return (new Date().getFullYear() - 1).toString();
|
||||
}
|
||||
|
||||
public calculate(response: any, jsonPath: string[]) {
|
||||
let result = JSON.parse(JSON.stringify(response));
|
||||
jsonPath.forEach(path => {
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit a4d8923b82a59ac1cc41e9c0574f1d64a61c0c1b
|
||||
Subproject commit 014adfe4588975e499c72b284ce7368fc2cb5d14
|
||||
|
|
@ -39,7 +39,6 @@ svg .a {
|
|||
|
||||
@training-color: #A8B9FF;
|
||||
@webinar-color: #E0C44F;
|
||||
@engagement-color: #dab6ff;
|
||||
|
||||
.card {
|
||||
height: 325px;
|
||||
|
|
@ -54,10 +53,6 @@ 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));
|
||||
|
|
@ -102,11 +97,6 @@ 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;
|
||||
|
|
|
|||
Loading…
Reference in New Issue