Revision 59559
Added by Stefania Martziou over 3 years ago
| modules/open-science-observatory-ui/trunk/src/app/pages/countrypage/country-page.component.html | ||
|---|---|---|
| 393 | 393 |
<div class="numbers"> |
| 394 | 394 |
|
| 395 | 395 |
<div class="indicator uk-margin-small-top"> |
| 396 |
<span class="number primary">--</span> |
|
| 397 |
<span><i>R&D expenditure</i></span> |
|
| 396 |
<ng-container *ngIf="countryPageOverviewData?.rndExpenditure"> |
|
| 397 |
<span class="number primary">{{countryPageOverviewData.rndExpenditure.expenditure}}%</span>
|
|
| 398 |
<span> |
|
| 399 |
<span><i> of gdp for </i></span> |
|
| 400 |
<span class="number primary">{{countryPageOverviewData.rndExpenditure.year}}</span>
|
|
| 401 |
<div><i> R&D expenditure</i></div> |
|
| 402 |
</span> |
|
| 403 |
</ng-container> |
|
| 404 |
<ng-container *ngIf="!countryPageOverviewData || !countryPageOverviewData.rndExpenditure"> |
|
| 405 |
<span class="number primary">--</span> |
|
| 406 |
<span><i>R&D expenditure</i></span> |
|
| 407 |
</ng-container> |
|
| 398 | 408 |
</div> |
| 399 | 409 |
|
| 400 | 410 |
<hr class="greyBoldDivider uk-margin-medium-top uk-margin-medium-bottom"> |
| ... | ... | |
| 447 | 457 |
<div class="numbers"> |
| 448 | 458 |
|
| 449 | 459 |
<div class=""> |
| 450 |
<div class="number big primary">--</div> |
|
| 451 |
<div class="uk-margin-small-top">R&D EXPENDITURE</div> |
|
| 460 |
<ng-container *ngIf="countryPageOverviewData?.rndExpenditure"> |
|
| 461 |
<span class="number big primary">{{countryPageOverviewData.rndExpenditure.expenditure}}%</span>
|
|
| 462 |
<span> |
|
| 463 |
<span class="uk-margin-small-right uk-margin-small-left"> OF DGP FOR </span> |
|
| 464 |
<span class="number big primary">{{countryPageOverviewData.rndExpenditure.year}}</span>
|
|
| 465 |
<div class="uk-margin-small-top"> R&D EXPENDITURE</div> |
|
| 466 |
</span> |
|
| 467 |
</ng-container> |
|
| 468 |
<ng-container *ngIf="!countryPageOverviewData || !countryPageOverviewData.rndExpenditure"> |
|
| 469 |
<div class="number big primary">--</div> |
|
| 470 |
<div class="uk-margin-small-top">R&D EXPENDITURE</div> |
|
| 471 |
</ng-container> |
|
| 452 | 472 |
</div> |
| 453 | 473 |
|
| 454 | 474 |
<div class="uk-margin-medium-top"> |
| modules/open-science-observatory-ui/trunk/src/app/services/data-handler.service.ts | ||
|---|---|---|
| 6 | 6 |
EuropeData, |
| 7 | 7 |
OverviewMapData, |
| 8 | 8 |
CountryTableData, |
| 9 |
CountryPageOverviewData |
|
| 9 |
CountryPageOverviewData, RnDExpenditure
|
|
| 10 | 10 |
} from '../domain/overview-map-data'; |
| 11 | 11 |
import {Indicator} from '../domain/overview-data';
|
| 12 | 12 |
import {TreemapHighchartsData} from '../domain/treemap-highcharts-data';
|
| ... | ... | |
| 851 | 851 |
|
| 852 | 852 |
countryPageOverviewData.policies = Number(series.series.result[0].row[0]); |
| 853 | 853 |
|
| 854 |
} else if (series.series.query.name === 'new.oso.rnd.country' |
|
| 855 |
&& series.series.result && series.series.result.length > 0 && series.series.result[0].row) {
|
|
| 856 |
|
|
| 857 |
const rndExpenditure: RnDExpenditure = new RnDExpenditure(); |
|
| 858 |
rndExpenditure.expenditure = Number(series.series.result[0].row[0]); |
|
| 859 |
rndExpenditure.year = Number(series.series.result[0].row[1]); |
|
| 860 |
countryPageOverviewData.rndExpenditure = rndExpenditure; |
|
| 861 |
|
|
| 854 | 862 |
} else if (series.series.query.name === 'new.oso.funder.country' |
| 855 | 863 |
&& series.series.result && series.series.result.length > 0 && series.series.result[0].row) {
|
| 856 | 864 |
|
| modules/open-science-observatory-ui/trunk/src/app/services/data.service.ts | ||
|---|---|---|
| 84 | 84 |
} |
| 85 | 85 |
|
| 86 | 86 |
public getCountryPageOverviewData(countryCode: string): Observable<RawData> {
|
| 87 |
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'; |
|
| 87 |
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';
|
|
| 88 | 88 |
return this.httpClient.get<RawData>(this.apiURL + countryPageOverviewDataQuery, headerOptions); |
| 89 | 89 |
} |
| 90 | 90 |
|
| modules/open-science-observatory-ui/trunk/src/app/domain/overview-map-data.ts | ||
|---|---|---|
| 79 | 79 |
repositories: Indicator; |
| 80 | 80 |
journals: Indicator; |
| 81 | 81 |
policies: number = null; |
| 82 |
rndExpenditure: RnDExpenditure; |
|
| 82 | 83 |
funders: number = null; |
| 83 | 84 |
fundingOrganizations: number = null; |
| 84 | 85 |
ec_fundedOrganizations: number = null; |
| 85 | 86 |
} |
| 87 |
|
|
| 88 |
export class RnDExpenditure {
|
|
| 89 |
expenditure: number; |
|
| 90 |
year: number; |
|
| 91 |
} |
|
Also available in: Unified diff
Added R&D expenditure in country page