[angular-16-irish-monitor | DONE | ADDED] indicator utils, add researcher as stakeholder type and extract researcher parameters
This commit is contained in:
parent
0a01288a46
commit
9a96851e70
|
@ -25,6 +25,7 @@ class Entities {
|
||||||
project = 'Project';
|
project = 'Project';
|
||||||
country = 'National';
|
country = 'National';
|
||||||
datasource = 'Repository';
|
datasource = 'Repository';
|
||||||
|
researcher = 'Researcher';
|
||||||
|
|
||||||
stakeholders = 'Dashboards';
|
stakeholders = 'Dashboards';
|
||||||
funders = 'Funders';
|
funders = 'Funders';
|
||||||
|
@ -32,6 +33,7 @@ class Entities {
|
||||||
organizations = 'Research Institutions';
|
organizations = 'Research Institutions';
|
||||||
projects = 'Projects';
|
projects = 'Projects';
|
||||||
datasources = 'Repositories';
|
datasources = 'Repositories';
|
||||||
|
researchers = 'Researchers';
|
||||||
}
|
}
|
||||||
|
|
||||||
export class StakeholderConfiguration {
|
export class StakeholderConfiguration {
|
||||||
|
@ -765,6 +767,7 @@ export class IndicatorUtils {
|
||||||
this.extractRI(obj, indicatorPath, stakeholder);
|
this.extractRI(obj, indicatorPath, stakeholder);
|
||||||
this.extractOrganization(obj, indicatorPath, stakeholder);
|
this.extractOrganization(obj, indicatorPath, stakeholder);
|
||||||
this.extractDatasource(obj, indicatorPath, stakeholder);
|
this.extractDatasource(obj, indicatorPath, stakeholder);
|
||||||
|
this.extractResearcher(obj, indicatorPath, stakeholder);
|
||||||
}
|
}
|
||||||
|
|
||||||
private extractFunder(obj, indicatorPath: IndicatorPath, stakeholder: Stakeholder) {
|
private extractFunder(obj, indicatorPath: IndicatorPath, stakeholder: Stakeholder) {
|
||||||
|
@ -846,8 +849,8 @@ export class IndicatorUtils {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private extractDatasource(obj, indicatorPath: IndicatorPath, stakeholder: Stakeholder) {
|
private extractDatasource(obj, indicatorPath: IndicatorPath, stakeholder: Stakeholder) {
|
||||||
// works for publication.project.organization.name
|
// works for .datasource.name and .HostedBy datasource
|
||||||
// and publication.organization.name
|
// and .datasource.id
|
||||||
if (stakeholder.type != "datasource") {
|
if (stakeholder.type != "datasource") {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -871,6 +874,30 @@ export class IndicatorUtils {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
private extractResearcher(obj, indicatorPath: IndicatorPath, stakeholder: Stakeholder) {
|
||||||
|
// works for .orcid
|
||||||
|
if (stakeholder.type != "researcher") {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
for (let query of this.getQueryObjectName(obj) ? obj[this.getDescriptionObjectName(obj)][this.getQueryObjectName(obj)] : obj[this.getDescriptionObjectName(obj)]) {
|
||||||
|
if (query["query"]["profile"]) {
|
||||||
|
query["query"]["profile"] = ChartHelper.prefix + this.statsProfileParameter + ChartHelper.suffix;
|
||||||
|
}
|
||||||
|
if (!query["query"]["filters"]) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
for (let filter of query["query"]["filters"]) {
|
||||||
|
for (let gfilter of filter["groupFilters"]) {
|
||||||
|
let replacedValue = this.replaceIndexValues(gfilter["values"][0], stakeholder, indicatorPath.parameters);
|
||||||
|
if(replacedValue) { // don't proceed in replacement if no replaced value matches
|
||||||
|
if ((gfilter["field"].indexOf(".orcid") != -1 )) {
|
||||||
|
gfilter["values"][0] = replacedValue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
private replaceIndexValues(currentValue, stakeholder, parameters ){
|
private replaceIndexValues(currentValue, stakeholder, parameters ){
|
||||||
if(currentValue == stakeholder.index_name){
|
if(currentValue == stakeholder.index_name){
|
||||||
parameters["index_name"] = stakeholder.index_name;
|
parameters["index_name"] = stakeholder.index_name;
|
||||||
|
|
Loading…
Reference in New Issue