Revision 61541
Added by Stefania Martziou over 2 years ago
| data-handler.service.ts | ||
|---|---|---|
| 729 | 729 |
mapTableData.set(rowResult.row[3], countryTableData); |
| 730 | 730 |
} |
| 731 | 731 |
} |
| 732 |
} else if (series.series.query.name.includes('oso.results.cc_licence_percentage')) {
|
|
| 733 |
|
|
| 734 |
for (const rowResult of series.series.result) {
|
|
| 735 |
|
|
| 736 |
const ccLicenceIndicator = new Indicator(); |
|
| 737 |
|
|
| 738 |
// remove unwanted countries |
|
| 739 |
if (this.isCountryToBeRemoved(rowResult.row[3])) {
|
|
| 740 |
continue; |
|
| 741 |
} |
|
| 742 |
|
|
| 743 |
if (mapTableData.has(rowResult.row[3])) {
|
|
| 744 |
const countryTableData = mapTableData.get(rowResult.row[3]); |
|
| 745 |
if (rowResult.row[0] !== 'NaN') {
|
|
| 746 |
ccLicenceIndicator.total = Number(rowResult.row[2]); |
|
| 747 |
ccLicenceIndicator.oa = Number(rowResult.row[1]); |
|
| 748 |
ccLicenceIndicator.percentage = Number(rowResult.row[0]); |
|
| 749 |
countryTableData.cc_licence = ccLicenceIndicator; |
|
| 750 |
} |
|
| 751 |
} else {
|
|
| 752 |
const countryTableData: CountryTableData = new CountryTableData(); |
|
| 753 |
if (rowResult.row[0] !== 'NaN') {
|
|
| 754 |
ccLicenceIndicator.total = Number(rowResult.row[2]); |
|
| 755 |
ccLicenceIndicator.oa = Number(rowResult.row[1]); |
|
| 756 |
ccLicenceIndicator.percentage = Number(rowResult.row[0]); |
|
| 757 |
countryTableData.cc_licence = ccLicenceIndicator; |
|
| 758 |
} |
|
| 759 |
countryTableData.name = rowResult.row[4]; |
|
| 760 |
countryTableData.code = rowResult.row[3]; |
|
| 761 |
mapTableData.set(rowResult.row[3], countryTableData); |
|
| 762 |
} |
|
| 763 |
} |
|
| 764 |
} else if (series.series.query.name.includes('oso.results.abstract_percentage')) {
|
|
| 765 |
|
|
| 766 |
for (const rowResult of series.series.result) {
|
|
| 767 |
|
|
| 768 |
const abstractIndicator = new Indicator(); |
|
| 769 |
|
|
| 770 |
// remove unwanted countries |
|
| 771 |
if (this.isCountryToBeRemoved(rowResult.row[3])) {
|
|
| 772 |
continue; |
|
| 773 |
} |
|
| 774 |
|
|
| 775 |
if (mapTableData.has(rowResult.row[3])) {
|
|
| 776 |
const countryTableData = mapTableData.get(rowResult.row[3]); |
|
| 777 |
if (rowResult.row[0] !== 'NaN') {
|
|
| 778 |
abstractIndicator.total = Number(rowResult.row[2]); |
|
| 779 |
abstractIndicator.oa = Number(rowResult.row[1]); |
|
| 780 |
abstractIndicator.percentage = Number(rowResult.row[0]); |
|
| 781 |
countryTableData.abstract = abstractIndicator; |
|
| 782 |
} |
|
| 783 |
} else {
|
|
| 784 |
const countryTableData: CountryTableData = new CountryTableData(); |
|
| 785 |
if (rowResult.row[0] !== 'NaN') {
|
|
| 786 |
abstractIndicator.total = Number(rowResult.row[2]); |
|
| 787 |
abstractIndicator.oa = Number(rowResult.row[1]); |
|
| 788 |
abstractIndicator.percentage = Number(rowResult.row[0]); |
|
| 789 |
countryTableData.abstract = abstractIndicator; |
|
| 790 |
} |
|
| 791 |
countryTableData.name = rowResult.row[4]; |
|
| 792 |
countryTableData.code = rowResult.row[3]; |
|
| 793 |
mapTableData.set(rowResult.row[3], countryTableData); |
|
| 794 |
} |
|
| 795 |
} |
|
| 732 | 796 |
} |
| 733 | 797 |
} |
| 734 | 798 |
|
Also available in: Unified diff
Finisged the more details tables for europe open science