diff --git a/src/app/domain/overview-map-data.ts b/src/app/domain/overview-map-data.ts index 49fcdaa05..ae5a98eeb 100644 --- a/src/app/domain/overview-map-data.ts +++ b/src/app/domain/overview-map-data.ts @@ -79,7 +79,13 @@ export class CountryPageOverviewData { repositories: Indicator; journals: Indicator; policies: number = null; + rndExpenditure: RnDExpenditure; funders: number = null; fundingOrganizations: number = null; ec_fundedOrganizations: number = null; } + +export class RnDExpenditure { + expenditure: number; + year: number; +} diff --git a/src/app/pages/countrypage/country-page.component.html b/src/app/pages/countrypage/country-page.component.html index 6367ec7e3..196baa344 100644 --- a/src/app/pages/countrypage/country-page.component.html +++ b/src/app/pages/countrypage/country-page.component.html @@ -393,8 +393,18 @@
- -- - R&D expenditure + + {{countryPageOverviewData.rndExpenditure.expenditure}}% + + of gdp for + {{countryPageOverviewData.rndExpenditure.year}} +
R&D expenditure
+
+
+ + -- + R&D expenditure +

@@ -447,8 +457,18 @@
-
--
-
R&D EXPENDITURE
+ + {{countryPageOverviewData.rndExpenditure.expenditure}}% + + OF DGP FOR + {{countryPageOverviewData.rndExpenditure.year}} +
R&D EXPENDITURE
+
+
+ +
--
+
R&D EXPENDITURE
+
diff --git a/src/app/services/data-handler.service.ts b/src/app/services/data-handler.service.ts index 927410c14..dca8a84b3 100644 --- a/src/app/services/data-handler.service.ts +++ b/src/app/services/data-handler.service.ts @@ -6,7 +6,7 @@ import { EuropeData, OverviewMapData, CountryTableData, - CountryPageOverviewData + CountryPageOverviewData, RnDExpenditure } from '../domain/overview-map-data'; import {Indicator} from '../domain/overview-data'; import {TreemapHighchartsData} from '../domain/treemap-highcharts-data'; @@ -851,6 +851,14 @@ export class DataHandlerService { countryPageOverviewData.policies = Number(series.series.result[0].row[0]); + } else if (series.series.query.name === 'new.oso.rnd.country' + && series.series.result && series.series.result.length > 0 && series.series.result[0].row) { + + const rndExpenditure: RnDExpenditure = new RnDExpenditure(); + rndExpenditure.expenditure = Number(series.series.result[0].row[0]); + rndExpenditure.year = Number(series.series.result[0].row[1]); + countryPageOverviewData.rndExpenditure = rndExpenditure; + } else if (series.series.query.name === 'new.oso.funder.country' && series.series.result && series.series.result.length > 0 && series.series.result[0].row) { diff --git a/src/app/services/data.service.ts b/src/app/services/data.service.ts index 6cebcf9af..29aadbf07 100644 --- a/src/app/services/data.service.ts +++ b/src/app/services/data.service.ts @@ -84,7 +84,7 @@ export class DataService { } public getCountryPageOverviewData(countryCode: string): Observable { - const countryPageOverviewDataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.country%22%2C%20%22parameters%22%3A%5B%22publication%22%2C%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.deposited.country%22%2C%20%22parameters%22%3A%5B%22publication%22%2C%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.country%22%2C%20%22parameters%22%3A%5B%22dataset%22%2C%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.deposited.country%22%2C%20%22parameters%22%3A%5B%22dataset%22%2C%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.repositories.doar_re3data.validated.country%22%2C%20%22parameters%22%3A%5B%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.journals.doaj.validated.country%22%2C%20%22parameters%22%3A%5B%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.oa_policies.country%22%2C%20%22parameters%22%3A%5B%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.funder.country%22%2C%20%22parameters%22%3A%5B%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.funding_organizations.country%22%2C%20%22parameters%22%3A%5B%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.ec_funded_organizations.country%22%2C%20%22parameters%22%3A%5B%22' + countryCode + '%22%5D%7D%7D%5D%2C%22verbose%22%3Atrue%7D'; + const countryPageOverviewDataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.country%22%2C%20%22parameters%22%3A%5B%22publication%22%2C%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.deposited.country%22%2C%20%22parameters%22%3A%5B%22publication%22%2C%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.country%22%2C%20%22parameters%22%3A%5B%22dataset%22%2C%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.deposited.country%22%2C%20%22parameters%22%3A%5B%22dataset%22%2C%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.repositories.doar_re3data.validated.country%22%2C%20%22parameters%22%3A%5B%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.journals.doaj.validated.country%22%2C%20%22parameters%22%3A%5B%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.oa_policies.country%22%2C%20%22parameters%22%3A%5B%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.rnd.country%22%2C%20%22parameters%22%3A%5B%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.funder.country%22%2C%20%22parameters%22%3A%5B%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.funding_organizations.country%22%2C%20%22parameters%22%3A%5B%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.ec_funded_organizations.country%22%2C%20%22parameters%22%3A%5B%22' + countryCode + '%22%5D%7D%7D%5D%2C%22verbose%22%3Atrue%7D'; return this.httpClient.get(this.apiURL + countryPageOverviewDataQuery, headerOptions); }