Revision 58923
Added by Stefania Martziou almost 4 years ago
data-handler.service.ts | ||
---|---|---|
14 | 14 |
@Injectable () |
15 | 15 |
export class DataHandlerService { |
16 | 16 |
|
17 |
public convertRawDataToLastUpdateDate(rawData: RawData) { |
|
18 |
|
|
19 |
let lastUpdateDate: string; |
|
20 |
|
|
21 |
for (const series of rawData.datasets) { |
|
22 |
|
|
23 |
if (series.series.query.name === 'creation_date') { |
|
24 |
lastUpdateDate = series.series.result[0].row[0]; |
|
25 |
} |
|
26 |
} |
|
27 |
|
|
28 |
return lastUpdateDate; |
|
29 |
} |
|
30 |
|
|
17 | 31 |
public convertRawMapDataToMapData(rawData: RawData) { |
18 | 32 |
|
19 | 33 |
const overviewMapData: OverviewMapData = new OverviewMapData(); |
... | ... | |
633 | 647 |
publicationsDepositedIndicator.total = Number(series.series.result[0].row[2]); |
634 | 648 |
countryPageOverviewData.publicationsDeposited = publicationsDepositedIndicator; |
635 | 649 |
|
636 |
} if ((series.series.query.name === 'new.oso.results.oa_percentage.country') |
|
650 |
} else if ((series.series.query.name === 'new.oso.results.oa_percentage.country')
|
|
637 | 651 |
&& series.series.query.parameters && series.series.query.parameters[0] === 'dataset') { |
638 | 652 |
|
639 | 653 |
countryPageOverviewData.name = series.series.result[0].row[3]; |
... | ... | |
700 | 714 |
return countryPageOverviewData; |
701 | 715 |
} |
702 | 716 |
|
717 |
public convertRawDataToCountryPageOAData(rawData: RawData) { |
|
718 |
|
|
719 |
const countryPageOverviewData: CountryPageOverviewData = new CountryPageOverviewData(); |
|
720 |
|
|
721 |
for (const series of rawData.datasets) { |
|
722 |
|
|
723 |
if ((series.series.query.name === 'new.oso.results.oa_percentage.country') |
|
724 |
&& series.series.query.parameters && series.series.query.parameters[0] === 'publication') { |
|
725 |
|
|
726 |
countryPageOverviewData.name = series.series.result[0].row[3]; |
|
727 |
countryPageOverviewData.code = series.series.result[0].row[4]; |
|
728 |
|
|
729 |
const publicationsAffiliatedIndicator: Indicator = new Indicator(); |
|
730 |
publicationsAffiliatedIndicator.percentage = Number(series.series.result[0].row[0]); |
|
731 |
publicationsAffiliatedIndicator.oa = Number(series.series.result[0].row[1]); |
|
732 |
publicationsAffiliatedIndicator.total = Number(series.series.result[0].row[2]); |
|
733 |
countryPageOverviewData.publicationsAffiliated = publicationsAffiliatedIndicator; |
|
734 |
|
|
735 |
} else if ((series.series.query.name === 'new.oso.results.oa_percentage.country') |
|
736 |
&& series.series.query.parameters && series.series.query.parameters[0] === 'dataset') { |
|
737 |
|
|
738 |
countryPageOverviewData.name = series.series.result[0].row[3]; |
|
739 |
countryPageOverviewData.code = series.series.result[0].row[4]; |
|
740 |
|
|
741 |
const datasetsAffiliatedIndicator: Indicator = new Indicator(); |
|
742 |
datasetsAffiliatedIndicator.percentage = Number(series.series.result[0].row[0]); |
|
743 |
datasetsAffiliatedIndicator.oa = Number(series.series.result[0].row[1]); |
|
744 |
datasetsAffiliatedIndicator.total = Number(series.series.result[0].row[2]); |
|
745 |
countryPageOverviewData.datasetsAffiliated = datasetsAffiliatedIndicator; |
|
746 |
|
|
747 |
} else if ((series.series.query.name === 'new.oso.results.oa_percentage.country') |
|
748 |
&& series.series.query.parameters && series.series.query.parameters[0] === 'software') { |
|
749 |
|
|
750 |
countryPageOverviewData.name = series.series.result[0].row[3]; |
|
751 |
countryPageOverviewData.code = series.series.result[0].row[4]; |
|
752 |
|
|
753 |
const softwareIndicator: Indicator = new Indicator(); |
|
754 |
softwareIndicator.percentage = Number(series.series.result[0].row[0]); |
|
755 |
softwareIndicator.oa = Number(series.series.result[0].row[1]); |
|
756 |
softwareIndicator.total = Number(series.series.result[0].row[2]); |
|
757 |
countryPageOverviewData.software = softwareIndicator; |
|
758 |
|
|
759 |
} else if ((series.series.query.name === 'new.oso.results.oa_percentage.country') |
|
760 |
&& series.series.query.parameters && series.series.query.parameters[0] === 'other') { |
|
761 |
|
|
762 |
countryPageOverviewData.name = series.series.result[0].row[3]; |
|
763 |
countryPageOverviewData.code = series.series.result[0].row[4]; |
|
764 |
|
|
765 |
const otherIndicator: Indicator = new Indicator(); |
|
766 |
otherIndicator.percentage = Number(series.series.result[0].row[0]); |
|
767 |
otherIndicator.oa = Number(series.series.result[0].row[1]); |
|
768 |
otherIndicator.total = Number(series.series.result[0].row[2]); |
|
769 |
countryPageOverviewData.other = otherIndicator; |
|
770 |
|
|
771 |
} |
|
772 |
} |
|
773 |
|
|
774 |
return countryPageOverviewData; |
|
775 |
} |
|
776 |
|
|
703 | 777 |
public convertRawDataToTreemapHighchartsData(rawData: RawData) { |
704 | 778 |
|
705 | 779 |
const treeMapData: TreemapHighchartsData[] = []; |
Also available in: Unified diff
Finished the charts for the overview tab of the country page