Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
c3587bb2c4
|
@ -145,9 +145,9 @@ export class FundersComponent implements OnInit {
|
||||||
let refineParams = '&fq=resultbestaccessright%20exact%20%22Open%20Access%22';
|
let refineParams = '&fq=resultbestaccessright%20exact%20%22Open%20Access%22';
|
||||||
this.subscriptions.push(
|
this.subscriptions.push(
|
||||||
zip(
|
zip(
|
||||||
this.refineFieldResultsService.getRefineFieldsResultsByEntityName(['relfunder'], 'result', this.properties),
|
this.refineFieldResultsService.getAllRefineFieldResultsByFieldName('relfunder', 'result', this.properties),
|
||||||
this.refineFieldResultsService.getRefineFieldsResultsByEntityName(['relfunder'], 'result', this.properties, refineParams),
|
this.refineFieldResultsService.getAllRefineFieldResultsByFieldName('relfunder', 'result', this.properties, refineParams),
|
||||||
this.refineFieldResultsService.getRefineFieldsResultsByEntityName(['funder'], 'project', this.properties),
|
this.refineFieldResultsService.getAllRefineFieldResultsByFieldName('funder', 'project', this.properties),
|
||||||
this.stakeholderService.getStakeholders(this.properties.monitorServiceAPIURL, 'funder')
|
this.stakeholderService.getStakeholders(this.properties.monitorServiceAPIURL, 'funder')
|
||||||
).subscribe((data: any[]) => {
|
).subscribe((data: any[]) => {
|
||||||
// storing all needed data to a map
|
// storing all needed data to a map
|
||||||
|
|
|
@ -109,9 +109,9 @@
|
||||||
<span *ngIf="type=='persistent'">
|
<span *ngIf="type=='persistent'">
|
||||||
<span>Persistent identifiers and registries</span>
|
<span>Persistent identifiers and registries</span>
|
||||||
</span>
|
</span>
|
||||||
<span *ngIf="type=='funder' && numbersComponent.showProjects && numbers?.fundersSize && numbers?.projectsSize">
|
<span *ngIf="type=='funder' && numbersComponent.showProjects && numbers?.mergedFundersSize && numbers?.projectsSize">
|
||||||
<span
|
<span
|
||||||
class="uk-text-bold">{{numbers.fundersSize.number|number}}{{numbers.fundersSize.size}}
|
class="uk-text-bold">{{numbers.mergedFundersSize.number|number}}{{numbers.mergedFundersSize.size}}
|
||||||
funders</span><span> and</span>
|
funders</span><span> and</span>
|
||||||
<span
|
<span
|
||||||
class="uk-text-bold"> {{numbers.projectsSize.number|number}}{{numbers.projectsSize.size}}
|
class="uk-text-bold"> {{numbers.projectsSize.number|number}}{{numbers.projectsSize.size}}
|
||||||
|
|
Loading…
Reference in New Issue