diff --git a/explore/src/app/funders/funders.component.html b/explore/src/app/funders/funders.component.html index 2b262f89..939035fb 100644 --- a/explore/src/app/funders/funders.component.html +++ b/explore/src/app/funders/funders.component.html @@ -204,9 +204,9 @@
- + target="_blank" [href]="'https://'+(properties.environment =='beta' || properties.environment =='development'?'beta.':'')+'monitor.openaire.eu/dashboard/'+funder.monitorDashboard"> OpenAIRE logo @@ -220,6 +220,23 @@ Monitor Dashboard + + + + Irish logo + RFO Dashboard + + + + Irish logo + RFO Dashboard + +
@@ -238,7 +255,7 @@
- +
{{funder.name}} @@ -250,10 +267,10 @@
-
- + + target="_blank" [href]="'https://'+(properties.environment =='beta' || properties.environment =='development'?'beta.':'')+'monitor.openaire.eu/dashboard/'+funder.monitorDashboard"> OpenAIRE logo @@ -267,6 +284,23 @@ Monitor Dashboard + + + + Irish logo + RFO Dashboard + + + + Irish logo + RFO Dashboard + +
diff --git a/explore/src/app/funders/funders.component.less b/explore/src/app/funders/funders.component.less index 3c28bf03..55eb5d3c 100644 --- a/explore/src/app/funders/funders.component.less +++ b/explore/src/app/funders/funders.component.less @@ -1,6 +1,12 @@ @import (reference) "~src/assets/openaire-theme/less/color.less"; @import "flag-icons/css/flag-icons.min.css"; +@irish-color: #FF7901; + +.irish-dashboard-link { + color: @irish-color; +} + .custom-coins-dot:after { content: ""; background-image: url("~src/assets/explore-assets/funders/coins.svg"); diff --git a/explore/src/app/funders/funders.component.ts b/explore/src/app/funders/funders.component.ts index 15a3882b..418b3329 100644 --- a/explore/src/app/funders/funders.component.ts +++ b/explore/src/app/funders/funders.component.ts @@ -55,13 +55,16 @@ export class FundersComponent implements OnInit { "id": string, "name": string, "shortName": string, - "alias": string, - "researchProducts": number, + // "alias": string, + // "irishAlias": string, + "researchProducts": number, "openAccessResearchProducts": number, "openAccessPercentage": number, "projects": number, "monitorDashboard": string, - "monitorDashboardStatus": string, + "monitorDashboardStatus": string, + "irishDashboard": string, + "irishDashboardStatus": string, "logoUrl": string, "websiteUrl": string, "country": string, @@ -111,7 +114,8 @@ export class FundersComponent implements OnInit { })); this.showOptions = [ {value: 'all', label: 'All funders'}, - {value: 'dashboard', label: 'Funders with dashboard'} + {value: 'monitor', label: 'Funders with Monitor dashboard'}, + {value: 'rfo', label: 'Funders with RFO dashboard'} ]; this.sortOptions = [ {value: 'alphAsc', label: 'Alphabetically asc. (A-Z)'}, @@ -162,13 +166,16 @@ export class FundersComponent implements OnInit { "id": id, "name": this.removePartAfterCharacters(queriedFunder.name, "||"), "shortName": queriedFunder.shortName, - "alias": '', + // "alias": '', + // "irishAlias": '', "researchProducts": +queriedFunder.results, "openAccessResearchProducts": +queriedFunder.openResults, "openAccessPercentage": 0, "projects": +queriedFunder.projects, "monitorDashboard": '', "monitorDashboardStatus": '', + "irishDashboard": '', + "irishDashboardStatus": '', "logoUrl": '', "websiteUrl": '', "country": queriedFunder.country, @@ -181,12 +188,15 @@ export class FundersComponent implements OnInit { if(queriedFunder.stakeholder) { let stakeholder = queriedFunder.stakeholder; - funder.alias = stakeholder.alias; - if(!funder.shortName) { - funder.shortName = stakeholder.alias; - } + // funder.alias = stakeholder.alias; + // funder.irishAlias = stakeholder.irishAlias; + // if(!funder.shortName) { + // funder.shortName = stakeholder.alias; + // } funder.monitorDashboard = stakeholder.alias; funder.monitorDashboardStatus = stakeholder.visibility; + funder.irishDashboard = stakeholder.irishAlias; + funder.irishDashboardStatus = stakeholder.irishVisibility; if(stakeholder.logoUrl) { funder.logoUrl = (stakeholder.isUpload ? properties.utilsService + "/download/" : "") + (stakeholder.logoUrl); } @@ -385,10 +395,16 @@ export class FundersComponent implements OnInit { this.keyword = ''; } if(this.funders.length) { - displayedFunders = displayedFunders.filter(item => (item['name'] && item['name'].toLowerCase().includes(this.keyword.toLowerCase())) || (item['alias'] && item['alias'].toLowerCase().includes(this.keyword.toLowerCase()))); + displayedFunders = displayedFunders.filter(item => (item['name'] && item['name'].toLowerCase().includes(this.keyword.toLowerCase())) + || (item['monitorDashboard'] && item['monitorDashboard'].toLowerCase().includes(this.keyword.toLowerCase()) + || (item['irishDashboard'] && item['irishDashboard'].toLowerCase().includes(this.keyword.toLowerCase())))); } - if(this.show == 'dashboard') { - displayedFunders = displayedFunders.filter(funder => funder.monitorDashboard && funder.monitorDashboard?.length > 0 && funder.monitorDashboardStatus != 'PRIVATE'); + if(this.show == 'monitor') { + displayedFunders = displayedFunders.filter(funder => funder.monitorDashboard && funder.monitorDashboard?.length > 0 && ((funder.monitorDashboardStatus && funder.monitorDashboardStatus != 'PRIVATE'))); + } + + if(this.show == 'rfo') { + displayedFunders = displayedFunders.filter(funder => funder.monitorDashboard && funder.monitorDashboard?.length > 0 && ((funder.irishDashboardStatus && funder.irishDashboardStatus != 'PRIVATE'))); } this.displayedFunders = displayedFunders;