Merge Angular 16 Irish Monitor to develop #33
|
@ -249,7 +249,7 @@ export class IndicatorFilterUtils {
|
||||||
"foslvl1":
|
"foslvl1":
|
||||||
{
|
{
|
||||||
"publication":"publication.topics.result.result_fos.lvl1",
|
"publication":"publication.topics.result.result_fos.lvl1",
|
||||||
"result":"result.result_fos.lvl1",
|
// "result":"result.result_fos.lvl1",
|
||||||
"indi_pub_downloads":"indi_pub_downloads.result.result_fos.lvl1",
|
"indi_pub_downloads":"indi_pub_downloads.result.result_fos.lvl1",
|
||||||
"indi_pub_downloads_year":"indi_pub_downloads_year.result.result_fos.lvl1",
|
"indi_pub_downloads_year":"indi_pub_downloads_year.result.result_fos.lvl1",
|
||||||
"indi_impact_measures":"indi_impact_measures.result.result_fos.lvl1",
|
"indi_impact_measures":"indi_impact_measures.result.result_fos.lvl1",
|
||||||
|
@ -260,7 +260,7 @@ export class IndicatorFilterUtils {
|
||||||
},
|
},
|
||||||
"foslvl2":{
|
"foslvl2":{
|
||||||
"publication":"publication.topics.result.result_fos.lvl2",
|
"publication":"publication.topics.result.result_fos.lvl2",
|
||||||
"result":"result.result_fos.lvl2",
|
// "result":"result.result_fos.lvl2",
|
||||||
"indi_pub_downloads":"indi_pub_downloads.result.result_fos.lvl2",
|
"indi_pub_downloads":"indi_pub_downloads.result.result_fos.lvl2",
|
||||||
"indi_pub_downloads_year":"indi_pub_downloads_year.result.result_fos.lvl2",
|
"indi_pub_downloads_year":"indi_pub_downloads_year.result.result_fos.lvl2",
|
||||||
"indi_impact_measures":"indi_impact_measures.result.result_fos.lvl2",
|
"indi_impact_measures":"indi_impact_measures.result.result_fos.lvl2",
|
||||||
|
@ -281,7 +281,7 @@ export class IndicatorFilterUtils {
|
||||||
|
|
||||||
}
|
}
|
||||||
static getFieldForTable(field, table){
|
static getFieldForTable(field, table){
|
||||||
if(["publication", "software", "dataset", "other", "result"].indexOf(table)!=-1){
|
if(["publication", "software", "dataset", "other", "result"].indexOf(table)!=-1 && IndicatorFilterUtils.filteredFields[field]["result"]){
|
||||||
return IndicatorFilterUtils.filteredFields[field]["result"];
|
return IndicatorFilterUtils.filteredFields[field]["result"];
|
||||||
}else{
|
}else{
|
||||||
return IndicatorFilterUtils.filteredFields[field][table];
|
return IndicatorFilterUtils.filteredFields[field][table];
|
||||||
|
|
Loading…
Reference in New Issue