extract stakeholder info even it is not in the first groupfilter
This commit is contained in:
parent
cebc5b08fe
commit
e902ebaed5
|
@ -674,19 +674,21 @@ export class IndicatorUtils {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
for (let filter of query["query"]["filters"]) {
|
for (let filter of query["query"]["filters"]) {
|
||||||
if (filter["groupFilters"][0]["field"].indexOf(" funder") != -1) {//new statistcs schema
|
for (let gfilter of filter["groupFilters"]) {
|
||||||
filter["groupFilters"][0]["values"][0] = ChartHelper.prefix + "index_name" + ChartHelper.suffix;
|
if (gfilter["field"].indexOf(" funder") != -1) {//new statistcs schema
|
||||||
|
gfilter["values"][0] = ChartHelper.prefix + "index_name" + ChartHelper.suffix;
|
||||||
indicatorPath.parameters["index_name"] = stakeholder.index_name;
|
indicatorPath.parameters["index_name"] = stakeholder.index_name;
|
||||||
}else if (filter["groupFilters"][0]["field"].indexOf(".funder") != -1) {
|
} else if (gfilter["field"].indexOf(".funder") != -1) {
|
||||||
filter["groupFilters"][0]["values"][0] = ChartHelper.prefix + "index_name" + ChartHelper.suffix;
|
gfilter["values"][0] = ChartHelper.prefix + "index_name" + ChartHelper.suffix;
|
||||||
indicatorPath.parameters["index_name"] = stakeholder.index_name;
|
indicatorPath.parameters["index_name"] = stakeholder.index_name;
|
||||||
}else if (filter["groupFilters"][0]["field"].indexOf(".funder.id") != -1) {
|
} else if (gfilter["field"].indexOf(".funder.id") != -1) {
|
||||||
filter["groupFilters"][0]["values"][0] = ChartHelper.prefix + "index_shortName" + ChartHelper.suffix;
|
gfilter["values"][0] = ChartHelper.prefix + "index_shortName" + ChartHelper.suffix;
|
||||||
indicatorPath.parameters["index_shortName"] = stakeholder.index_shortName;
|
indicatorPath.parameters["index_shortName"] = stakeholder.index_shortName;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private extractRI(obj, indicatorPath: IndicatorPath, stakeholder:Stakeholder) {
|
private extractRI(obj, indicatorPath: IndicatorPath, stakeholder:Stakeholder) {
|
||||||
if(stakeholder.type != "ri"){
|
if(stakeholder.type != "ri"){
|
||||||
|
@ -697,16 +699,18 @@ export class IndicatorUtils {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
for (let filter of query["query"]["filters"]) {
|
for (let filter of query["query"]["filters"]) {
|
||||||
if (filter["groupFilters"][0]["field"].indexOf(".context.name") != -1) {
|
for (let gfilter of filter["groupFilters"]) {
|
||||||
filter["groupFilters"][0]["values"][0] = ChartHelper.prefix + "index_name" + ChartHelper.suffix;
|
if (gfilter["field"].indexOf(".context.name") != -1) {
|
||||||
|
gfilter["values"][0] = ChartHelper.prefix + "index_name" + ChartHelper.suffix;
|
||||||
indicatorPath.parameters["index_name"] = stakeholder.index_name;
|
indicatorPath.parameters["index_name"] = stakeholder.index_name;
|
||||||
}else if (filter["groupFilters"][0]["field"].indexOf(".context.id") != -1) {
|
} else if (gfilter["field"].indexOf(".context.id") != -1) {
|
||||||
filter["groupFilters"][0]["values"][0] = ChartHelper.prefix + "index_shortName" + ChartHelper.suffix;
|
gfilter["values"][0] = ChartHelper.prefix + "index_shortName" + ChartHelper.suffix;
|
||||||
indicatorPath.parameters["index_shortName"] = stakeholder.index_shortName;
|
indicatorPath.parameters["index_shortName"] = stakeholder.index_shortName;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private extractOrganization(obj, indicatorPath: IndicatorPath, stakeholder:Stakeholder) {
|
private extractOrganization(obj, indicatorPath: IndicatorPath, stakeholder:Stakeholder) {
|
||||||
// works for publication.project.organization.name
|
// works for publication.project.organization.name
|
||||||
|
@ -719,16 +723,18 @@ export class IndicatorUtils {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
for (let filter of query["query"]["filters"]) {
|
for (let filter of query["query"]["filters"]) {
|
||||||
if (filter["groupFilters"][0]["field"].indexOf(".organization.name") != -1) {
|
for (let gfilter of filter["groupFilters"]) {
|
||||||
filter["groupFilters"][0]["values"][0] = ChartHelper.prefix + "index_name" + ChartHelper.suffix;
|
if (gfilter["field"].indexOf(".organization.name") != -1) {
|
||||||
|
gfilter["values"][0] = ChartHelper.prefix + "index_name" + ChartHelper.suffix;
|
||||||
indicatorPath.parameters["index_name"] = stakeholder.index_name;
|
indicatorPath.parameters["index_name"] = stakeholder.index_name;
|
||||||
}else if (filter["groupFilters"][0]["field"].indexOf(".organization.id") != -1) {
|
} else if (gfilter["field"].indexOf(".organization.id") != -1) {
|
||||||
filter["groupFilters"][0]["values"][0] = ChartHelper.prefix + "index_shortName" + ChartHelper.suffix;
|
gfilter["values"][0] = ChartHelper.prefix + "index_shortName" + ChartHelper.suffix;
|
||||||
indicatorPath.parameters["index_shortName"] = stakeholder.index_shortName;
|
indicatorPath.parameters["index_shortName"] = stakeholder.index_shortName;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
private extractStartYear(obj, indicatorPath: IndicatorPath) {
|
private extractStartYear(obj, indicatorPath: IndicatorPath) {
|
||||||
let start_year;
|
let start_year;
|
||||||
for (let query of obj[this.getDescriptionObjectName(obj)][this.getQueryObjectName(obj)]) {
|
for (let query of obj[this.getDescriptionObjectName(obj)][this.getQueryObjectName(obj)]) {
|
||||||
|
|
Loading…
Reference in New Issue