Change OpenAIRE Research Graph to OpenAIRE Graph.
This commit is contained in:
parent
006671722c
commit
c93523a178
|
@ -61,7 +61,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="uk-position-relative">
|
<div class="uk-position-relative">
|
||||||
<img class="uk-visible@m uk-height-1-1 uk-position-center-right" src="assets/common-assets/common/graph-nodes.svg" alt="OpenAIRE Research Graph" loading="lazy">
|
<img class="uk-visible@m uk-height-1-1 uk-position-center-right" src="assets/common-assets/common/graph-nodes.svg" alt="OpenAIRE Graph" loading="lazy">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -78,7 +78,7 @@
|
||||||
<div class="uk-margin-top uk-margin-bottom title">{{funder.name}}</div>
|
<div class="uk-margin-top uk-margin-bottom title">{{funder.name}}</div>
|
||||||
<div class="outcomes">
|
<div class="outcomes">
|
||||||
<h5 class="uk-margin-remove">{{funder.publications | number}}</h5>
|
<h5 class="uk-margin-remove">{{funder.publications | number}}</h5>
|
||||||
<span>Research Outcomes Found</span>
|
<span class="uk-text-capitalize">{{entities.RESULTS}} Found</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="uk-margin-top percentage">
|
<div class="uk-margin-top percentage">
|
||||||
<h5 class="uk-margin-remove">{{(funder.openAccessPublications / funder.publications) * 100 | number : '1.0-0'}}%</h5>
|
<h5 class="uk-margin-remove">{{(funder.openAccessPublications / funder.publications) * 100 | number : '1.0-0'}}%</h5>
|
||||||
|
|
|
@ -46,11 +46,21 @@ export class HomeComponent {
|
||||||
disableSelect;
|
disableSelect;
|
||||||
selectedEntitySimpleUrl;
|
selectedEntitySimpleUrl;
|
||||||
selectedEntityAdvancedUrl;
|
selectedEntityAdvancedUrl;
|
||||||
resultTypes:Filter = {values:[],filterId:"type", countSelectedValues: 0, filterType: 'checkbox', originalFilterId: "", valueIsExact: true, title: "Result Types",filterOperator:"or"};
|
resultTypes: Filter = {
|
||||||
|
values: [],
|
||||||
|
filterId: "type",
|
||||||
|
countSelectedValues: 0,
|
||||||
|
filterType: 'checkbox',
|
||||||
|
originalFilterId: "",
|
||||||
|
valueIsExact: true,
|
||||||
|
title: "Result Types",
|
||||||
|
filterOperator: "or"
|
||||||
|
};
|
||||||
public pageContents = null;
|
public pageContents = null;
|
||||||
customFilter: SearchCustomFilter = null;
|
customFilter: SearchCustomFilter = null;
|
||||||
aggregatorId;
|
aggregatorId;
|
||||||
aggregator: AggregatorInfo;
|
aggregator: AggregatorInfo;
|
||||||
|
entities = OpenaireEntities;
|
||||||
@ViewChild('numbersComponent', {static: true}) numbersComponent: NumbersComponent;
|
@ViewChild('numbersComponent', {static: true}) numbersComponent: NumbersComponent;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
|
@ -116,16 +126,36 @@ export class HomeComponent {
|
||||||
this.numbersComponent.showOrganizations = !!showEntity["organization"];
|
this.numbersComponent.showOrganizations = !!showEntity["organization"];
|
||||||
}
|
}
|
||||||
if (this.numbersComponent && this.numbersComponent.showPublications) {
|
if (this.numbersComponent && this.numbersComponent.showPublications) {
|
||||||
this.resultTypes.values.push({name: this.openaireEntities.PUBLICATIONS , id:"publications",selected:false, number:0});
|
this.resultTypes.values.push({
|
||||||
|
name: this.openaireEntities.PUBLICATIONS,
|
||||||
|
id: "publications",
|
||||||
|
selected: false,
|
||||||
|
number: 0
|
||||||
|
});
|
||||||
}
|
}
|
||||||
if (this.numbersComponent && this.numbersComponent.showDatasets) {
|
if (this.numbersComponent && this.numbersComponent.showDatasets) {
|
||||||
this.resultTypes.values.push({name: this.openaireEntities.DATASETS , id:"datasets",selected:false, number:0});
|
this.resultTypes.values.push({
|
||||||
|
name: this.openaireEntities.DATASETS,
|
||||||
|
id: "datasets",
|
||||||
|
selected: false,
|
||||||
|
number: 0
|
||||||
|
});
|
||||||
}
|
}
|
||||||
if (this.numbersComponent && this.numbersComponent.showSoftware) {
|
if (this.numbersComponent && this.numbersComponent.showSoftware) {
|
||||||
this.resultTypes.values.push({name: this.openaireEntities.SOFTWARE , id:"software",selected:false, number:0});
|
this.resultTypes.values.push({
|
||||||
|
name: this.openaireEntities.SOFTWARE,
|
||||||
|
id: "software",
|
||||||
|
selected: false,
|
||||||
|
number: 0
|
||||||
|
});
|
||||||
}
|
}
|
||||||
if (this.numbersComponent && this.numbersComponent.showOrp) {
|
if (this.numbersComponent && this.numbersComponent.showOrp) {
|
||||||
this.resultTypes.values.push({name: this.openaireEntities.OTHER , id:"other",selected:false, number:0});
|
this.resultTypes.values.push({
|
||||||
|
name: this.openaireEntities.OTHER,
|
||||||
|
id: "other",
|
||||||
|
selected: false,
|
||||||
|
number: 0
|
||||||
|
});
|
||||||
}
|
}
|
||||||
if (this.numbersComponent) {
|
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.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,
|
||||||
|
@ -141,6 +171,7 @@ export class HomeComponent {
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public ngOnDestroy() {
|
public ngOnDestroy() {
|
||||||
for (let sub of this.subs) {
|
for (let sub of this.subs) {
|
||||||
sub.unsubscribe();
|
sub.unsubscribe();
|
||||||
|
@ -150,11 +181,13 @@ export class HomeComponent {
|
||||||
private handleError(message: string, error) {
|
private handleError(message: string, error) {
|
||||||
console.error("Home Page: " + message, error);
|
console.error("Home Page: " + message, error);
|
||||||
}
|
}
|
||||||
|
|
||||||
entityChanged($event) {
|
entityChanged($event) {
|
||||||
this.selectedEntity = $event.entity;
|
this.selectedEntity = $event.entity;
|
||||||
this.selectedEntitySimpleUrl = $event.simpleUrl;
|
this.selectedEntitySimpleUrl = $event.simpleUrl;
|
||||||
this.selectedEntityAdvancedUrl = $event.advancedUrl;
|
this.selectedEntityAdvancedUrl = $event.advancedUrl;
|
||||||
}
|
}
|
||||||
|
|
||||||
goTo(simple: boolean) {
|
goTo(simple: boolean) {
|
||||||
let url = (simple) ? this.selectedEntitySimpleUrl : this.selectedEntityAdvancedUrl;
|
let url = (simple) ? this.selectedEntitySimpleUrl : this.selectedEntityAdvancedUrl;
|
||||||
let parameterNames = [];
|
let parameterNames = [];
|
||||||
|
@ -196,6 +229,7 @@ export class HomeComponent {
|
||||||
}
|
}
|
||||||
this._router.navigate([url], {queryParams: this.routerHelper.createQueryParams(parameterNames, parameterValues)});
|
this._router.navigate([url], {queryParams: this.routerHelper.createQueryParams(parameterNames, parameterValues)});
|
||||||
}
|
}
|
||||||
|
|
||||||
getQueryParamsForAdvancedSearch(entity) {
|
getQueryParamsForAdvancedSearch(entity) {
|
||||||
let params = {};
|
let params = {};
|
||||||
if (entity == "result") {
|
if (entity == "result") {
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 2ef5d069dd55b3ae366fbf8723975c98e6a8c140
|
Subproject commit 1ec84770535c7f691d6eb7d2b0a99c6aec4bcd65
|
|
@ -42,7 +42,7 @@ export class PortalAggregators {
|
||||||
Welcome to the Portal of Canadian Research Outputs. This has been developed as part of a collaboration between
|
Welcome to the Portal of Canadian Research Outputs. This has been developed as part of a collaboration between
|
||||||
Canadian Association of Research Libraries (CARL) and OpenAIRE. The portal presents research results collected
|
Canadian Association of Research Libraries (CARL) and OpenAIRE. The portal presents research results collected
|
||||||
from Canadian institutional repositories compliant to <a
|
from Canadian institutional repositories compliant to <a
|
||||||
href="https://guidelines.openaire.eu/" target="_blank">OpenAIRE guidelines</a> and from the OpenAIRE Research Graph.
|
href="https://guidelines.openaire.eu/" target="_blank">OpenAIRE guidelines</a> and from the OpenAIRE Graph.
|
||||||
It links them to three Canadian funders, Natural Sciences and Engineering Research Council of Canada, Canadian Institutes of Health Research and
|
It links them to three Canadian funders, Natural Sciences and Engineering Research Council of Canada, Canadian Institutes of Health Research and
|
||||||
Social Sciences and Humanities Research Council. For more information, visit the <a
|
Social Sciences and Humanities Research Council. For more information, visit the <a
|
||||||
Social Sciences and Humanities Research Council. For more information, visit the <a
|
Social Sciences and Humanities Research Council. For more information, visit the <a
|
||||||
|
|
Loading…
Reference in New Issue