[master]: Fix numbers in dashboard. Change message in 5 monitors.
This commit is contained in:
parent
491f516572
commit
62347613ed
|
@ -1 +1 @@
|
||||||
Subproject commit 474a73e2f791abdfd354471f8be27af204008f7b
|
Subproject commit 68125b35774dddea903732074f206ade9311dbbd
|
|
@ -75,7 +75,7 @@
|
||||||
<div class="uk-card-body">
|
<div class="uk-card-body">
|
||||||
<span class="uk-text-primary">Step 1a</span>
|
<span class="uk-text-primary">Step 1a</span>
|
||||||
<p class="uk-text-large uk-margin-xsmall-top">Assign a Primary Dashboard Manager</p>
|
<p class="uk-text-large uk-margin-xsmall-top">Assign a Primary Dashboard Manager</p>
|
||||||
<p>Nominate a primary dashboard manager by filling out <a href="https://app.onlinesurveys.jisc.ac.uk/s/maynoothuniversity/national-open-access-monitor-dashboard-manager-application-form" target="_blank">an application form</a>. If you already have a primary dashboard manager or prefer not to be one, proceed to step 2. </p>
|
<p>Nominate a primary dashboard manager by <a routerLink="/contact-us" target="_blank">contacting us</a>. If you already have a primary dashboard manager or prefer not to be one, proceed to step 2. </p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="uk-card uk-blur-background uk-box-shadow-large uk-card-body uk-position-relative uk-margin-large-bottom">
|
<div class="uk-card uk-blur-background uk-box-shadow-large uk-card-body uk-position-relative uk-margin-large-bottom">
|
||||||
|
@ -119,7 +119,7 @@
|
||||||
<div class="uk-card-body">
|
<div class="uk-card-body">
|
||||||
<span class="uk-text-primary">Step 1a</span>
|
<span class="uk-text-primary">Step 1a</span>
|
||||||
<p class="uk-text-large uk-margin-xsmall-top">Assign a Primary Dashboard Manager</p>
|
<p class="uk-text-large uk-margin-xsmall-top">Assign a Primary Dashboard Manager</p>
|
||||||
<p>Nominate a primary dashboard manager by completing <a href="https://app.onlinesurveys.jisc.ac.uk/s/maynoothuniversity/national-open-access-monitor-dashboard-manager-application-form" target="_blank">our application form</a>. If you already have a primary dashboard manager or prefer not to be one, proceed to step 2.</p>
|
<p>Nominate a primary dashboard manager by by <a routerLink="/contact-us" target="_blank">contacting us</a>. If you already have a primary dashboard manager or prefer not to be one, proceed to step 2.</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="uk-card uk-blur-background uk-box-shadow-large uk-card-body uk-position-relative uk-margin-large-bottom">
|
<div class="uk-card uk-blur-background uk-box-shadow-large uk-card-body uk-position-relative uk-margin-large-bottom">
|
||||||
|
|
|
@ -40,9 +40,9 @@
|
||||||
<div *ngIf="!indicator.overlay">
|
<div *ngIf="!indicator.overlay">
|
||||||
<div class="uk-text-small uk-text-truncate uk-margin-xsmall-bottom uk-margin-right">{{indicator.name}}</div>
|
<div class="uk-text-small uk-text-truncate uk-margin-xsmall-bottom uk-margin-right">{{indicator.name}}</div>
|
||||||
<div class="number uk-text-small uk-text-bold">
|
<div class="number uk-text-small uk-text-bold">
|
||||||
<span *ngIf="numberResults.get(i + '-' + j)"
|
<span *ngIf="numberResults.get(i + '-' + j + '-0')"
|
||||||
[innerHTML]="(indicator.indicatorPaths[0].format == 'NUMBER'?(numberResults.get(i + '-' + j) | numberRound: 2:1:stakeholder.locale):(numberResults.get(i + '-' + j) | numberPercentage: stakeholder.locale))"></span>
|
[innerHTML]="(indicator.indicatorPaths[0].format == 'NUMBER'?(numberResults.get(i + '-' + j + '-0') | numberRound: 2:1:stakeholder.locale):(numberResults.get(i + '-' + j + '-0') | numberPercentage: stakeholder.locale))"></span>
|
||||||
<span *ngIf="!numberResults.get(i + '-' + j)">--</span>
|
<span *ngIf="!numberResults.get(i + '-' + j + '-0')">--</span>
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="indicator.description || indicator.additionalDescription"
|
<div *ngIf="indicator.description || indicator.additionalDescription"
|
||||||
class="uk-position-top-right uk-text-center uk-margin-small-top uk-margin-small-right uk-visible@m">
|
class="uk-position-top-right uk-text-center uk-margin-small-top uk-margin-small-right uk-visible@m">
|
||||||
|
@ -90,9 +90,9 @@
|
||||||
<div
|
<div
|
||||||
class="uk-text-xsmall uk-text-truncate uk-margin-xsmall-bottom uk-margin-right">{{indicator.name}}</div>
|
class="uk-text-xsmall uk-text-truncate uk-margin-xsmall-bottom uk-margin-right">{{indicator.name}}</div>
|
||||||
<div class="number uk-text-small uk-text-bold">
|
<div class="number uk-text-small uk-text-bold">
|
||||||
<span *ngIf="numberResults.get(i + '-' + j)"
|
<span *ngIf="numberResults.get(i + '-' + j + '-0')"
|
||||||
[innerHTML]="(indicator.indicatorPaths[0].format == 'NUMBER'?(numberResults.get(i + '-' + j) | numberRound: 2:1:stakeholder.locale):(numberResults.get(i + '-' + j) | numberPercentage: stakeholder.locale))"></span>
|
[innerHTML]="(indicator.indicatorPaths[0].format == 'NUMBER'?(numberResults.get(i + '-' + j + '-0') | numberRound: 2:1:stakeholder.locale):(numberResults.get(i + '-' + j + '-0') | numberPercentage: stakeholder.locale))"></span>
|
||||||
<span *ngIf="!numberResults.get(i + '-' + j)">--</span>
|
<span *ngIf="!numberResults.get(i + '-' + j + '-0')">--</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue