From bce47ea21e2e50c172cfb72309bb50a70d313c9e Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 10 Nov 2023 19:44:15 +0200 Subject: [PATCH 1/5] [develop | DONE | CHANGED]: data sources landing: Get and parse number of collected fulltexts from a new stats api. 1. env-properties.ts: Added property pdfStatisticsAPIURL?: string; 2. environment.ts: Added pdfStatisticsAPIURL property in all environments. 3. dataProvider.service.ts: Uncomment method "getCollectedFulltexts()". 4. dataProvider.component.ts: Call method "getCollectedFulltexts()" instead of "getDataProviderAggregationStatus()". --- explore/src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index 68c352d3..7f9117ec 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 68c352d3d275209d52bc3198dad7482ee21d193d +Subproject commit 7f9117eccb43f1e29a84b6e7e6d4494da6a34384 From 8c9337fd0bd9343eab222b128112ba6f38ed1f7f Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 24 Nov 2023 11:45:59 +0200 Subject: [PATCH 2/5] [develop | DONE | FIXED]: funders.component.ts: Updated method called in refine queries from "getRefineFieldsResultsByEntityName()" to "getAllRefineFieldResultsByFieldName()" to be able to get more than 100 funders each time. --- explore/src/app/funders/funders.component.ts | 6 +++--- explore/src/assets/common-assets | 2 +- explore/src/assets/openaire-theme | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/explore/src/app/funders/funders.component.ts b/explore/src/app/funders/funders.component.ts index 2c1f9b54..0a08b32e 100644 --- a/explore/src/app/funders/funders.component.ts +++ b/explore/src/app/funders/funders.component.ts @@ -145,9 +145,9 @@ export class FundersComponent implements OnInit { let refineParams = '&fq=resultbestaccessright%20exact%20%22Open%20Access%22'; this.subscriptions.push( zip( - this.refineFieldResultsService.getRefineFieldsResultsByEntityName(['relfunder'], 'result', this.properties), - this.refineFieldResultsService.getRefineFieldsResultsByEntityName(['relfunder'], 'result', this.properties, refineParams), - this.refineFieldResultsService.getRefineFieldsResultsByEntityName(['funder'], 'project', this.properties), + this.refineFieldResultsService.getAllRefineFieldResultsByFieldName('relfunder', 'result', this.properties), + this.refineFieldResultsService.getAllRefineFieldResultsByFieldName('relfunder', 'result', this.properties, refineParams), + this.refineFieldResultsService.getAllRefineFieldResultsByFieldName('funder', 'project', this.properties), this.stakeholderService.getStakeholders(this.properties.monitorServiceAPIURL, 'funder') ).subscribe((data: any[]) => { // storing all needed data to a map diff --git a/explore/src/assets/common-assets b/explore/src/assets/common-assets index 6bb1e61b..b68f3757 160000 --- a/explore/src/assets/common-assets +++ b/explore/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 6bb1e61b059bef1bff3bfb0611b0df46f7840426 +Subproject commit b68f375714b679743e586bb2fb4721e633e43fc1 diff --git a/explore/src/assets/openaire-theme b/explore/src/assets/openaire-theme index 5e8c1add..7aa9e577 160000 --- a/explore/src/assets/openaire-theme +++ b/explore/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 5e8c1addb1ebfa508aac8cb9540a755940c95b79 +Subproject commit 7aa9e577193e3a77415434fd5e6e856a21d5efeb From 852c81d83497a71a8f31a6c6178b0d28e04b15cc Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 24 Nov 2023 17:01:38 +0200 Subject: [PATCH 3/5] [develop | DONE | CHANGED]: home.component.html: In home page, get number of funders by numbers.mergedFundersSize (instead of numbers.fundersSize) - all funders that with research products or >1 projects. --- explore/src/app/home/home.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/explore/src/app/home/home.component.html b/explore/src/app/home/home.component.html index c63b95d2..1f41806a 100644 --- a/explore/src/app/home/home.component.html +++ b/explore/src/app/home/home.component.html @@ -109,9 +109,9 @@ Persistent identifiers and registries - + {{numbers.fundersSize.number|number}}{{numbers.fundersSize.size}} + class="uk-text-bold">{{numbers.mergedFundersSize.number|number}}{{numbers.mergedFundersSize.size}} funders and {{numbers.projectsSize.number|number}}{{numbers.projectsSize.size}} From ec8e6b69381de9578cada7968ecef5c2ebf8302b Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 27 Nov 2023 13:49:04 +0200 Subject: [PATCH 4/5] Updating openaireLibrary --- explore/src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index 7f9117ec..fa61b8be 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 7f9117eccb43f1e29a84b6e7e6d4494da6a34384 +Subproject commit fa61b8bef431b03eca1092fe05ab16611e3233ae From c416853045e98a1abd7acefc6065c4bccb87235c Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 28 Nov 2023 13:02:55 +0200 Subject: [PATCH 5/5] Updating openaireLibrary --- explore/src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index fa61b8be..c7c1aec2 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit fa61b8bef431b03eca1092fe05ab16611e3233ae +Subproject commit c7c1aec26ea7ff3decda4675a7bdb0e6ea83a4ae