diff --git a/explore/src/app/fos/fos.component.html b/explore/src/app/fos/fos.component.html index 222b2a8e..bde7e733 100644 --- a/explore/src/app/fos/fos.component.html +++ b/explore/src/app/fos/fos.component.html @@ -9,7 +9,10 @@

Fields of Science.

- Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. + We have integrated a Field-of-Science (FoS) taxonomy into our dataset to organize and discover research more effectively. Using the full capabilities of the OpenAIRE Research Graph (full-texts, citations, references, venues) we apply AI and bring forward any multidisciplinarity potential. +
+
+ Our work is based on the work from our partner Athena Research Center: SciNoBo : A Hierarchical Multi-Label Classifier of Scientific Publications - https://arxiv.org/abs/2204.00880
+
+ Find information about the OpenAIRE Research Graph, how to test it and contribute to improving it.
- Find information about the OpenAIRE Research Graph, how to test it and contribute to improving it on our blog. You can also write to Paolo Manghi, the OpenAIRE Technical Director, for additional details. + + Learn more. Contribute +
-
+
@@ -257,11 +281,30 @@
-

- Lorem ipsum. +

+ Did you know?

+
+ That you may +
-

- Need more information?
Get in touch and let us help you. +

+ Need more information?

- + Get in touch and let us help you. + + Contact us
diff --git a/explore/src/app/home/home.component.ts b/explore/src/app/home/home.component.ts index 4da64826..dec03ab7 100644 --- a/explore/src/app/home/home.component.ts +++ b/explore/src/app/home/home.component.ts @@ -270,7 +270,7 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit{ if (this.showOrp) { this.resultTypes.values.push({name: "Other research products", id: "other", selected: true, number: 0}); } - this.init(this.showDatasets, this.showSoftware, this.showPublications, this.showDatasets, this.showSoftware, this.showOrp, this.showProjects, this.showDataProviders); + this.init(this.showDatasets, this.showSoftware, this.showPublications, this.showDatasets, this.showSoftware, this.showOrp, this.showProjects, this.showDataProviders, this.showOrganizations); } }, error => { @@ -364,7 +364,7 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit{ } init(getDatasetsLinked = false, getSoftwareLinked = false, getPublications = true, getDatasets = true, - getSoftware = true, getOther = true, getProjects = true, getDataProviders = true, refineValue: string = null) { + getSoftware = true, getOther = true, getProjects = true, getDataProviders = true, getOrganizations = true, refineValue: string = null) { this.subscriptions.push(zip( (getPublications) ? this.searchResearchResultsService.numOfSearchResults('publication', '', this.properties, null) : of(0), (getDatasets) ? this.searchResearchResultsService.numOfSearchResults('dataset', '', this.properties, null) : of(0), @@ -373,7 +373,8 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit{ (getSoftwareLinked) ? this.searchResearchResultsService.numOfSearchResultsLinkedToPub("software", this.properties) : of(0), (getOther) ? this.searchResearchResultsService.numOfSearchResults('other', '', this.properties, null) : of(0), (getProjects) ? this.refineFieldResultsService.getRefineFieldsResultsByEntityName(['funder'], 'project', this.properties, null) : of(0), - (getDataProviders) ? this.searchDataprovidersService.numOfSearchDataproviders('', this.properties, null) : of(0) + (getDataProviders) ? this.searchDataprovidersService.numOfSearchDataproviders('', this.properties, null) : of(0), + (getOrganizations) ? this.searchOrganizationsService.numOfSearchOrganizations2('', this.properties, null) : of(0) ).subscribe((data: any[]) => { if (data[0] && data[0] > 0) { this.numbers.publicationsSize = NumberUtils.roundNumber(data[0]); @@ -402,6 +403,9 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit{ if (data[7] && data[7] > 0) { this.numbers.datasourcesSize = NumberUtils.roundNumber(data[7]); } + if (data[8] && data[8] > 0) { + this.numbers.organizationsSize = NumberUtils.roundNumber(data[8]); + } }, err => { this.handleError('Error getting numbers', err); })); @@ -411,4 +415,10 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit{ this.disableSelect = event; this.cdr.detectChanges(); } + + public get showContentWithNumbers() { + if(this.numbers && this.numbers.publicationsSize && this.numbers.datasetsSize && this.numbers.softwareSize && this.numbers.datasourcesSize && this.numbers.projectsSize && this.numbers.organizationsSize) { + return true; + } + } } diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index ac2c67d0..bb4c310e 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit ac2c67d0cafc16172dcf14fc286f97504dfce346 +Subproject commit bb4c310ede4efc5092b975cc975b10c1069d42ce diff --git a/explore/src/assets/openaire-theme b/explore/src/assets/openaire-theme index ffffa5d8..40cf4279 160000 --- a/explore/src/assets/openaire-theme +++ b/explore/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit ffffa5d8e2dcb01ce8c8b89d33e19bb626c29c37 +Subproject commit 40cf427940b7378d5794c924401008dde031a4e5