diff --git a/landingPages/landing-utils/projects-in-modal.component.ts b/landingPages/landing-utils/projects-in-modal.component.ts index 8d4ea3d4..4c8e17b3 100644 --- a/landingPages/landing-utils/projects-in-modal.component.ts +++ b/landingPages/landing-utils/projects-in-modal.component.ts @@ -14,19 +14,23 @@ import {OpenaireEntities} from '../../utils/properties/searchFields'; @Component({ selector: 'projectsInModal', template: ` -
-
Filter by Funder:
- -
+
+ +
+ +
+
+ + +
+
+
+ +
diff --git a/landingPages/landing-utils/projects-in-modal.module.ts b/landingPages/landing-utils/projects-in-modal.module.ts index 6f574ccf..99e647e7 100644 --- a/landingPages/landing-utils/projects-in-modal.module.ts +++ b/landingPages/landing-utils/projects-in-modal.module.ts @@ -13,12 +13,14 @@ import {PagingModule} from '../../utils/paging.module'; import {ErrorMessagesModule} from '../../utils/errorMessages.module'; import {NoLoadPaging} from "../../searchPages/searchUtils/no-load-paging.module"; import {SearchResultsModule} from "../../searchPages/searchUtils/searchResults.module"; +import {SearchFilterModule} from '../../searchPages/searchUtils/searchFilter.module'; @NgModule({ imports: [ RouterModule, CommonModule, FormsModule, ProjectsServiceModule, TabResultModule, - PagingModule, ErrorMessagesModule, NoLoadPaging, SearchResultsModule + PagingModule, ErrorMessagesModule, NoLoadPaging, + SearchResultsModule, SearchFilterModule ], declarations: [ ProjectsInModalComponent diff --git a/landingPages/landing-utils/showIdentifiers.component.ts b/landingPages/landing-utils/showIdentifiers.component.ts index 420fae97..70ec65ab 100644 --- a/landingPages/landing-utils/showIdentifiers.component.ts +++ b/landingPages/landing-utils/showIdentifiers.component.ts @@ -23,7 +23,7 @@ import {properties} from "../../../../environments/environment"; [class.uk-margin-bottom]="modal">

- {{key}}: + {{key}}: - + @@ -273,7 +273,7 @@

Funder report
+ [options]="funderOptions" [(value)]="funder">
diff --git a/landingPages/organization/organization.component.ts b/landingPages/organization/organization.component.ts index d03a3596..82e346c7 100644 --- a/landingPages/organization/organization.component.ts +++ b/landingPages/organization/organization.component.ts @@ -25,6 +25,7 @@ import {IndexInfoService} from "../../utils/indexInfo.service"; import {Subscriber} from "rxjs"; import {properties} from "../../../../environments/environment"; import {OpenaireEntities} from '../../utils/properties/searchFields'; +import {Option} from '../../sharedComponents/input/input.component'; @Component({ selector: 'organization', @@ -95,6 +96,8 @@ export class OrganizationComponent { private funderId: string; private funderCount: number; + public funderOptions: Option[] = []; + public offset: number; public stickyHeader: boolean = false; public graph_offset: number = 0; @@ -761,6 +764,16 @@ export class OrganizationComponent { } } + public buildFunderOptions() { + this.funderOptions = []; + if(this.fetchProjects.funders && this.fetchProjects.funders.length > 0) { + for(let funder of this.fetchProjects.funders) { + this.funderOptions.push({"label": funder.name, "value": funder}); + } + this.funder = this.funderOptions[0]; + } + } + public scroll() { HelperFunctions.scroll(); } diff --git a/searchPages/searchUtils/searchFilter.component.ts b/searchPages/searchUtils/searchFilter.component.ts index c3876685..c1b31dd2 100644 --- a/searchPages/searchUtils/searchFilter.component.ts +++ b/searchPages/searchUtils/searchFilter.component.ts @@ -76,6 +76,7 @@ export class SearchFilterComponent implements OnInit, OnChanges { ngOnChanges(changes: SimpleChanges) { if (changes.filter) { + console.log(this.filter); this.filter.values = this.filter.values.filter(value => !value.name.toLowerCase().includes('unknown') && !value.name.toLowerCase().includes('not available')); if (this.filter.filterType == "radio") { this.filter.radioValue = ""; diff --git a/utils/result-preview/result-preview.component.html b/utils/result-preview/result-preview.component.html index 9aeac777..1392fc2c 100644 --- a/utils/result-preview/result-preview.component.html +++ b/utils/result-preview/result-preview.component.html @@ -1,403 +1,412 @@
- -
-
- Enermaps tool preview -
-

Visit - Enermaps tool -

-
+ +
+
+ Enermaps tool preview +
+

Visit + Enermaps tool +

+
+
+
+ +
+ + + + Visit repository to deposit + + + +
+ {{type}} + . + + {{beforeTitle.join(' . ')}} + + + . Embargo End Date: {{result.embargoEndDate | date: 'dd MMM yyyy'}} + +
+ + -
-
- - - - Visit repository to deposit - - -
- {{type}} - . - - {{beforeTitle.join(' . ')}} - - - . Embargo End Date: {{result.embargoEndDate | date: 'dd MMM yyyy'}} - -
- -
-

- -
- - {{result.acronym}} - - ( - - ) -
-
- [no title available] -
- - - - - - {{result.acronym}} - - ( - - ) - - - [no title available] - - - -
-
- - {{result.acronym}} - - ( - - ) -
-
- [no title available] -
-
-
-

-
- -
- - Funder: - {{result.funderShortname}} - - - {{openaireEntities.PROJECT}} Code: - {{result.code}} - - - - - - -
- -
- - Overall Budget: - {{result.budget | number}} - {{result.currency}} - - - Funder Contribution: - {{result.contribution | number}} - {{result.currency}} - -
- -
- - {{result.accessMode}} - {{' '}} - - Open Access mandate for {{openaireEntities.PUBLICATIONS}} - {{' '}} - - Open Access mandate for {{openaireEntities.DATASETS}} - {{' '}} - - Open Access mandate for {{openaireEntities.PUBLICATIONS}} and {{openaireEntities.DATASETS}} - {{' '}} - - - {{language}} - {{' '}} - - - - {{programmingLanguage}} - {{" "}} - - - Special Clause 39 - {{' '}} - - {{result.compatibility}} - {{' '}} - - Not yet registered - {{' '}} -
- -
- Authors:  - -
- -
- -
- -
- Publisher: - {{result.publisher}} -
- -
- {{(result.countries.length == 1) ? 'Country' : 'Countries'}}: - - {{country}}{{(i < (result.countries.slice(0, 10).length - 1)) ? ", " : ""}} - {{(i == result.countries.slice(0, 10).length - 1 && result.countries.length > 10) ? "..." : ""}} - -
- -
- Project: - - - {{project.funderShortname ? project.funderShortname : project.funderName}} - - - | {{ project.acronym ? project.acronym : (project.title.length > 25 ? - project.title.substring(0, 25) + '...' : project.title)}} - - ({{project.code}}) - , - - ... -
- -
- Partners: - - {{organization.name}} - , - - ... -
- -
- Website URL: - - - {{result.websiteURL}} - - -
- -
- OAI-PMH URL: - - - {{result.OAIPMHURL}} - - -
- -
- Subject: - - {{subject}} - {{(i < (result.subjects.slice(0, 10).length - 1)) ? ", " : ""}} - {{(i == result.subjects.slice(0, 10).length - 1 && result.subjects.length > 10) ? "..." : ""}} - -
-
- -
-

- {{result.description}} -

-
- -
-
- - - - - - Download from: - - {{from.downloadNames.join("; ")}} - - - {{from.downloadNames.join(", ")}} - - - - Provider: - - {{collectedName}}; - - - -
-
-
-
+
+
+ + {{result.acronym}} + + ( + + ) +
+
+ [no title available] +
+
+
+ +
+
+ +
+ +
+ + {{result.accessMode}} + {{' '}} + + Open Access mandate for {{openaireEntities.PUBLICATIONS}} + {{' '}} + + Open Access mandate for {{openaireEntities.DATASETS}} + {{' '}} + + Open Access mandate for {{openaireEntities.PUBLICATIONS}} and {{openaireEntities.DATASETS}} + {{' '}} + + + {{language}} + {{' '}} + + + + {{programmingLanguage}} + {{" "}} + + + Special Clause 39 + {{' '}} + + {{result.compatibility}} + {{' '}} + + Not yet registered + {{' '}} +
+
+ +
+ +
+ + Funder: + {{result.funderShortname}} + + + {{openaireEntities.PROJECT}} Code: + {{result.code}} + + + + + + +
+ +
+ + Overall Budget: + {{result.budget | number}} + {{result.currency}} + + + Funder Contribution: + {{result.contribution | number}} + {{result.currency}} + +
+ +
+ Authors:  + +
+ +
+ +
+ +
+ Publisher: + {{result.publisher}} +
+ +
+ {{(result.countries.length == 1) ? 'Country' : 'Countries'}}: + + {{country}}{{(i < (result.countries.slice(0, 10).length - 1)) ? ", " : ""}} + {{(i == result.countries.slice(0, 10).length - 1 && result.countries.length > 10) ? "..." : ""}} + +
+ +
+ Project: + + + {{project.funderShortname ? project.funderShortname : project.funderName}} + + + | {{ project.acronym ? project.acronym : (project.title.length > 25 ? + project.title.substring(0, 25) + '...' : project.title)}} + + ({{project.code}}) + , + + ... +
+ +
+ Partners: + + {{organization.name}} + , + + ... +
+ +
+ Website URL: + + + {{result.websiteURL}} + + +
+ +
+ OAI-PMH URL: + + + {{result.OAIPMHURL}} + + +
+ +
+ Subject: + + {{subject}} + {{(i < (result.subjects.slice(0, 10).length - 1)) ? ", " : ""}} + {{(i == result.subjects.slice(0, 10).length - 1 && result.subjects.length > 10) ? "..." : ""}} + +
+ +
+
+ + + + + + Download from: + + {{from.downloadNames.join("; ")}} + + + {{from.downloadNames.join(", ")}} + + + + Provider: + + {{collectedName}}; + + + +
+
+
+ +
+ +
+

+ {{result.description}} +

+
+
+
+
- -
- - - - - - - - {{" " + result.pop_inf[2] + - " popularity" }} + +
+ + + + + + + + {{" " + result.pop_inf[2] + + " popularity" }} - -
- - - - - {{" " + result.pop_inf[2] + - " popularity" }} - {{" " + (result.pop_inf[0] == 'A' ? 'In top 0.01%' : '') + (result.pop_inf[0] == 'B' ? 'In top 1%' : '') + (result.pop_inf[0] == 'C' ? 'In bottom 99%' : '')}} - -
Popularity: Citation-based measure reflecting the current impact.
- -
- - - - - - - {{" " + result.pop_inf[3] + - " influence" }} - -
- - - - - {{result.pop_inf[3] + - " influence" }} - {{" " + (result.pop_inf[1] == 'A' ? 'In top 0.01%' : '') + (result.pop_inf[1] == 'B' ? 'In top 1%' : '') + (result.pop_inf[1] == 'C' ? 'In bottom 99%' : '')}} - + +
+ + + + + {{" " + result.pop_inf[2] + + " popularity" }} + {{" " + (result.pop_inf[0] == 'A' ? 'In top 0.01%' : '') + (result.pop_inf[0] == 'B' ? 'In top 1%' : '') + (result.pop_inf[0] == 'C' ? 'In bottom 99%' : '')}} + +
Popularity: Citation-based measure reflecting the current impact.
+ +
+ + + + + + + {{" " + result.pop_inf[3] + + " influence" }} + +
+ + + + + {{result.pop_inf[3] + + " influence" }} + {{" " + (result.pop_inf[1] == 'A' ? 'In top 0.01%' : '') + (result.pop_inf[1] == 'B' ? 'In top 1%' : '') + (result.pop_inf[1] == 'C' ? 'In bottom 99%' : '')}} + -
Influence: Citation-based measure reflecting the total impact.
- -
- - - - - - - - - - - Added in ORCID: - - {{date | date: 'dd MMM yyyy'}} - & - - - - - - - - - - - - - - +
Influence: Citation-based measure reflecting the total impact.
+ +
+ + + + + + + + + + + Added in ORCID: + + {{date | date: 'dd MMM yyyy'}} + & + + + + + + + + + + + + + +