Revision 61541
Added by Stefania Martziou over 2 years ago
| modules/open-science-observatory-ui/branches/new-indicators-and-graphs-osfair-2021/src/app/pages/continent/open-science/datasets/continent-os-datasets-indicators.component.html | ||
|---|---|---|
| 227 | 227 |
|
| 228 | 228 |
<div *ngIf="indicator && indicator=='more-details'" class="indicatorsTable uk-visible@m uk-margin-large-top"> |
| 229 | 229 |
|
| 230 |
<h3 class="">More details for datasets</h3>
|
|
| 230 |
<!--<h3 class="">More details for datasets</h3>-->
|
|
| 231 | 231 |
|
| 232 | 232 |
<div class="uk-margin-top uk-margin-bottom"> |
| 233 | 233 |
<label class="uk-margin-right">Show: </label> |
| 234 | 234 |
<select class="md-input" #selectDatasetsContent (change)="getContent('dataset', selectDatasetsContent.value)" style="width: 230px; display: inline-block">
|
| 235 | 235 |
<option value="affiliated">affiliated</option> |
| 236 |
<option value="affiliated_peer_reviewed">affiliated peer reviewed</option>
|
|
| 236 |
<!--<option value="affiliated_peer_reviewed">affiliated peer reviewed</option>-->
|
|
| 237 | 237 |
<option value="deposited">deposited</option> |
| 238 |
<option value="deposited_peer_reviewed">deposited peer reviewed</option>
|
|
| 238 |
<!--<option value="deposited_peer_reviewed">deposited peer reviewed</option>-->
|
|
| 239 | 239 |
</select> |
| 240 | 240 |
<!--<span class="md-input-bar"></span>--> |
| 241 | 241 |
</div> |
| modules/open-science-observatory-ui/branches/new-indicators-and-graphs-osfair-2021/src/app/pages/continent/open-science/datasets/continent-os-datasets.component.html | ||
|---|---|---|
| 1 | 1 |
<div> |
| 2 | 2 |
|
| 3 |
<div class="uk-margin-large-top uk-margin-medium-bottom"> |
|
| 4 |
<h3>Datasets</h3> |
|
| 5 |
</div> |
|
| 6 |
|
|
| 3 | 7 |
<ul uk-tab class="uk-tab-large"> |
| 4 | 8 |
<li [routerLinkActive]="['uk-active']"><a [routerLink]="['./licence']">Licence</a></li> |
| 5 | 9 |
<li [routerLinkActive]="['uk-active']"><a [routerLink]="['./pid']">PID</a></li> |
| modules/open-science-observatory-ui/branches/new-indicators-and-graphs-osfair-2021/src/app/pages/continent/open-science/software/continent-os-software-indicators.component.html | ||
|---|---|---|
| 227 | 227 |
|
| 228 | 228 |
<div *ngIf="indicator && indicator=='more-details'" class="indicatorsTable uk-visible@m uk-margin-large-top"> |
| 229 | 229 |
|
| 230 |
<h3 class="">More details for software</h3>
|
|
| 230 |
<!--<h3 class="">More details for software</h3>-->
|
|
| 231 | 231 |
|
| 232 | 232 |
<div class="uk-margin-top uk-margin-bottom"> |
| 233 | 233 |
<label class="uk-margin-right">Show: </label> |
| 234 | 234 |
<select class="md-input" #selectSoftwareContent (change)="getContent('software', selectSoftwareContent.value)" style="width: 230px; display: inline-block">
|
| 235 | 235 |
<option value="affiliated">affiliated</option> |
| 236 |
<option value="affiliated_peer_reviewed">affiliated peer reviewed</option>
|
|
| 236 |
<!--<option value="affiliated_peer_reviewed">affiliated peer reviewed</option>-->
|
|
| 237 | 237 |
<option value="deposited">deposited</option> |
| 238 |
<option value="deposited_peer_reviewed">deposited peer reviewed</option>
|
|
| 238 |
<!--<option value="deposited_peer_reviewed">deposited peer reviewed</option>-->
|
|
| 239 | 239 |
</select> |
| 240 | 240 |
<!--<span class="md-input-bar"></span>--> |
| 241 | 241 |
</div> |
| modules/open-science-observatory-ui/branches/new-indicators-and-graphs-osfair-2021/src/app/pages/continent/open-science/software/continent-os-software.component.html | ||
|---|---|---|
| 1 | 1 |
<div> |
| 2 | 2 |
|
| 3 |
<div class="uk-margin-large-top uk-margin-medium-bottom"> |
|
| 4 |
<h3>Software</h3> |
|
| 5 |
</div> |
|
| 6 |
|
|
| 3 | 7 |
<ul uk-tab class="uk-tab-large"> |
| 4 | 8 |
<li [routerLinkActive]="['uk-active']"><a [routerLink]="['./licence']">Licence</a></li> |
| 5 | 9 |
<li [routerLinkActive]="['uk-active']"><a [routerLink]="['./pid']">PID</a></li> |
| modules/open-science-observatory-ui/branches/new-indicators-and-graphs-osfair-2021/src/app/pages/continent/open-science/other-research-products/continent-os-orp-indicators.component.html | ||
|---|---|---|
| 228 | 228 |
|
| 229 | 229 |
<div *ngIf="indicator && indicator=='more-details'" class="indicatorsTable uk-visible@m uk-margin-large-top"> |
| 230 | 230 |
|
| 231 |
<h3 class="">More details for other research products</h3>
|
|
| 231 |
<!--<h3 class="">More details for other research products</h3>-->
|
|
| 232 | 232 |
|
| 233 | 233 |
<div class="uk-margin-top uk-margin-bottom"> |
| 234 | 234 |
<label class="uk-margin-right">Show: </label> |
| 235 | 235 |
<select class="md-input" #selectOtherContent (change)="getContent('other', selectOtherContent.value)" style="width: 230px; display: inline-block">
|
| 236 | 236 |
<option value="affiliated">affiliated</option> |
| 237 |
<option value="affiliated_peer_reviewed">affiliated peer reviewed</option>
|
|
| 237 |
<!--<option value="affiliated_peer_reviewed">affiliated peer reviewed</option>-->
|
|
| 238 | 238 |
<option value="deposited">deposited</option> |
| 239 |
<option value="deposited_peer_reviewed">deposited peer reviewed</option>
|
|
| 239 |
<!--<option value="deposited_peer_reviewed">deposited peer reviewed</option>-->
|
|
| 240 | 240 |
</select> |
| 241 | 241 |
<!--<span class="md-input-bar"></span>--> |
| 242 | 242 |
</div> |
| modules/open-science-observatory-ui/branches/new-indicators-and-graphs-osfair-2021/src/app/pages/continent/open-science/other-research-products/continent-os-orp.component.html | ||
|---|---|---|
| 1 | 1 |
<div> |
| 2 | 2 |
|
| 3 |
<div class="uk-margin-large-top uk-margin-medium-bottom"> |
|
| 4 |
<h3>Other research products (ORPs)</h3> |
|
| 5 |
</div> |
|
| 6 |
|
|
| 3 | 7 |
<ul uk-tab class="uk-tab-large"> |
| 4 | 8 |
<li [routerLinkActive]="['uk-active']"><a [routerLink]="['./licence']">Licence</a></li> |
| 5 | 9 |
<li [routerLinkActive]="['uk-active']"><a [routerLink]="['./pid']">PID</a></li> |
| modules/open-science-observatory-ui/branches/new-indicators-and-graphs-osfair-2021/src/app/pages/continent/open-science/publications/continent-os-publications-indicators.component.html | ||
|---|---|---|
| 384 | 384 |
|
| 385 | 385 |
<div *ngIf="indicator && indicator=='more-details'" class="indicatorsTable uk-visible@m uk-margin-large-top"> |
| 386 | 386 |
|
| 387 |
<h3 class="">More details for publications</h3>
|
|
| 387 |
<!--<h3 class="">More details for publications</h3>-->
|
|
| 388 | 388 |
|
| 389 | 389 |
<div class="uk-margin-top uk-margin-bottom"> |
| 390 | 390 |
<label class="uk-margin-right">Show: </label> |
| 391 | 391 |
<select class="md-input" #selectPublicationsContent (change)="getContent('publication', selectPublicationsContent.value)" style="width: 230px; display: inline-block">
|
| 392 |
<option value="affiliated">affiliated</option> |
|
| 393 |
<option value="affiliated_peer_reviewed">affiliated peer reviewed</option>
|
|
| 394 |
<option value="deposited">deposited</option> |
|
| 395 |
<option value="deposited_peer_reviewed">deposited peer reviewed</option>
|
|
| 392 |
<option value="affiliated_peer_reviewed">affiliated</option>
|
|
| 393 |
<option value="affiliated">affiliated (incl. non-peer reviewed publications)</option>
|
|
| 394 |
<option value="deposited_peer_reviewed">deposited</option>
|
|
| 395 |
<option value="deposited">deposited (incl. non-peer reviewed publications)</option>
|
|
| 396 | 396 |
</select> |
| 397 | 397 |
<!--<span class="md-input-bar"></span>--> |
| 398 | 398 |
</div> |
| 399 | 399 |
|
| 400 |
<div class="uk-grid uk-child-width-1-2@l uk-child-width-1-2@m">
|
|
| 401 |
<div class="absoluteTable"> |
|
| 400 |
<div class="uk-grid"> |
|
| 401 |
<div class="absoluteTable uk-width-3-4@l uk-width-3-4@m">
|
|
| 402 | 402 |
<div class="md-card chartCard"> |
| 403 | 403 |
<div class="md-card-content"> |
| 404 | 404 |
|
| modules/open-science-observatory-ui/branches/new-indicators-and-graphs-osfair-2021/src/app/pages/continent/open-science/publications/continent-os-publications.component.html | ||
|---|---|---|
| 1 | 1 |
<div> |
| 2 | 2 |
|
| 3 |
<div class="uk-margin-large-top uk-margin-medium-bottom"> |
|
| 4 |
<h3>Publications</h3> |
|
| 5 |
</div> |
|
| 6 |
|
|
| 3 | 7 |
<ul uk-tab class="uk-tab-large"> |
| 4 | 8 |
<li [routerLinkActive]="['uk-active']"><a [routerLink]="['./gold-green']">Gold/Green</a></li> |
| 5 | 9 |
<li [routerLinkActive]="['uk-active']"><a [routerLink]="['./abstract']">Abstract</a></li> |
| modules/open-science-observatory-ui/branches/new-indicators-and-graphs-osfair-2021/src/app/pages/home/countries-table.component.html | ||
|---|---|---|
| 124 | 124 |
<span *ngIf="isSortedBy && isSortedBy=='country' && !isDescending"><img src="../../../assets/img/icons/sort-ascending.svg"></span> |
| 125 | 125 |
Country |
| 126 | 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 *ngIf="entity==='publication'" class="uk-text-center" width="20%" (click)="sortBy('gold')">
|
|
| 127 |
<th *ngIf="entity==='publication'" class="uk-text-center" (click)="sortBy('gold')">
|
|
| 140 | 128 |
<span *ngIf="!isSortedBy || isSortedBy!='gold'" class="uk-margin-small-right"><img src="../../../assets/img/icons/sort.svg"></span> |
| 141 | 129 |
<span *ngIf="isSortedBy && isSortedBy=='gold' && isDescending"><img src="../../../assets/img/icons/sort-descending.svg"></span> |
| 142 | 130 |
<span *ngIf="isSortedBy && isSortedBy=='gold' && !isDescending"><img src="../../../assets/img/icons/sort-ascending.svg"></span> |
| 143 | 131 |
Gold |
| 144 | 132 |
</th> |
| 145 |
<th *ngIf="entity==='publication'" class="uk-text-center" width="20%" (click)="sortBy('green')">
|
|
| 133 |
<th *ngIf="entity==='publication'" class="uk-text-center" (click)="sortBy('green')">
|
|
| 146 | 134 |
<span *ngIf="!isSortedBy || isSortedBy!='green'" class="uk-margin-small-right"><img src="../../../assets/img/icons/sort.svg"></span> |
| 147 | 135 |
<span *ngIf="isSortedBy && isSortedBy=='green' && isDescending"><img src="../../../assets/img/icons/sort-descending.svg"></span> |
| 148 | 136 |
<span *ngIf="isSortedBy && isSortedBy=='green' && !isDescending"><img src="../../../assets/img/icons/sort-ascending.svg"></span> |
| 149 | 137 |
Green |
| 150 | 138 |
</th> |
| 139 |
<th *ngIf="entity==='publication'" class="uk-text-center" (click)="sortBy('abstract')">
|
|
| 140 |
<span *ngIf="!isSortedBy || isSortedBy!='abstract'" class="uk-margin-small-right"><img src="../../../assets/img/icons/sort.svg"></span> |
|
| 141 |
<span *ngIf="isSortedBy && isSortedBy=='abstract' && isDescending"><img src="../../../assets/img/icons/sort-descending.svg"></span> |
|
| 142 |
<span *ngIf="isSortedBy && isSortedBy=='abstract' && !isDescending"><img src="../../../assets/img/icons/sort-ascending.svg"></span> |
|
| 143 |
Abstract |
|
| 144 |
</th> |
|
| 145 |
<th class="uk-text-center" (click)="sortBy('licence')">
|
|
| 146 |
<span *ngIf="!isSortedBy || isSortedBy!='licence'" class="uk-margin-small-right"><img src="../../../assets/img/icons/sort.svg"></span> |
|
| 147 |
<span *ngIf="isSortedBy && isSortedBy=='licence' && isDescending"><img src="../../../assets/img/icons/sort-descending.svg"></span> |
|
| 148 |
<span *ngIf="isSortedBy && isSortedBy=='licence' && !isDescending"><img src="../../../assets/img/icons/sort-ascending.svg"></span> |
|
| 149 |
Licence |
|
| 150 |
</th> |
|
| 151 |
<th class="uk-text-center" (click)="sortBy('cc_licence')">
|
|
| 152 |
<span *ngIf="!isSortedBy || isSortedBy!='cc_licence'" class="uk-margin-small-right"><img src="../../../assets/img/icons/sort.svg"></span> |
|
| 153 |
<span *ngIf="isSortedBy && isSortedBy=='cc_licence' && isDescending"><img src="../../../assets/img/icons/sort-descending.svg"></span> |
|
| 154 |
<span *ngIf="isSortedBy && isSortedBy=='cc_licence' && !isDescending"><img src="../../../assets/img/icons/sort-ascending.svg"></span> |
|
| 155 |
CC Licence |
|
| 156 |
</th> |
|
| 157 |
<th class="uk-text-center" (click)="sortBy('pid')">
|
|
| 158 |
<span *ngIf="!isSortedBy || isSortedBy!='pid'" class="uk-margin-small-right"><img src="../../../assets/img/icons/sort.svg"></span> |
|
| 159 |
<span *ngIf="isSortedBy && isSortedBy=='pid' && isDescending"><img src="../../../assets/img/icons/sort-descending.svg"></span> |
|
| 160 |
<span *ngIf="isSortedBy && isSortedBy=='pid' && !isDescending"><img src="../../../assets/img/icons/sort-ascending.svg"></span> |
|
| 161 |
PID |
|
| 162 |
</th> |
|
| 151 | 163 |
</tr> |
| 152 | 164 |
</thead> |
| 153 | 165 |
<tbody> |
| 154 | 166 |
<tr *ngFor="let countryOverview of countries"> |
| 155 | 167 |
<td class=""><a [routerLink]="['/country', 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 | 168 |
<td *ngIf="entity==='publication'" class="uk-text-center"> |
| 171 | 169 |
<ng-container *ngIf="countryOverview.gold===null">--</ng-container> |
| 172 | 170 |
<ng-container *ngIf="countryOverview.gold!=null"> |
| ... | ... | |
| 181 | 179 |
<ng-container *ngIf="!isPercentage">{{countryOverview.green.oa | number}}</ng-container>
|
| 182 | 180 |
</ng-container> |
| 183 | 181 |
</td> |
| 182 |
<td *ngIf="entity==='publication'" class="uk-text-center"> |
|
| 183 |
<ng-container *ngIf="countryOverview.abstract===null">--</ng-container> |
|
| 184 |
<ng-container *ngIf="countryOverview.abstract!=null"> |
|
| 185 |
<ng-container *ngIf="isPercentage">{{countryOverview.abstract.percentage | number :'1.0-1'}}%</ng-container>
|
|
| 186 |
<ng-container *ngIf="!isPercentage">{{countryOverview.abstract.oa | number}}</ng-container>
|
|
| 187 |
</ng-container> |
|
| 188 |
</td> |
|
| 189 |
<td class="uk-text-center"> |
|
| 190 |
<ng-container *ngIf="countryOverview.licence===null">--</ng-container> |
|
| 191 |
<ng-container *ngIf="countryOverview.licence!=null"> |
|
| 192 |
<ng-container *ngIf="isPercentage">{{countryOverview.licence.percentage | number :'1.0-1'}}%</ng-container>
|
|
| 193 |
<ng-container *ngIf="!isPercentage">{{countryOverview.licence.oa | number}}</ng-container>
|
|
| 194 |
</ng-container> |
|
| 195 |
</td> |
|
| 196 |
<td class="uk-text-center"> |
|
| 197 |
<ng-container *ngIf="countryOverview.cc_licence===null">--</ng-container> |
|
| 198 |
<ng-container *ngIf="countryOverview.cc_licence!=null"> |
|
| 199 |
<ng-container *ngIf="isPercentage">{{countryOverview.cc_licence.percentage | number :'1.0-1'}}%</ng-container>
|
|
| 200 |
<ng-container *ngIf="!isPercentage">{{countryOverview.cc_licence.oa | number}}</ng-container>
|
|
| 201 |
</ng-container> |
|
| 202 |
</td> |
|
| 203 |
<td class="uk-text-center"> |
|
| 204 |
<ng-container *ngIf="countryOverview.pid===null">--</ng-container> |
|
| 205 |
<ng-container *ngIf="countryOverview.pid!=null"> |
|
| 206 |
<ng-container *ngIf="isPercentage">{{countryOverview.pid.percentage | number :'1.0-1'}}%</ng-container>
|
|
| 207 |
<ng-container *ngIf="!isPercentage">{{countryOverview.pid.oa | number}}</ng-container>
|
|
| 208 |
</ng-container> |
|
| 209 |
</td> |
|
| 184 | 210 |
</tr> |
| 185 | 211 |
</tbody> |
| 186 | 212 |
</table> |
| modules/open-science-observatory-ui/branches/new-indicators-and-graphs-osfair-2021/src/app/pages/home/countries-table.component.ts | ||
|---|---|---|
| 33 | 33 |
|
| 34 | 34 |
this.isSortedBy = field; |
| 35 | 35 |
|
| 36 |
if (field === 'pid' || field === 'licence' || field === 'gold' || field === 'green') {
|
|
| 36 |
if (field === 'pid' || field === 'licence' || field === 'gold' || field === 'green' || field === 'cc_licence' || field === 'abstract') {
|
|
| 37 | 37 |
if (this.isDescending) {
|
| 38 | 38 |
if (this.isPercentage) {
|
| 39 | 39 |
this.countries.sort((a, b) => b[field].percentage - a[field].percentage); |
| modules/open-science-observatory-ui/branches/new-indicators-and-graphs-osfair-2021/src/app/services/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 |
|
| modules/open-science-observatory-ui/branches/new-indicators-and-graphs-osfair-2021/src/app/services/data.service.ts | ||
|---|---|---|
| 110 | 110 |
} |
| 111 | 111 |
|
| 112 | 112 |
public getFundersResultsByTypeForCCLicence(type: string): Observable<RawData> {
|
| 113 |
const fundersResultsByTypeForCCLicenceQuery = `{"series":[{"query":{"name":"oso.results.cc_licence.affiliated.byfunder", "parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 113 |
const fundersResultsByTypeForCCLicenceQuery = `{"series":[{"query":{"name":"new.oso.results.cc_licence.affiliated.byfunder", "parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 114 | 114 |
return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(fundersResultsByTypeForCCLicenceQuery), headerOptions); |
| 115 | 115 |
} |
| 116 | 116 |
|
| ... | ... | |
| 138 | 138 |
|
| 139 | 139 |
let indicatorsTableDataQuery = ''; |
| 140 | 140 |
if (content === 'affiliated') {
|
| 141 |
indicatorsTableDataQuery = `{"series":[{"query":{"name":"oso.results.pid_percentage.affiliated.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.licence_percentage.affiliated.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.green_percentage.affiliated.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.gold_percentage.affiliated.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 141 |
indicatorsTableDataQuery = `{"series":[{"query":{"name":"oso.results.pid_percentage.affiliated.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.licence_percentage.affiliated.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.green_percentage.affiliated.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.gold_percentage.affiliated.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.cc_licence_percentage.affiliated.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.abstract_percentage.affiliated.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 142 | 142 |
} else if (content === 'affiliated_peer_reviewed') {
|
| 143 |
indicatorsTableDataQuery = `{"series":[{"query":{"name":"oso.results.pid_percentage.affiliated.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.licence_percentage.affiliated.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.green_percentage.affiliated.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.gold_percentage.affiliated.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 143 |
indicatorsTableDataQuery = `{"series":[{"query":{"name":"oso.results.pid_percentage.affiliated.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.licence_percentage.affiliated.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.green_percentage.affiliated.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.gold_percentage.affiliated.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.cc_licence_percentage.affiliated.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.abstract_percentage.affiliated.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 144 | 144 |
} else if (content === 'deposited') {
|
| 145 |
indicatorsTableDataQuery = `{"series":[{"query":{"name":"oso.results.pid_percentage.deposited.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.licence_percentage.deposited.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.green_percentage.deposited.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.gold_percentage.deposited.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 145 |
indicatorsTableDataQuery = `{"series":[{"query":{"name":"oso.results.pid_percentage.deposited.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.licence_percentage.deposited.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.green_percentage.deposited.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.gold_percentage.deposited.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.cc_licence_percentage.deposited.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.abstract_percentage.deposited.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 146 | 146 |
} else if (content === 'deposited_peer_reviewed') {
|
| 147 |
indicatorsTableDataQuery = `{"series":[{"query":{"name":"oso.results.pid_percentage.deposited.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.licence_percentage.deposited.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.green_percentage.deposited.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.gold_percentage.deposited.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 147 |
indicatorsTableDataQuery = `{"series":[{"query":{"name":"oso.results.pid_percentage.deposited.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.licence_percentage.deposited.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.green_percentage.deposited.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"oso.results.gold_percentage.deposited.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.cc_licence_percentage.deposited.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}},{"query":{"name":"new.oso.results.abstract_percentage.deposited.peer_reviewed.bycountry","parameters":["${type}"],"profile":"${this.profileName}"}}],"verbose":true}`;
|
|
| 148 | 148 |
} |
| 149 | 149 |
return this.httpClient.get<RawData>(this.apiURL + encodeURIComponent(indicatorsTableDataQuery), headerOptions); |
| 150 | 150 |
} |
| modules/open-science-observatory-ui/branches/new-indicators-and-graphs-osfair-2021/src/app/domain/overview-map-data.ts | ||
|---|---|---|
| 65 | 65 |
licence: Indicator; |
| 66 | 66 |
gold: Indicator; |
| 67 | 67 |
green: Indicator; |
| 68 |
cc_licence: Indicator; |
|
| 69 |
abstract: Indicator; |
|
| 68 | 70 |
} |
| 69 | 71 |
|
| 70 | 72 |
export class CountryPageOverviewData {
|
Also available in: Unified diff
Finisged the more details tables for europe open science