MaDgIK
/
open-science-observatory-ui
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added R&D expenditure in country page

This commit is contained in:
Stefania Martziou 2020-10-12 23:01:35 +00:00
parent 1c81e9d6d8
commit 2891b8d9d9
4 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/domain/overview-map-data.ts
View File

@ -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;
}

28
src/app/pages/countrypage/country-page.component.html
View File

@ -393,8 +393,18 @@
<div class="numbers">
<div class="indicator uk-margin-small-top">
<span class="number primary">--</span>
<span><i>R&D expenditure</i></span>
<ng-container *ngIf="countryPageOverviewData?.rndExpenditure">
<span class="number primary">{{countryPageOverviewData.rndExpenditure.expenditure}}%</span>
<span>
<span><i> of gdp for </i></span>
<span class="number primary">{{countryPageOverviewData.rndExpenditure.year}}</span>
<div><i> R&D expenditure</i></div>
</span>
</ng-container>
<ng-container *ngIf="!countryPageOverviewData || !countryPageOverviewData.rndExpenditure">
<span class="number primary">--</span>
<span><i>R&D expenditure</i></span>
</ng-container>
</div>
<hr class="greyBoldDivider uk-margin-medium-top uk-margin-medium-bottom">
@ -447,8 +457,18 @@
<div class="numbers">
<div class="">
<div class="number big primary">--</div>
<div class="uk-margin-small-top">R&D EXPENDITURE</div>
<ng-container *ngIf="countryPageOverviewData?.rndExpenditure">
<span class="number big primary">{{countryPageOverviewData.rndExpenditure.expenditure}}%</span>
<span>
<span class="uk-margin-small-right uk-margin-small-left"> OF DGP FOR </span>
<span class="number big primary">{{countryPageOverviewData.rndExpenditure.year}}</span>
<div class="uk-margin-small-top"> R&D EXPENDITURE</div>
</span>
</ng-container>
<ng-container *ngIf="!countryPageOverviewData || !countryPageOverviewData.rndExpenditure">
<div class="number big primary">--</div>
<div class="uk-margin-small-top">R&D EXPENDITURE</div>
</ng-container>
</div>
<div class="uk-margin-medium-top">

10
src/app/services/data-handler.service.ts
View File

@ -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) {

2
src/app/services/data.service.ts
View File

@ -84,7 +84,7 @@ export class DataService {
}
public getCountryPageOverviewData(countryCode: string): Observable<RawData> {
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<RawData>(this.apiURL + countryPageOverviewDataQuery, headerOptions);
}