MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of code-repo.d4science.org:MaDgIK/openaire-library into develop

This commit is contained in:
Konstantinos Triantafyllou 2024-06-25 15:26:58 +03:00
parent 8afe96a45d 4bd7e822ac
commit ab3fb51ea3
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
monitor/entities/stakeholder.ts
View File

@ -264,7 +264,7 @@ export class IndicatorFilterUtils {
"indi_pub_downloads":"indi_pub_downloads.result.year", "indi_pub_downloads":"indi_pub_downloads.result.year",
"result_apc":"result_apc.result.year", "result_apc":"result_apc.result.year",
"result_apc_affiliations":"result_apc_affiliations.result.year", "result_apc_affiliations":"result_apc_affiliations.result.year",
"result_country":"result_country.result.year", "cross_country":"cross_country.year",
"indi_impact_measures": "indi_impact_measures.result.year", "indi_impact_measures": "indi_impact_measures.result.year",
"project": "project.start year" "project": "project.start year"
}, },
@ -286,7 +286,7 @@ export class IndicatorFilterUtils {
"indi_impact_measures":"indi_impact_measures.result.result_fos.lvl1", "indi_impact_measures":"indi_impact_measures.result.result_fos.lvl1",
"result_apc":"result_apc.result.result_fos.lvl1", "result_apc":"result_apc.result.result_fos.lvl1",
"result_apc_affiliations":"result_apc_affiliations.result.result_fos.lvl1", "result_apc_affiliations":"result_apc_affiliations.result.result_fos.lvl1",
"result_country":"result_country.result.result_fos.lvl1", "cross_country":"cross_country.lvl1",
"historical_snapshots_irish_fos":"historical_snapshots_irish_fos.lvl1" "historical_snapshots_irish_fos":"historical_snapshots_irish_fos.lvl1"
}, },
"foslvl2":{ "foslvl2":{
@ -297,7 +297,7 @@ export class IndicatorFilterUtils {
"indi_impact_measures":"indi_impact_measures.result.result_fos.lvl2", "indi_impact_measures":"indi_impact_measures.result.result_fos.lvl2",
"result_apc":"result_apc.result.result_fos.lvl2", "result_apc":"result_apc.result.result_fos.lvl2",
"result_apc_affiliations":"result_apc_affiliations.result.result_fos.lvl2", "result_apc_affiliations":"result_apc_affiliations.result.result_fos.lvl2",
"result_country":"result_country.result.result_fos.lvl2", "cross_country":"cross_country.lvl2",
"historical_snapshots_irish_fos":"historical_snapshots_irish_fos.lvl2" "historical_snapshots_irish_fos":"historical_snapshots_irish_fos.lvl2"
}, },
"publicly-funded":{ "publicly-funded":{
@ -307,7 +307,7 @@ export class IndicatorFilterUtils {
"indi_impact_measures":"indi_impact_measures.result.indi_pub_publicly_funded.publicly_funded", "indi_impact_measures":"indi_impact_measures.result.indi_pub_publicly_funded.publicly_funded",
"result_apc":"result_apc.result.indi_pub_publicly_funded.publicly_funded", "result_apc":"result_apc.result.indi_pub_publicly_funded.publicly_funded",
"result_apc_affiliations":"result_apc_affiliations.result.indi_pub_publicly_funded.publicly_funded", "result_apc_affiliations":"result_apc_affiliations.result.indi_pub_publicly_funded.publicly_funded",
"result_country":"result_country.result.indi_pub_publicly_funded.publicly_funded" "cross_country":"cross_country.publicly_funded"
} }
} }

6
utils/entities/dataProviderInfo.ts
View File

@ -46,8 +46,11 @@ export class DataProviderInfo {
// aggregationStatus: {"fundedContent": string, "indexRecords": string, "fulltexts": string, "lastUpdateDate": string}; // aggregationStatus: {"fundedContent": string, "indexRecords": string, "fulltexts": string, "lastUpdateDate": string};
aggregationStatus: { "fulltexts": string }; aggregationStatus: { "fulltexts": string };
/** @deprecated*/
tabs: { "name": string, "content": string }[]; tabs: { "name": string, "content": string }[];
/** @deprecated*/
tabs2: string[] = []; tabs2: string[] = [];
/** @deprecated*/
tabsInTypes = { tabsInTypes = {
"publicationsTab": new Set<string>( "publicationsTab": new Set<string>(
["aggregator::datarepository", ["aggregator::datarepository",
@ -196,11 +199,14 @@ export class DataProviderInfo {
organizations: { "acronym": string, "name": string, "id": string }[] = []; organizations: { "acronym": string, "name": string, "id": string }[] = [];
//publications: any; //publications: any;
//datasets: any; //datasets: any;
/** @deprecated*/
statistics: any; statistics: any;
//projects: any; //projects: any;
/** @deprecated*/
datasources: any; datasources: any;
//relatedDatasources: Map<string, {"name": string, "countPublications": string, "countDatasets": string, "countSoftware": string, "countOrps": string}>; //relatedDatasources: Map<string, {"name": string, "countPublications": string, "countDatasets": string, "countSoftware": string, "countOrps": string}>;
// Search query
relatedDatasources: { "id": string, "name": string, "count": number }[] = []; relatedDatasources: { "id": string, "name": string, "count": number }[] = [];
belongsTo: boolean = true; belongsTo: boolean = true;

4
utils/entities/organizationInfo.ts
View File

@ -21,8 +21,8 @@ export class OrganizationInfo {
name: string; name: string;
country: string; country: string;
objIdentifier: string; objIdentifier: string;
/** @deprecated*/ //deprecated - search query
projects: Map<string, OrganizationProject[]>; projects: Map<string, OrganizationProject[]>;
//dataProviders: { name: string; url: string; type: string; websiteUrl: string; //dataProviders: { name: string; url: string; type: string; websiteUrl: string;
// organizations: {name: string; url: string}[]}[]; // organizations: {name: string; url: string}[]}[];