Revision 58946
Added by Stefania Martziou almost 4 years ago
| modules/open-science-observatory-ui/trunk/src/app/pages/countrypage/country-page.component.html | ||
|---|---|---|
| 759 | 759 |
<div> |
| 760 | 760 |
|
| 761 | 761 |
<div class="pidIndicator"> |
| 762 |
<h3>PID</h3> |
|
| 762 |
<h3 class="uk-margin-remove">PID</h3>
|
|
| 763 | 763 |
<div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s"> |
| 764 | 764 |
|
| 765 | 765 |
<div class="uk-grid-margin"> |
| ... | ... | |
| 798 | 798 |
</div> |
| 799 | 799 |
</div> |
| 800 | 800 |
|
| 801 |
<div class="licenceIndicator uk-margin-medium-top">
|
|
| 802 |
<h3>Licence</h3> |
|
| 801 |
<div class="licenceIndicator uk-margin-large-top">
|
|
| 802 |
<h3 class="uk-margin-remove">Licence</h3>
|
|
| 803 | 803 |
<div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s"> |
| 804 | 804 |
|
| 805 | 805 |
<div class="uk-grid-margin"> |
| ... | ... | |
| 838 | 838 |
</div> |
| 839 | 839 |
</div> |
| 840 | 840 |
|
| 841 |
<div class="goldIndicator uk-margin-medium-top">
|
|
| 842 |
<h3>Gold</h3> |
|
| 841 |
<div class="goldIndicator uk-margin-large-top">
|
|
| 842 |
<h3 class="uk-margin-remove">Gold</h3>
|
|
| 843 | 843 |
<div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s"> |
| 844 | 844 |
|
| 845 | 845 |
<div class="uk-grid-margin"> |
| ... | ... | |
| 878 | 878 |
</div> |
| 879 | 879 |
</div> |
| 880 | 880 |
|
| 881 |
<div class="greenIndicator uk-margin-medium-top">
|
|
| 882 |
<h3>Green</h3> |
|
| 881 |
<div class="greenIndicator uk-margin-large-top">
|
|
| 882 |
<h3 class="uk-margin-remove">Green</h3>
|
|
| 883 | 883 |
<div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s"> |
| 884 | 884 |
|
| 885 | 885 |
<div class="uk-grid-margin"> |
| ... | ... | |
| 918 | 918 |
</div> |
| 919 | 919 |
</div> |
| 920 | 920 |
|
| 921 |
<div class="greenVsGoldIndicator uk-margin-medium-top">
|
|
| 922 |
<h3>Green vs. Gold</h3> |
|
| 921 |
<div class="greenVsGoldIndicator uk-margin-large-top">
|
|
| 922 |
<h3 class="uk-margin-remove">Green vs. Gold</h3>
|
|
| 923 | 923 |
<div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s"> |
| 924 | 924 |
|
| 925 | 925 |
<div class="uk-grid-margin"> |
| ... | ... | |
| 941 | 941 |
<div> |
| 942 | 942 |
|
| 943 | 943 |
<div class="pidIndicator"> |
| 944 |
<h3>PID</h3> |
|
| 944 |
<h3 class="uk-margin-remove">PID</h3>
|
|
| 945 | 945 |
<div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s"> |
| 946 | 946 |
|
| 947 | 947 |
<div class="uk-grid-margin"> |
| ... | ... | |
| 980 | 980 |
</div> |
| 981 | 981 |
</div> |
| 982 | 982 |
|
| 983 |
<div class="licenceIndicator uk-margin-medium-top">
|
|
| 984 |
<h3>Licence</h3> |
|
| 983 |
<div class="licenceIndicator uk-margin-large-top">
|
|
| 984 |
<h3 class="uk-margin-remove">Licence</h3>
|
|
| 985 | 985 |
<div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s"> |
| 986 | 986 |
|
| 987 | 987 |
<div class="uk-grid-margin"> |
| ... | ... | |
| 1028 | 1028 |
<div> |
| 1029 | 1029 |
|
| 1030 | 1030 |
<div class="pidIndicator"> |
| 1031 |
<h3>PID</h3> |
|
| 1031 |
<h3 class="uk-margin-remove">PID</h3>
|
|
| 1032 | 1032 |
<div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s"> |
| 1033 | 1033 |
|
| 1034 | 1034 |
<div class="uk-grid-margin"> |
| ... | ... | |
| 1067 | 1067 |
</div> |
| 1068 | 1068 |
</div> |
| 1069 | 1069 |
|
| 1070 |
<div class="licenceIndicator uk-margin-medium-top">
|
|
| 1071 |
<h3>Licence</h3> |
|
| 1070 |
<div class="licenceIndicator uk-margin-large-top">
|
|
| 1071 |
<h3 class="uk-margin-remove">Licence</h3>
|
|
| 1072 | 1072 |
<div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s"> |
| 1073 | 1073 |
|
| 1074 | 1074 |
<div class="uk-grid-margin"> |
| ... | ... | |
| 1115 | 1115 |
<div> |
| 1116 | 1116 |
|
| 1117 | 1117 |
<div class="pidIndicator"> |
| 1118 |
<h3>PID</h3> |
|
| 1118 |
<h3 class="uk-margin-remove">PID</h3>
|
|
| 1119 | 1119 |
<div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s"> |
| 1120 | 1120 |
|
| 1121 | 1121 |
<div class="uk-grid-margin"> |
| ... | ... | |
| 1154 | 1154 |
</div> |
| 1155 | 1155 |
</div> |
| 1156 | 1156 |
|
| 1157 |
<div class="licenceIndicator uk-margin-medium-top">
|
|
| 1158 |
<h3>Licence</h3> |
|
| 1157 |
<div class="licenceIndicator uk-margin-large-top">
|
|
| 1158 |
<h3 class="uk-margin-remove">Licence</h3>
|
|
| 1159 | 1159 |
<div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s"> |
| 1160 | 1160 |
|
| 1161 | 1161 |
<div class="uk-grid-margin"> |
| modules/open-science-observatory-ui/trunk/src/app/pages/continentoverview/continent-overview.component.html | ||
|---|---|---|
| 129 | 129 |
|
| 130 | 130 |
<hr class="entitiesDivider"> |
| 131 | 131 |
|
| 132 |
<div class="uk-grid uk-child-width-1-4 uk-margin-large-top"> |
|
| 132 |
<div *ngIf="europeOverviewData" class="uk-grid uk-child-width-1-4 uk-margin-large-top">
|
|
| 133 | 133 |
|
| 134 | 134 |
<div class="entityLegendContent"> |
| 135 | 135 |
<div class="publicationsDot uk-inline"></div> |
| ... | ... | |
| 543 | 543 |
<div> |
| 544 | 544 |
|
| 545 | 545 |
<div class="pidIndicator"> |
| 546 |
<h3>PID</h3> |
|
| 546 |
<h3 class="uk-margin-remove">PID</h3>
|
|
| 547 | 547 |
<div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s"> |
| 548 | 548 |
|
| 549 | 549 |
<div class="uk-grid-margin"> |
| ... | ... | |
| 590 | 590 |
</div> |
| 591 | 591 |
</div> |
| 592 | 592 |
|
| 593 |
<div class="licenceIndicator uk-margin-medium-top">
|
|
| 594 |
<h3>Licence</h3> |
|
| 593 |
<div class="licenceIndicator uk-margin-large-top">
|
|
| 594 |
<h3 class="uk-margin-remove">Licence</h3>
|
|
| 595 | 595 |
<div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s"> |
| 596 | 596 |
|
| 597 | 597 |
<div class="uk-grid-margin"> |
| ... | ... | |
| 638 | 638 |
</div> |
| 639 | 639 |
</div> |
| 640 | 640 |
|
| 641 |
<div class="goldIndicator uk-margin-medium-top">
|
|
| 642 |
<h3>Gold</h3> |
|
| 641 |
<div class="goldIndicator uk-margin-large-top">
|
|
| 642 |
<h3 class="uk-margin-remove">Gold</h3>
|
|
| 643 | 643 |
<div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s"> |
| 644 | 644 |
|
| 645 | 645 |
<div class="uk-grid-margin"> |
| ... | ... | |
| 686 | 686 |
</div> |
| 687 | 687 |
</div> |
| 688 | 688 |
|
| 689 |
<div class="greenIndicator uk-margin-medium-top">
|
|
| 690 |
<h3>Green</h3> |
|
| 689 |
<div class="greenIndicator uk-margin-large-top">
|
|
| 690 |
<h3 class="uk-margin-remove">Green</h3>
|
|
| 691 | 691 |
<div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s"> |
| 692 | 692 |
|
| 693 | 693 |
<div class="uk-grid-margin"> |
| ... | ... | |
| 734 | 734 |
</div> |
| 735 | 735 |
</div> |
| 736 | 736 |
|
| 737 |
<div class="greenVsGoldIndicator uk-margin-medium-top">
|
|
| 738 |
<h3>Green vs. Gold</h3> |
|
| 737 |
<div class="greenVsGoldIndicator uk-margin-large-top">
|
|
| 738 |
<h3 class="uk-margin-remove">Green vs. Gold</h3>
|
|
| 739 | 739 |
<div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s"> |
| 740 | 740 |
|
| 741 | 741 |
<div class="uk-grid-margin"> |
| ... | ... | |
| 749 | 749 |
</div> |
| 750 | 750 |
</div> |
| 751 | 751 |
|
| 752 |
<div class="indicatorsTable uk-visible@m uk-margin-large-top"> |
|
| 753 |
|
|
| 754 |
<h3 class="">More details for publications</h3> |
|
| 755 |
|
|
| 756 |
<div class="uk-margin-top uk-margin-bottom"> |
|
| 757 |
<label class="uk-margin-right">Show: </label> |
|
| 758 |
<select class="md-input" #selectContent (change)="getContent('publication', selectContent.value)" style="width: 230px; display: inline-block">
|
|
| 759 |
<option value="affiliated">affiliated</option> |
|
| 760 |
<option value="affiliated_peer_reviewed">affiliated peer reviewed</option> |
|
| 761 |
<option value="deposited">deposited</option> |
|
| 762 |
<option value="deposited_peer_reviewed">deposited peer reviewed</option> |
|
| 763 |
</select> |
|
| 764 |
<!--<span class="md-input-bar"></span>--> |
|
| 765 |
</div> |
|
| 766 |
|
|
| 767 |
<div class="uk-grid uk-child-width-1-2@l uk-child-width-1-2@m"> |
|
| 768 |
<div class="absoluteTable"> |
|
| 769 |
<div class="md-card chartCard"> |
|
| 770 |
<div class="md-card-content"> |
|
| 771 |
|
|
| 772 |
<ul class="uk-subnav uk-subnav-pill dataView uk-flex uk-flex-center" data-uk-switcher="{connect:'#pubs-indicators-content-a-fade', animation: 'fade'}">
|
|
| 773 |
<li aria-expanded="true" class="uk-active"> |
|
| 774 |
<a href="#"> |
|
| 775 |
<i class="fas fa-hashtag"></i> |
|
| 776 |
</a> |
|
| 777 |
</li> |
|
| 778 |
<li aria-expanded="false" class=""> |
|
| 779 |
<a href="#"> |
|
| 780 |
<i class="fas fa-percentage"></i> |
|
| 781 |
</a> |
|
| 782 |
</li> |
|
| 783 |
</ul> |
|
| 784 |
|
|
| 785 |
<ul id="pubs-indicators-content-a-fade" class="uk-switcher uk-margin" > |
|
| 786 |
<li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;"> |
|
| 787 |
<!--<div *ngIf="loadingPublicationsAbsoluteTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>--> |
|
| 788 |
<app-countries-table *ngIf="publicationsAbsoluteTableData" [isPercentage]="false" [countries]="publicationsAbsoluteTableData" [view]="'openScience'" [entity]="'publication'"></app-countries-table> |
|
| 789 |
</li> |
|
| 790 |
<li aria-hidden="true" style="animation-duration: 200ms;" class=""> |
|
| 791 |
<!--<div *ngIf="loadingPublicationsPercentageTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>--> |
|
| 792 |
<app-countries-table *ngIf="publicationsPercentageTableData" [isPercentage]="true" [countries]="publicationsPercentageTableData" [view]="'openScience'" [entity]="'publication'"></app-countries-table> |
|
| 793 |
</li> |
|
| 794 |
</ul> |
|
| 795 |
|
|
| 796 |
</div> |
|
| 797 |
</div> |
|
| 798 |
|
|
| 799 |
</div> |
|
| 800 |
|
|
| 801 |
</div> |
|
| 802 |
|
|
| 803 |
|
|
| 804 |
</div> |
|
| 805 |
|
|
| 752 | 806 |
</div> |
| 753 | 807 |
|
| 754 | 808 |
</li> |
| ... | ... | |
| 757 | 811 |
<div> |
| 758 | 812 |
|
| 759 | 813 |
<div class="pidIndicator"> |
| 760 |
<h3>PID</h3> |
|
| 814 |
<h3 class="uk-margin-remove">PID</h3>
|
|
| 761 | 815 |
<div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s"> |
| 762 | 816 |
|
| 763 | 817 |
<div class="uk-grid-margin"> |
| ... | ... | |
| 804 | 858 |
</div> |
| 805 | 859 |
</div> |
| 806 | 860 |
|
| 807 |
<div class="licenceIndicator uk-margin-medium-top">
|
|
| 808 |
<h3>Licence</h3> |
|
| 861 |
<div class="licenceIndicator uk-margin-large-top">
|
|
| 862 |
<h3 class="uk-margin-remove">Licence</h3>
|
|
| 809 | 863 |
<div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s"> |
| 810 | 864 |
|
| 811 | 865 |
<div class="uk-grid-margin"> |
| ... | ... | |
| 852 | 906 |
</div> |
| 853 | 907 |
</div> |
| 854 | 908 |
|
| 909 |
<div class="indicatorsTable uk-visible@m uk-margin-large-top"> |
|
| 910 |
|
|
| 911 |
<h3 class="">More details for datasets</h3> |
|
| 912 |
|
|
| 913 |
<div class="uk-margin-top uk-margin-bottom"> |
|
| 914 |
<label class="uk-margin-right">Show: </label> |
|
| 915 |
<select class="md-input" #selectContent (change)="getContent('dataset', selectContent.value)" style="width: 230px; display: inline-block">
|
|
| 916 |
<option value="affiliated">affiliated</option> |
|
| 917 |
<option value="affiliated_peer_reviewed">affiliated peer reviewed</option> |
|
| 918 |
<option value="deposited">deposited</option> |
|
| 919 |
<option value="deposited_peer_reviewed">deposited peer reviewed</option> |
|
| 920 |
</select> |
|
| 921 |
<!--<span class="md-input-bar"></span>--> |
|
| 922 |
</div> |
|
| 923 |
|
|
| 924 |
<div class="uk-grid uk-child-width-1-2@l uk-child-width-1-2@m"> |
|
| 925 |
<div class="absoluteTable"> |
|
| 926 |
<div class="md-card chartCard"> |
|
| 927 |
<div class="md-card-content"> |
|
| 928 |
|
|
| 929 |
<ul class="uk-subnav uk-subnav-pill dataView uk-flex uk-flex-center" data-uk-switcher="{connect:'#data-indicators-content-a-fade', animation: 'fade'}">
|
|
| 930 |
<li aria-expanded="true" class="uk-active"> |
|
| 931 |
<a href="#"> |
|
| 932 |
<i class="fas fa-hashtag"></i> |
|
| 933 |
</a> |
|
| 934 |
</li> |
|
| 935 |
<li aria-expanded="false" class=""> |
|
| 936 |
<a href="#"> |
|
| 937 |
<i class="fas fa-percentage"></i> |
|
| 938 |
</a> |
|
| 939 |
</li> |
|
| 940 |
</ul> |
|
| 941 |
|
|
| 942 |
<ul id="data-indicators-content-a-fade" class="uk-switcher uk-margin" > |
|
| 943 |
<li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;"> |
|
| 944 |
<!--<div *ngIf="loadingPublicationsAbsoluteTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>--> |
|
| 945 |
<app-countries-table *ngIf="datasetsAbsoluteTableData" [isPercentage]="false" [countries]="datasetsAbsoluteTableData" [view]="'openScience'" [entity]="'dataset'"></app-countries-table> |
|
| 946 |
</li> |
|
| 947 |
<li aria-hidden="true" style="animation-duration: 200ms;" class=""> |
|
| 948 |
<!--<div *ngIf="loadingPublicationsPercentageTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>--> |
|
| 949 |
<app-countries-table *ngIf="datasetsPercentageTableData" [isPercentage]="true" [countries]="datasetsPercentageTableData" [view]="'openScience'" [entity]="'dataset'"></app-countries-table> |
|
| 950 |
</li> |
|
| 951 |
</ul> |
|
| 952 |
|
|
| 953 |
</div> |
|
| 954 |
</div> |
|
| 955 |
|
|
| 956 |
</div> |
|
| 957 |
|
|
| 958 |
</div> |
|
| 959 |
|
|
| 960 |
|
|
| 961 |
</div> |
|
| 962 |
|
|
| 855 | 963 |
</div> |
| 856 | 964 |
|
| 857 | 965 |
</li> |
| ... | ... | |
| 860 | 968 |
<div> |
| 861 | 969 |
|
| 862 | 970 |
<div class="pidIndicator"> |
| 863 |
<h3>PID</h3> |
|
| 971 |
<h3 class="uk-margin-remove">PID</h3>
|
|
| 864 | 972 |
<div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s"> |
| 865 | 973 |
|
| 866 | 974 |
<div class="uk-grid-margin"> |
| ... | ... | |
| 907 | 1015 |
</div> |
| 908 | 1016 |
</div> |
| 909 | 1017 |
|
| 910 |
<div class="licenceIndicator uk-margin-medium-top">
|
|
| 911 |
<h3>Licence</h3> |
|
| 1018 |
<div class="licenceIndicator uk-margin-large-top">
|
|
| 1019 |
<h3 class="uk-margin-remove">Licence</h3>
|
|
| 912 | 1020 |
<div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s"> |
| 913 | 1021 |
|
| 914 | 1022 |
<div class="uk-grid-margin"> |
| ... | ... | |
| 955 | 1063 |
</div> |
| 956 | 1064 |
</div> |
| 957 | 1065 |
|
| 1066 |
<div class="indicatorsTable uk-visible@m uk-margin-large-top"> |
|
| 1067 |
|
|
| 1068 |
<h3 class="">More details for software</h3> |
|
| 1069 |
|
|
| 1070 |
<div class="uk-margin-top uk-margin-bottom"> |
|
| 1071 |
<label class="uk-margin-right">Show: </label> |
|
| 1072 |
<select class="md-input" #selectContent (change)="getContent('software', selectContent.value)" style="width: 230px; display: inline-block">
|
|
| 1073 |
<option value="affiliated">affiliated</option> |
|
| 1074 |
<option value="affiliated_peer_reviewed">affiliated peer reviewed</option> |
|
| 1075 |
<option value="deposited">deposited</option> |
|
| 1076 |
<option value="deposited_peer_reviewed">deposited peer reviewed</option> |
|
| 1077 |
</select> |
|
| 1078 |
<!--<span class="md-input-bar"></span>--> |
|
| 1079 |
</div> |
|
| 1080 |
|
|
| 1081 |
<div class="uk-grid uk-child-width-1-2@l uk-child-width-1-2@m"> |
|
| 1082 |
<div class="absoluteTable"> |
|
| 1083 |
<div class="md-card chartCard"> |
|
| 1084 |
<div class="md-card-content"> |
|
| 1085 |
|
|
| 1086 |
<ul class="uk-subnav uk-subnav-pill dataView uk-flex uk-flex-center" data-uk-switcher="{connect:'#software-indicators-content-a-fade', animation: 'fade'}">
|
|
| 1087 |
<li aria-expanded="true" class="uk-active"> |
|
| 1088 |
<a href="#"> |
|
| 1089 |
<i class="fas fa-hashtag"></i> |
|
| 1090 |
</a> |
|
| 1091 |
</li> |
|
| 1092 |
<li aria-expanded="false" class=""> |
|
| 1093 |
<a href="#"> |
|
| 1094 |
<i class="fas fa-percentage"></i> |
|
| 1095 |
</a> |
|
| 1096 |
</li> |
|
| 1097 |
</ul> |
|
| 1098 |
|
|
| 1099 |
<ul id="software-indicators-content-a-fade" class="uk-switcher uk-margin" > |
|
| 1100 |
<li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;"> |
|
| 1101 |
<!--<div *ngIf="loadingPublicationsAbsoluteTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>--> |
|
| 1102 |
<app-countries-table *ngIf="softwareAbsoluteTableData" [isPercentage]="false" [countries]="softwareAbsoluteTableData" [view]="'openScience'" [entity]="'software'"></app-countries-table> |
|
| 1103 |
</li> |
|
| 1104 |
<li aria-hidden="true" style="animation-duration: 200ms;" class=""> |
|
| 1105 |
<!--<div *ngIf="loadingPublicationsPercentageTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>--> |
|
| 1106 |
<app-countries-table *ngIf="softwarePercentageTableData" [isPercentage]="true" [countries]="softwarePercentageTableData" [view]="'openScience'" [entity]="'software'"></app-countries-table> |
|
| 1107 |
</li> |
|
| 1108 |
</ul> |
|
| 1109 |
|
|
| 1110 |
</div> |
|
| 1111 |
</div> |
|
| 1112 |
|
|
| 1113 |
</div> |
|
| 1114 |
|
|
| 1115 |
</div> |
|
| 1116 |
|
|
| 1117 |
|
|
| 1118 |
</div> |
|
| 1119 |
|
|
| 958 | 1120 |
</div> |
| 959 | 1121 |
|
| 960 | 1122 |
</li> |
| ... | ... | |
| 963 | 1125 |
<div> |
| 964 | 1126 |
|
| 965 | 1127 |
<div class="pidIndicator"> |
| 966 |
<h3>PID</h3> |
|
| 1128 |
<h3 class="uk-margin-remove">PID</h3>
|
|
| 967 | 1129 |
<div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s"> |
| 968 | 1130 |
|
| 969 | 1131 |
<div class="uk-grid-margin"> |
| ... | ... | |
| 1010 | 1172 |
</div> |
| 1011 | 1173 |
</div> |
| 1012 | 1174 |
|
| 1013 |
<div class="licenceIndicator uk-margin-medium-top">
|
|
| 1014 |
<h3>Licence</h3> |
|
| 1175 |
<div class="licenceIndicator uk-margin-large-top">
|
|
| 1176 |
<h3 class="uk-margin-remove">Licence</h3>
|
|
| 1015 | 1177 |
<div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s"> |
| 1016 | 1178 |
|
| 1017 | 1179 |
<div class="uk-grid-margin"> |
| ... | ... | |
| 1058 | 1220 |
</div> |
| 1059 | 1221 |
</div> |
| 1060 | 1222 |
|
| 1223 |
<div class="indicatorsTable uk-visible@m uk-margin-large-top"> |
|
| 1224 |
|
|
| 1225 |
<h3 class="">More details for other research products</h3> |
|
| 1226 |
|
|
| 1227 |
<div class="uk-margin-top uk-margin-bottom"> |
|
| 1228 |
<label class="uk-margin-right">Show: </label> |
|
| 1229 |
<select class="md-input" #selectContent (change)="getContent('other', selectContent.value)" style="width: 230px; display: inline-block">
|
|
| 1230 |
<option value="affiliated">affiliated</option> |
|
| 1231 |
<option value="affiliated_peer_reviewed">affiliated peer reviewed</option> |
|
| 1232 |
<option value="deposited">deposited</option> |
|
| 1233 |
<option value="deposited_peer_reviewed">deposited peer reviewed</option> |
|
| 1234 |
</select> |
|
| 1235 |
<!--<span class="md-input-bar"></span>--> |
|
| 1236 |
</div> |
|
| 1237 |
|
|
| 1238 |
<div class="uk-grid uk-child-width-1-2@l uk-child-width-1-2@m"> |
|
| 1239 |
<div class="absoluteTable"> |
|
| 1240 |
<div class="md-card chartCard"> |
|
| 1241 |
<div class="md-card-content"> |
|
| 1242 |
|
|
| 1243 |
<ul class="uk-subnav uk-subnav-pill dataView uk-flex uk-flex-center" data-uk-switcher="{connect:'#other-indicators-content-a-fade', animation: 'fade'}">
|
|
| 1244 |
<li aria-expanded="true" class="uk-active"> |
|
| 1245 |
<a href="#"> |
|
| 1246 |
<i class="fas fa-hashtag"></i> |
|
| 1247 |
</a> |
|
| 1248 |
</li> |
|
| 1249 |
<li aria-expanded="false" class=""> |
|
| 1250 |
<a href="#"> |
|
| 1251 |
<i class="fas fa-percentage"></i> |
|
| 1252 |
</a> |
|
| 1253 |
</li> |
|
| 1254 |
</ul> |
|
| 1255 |
|
|
| 1256 |
<ul id="other-indicators-content-a-fade" class="uk-switcher uk-margin" > |
|
| 1257 |
<li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;"> |
|
| 1258 |
<!--<div *ngIf="loadingPublicationsAbsoluteTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>--> |
|
| 1259 |
<app-countries-table *ngIf="otherAbsoluteTableData" [isPercentage]="false" [countries]="otherAbsoluteTableData" [view]="'openScience'" [entity]="'other'"></app-countries-table> |
|
| 1260 |
</li> |
|
| 1261 |
<li aria-hidden="true" style="animation-duration: 200ms;" class=""> |
|
| 1262 |
<!--<div *ngIf="loadingPublicationsPercentageTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>--> |
|
| 1263 |
<app-countries-table *ngIf="otherPercentageTableData" [isPercentage]="true" [countries]="otherPercentageTableData" [view]="'openScience'" [entity]="'other'"></app-countries-table> |
|
| 1264 |
</li> |
|
| 1265 |
</ul> |
|
| 1266 |
|
|
| 1267 |
</div> |
|
| 1268 |
</div> |
|
| 1269 |
|
|
| 1270 |
</div> |
|
| 1271 |
|
|
| 1272 |
</div> |
|
| 1273 |
|
|
| 1274 |
|
|
| 1275 |
</div> |
|
| 1276 |
|
|
| 1061 | 1277 |
</div> |
| 1062 | 1278 |
|
| 1063 | 1279 |
</li> |
| modules/open-science-observatory-ui/trunk/src/app/pages/continentoverview/continent-overview.component.ts | ||
|---|---|---|
| 3 | 3 |
import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
|
| 4 | 4 |
import { DataService } from '../../services/data.service';
|
| 5 | 5 |
import { DataHandlerService } from '../../services/data-handler.service';
|
| 6 |
import { EuropeData } from '../../domain/overview-map-data';
|
|
| 6 |
import {CountryTableData, EuropeData} from '../../domain/overview-map-data';
|
|
| 7 | 7 |
import { environment } from '../../../environments/environment';
|
| 8 | 8 |
import { TreemapHighchartsData } from '../../domain/treemap-highcharts-data';
|
| 9 |
import {Observable} from 'rxjs';
|
|
| 9 | 10 |
|
| 10 | 11 |
@Component({
|
| 11 | 12 |
selector: 'app-continent-overview', |
| ... | ... | |
| 82 | 83 |
|
| 83 | 84 |
greenVsGoldPublicationsChartURL: SafeResourceUrl; |
| 84 | 85 |
|
| 86 |
loadingPublicationsAbsoluteTable: boolean = true; |
|
| 87 |
loadingPublicationsPercentageTable: boolean = true; |
|
| 88 |
publicationsTableContentSelection: string = 'affiliated'; |
|
| 89 |
publicationsAbsoluteTableData: CountryTableData[]; |
|
| 90 |
publicationsPercentageTableData: CountryTableData[]; |
|
| 91 |
|
|
| 85 | 92 |
// Open Science Tab |
| 86 | 93 |
// datasets subtab |
| 87 | 94 |
openScienceDatasetsTabIsInitialised: boolean = false; |
| ... | ... | |
| 101 | 108 |
datasetsWithPIDByFunderData: TreemapHighchartsData[]; |
| 102 | 109 |
datasetsWithLicenceByFunderData: TreemapHighchartsData[]; |
| 103 | 110 |
|
| 111 |
loadingDatasetsAbsoluteTable: boolean = true; |
|
| 112 |
loadingDatasetsPercentageTable: boolean = true; |
|
| 113 |
datasetsTableContentSelection: string = 'affiliated'; |
|
| 114 |
datasetsAbsoluteTableData: CountryTableData[]; |
|
| 115 |
datasetsPercentageTableData: CountryTableData[]; |
|
| 116 |
|
|
| 104 | 117 |
// Open Science Tab |
| 105 | 118 |
// software subtab |
| 106 | 119 |
openScienceSoftwareTabIsInitialised: boolean = false; |
| ... | ... | |
| 120 | 133 |
softwareWithPIDByFunderData: TreemapHighchartsData[]; |
| 121 | 134 |
softwareWithLicenceByFunderData: TreemapHighchartsData[]; |
| 122 | 135 |
|
| 136 |
loadingSoftwareAbsoluteTable: boolean = true; |
|
| 137 |
loadingSoftwarePercentageTable: boolean = true; |
|
| 138 |
softwareTableContentSelection: string = 'affiliated'; |
|
| 139 |
softwareAbsoluteTableData: CountryTableData[]; |
|
| 140 |
softwarePercentageTableData: CountryTableData[]; |
|
| 141 |
|
|
| 123 | 142 |
// Open Science Tab |
| 124 | 143 |
// other research products subtab |
| 125 | 144 |
openScienceOtherTabIsInitialised: boolean = false; |
| ... | ... | |
| 139 | 158 |
otherWithPIDByFunderData: TreemapHighchartsData[]; |
| 140 | 159 |
otherWithLicenceByFunderData: TreemapHighchartsData[]; |
| 141 | 160 |
|
| 161 |
loadingOtherAbsoluteTable: boolean = true; |
|
| 162 |
loadingOtherPercentageTable: boolean = true; |
|
| 163 |
otherTableContentSelection: string = 'affiliated'; |
|
| 164 |
otherAbsoluteTableData: CountryTableData[]; |
|
| 165 |
otherPercentageTableData: CountryTableData[]; |
|
| 166 |
|
|
| 142 | 167 |
constructor(private dataService: DataService, |
| 143 | 168 |
private dataHandlerService: DataHandlerService, |
| 144 | 169 |
private route: ActivatedRoute, |
| ... | ... | |
| 368 | 393 |
} |
| 369 | 394 |
); |
| 370 | 395 |
|
| 396 |
this.getPublicationsTableData(this.publicationsTableContentSelection); |
|
| 397 |
|
|
| 371 | 398 |
this.openSciencePubsTabIsInitialised = true; |
| 372 | 399 |
} |
| 373 | 400 |
} |
| ... | ... | |
| 404 | 431 |
} |
| 405 | 432 |
); |
| 406 | 433 |
|
| 434 |
this.getDatasetsTableData(this.datasetsTableContentSelection); |
|
| 435 |
|
|
| 407 | 436 |
this.openSciencePubsTabIsInitialised = true; |
| 408 | 437 |
} |
| 409 | 438 |
} |
| ... | ... | |
| 440 | 469 |
} |
| 441 | 470 |
); |
| 442 | 471 |
|
| 472 |
this.getSoftwareTableData(this.softwareTableContentSelection); |
|
| 473 |
|
|
| 443 | 474 |
this.openScienceSoftwareTabIsInitialised = true; |
| 444 | 475 |
} |
| 445 | 476 |
} |
| ... | ... | |
| 476 | 507 |
} |
| 477 | 508 |
); |
| 478 | 509 |
|
| 510 |
this.getOtherTableData(this.otherTableContentSelection); |
|
| 511 |
|
|
| 479 | 512 |
this.openScienceOtherTabIsInitialised = true; |
| 480 | 513 |
} |
| 481 | 514 |
} |
| 515 |
|
|
| 516 |
getContent(type: string, contentSelection: string): void {
|
|
| 517 |
|
|
| 518 |
if (type === 'publication') {
|
|
| 519 |
this.publicationsTableContentSelection = contentSelection; |
|
| 520 |
this.getPublicationsTableData(this.publicationsTableContentSelection); |
|
| 521 |
} else if (type === 'dataset') {
|
|
| 522 |
this.datasetsTableContentSelection = contentSelection; |
|
| 523 |
this.getDatasetsTableData(this.datasetsTableContentSelection); |
|
| 524 |
} else if (type === 'software') {
|
|
| 525 |
this.softwareTableContentSelection = contentSelection; |
|
| 526 |
this.getSoftwareTableData(this.softwareTableContentSelection); |
|
| 527 |
} else if (type === 'other') {
|
|
| 528 |
this.otherTableContentSelection = contentSelection; |
|
| 529 |
this.getOtherTableData(this.otherTableContentSelection); |
|
| 530 |
} |
|
| 531 |
} |
|
| 532 |
|
|
| 533 |
getPublicationsTableData(contentSelection: string) {
|
|
| 534 |
this.loadingPublicationsAbsoluteTable = true; |
|
| 535 |
this.loadingPublicationsPercentageTable = true; |
|
| 536 |
this.dataService.getIndicatorsTableData('publication', contentSelection).subscribe(
|
|
| 537 |
rawData => {
|
|
| 538 |
this.publicationsAbsoluteTableData = this.dataHandlerService.convertRawDataToIndicatorsTableData(rawData); |
|
| 539 |
this.publicationsPercentageTableData = this.dataHandlerService.convertRawDataToIndicatorsTableData(rawData); |
|
| 540 |
this.loadingPublicationsAbsoluteTable = false; |
|
| 541 |
this.loadingPublicationsPercentageTable = false; |
|
| 542 |
}, error => {
|
|
| 543 |
console.log(error); |
|
| 544 |
this.loadingPublicationsAbsoluteTable = false; |
|
| 545 |
this.loadingPublicationsPercentageTable = false; |
|
| 546 |
} |
|
| 547 |
); |
|
| 548 |
} |
|
| 549 |
|
|
| 550 |
getDatasetsTableData(contentSelection: string) {
|
|
| 551 |
this.loadingDatasetsAbsoluteTable = true; |
|
| 552 |
this.loadingDatasetsPercentageTable = true; |
|
| 553 |
this.dataService.getIndicatorsTableData('dataset', contentSelection).subscribe(
|
|
| 554 |
rawData => {
|
|
| 555 |
this.datasetsAbsoluteTableData = this.dataHandlerService.convertRawDataToIndicatorsTableData(rawData); |
|
| 556 |
this.datasetsPercentageTableData = this.dataHandlerService.convertRawDataToIndicatorsTableData(rawData); |
|
| 557 |
this.loadingDatasetsAbsoluteTable = false; |
|
| 558 |
this.loadingDatasetsPercentageTable = false; |
|
| 559 |
}, error => {
|
|
| 560 |
console.log(error); |
|
| 561 |
this.loadingDatasetsAbsoluteTable = false; |
|
| 562 |
this.loadingDatasetsPercentageTable = false; |
|
| 563 |
} |
|
| 564 |
); |
|
| 565 |
} |
|
| 566 |
|
|
| 567 |
getSoftwareTableData(contentSelection: string) {
|
|
| 568 |
this.loadingSoftwareAbsoluteTable = true; |
|
| 569 |
this.loadingSoftwarePercentageTable = true; |
|
| 570 |
this.dataService.getIndicatorsTableData('software', contentSelection).subscribe(
|
|
| 571 |
rawData => {
|
|
| 572 |
this.softwareAbsoluteTableData = this.dataHandlerService.convertRawDataToIndicatorsTableData(rawData); |
|
| 573 |
this.softwarePercentageTableData = this.dataHandlerService.convertRawDataToIndicatorsTableData(rawData); |
|
| 574 |
this.loadingSoftwareAbsoluteTable = false; |
|
| 575 |
this.loadingSoftwarePercentageTable = false; |
|
| 576 |
}, error => {
|
|
| 577 |
console.log(error); |
|
| 578 |
this.loadingSoftwareAbsoluteTable = false; |
|
| 579 |
this.loadingSoftwarePercentageTable = false; |
|
| 580 |
} |
|
| 581 |
); |
|
| 582 |
} |
|
| 583 |
|
|
| 584 |
getOtherTableData(contentSelection: string) {
|
|
| 585 |
this.loadingOtherAbsoluteTable = true; |
|
| 586 |
this.loadingOtherPercentageTable = true; |
|
| 587 |
this.dataService.getIndicatorsTableData('other', contentSelection).subscribe(
|
|
| 588 |
rawData => {
|
|
| 589 |
this.otherAbsoluteTableData = this.dataHandlerService.convertRawDataToIndicatorsTableData(rawData); |
|
| 590 |
this.otherPercentageTableData = this.dataHandlerService.convertRawDataToIndicatorsTableData(rawData); |
|
| 591 |
this.loadingOtherAbsoluteTable = false; |
|
| 592 |
this.loadingOtherPercentageTable = false; |
|
| 593 |
}, error => {
|
|
| 594 |
console.log(error); |
|
| 595 |
this.loadingOtherAbsoluteTable = false; |
|
| 596 |
this.loadingOtherPercentageTable = false; |
|
| 597 |
} |
|
| 598 |
); |
|
| 599 |
} |
|
| 600 |
|
|
| 482 | 601 |
} |
| modules/open-science-observatory-ui/trunk/src/app/pages/home/countries-table.component.html | ||
|---|---|---|
| 1 |
<table *ngIf="countries" class="uk-table uk-table-hover uk-table-divider uk-table-small"> |
|
| 2 |
<thead> |
|
| 1 |
<ng-container *ngIf="view==='overview'"> |
|
| 2 |
<table *ngIf="countries" class="uk-table uk-table-hover uk-table-divider uk-table-small"> |
|
| 3 |
<thead> |
|
| 3 | 4 |
<tr> |
| 4 | 5 |
<th width="12,5%" class="" (click)="sortBy('country')">
|
| 5 | 6 |
<span *ngIf="!isSortedBy || isSortedBy!='country'" class="uk-margin-small-right"><img src="../../../assets/img/icons/sort.svg"></span> |
| ... | ... | |
| 20 | 21 |
OA journals |
| 21 | 22 |
</th> |
| 22 | 23 |
<!--<th *ngIf="type=='overview'" class="uk-text-center" width="12,5%" (click)="sortBy('policies')">-->
|
| 23 |
<!--<span *ngIf="!isSortedBy || isSortedBy!='policies'" class="uk-margin-small-right"><img src="../../../assets/img/icons/sort.svg"></span>-->
|
|
| 24 |
<!--<span *ngIf="isSortedBy && isSortedBy=='policies' && isDescending"><img src="../../../assets/img/icons/sort-descending.svg"></span>-->
|
|
| 25 |
<!--<span *ngIf="isSortedBy && isSortedBy=='policies' && !isDescending"><img src="../../../assets/img/icons/sort-ascending.svg"></span>-->
|
|
| 26 |
<!--OA policies-->
|
|
| 24 |
<!--<span *ngIf="!isSortedBy || isSortedBy!='policies'" class="uk-margin-small-right"><img src="../../../assets/img/icons/sort.svg"></span>--> |
|
| 25 |
<!--<span *ngIf="isSortedBy && isSortedBy=='policies' && isDescending"><img src="../../../assets/img/icons/sort-descending.svg"></span>--> |
|
| 26 |
<!--<span *ngIf="isSortedBy && isSortedBy=='policies' && !isDescending"><img src="../../../assets/img/icons/sort-ascending.svg"></span>--> |
|
| 27 |
<!--OA policies--> |
|
| 27 | 28 |
<!--</th>--> |
| 28 | 29 |
<th class="uk-text-center" width="12,5%" (click)="sortBy('publications')">
|
| 29 | 30 |
<span *ngIf="!isSortedBy || isSortedBy!='publications'" class="uk-margin-small-right"><img src="../../../assets/img/icons/sort.svg"></span> |
| ... | ... | |
| 50 | 51 |
OA other |
| 51 | 52 |
</th> |
| 52 | 53 |
</tr> |
| 53 |
</thead> |
|
| 54 |
<tbody> |
|
| 54 |
</thead>
|
|
| 55 |
<tbody>
|
|
| 55 | 56 |
<tr *ngFor="let countryOverview of countries"> |
| 56 | 57 |
<td class=""><a [routerLink]="['/countryDashboard', countryOverview.code]">{{countryOverview.name}}</a></td>
|
| 57 | 58 |
<td class="uk-text-center"> |
| ... | ... | |
| 109 | 110 |
</ng-container> |
| 110 | 111 |
</td> |
| 111 | 112 |
</tr> |
| 112 |
</tbody> |
|
| 113 |
</table> |
|
| 113 |
</tbody> |
|
| 114 |
</table> |
|
| 115 |
</ng-container> |
|
| 116 |
|
|
| 117 |
<ng-container *ngIf="view==='openScience'"> |
|
| 118 |
<table *ngIf="countries" class="uk-table uk-table-hover uk-table-divider uk-table-small"> |
|
| 119 |
<thead> |
|
| 120 |
<tr> |
|
| 121 |
<th width="20%" class="" (click)="sortBy('country')">
|
|
| 122 |
<span *ngIf="!isSortedBy || isSortedBy!='country'" class="uk-margin-small-right"><img src="../../../assets/img/icons/sort.svg"></span> |
|
| 123 |
<span *ngIf="isSortedBy && isSortedBy=='country' && isDescending"><img src="../../../assets/img/icons/sort-descending.svg"></span> |
|
| 124 |
<span *ngIf="isSortedBy && isSortedBy=='country' && !isDescending"><img src="../../../assets/img/icons/sort-ascending.svg"></span> |
|
| 125 |
Country |
|
| 126 |
</th> |
|
| 127 |
<th class="uk-text-center" width="20%" (click)="sortBy('pid')">
|
|
| 128 |
<span *ngIf="!isSortedBy || isSortedBy!='pid'" class="uk-margin-small-right"><img src="../../../assets/img/icons/sort.svg"></span> |
|
| 129 |
<span *ngIf="isSortedBy && isSortedBy=='pid' && isDescending"><img src="../../../assets/img/icons/sort-descending.svg"></span> |
|
| 130 |
<span *ngIf="isSortedBy && isSortedBy=='pid' && !isDescending"><img src="../../../assets/img/icons/sort-ascending.svg"></span> |
|
| 131 |
PID |
|
| 132 |
</th> |
|
| 133 |
<th class="uk-text-center" width="20%" (click)="sortBy('licence')">
|
|
| 134 |
<span *ngIf="!isSortedBy || isSortedBy!='licence'" class="uk-margin-small-right"><img src="../../../assets/img/icons/sort.svg"></span> |
|
| 135 |
<span *ngIf="isSortedBy && isSortedBy=='licence' && isDescending"><img src="../../../assets/img/icons/sort-descending.svg"></span> |
|
| 136 |
<span *ngIf="isSortedBy && isSortedBy=='licence' && !isDescending"><img src="../../../assets/img/icons/sort-ascending.svg"></span> |
|
| 137 |
Licence |
|
| 138 |
</th> |
|
| 139 |
<th class="uk-text-center" width="20%" (click)="sortBy('gold')">
|
|
| 140 |
<span *ngIf="!isSortedBy || isSortedBy!='gold'" class="uk-margin-small-right"><img src="../../../assets/img/icons/sort.svg"></span> |
|
| 141 |
<span *ngIf="isSortedBy && isSortedBy=='gold' && isDescending"><img src="../../../assets/img/icons/sort-descending.svg"></span> |
|
| 142 |
<span *ngIf="isSortedBy && isSortedBy=='gold' && !isDescending"><img src="../../../assets/img/icons/sort-ascending.svg"></span> |
|
| 143 |
Gold |
|
| 144 |
</th> |
|
| 145 |
<th class="uk-text-center" width="20%" (click)="sortBy('green')">
|
|
| 146 |
<span *ngIf="!isSortedBy || isSortedBy!='green'" class="uk-margin-small-right"><img src="../../../assets/img/icons/sort.svg"></span> |
|
| 147 |
<span *ngIf="isSortedBy && isSortedBy=='green' && isDescending"><img src="../../../assets/img/icons/sort-descending.svg"></span> |
|
| 148 |
<span *ngIf="isSortedBy && isSortedBy=='green' && !isDescending"><img src="../../../assets/img/icons/sort-ascending.svg"></span> |
|
| 149 |
Green |
|
| 150 |
</th> |
|
| 151 |
</tr> |
|
| 152 |
</thead> |
|
| 153 |
<tbody> |
|
| 154 |
<tr *ngFor="let countryOverview of countries"> |
|
| 155 |
<td class=""><a [routerLink]="['/countryDashboard', countryOverview.code]">{{countryOverview.name}}</a></td>
|
|
| 156 |
<td class="uk-text-center"> |
|
| 157 |
<ng-container *ngIf="countryOverview.pid===null">--</ng-container> |
|
| 158 |
<ng-container *ngIf="countryOverview.pid!=null"> |
|
| 159 |
<ng-container *ngIf="isPercentage">{{countryOverview.pid.percentage | number :'1.0-1'}}%</ng-container>
|
|
| 160 |
<ng-container *ngIf="!isPercentage">{{countryOverview.pid.oa | number}}</ng-container>
|
|
| 161 |
</ng-container> |
|
| 162 |
</td> |
|
| 163 |
<td class="uk-text-center"> |
|
| 164 |
<ng-container *ngIf="countryOverview.licence===null">--</ng-container> |
|
| 165 |
<ng-container *ngIf="countryOverview.licence!=null"> |
|
| 166 |
<ng-container *ngIf="isPercentage">{{countryOverview.licence.percentage | number :'1.0-1'}}%</ng-container>
|
|
| 167 |
<ng-container *ngIf="!isPercentage">{{countryOverview.licence.oa | number}}</ng-container>
|
|
| 168 |
</ng-container> |
|
| 169 |
</td> |
|
| 170 |
<td class="uk-text-center"> |
|
| 171 |
<ng-container *ngIf="countryOverview.gold===null">--</ng-container> |
|
| 172 |
<ng-container *ngIf="countryOverview.gold!=null"> |
|
| 173 |
<ng-container *ngIf="isPercentage">{{countryOverview.gold.percentage | number :'1.0-1'}}%</ng-container>
|
|
| 174 |
<ng-container *ngIf="!isPercentage">{{countryOverview.gold.oa | number}}</ng-container>
|
|
| 175 |
</ng-container> |
|
| 176 |
</td> |
|
| 177 |
<td class="uk-text-center"> |
|
| 178 |
<ng-container *ngIf="countryOverview.green===null">--</ng-container> |
|
| 179 |
<ng-container *ngIf="countryOverview.green!=null"> |
|
| 180 |
<ng-container *ngIf="isPercentage">{{countryOverview.green.percentage | number :'1.0-1'}}%</ng-container>
|
|
| 181 |
<ng-container *ngIf="!isPercentage">{{countryOverview.green.oa | number}}</ng-container>
|
|
| 182 |
</ng-container> |
|
| 183 |
</td> |
|
| 184 |
</tr> |
|
| 185 |
</tbody> |
|
| 186 |
</table> |
|
| 187 |
</ng-container> |
|
| 188 |
|
|
| modules/open-science-observatory-ui/trunk/src/app/pages/home/data-view.component.html | ||
|---|---|---|
| 36 | 36 |
<!--<span class="md-input-bar"></span>--> |
| 37 | 37 |
</div> |
| 38 | 38 |
<div *ngIf="loadingAbsoluteTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div> |
| 39 |
<app-countries-table *ngIf="tableAbsoluteData" [isPercentage]="false" [countries]="tableAbsoluteData"></app-countries-table> |
|
| 39 |
<app-countries-table *ngIf="tableAbsoluteData" [isPercentage]="false" [countries]="tableAbsoluteData" [view]="'overview'"></app-countries-table>
|
|
| 40 | 40 |
</div> |
| 41 | 41 |
</li> |
| 42 | 42 |
<li aria-hidden="true" style="animation-duration: 200ms;" class=""> |
| ... | ... | |
| 53 | 53 |
<!--<span class="md-input-bar"></span>--> |
| 54 | 54 |
</div> |
| 55 | 55 |
<div *ngIf="loadingPercentageTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div> |
| 56 |
<app-countries-table *ngIf="tablePercentageData" [isPercentage]="true" [countries]="tablePercentageData"></app-countries-table> |
|
| 56 |
<app-countries-table *ngIf="tablePercentageData" [isPercentage]="true" [countries]="tablePercentageData" [view]="'overview'"></app-countries-table>
|
|
| 57 | 57 |
</div> |
| 58 | 58 |
</li> |
| 59 | 59 |
<li aria-hidden="true" style="animation-duration: 200ms;" class=""> |
| modules/open-science-observatory-ui/trunk/src/app/pages/home/countries-table.component.ts | ||
|---|---|---|
| 11 | 11 |
@Input() isPercentage: boolean; |
| 12 | 12 |
@Input() countries: CountryTableData[]; |
| 13 | 13 |
|
| 14 |
@Input() view: string; |
|
| 15 |
@Input() entity: string; |
|
| 16 |
|
|
| 14 | 17 |
isSortedBy: string; |
| 15 | 18 |
isDescending: boolean = true; |
| 16 | 19 |
|
| ... | ... | |
| 30 | 33 |
|
| 31 | 34 |
this.isSortedBy = field; |
| 32 | 35 |
|
| 33 |
if (field !== 'country') {
|
|
| 36 |
if (field === 'pid' || field === 'licence' || field === 'gold' || field === 'green') {
|
|
| 34 | 37 |
if (this.isDescending) {
|
| 38 |
if (this.isPercentage) {
|
|
| 39 |
this.countries.sort((a, b) => b[field].percentage - a[field].percentage); |
|
| 40 |
} else {
|
|
| 41 |
this.countries.sort((a, b) => b[field].oa - a[field].oa); |
|
| 42 |
} |
|
| 43 |
} else {
|
|
| 44 |
if (this.isPercentage) {
|
|
| 45 |
this.countries.sort((a, b) => a[field].percentage - b[field].percentage); |
|
| 46 |
} else {
|
|
| 47 |
this.countries.sort((a, b) => a[field].oa - b[field].oa); |
|
| 48 |
} |
|
| 49 |
} |
|
| 50 |
} else if (field !== 'country') {
|
|
| 51 |
if (this.isDescending) {
|
|
| 35 | 52 |
this.countries.sort((a, b) => b[field] - a[field]); |
| 36 | 53 |
} else {
|
| 37 | 54 |
this.countries.sort((a, b) => a[field] - b[field]); |
| modules/open-science-observatory-ui/trunk/src/app/services/data-handler.service.ts | ||
|---|---|---|
| 595 | 595 |
return tableData; |
| 596 | 596 |
} |
| 597 | 597 |
|
| 598 |
public convertRawDataToIndicatorsTableData(rawData: RawData) {
|
|
| 599 |
|
|
| 600 |
const mapTableData: Map<string, CountryTableData> = new Map(); |
|
| 601 |
|
|
| 602 |
for (const series of rawData.datasets) {
|
|
| 603 |
|
|
| 604 |
if (series.series.query.name.includes('new.oso.results.pid_percentage')) {
|
|
| 605 |
for (const rowResult of series.series.result) {
|
|
| 606 |
|
|
| 607 |
const pidIndicator = new Indicator(); |
|
| 608 |
|
|
| 609 |
// remove unwanted countries |
|
| 610 |
if (this.isCountryToBeRemoved(rowResult.row[3])) {
|
|
| 611 |
continue; |
|
| 612 |
} |
|
| 613 |
|
|
| 614 |
if (mapTableData.has(rowResult.row[3])) {
|
|
| 615 |
const countryTableData = mapTableData.get(rowResult.row[3]); |
|
| 616 |
if (rowResult.row[0] !== 'NaN') {
|
|
| 617 |
pidIndicator.total = Number(rowResult.row[2]); |
|
| 618 |
pidIndicator.oa = Number(rowResult.row[1]); |
|
| 619 |
pidIndicator.percentage = Number(rowResult.row[0]); |
|
| 620 |
countryTableData.pid = pidIndicator; |
|
| 621 |
} |
|
| 622 |
} else {
|
|
| 623 |
const countryTableData: CountryTableData = new CountryTableData(); |
|
| 624 |
if (rowResult.row[0] !== 'NaN') {
|
|
| 625 |
pidIndicator.total = Number(rowResult.row[2]); |
|
| 626 |
pidIndicator.oa = Number(rowResult.row[1]); |
|
| 627 |
pidIndicator.percentage = Number(rowResult.row[0]); |
|
| 628 |
countryTableData.pid = pidIndicator; |
|
| 629 |
} |
|
| 630 |
countryTableData.name = rowResult.row[4]; |
|
| 631 |
countryTableData.code = rowResult.row[3]; |
|
| 632 |
mapTableData.set(rowResult.row[3], countryTableData); |
|
| 633 |
} |
|
| 634 |
} |
|
| 635 |
|
|
| 636 |
} else if (series.series.query.name.includes('new.oso.results.licence_percentage')) {
|
|
| 637 |
|
|
| 638 |
for (const rowResult of series.series.result) {
|
|
| 639 |
|
|
| 640 |
const licenceIndicator = new Indicator(); |
|
| 641 |
|
|
| 642 |
// remove unwanted countries |
|
| 643 |
if (this.isCountryToBeRemoved(rowResult.row[3])) {
|
|
| 644 |
continue; |
|
| 645 |
} |
|
| 646 |
|
|
| 647 |
if (mapTableData.has(rowResult.row[3])) {
|
|
| 648 |
const countryTableData = mapTableData.get(rowResult.row[3]); |
|
| 649 |
if (rowResult.row[0] !== 'NaN') {
|
|
| 650 |
licenceIndicator.total = Number(rowResult.row[2]); |
|
| 651 |
licenceIndicator.oa = Number(rowResult.row[1]); |
|
| 652 |
licenceIndicator.percentage = Number(rowResult.row[0]); |
|
| 653 |
countryTableData.licence = licenceIndicator; |
|
| 654 |
} |
|
| 655 |
} else {
|
|
| 656 |
const countryTableData: CountryTableData = new CountryTableData(); |
|
| 657 |
if (rowResult.row[0] !== 'NaN') {
|
|
| 658 |
licenceIndicator.total = Number(rowResult.row[2]); |
|
| 659 |
licenceIndicator.oa = Number(rowResult.row[1]); |
|
| 660 |
licenceIndicator.percentage = Number(rowResult.row[0]); |
|
| 661 |
countryTableData.licence = licenceIndicator; |
|
| 662 |
} |
|
| 663 |
countryTableData.name = rowResult.row[4]; |
|
| 664 |
countryTableData.code = rowResult.row[3]; |
|
| 665 |
mapTableData.set(rowResult.row[3], countryTableData); |
|
| 666 |
} |
|
| 667 |
} |
|
| 668 |
} else if (series.series.query.name.includes('new.oso.results.green_percentage')) {
|
|
| 669 |
|
|
| 670 |
for (const rowResult of series.series.result) {
|
|
| 671 |
|
|
| 672 |
const greenIndicator = new Indicator(); |
|
| 673 |
|
|
| 674 |
// remove unwanted countries |
|
| 675 |
if (this.isCountryToBeRemoved(rowResult.row[3])) {
|
|
| 676 |
continue; |
|
| 677 |
} |
|
| 678 |
|
|
| 679 |
if (mapTableData.has(rowResult.row[3])) {
|
|
| 680 |
const countryTableData = mapTableData.get(rowResult.row[3]); |
|
| 681 |
if (rowResult.row[0] !== 'NaN') {
|
|
| 682 |
greenIndicator.total = Number(rowResult.row[2]); |
|
| 683 |
greenIndicator.oa = Number(rowResult.row[1]); |
|
| 684 |
greenIndicator.percentage = Number(rowResult.row[0]); |
|
| 685 |
countryTableData.green = greenIndicator; |
|
| 686 |
} |
|
| 687 |
} else {
|
|
| 688 |
const countryTableData: CountryTableData = new CountryTableData(); |
|
| 689 |
if (rowResult.row[0] !== 'NaN') {
|
|
| 690 |
greenIndicator.total = Number(rowResult.row[2]); |
|
| 691 |
greenIndicator.oa = Number(rowResult.row[1]); |
|
| 692 |
greenIndicator.percentage = Number(rowResult.row[0]); |
|
| 693 |
countryTableData.green = greenIndicator; |
|
| 694 |
} |
|
| 695 |
countryTableData.name = rowResult.row[4]; |
|
| 696 |
countryTableData.code = rowResult.row[3]; |
|
| 697 |
mapTableData.set(rowResult.row[3], countryTableData); |
|
| 698 |
} |
|
| 699 |
} |
|
| 700 |
} else if (series.series.query.name.includes('new.oso.results.gold_percentage')) {
|
|
| 701 |
|
|
| 702 |
for (const rowResult of series.series.result) {
|
|
| 703 |
|
|
| 704 |
const goldIndicator = new Indicator(); |
|
| 705 |
|
|
| 706 |
// remove unwanted countries |
|
| 707 |
if (this.isCountryToBeRemoved(rowResult.row[3])) {
|
|
| 708 |
continue; |
|
| 709 |
} |
|
| 710 |
|
|
| 711 |
if (mapTableData.has(rowResult.row[3])) {
|
|
| 712 |
const countryTableData = mapTableData.get(rowResult.row[3]); |
|
| 713 |
if (rowResult.row[0] !== 'NaN') {
|
|
| 714 |
goldIndicator.total = Number(rowResult.row[2]); |
|
| 715 |
goldIndicator.oa = Number(rowResult.row[1]); |
|
| 716 |
goldIndicator.percentage = Number(rowResult.row[0]); |
|
| 717 |
countryTableData.gold = goldIndicator; |
|
| 718 |
} |
|
| 719 |
} else {
|
|
| 720 |
const countryTableData: CountryTableData = new CountryTableData(); |
|
| 721 |
if (rowResult.row[0] !== 'NaN') {
|
|
| 722 |
goldIndicator.total = Number(rowResult.row[2]); |
|
| 723 |
goldIndicator.oa = Number(rowResult.row[1]); |
|
| 724 |
goldIndicator.percentage = Number(rowResult.row[0]); |
|
| 725 |
countryTableData.gold = goldIndicator; |
|
| 726 |
} |
|
| 727 |
countryTableData.name = rowResult.row[4]; |
|
| 728 |
countryTableData.code = rowResult.row[3]; |
|
| 729 |
mapTableData.set(rowResult.row[3], countryTableData); |
|
| 730 |
} |
|
| 731 |
} |
|
| 732 |
} |
|
| 733 |
} |
|
| 734 |
|
|
| 735 |
const tableData: CountryTableData[] = []; |
|
| 736 |
|
|
| 737 |
mapTableData.forEach((value: CountryTableData, key: string) => {
|
|
| 738 |
// console.log(key, value); |
|
| 739 |
tableData.push(value); |
|
| 740 |
}); |
|
| 741 |
|
|
| 742 |
return tableData; |
|
| 743 |
} |
|
| 744 |
|
|
| 598 | 745 |
public convertRawDataToLeadingOpenScienceData(rawData: RawData) {
|
| 599 | 746 |
|
| 600 | 747 |
const leadingOpenScienceData: CountryOverviewData[] = []; |
| modules/open-science-observatory-ui/trunk/src/app/services/data.service.ts | ||
|---|---|---|
| 128 | 128 |
return this.httpClient.get<RawData>(this.apiURL + fundersResultsByTypeForPIDForCountryQuery, headerOptions); |
| 129 | 129 |
} |
| 130 | 130 |
|
| 131 |
public getIndicatorsTableData(type: string, content: string): Observable<RawData> {
|
|
| 132 |
let indicatorsTableDataQuery = ''; |
|
| 133 |
if (content === 'affiliated') {
|
|
| 134 |
indicatorsTableDataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.pid_percentage.affiliated.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.licence_percentage.affiliated.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.green_percentage.affiliated.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.gold_percentage.affiliated.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%5D%2C%22verbose%22%3Atrue%7D'; |
|
| 135 |
} else if (content === 'affiliated_peer_reviewed') {
|
|
| 136 |
indicatorsTableDataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.pid_percentage.affiliated.peer_reviewed.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.licence_percentage.affiliated.peer_reviewed.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.green_percentage.affiliated.peer_reviewed.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.gold_percentage.affiliated.peer_reviewed.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%5D%2C%22verbose%22%3Atrue%7D'; |
|
| 137 |
} else if (content === 'deposited') {
|
|
| 138 |
indicatorsTableDataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.pid_percentage.deposited.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.licence_percentage.deposited.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.green_percentage.deposited.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.gold_percentage.deposited.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%5D%2C%22verbose%22%3Atrue%7D'; |
|
| 139 |
} else if (content === 'deposited_peer_reviewed') {
|
|
| 140 |
indicatorsTableDataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.pid_percentage.deposited.peer_reviewed.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.licence_percentage.deposited.peer_reviewed.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.green_percentage.deposited.peer_reviewed.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.gold_percentage.deposited.peer_reviewed.bycountry%22%2C%22parameters%22%3A%5B%22' + type + '%22%2C%22' + type + '%22%5D%7D%7D%5D%2C%22verbose%22%3Atrue%7D'; |
|
| 141 |
} |
|
| 142 |
return this.httpClient.get<RawData>(this.apiURL + indicatorsTableDataQuery, headerOptions); |
|
| 143 |
} |
|
| 131 | 144 |
|
| 132 | 145 |
|
| 133 |
|
|
| 134 | 146 |
public getOverviewData(): Observable<OverviewData> {
|
| 135 | 147 |
return this.httpClient.get<OverviewData>(this._jsonURl, headerOptions); |
| 136 | 148 |
} |
| modules/open-science-observatory-ui/trunk/src/app/domain/overview-map-data.ts | ||
|---|---|---|
| 61 | 61 |
repositories: number = null; |
| 62 | 62 |
journals: number = null; |
| 63 | 63 |
policies: number = null; |
| 64 |
pid: Indicator; |
|
| 65 |
licence: Indicator; |
|
| 66 |
gold: Indicator; |
|
| 67 |
green: Indicator; |
|
| 64 | 68 |
} |
| 65 | 69 |
|
| 66 | 70 |
export class CountryPageOverviewData {
|
Also available in: Unified diff
Created the indicator tables for the open science tab of the europe page