diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html
index d5241b7..0e138cd 100644
--- a/src/app/home/home.component.html
+++ b/src/app/home/home.component.html
@@ -6,24 +6,7 @@
Discover open linked research.
-
-
- A comprehensive and open dataset of research information covering
- {{numbers.publicationsSize.number|number}}{{numbers.publicationsSize.size}} {{openaireEntities.PUBLICATIONS.toLowerCase()}}
- ,
- {{numbers.datasetsSize.number|number}}{{numbers.datasetsSize.size}} {{openaireEntities.DATASETS.toLowerCase()}}
- ,
- {{numbers.softwareSize.number|number}}{{numbers.softwareSize.size}} {{openaireEntities.SOFTWARE.toLowerCase()}} items
- ,
- from
- {{numbers.datasourcesSize.number|number}}{{numbers.datasourcesSize.size}} {{openaireEntities.DATASOURCES.toLowerCase()}}
- , linked to
- {{numbers.projectsSize.number|number}}{{numbers.projectsSize.size}} grants
- and
- {{numbers.organizationsSize.number|number}}{{numbers.organizationsSize.size}} {{openaireEntities.ORGANIZATIONS.toLowerCase()}}.
-
-
All linked together through citations and semantics.
-
+
{
+ if(this.numbersComponent) {
+ this.numbersComponent.showPublications = portalProperties.entities.publication.isEnabled;
+ this.numbersComponent.showDatasets = portalProperties.entities.dataset.isEnabled;
+ this.numbersComponent.showSoftware = portalProperties.entities.software.isEnabled;
+ this.numbersComponent.showOrp = portalProperties.entities.other.isEnabled;
+ this.numbersComponent.showOrganizations = portalProperties.entities.organization.isEnabled;
+ this.numbersComponent.showProjects = portalProperties.entities.project.isEnabled;
+ this.numbersComponent.showDataProviders = portalProperties.entities.datasource.isEnabled;
+ }
this.subs.push(this.config.communityInformationState.subscribe(data => {
if(data) {
var showEntity = {};
for (var i = 0; i < data['entities'].length; i++) {
-
showEntity["" + data['entities'][i]["pid"] + ""] = data['entities'][i]["isEnabled"];
}
- this.showPublications = !!showEntity["publication"];
- this.showDatasets = !!showEntity["dataset"];
- this.showSoftware = !!showEntity["software"];
- this.showOrp = !!showEntity["orp"];
- this.showProjects = !!showEntity["project"];
- this.showDataProviders = !!showEntity["datasource"];
- this.showOrganizations = !!showEntity["organization"];
- if(this.showPublications){
+ if(this.numbersComponent) {
+ this.numbersComponent.showPublications = !!showEntity["publication"];
+ this.numbersComponent.showDatasets = !!showEntity["dataset"];
+ this.numbersComponent.showSoftware = !!showEntity["software"];
+ this.numbersComponent.showOrp = !!showEntity["orp"];
+ this.numbersComponent.showProjects = !!showEntity["project"];
+ this.numbersComponent.showDataProviders = !!showEntity["datasource"];
+ this.numbersComponent.showOrganizations = !!showEntity["organization"];
+ }
+ if(this.numbersComponent && this.numbersComponent.showPublications){
this.resultTypes.values.push({name: this.openaireEntities.PUBLICATIONS , id:"publications",selected:false, number:0});
}
- if(this.showDatasets){
+ if(this.numbersComponent && this.numbersComponent.showDatasets){
this.resultTypes.values.push({name: this.openaireEntities.DATASETS , id:"datasets",selected:false, number:0});
}
- if(this.showSoftware){
+ if(this.numbersComponent && this.numbersComponent.showSoftware){
this.resultTypes.values.push({name: this.openaireEntities.SOFTWARE , id:"software",selected:false, number:0});
}
- if(this.showOrp){
+ if(this.numbersComponent && this.numbersComponent.showOrp){
this.resultTypes.values.push({name: this.openaireEntities.OTHER , id:"other",selected:false, number:0});
}
- this.init(false, false, this.showPublications, this.showDatasets, this.showSoftware, this.showOrp, this.showProjects, this.showDataProviders, this.showOrganizations,
- this.customFilter ? StringUtils.URIEncode(this.customFilter.queryFieldName + " exact " + StringUtils.quote((this.customFilter.valueId))) : '');
+ if(this.numbersComponent) {
+ this.numbersComponent.init(false, false, this.numbersComponent.showPublications, this.numbersComponent.showDatasets, this.numbersComponent.showSoftware, this.numbersComponent.showOrp, this.numbersComponent.showProjects, this.numbersComponent.showDataProviders, this.numbersComponent.showOrganizations,
+ this.customFilter ? StringUtils.URIEncode(this.customFilter.queryFieldName + " exact " + StringUtils.quote((this.customFilter.valueId))) : '');
+ }
this.getFunders();
}
},
@@ -227,7 +208,7 @@ export class HomeComponent {
params["f0"] = "q";
}
if(this.customFilter){
- params = this.customFilter.getParameters(params);
+ params = this.customFilter.getParameters(params);
}
return params;
}
@@ -297,87 +278,8 @@ export class HomeComponent {
return false;
}
- init(getDatasetsLinked = false, getSoftwareLinked = false, getPublications = true, getDatasets = true,
- getSoftware = true, getOther = true, getProjects = true, getDataProviders = true, getOrganizations = true, refineValue: string = null) {
- let refineParams = (refineValue) ? ('&fq=' + refineValue) : null;
- this.subs.push(zip(
- (getPublications) ? this._searchResearchResultsService.numOfSearchResults('publication', '', this.properties, refineParams) : of(0),
- (getDatasets) ? this._searchResearchResultsService.numOfSearchResults('dataset', '', this.properties, refineParams) : of(0),
- (getDatasetsLinked) ? this._searchResearchResultsService.numOfSearchResultsLinkedToPub("dataset", this.properties) : of(0),
- (getSoftware) ? this._searchResearchResultsService.numOfSearchResults('software', '', this.properties, refineParams) : of(0),
- (getSoftwareLinked) ? this._searchResearchResultsService.numOfSearchResultsLinkedToPub("software", this.properties) : of(0),
- (getOther) ? this._searchResearchResultsService.numOfSearchResults('other', '', this.properties, refineParams) : of(0),
- (getProjects) ? this._refineFieldResultsService.getRefineFieldsResultsByEntityName(['funder'], 'project', this.properties, refineParams) : of(0),
- (getDataProviders) ? this._searchDataprovidersService.numOfSearchDataproviders('', this.properties, refineParams) : of(0),
- (getOrganizations) ? this._searchOrganizationsService.numOfSearchOrganizations2('', this.properties, refineParams) : of(0)
- ).subscribe((data: any[]) => {
- if (data[0] && data[0] > 0) {
- this.numbers.publicationsSize = NumberUtils.roundNumber(data[0]);
- }
- if (data[1] && data[1] > 0) {
- this.numbers.datasetsSize = NumberUtils.roundNumber(data[1]);
- }
- if (data[2] && data[2] > 0) {
- this.numbers.datasetsLinkedSize = NumberUtils.roundNumber(data[2]);
- }
- if (data[3] && data[3] > 0) {
- this.numbers.softwareSize = NumberUtils.roundNumber(data[3]);
- }
- if (data[4] && data[4] > 0) {
- this.numbers.softwareLinkedSize = NumberUtils.roundNumber(data[4]);
- }
- if (data[5] && data[5] > 0) {
- this.numbers.otherSize = NumberUtils.roundNumber(data[5]);
- }
- if (data[6][0] && data[6][0] > 0) {
- this.numbers.projectsSize = NumberUtils.roundNumber(data[6][0]);
- }
- if (data[6][1] && data[6][1].length > 0 && data[6][1][0].filterId == 'funder' && data[6][1][0].values) {
- this.numbers.fundersSize = NumberUtils.roundNumber(data[6][1][0].values.length);
- }
- 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);
- }));
-}
-
disableSelectChange(event: boolean) {
this.disableSelect = event;
this.cdr.detectChanges();
- }
-
- public get showContentWithNumbers() {
- if (this.numbers && (this.hasPublications || this.hasDatasets || this.hasSoftware || this.hasDatasources || this.hasProjects || this.hasOrganizations)) {
- return true;
- }
- }
-
- public get hasPublications() {
- return this.showPublications && this.numbers.publicationsSize && this.numbers.publicationsSize.count >= this.numbersLimit;
- }
-
- public get hasDatasets() {
- return this.showDatasets && this.numbers.datasetsSize && this.numbers.datasetsSize.count >= this.numbersLimit;
- }
-
- public get hasSoftware() {
- return this.showSoftware && this.numbers.softwareSize && this.numbers.softwareSize.count >= this.numbersLimit;
- }
-
- public get hasDatasources() {
- return this.showDataProviders && this.numbers.datasourcesSize && this.numbers.datasourcesSize.count >= this.numbersLimit;
- }
-
- public get hasProjects() {
- return this.showProjects && this.numbers.projectsSize && this.numbers.projectsSize.count >= this.numbersLimit;
- }
-
- public get hasOrganizations() {
- return this.showOrganizations && this.numbers.organizationsSize && this.numbers.organizationsSize.count >= this.numbersLimit;
}
}
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index 1721245..a2fea9e 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 17212458ebd439e3195808e61dc2a6169d76d9c7
+Subproject commit a2fea9e32331de06ab2192e3e638662531b9f42f
diff --git a/src/assets/common-assets b/src/assets/common-assets
index 3ec9d00..06e1889 160000
--- a/src/assets/common-assets
+++ b/src/assets/common-assets
@@ -1 +1 @@
-Subproject commit 3ec9d00bc4b794ae782b163a1a17886bd83534f4
+Subproject commit 06e1889730e456e86f728a31410bf550d16ac7d6
diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme
index 67483e8..e3e2a6e 160000
--- a/src/assets/openaire-theme
+++ b/src/assets/openaire-theme
@@ -1 +1 @@
-Subproject commit 67483e8b95c23aa8dcb2d1203e1fe89a4d7f033f
+Subproject commit e3e2a6ec11055f4d4352d0749bb1b484ddd711ae