Merge Angular 16 Irish Monitor to develop #33

Merged
k.triantafyllou merged 151 commits from angular-16-irish-monitor into develop 2024-02-13 09:32:41 +01:00
1 changed files with 3 additions and 3 deletions
Showing only changes of commit 3e96a5f889 - Show all commits

View File

@ -249,7 +249,7 @@ export class IndicatorFilterUtils {
"foslvl1":
{
"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_year":"indi_pub_downloads_year.result.result_fos.lvl1",
"indi_impact_measures":"indi_impact_measures.result.result_fos.lvl1",
@ -260,7 +260,7 @@ export class IndicatorFilterUtils {
},
"foslvl2":{
"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_year":"indi_pub_downloads_year.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){
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"];
}else{
return IndicatorFilterUtils.filteredFields[field][table];