[Monitor]: Add loaging on numbers indicators and add height match on titles.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor@57395 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
parent
c709432365
commit
18e739569f
|
@ -35,7 +35,7 @@
|
||||||
<div *ngIf="activeSubCategory"
|
<div *ngIf="activeSubCategory"
|
||||||
class="uk-width-expand uk-background-muted uk-padding uk-text-center@s uk-text-left@m">
|
class="uk-width-expand uk-background-muted uk-padding uk-text-center@s uk-text-left@m">
|
||||||
<h5 class="uk-margin-bottom uk-text-bold">Indicators</h5>
|
<h5 class="uk-margin-bottom uk-text-bold">Indicators</h5>
|
||||||
<div class="uk-grid-medium uk-margin-bottom" uk-grid>
|
<div class="uk-grid-medium uk-margin-bottom" uk-grid uk-height-match="target: div > h6">
|
||||||
<ng-template ngFor [ngForOf]="activeSubCategory.numbers" let-number let-i="index">
|
<ng-template ngFor [ngForOf]="activeSubCategory.numbers" let-number let-i="index">
|
||||||
<div *ngIf="number.isActive && number.isPublic"
|
<div *ngIf="number.isActive && number.isPublic"
|
||||||
[class.uk-width-1-3@m]="number.width === 'small'"
|
[class.uk-width-1-3@m]="number.width === 'small'"
|
||||||
|
@ -43,9 +43,12 @@
|
||||||
[class.uk-width-1-1@m]="number.width === 'large'">
|
[class.uk-width-1-1@m]="number.width === 'large'">
|
||||||
<div class="uk-card uk-card-default uk-box-shadow-large uk-padding-small" [attr.uk-tooltip]="number.description">
|
<div class="uk-card uk-card-default uk-box-shadow-large uk-padding-small" [attr.uk-tooltip]="number.description">
|
||||||
<h6>{{number.name}}</h6>
|
<h6>{{number.name}}</h6>
|
||||||
<div class="uk-h2">
|
<div class="uk-h2" *ngIf="numberResults.get(i)">
|
||||||
{{numberResults.get(i)|number}}
|
{{numberResults.get(i)|number}}
|
||||||
</div>
|
</div>
|
||||||
|
<div *ngIf="!numberResults.get(i)" class="uk-animation-fade uk-width-1-1" role="alert">
|
||||||
|
<span class="loading-gif uk-align-center"></span>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
|
|
|
@ -60,6 +60,8 @@ export class MonitorComponent {
|
||||||
var url = data.envSpecific.baseLink + this._router.url;
|
var url = data.envSpecific.baseLink + this._router.url;
|
||||||
if (!this.stakeholder || this.stakeholder.index_id !== params['stakeholder']) {
|
if (!this.stakeholder || this.stakeholder.index_id !== params['stakeholder']) {
|
||||||
this.status = this.errorCodes.LOADING;
|
this.status = this.errorCodes.LOADING;
|
||||||
|
this.numberResults= new Map<number, number>();
|
||||||
|
this.chartsActiveType = new Map<number, IndicatorPath>();
|
||||||
this.stakeholderService.getStakeholder(params['stakeholder']).subscribe(stakeholder => {
|
this.stakeholderService.getStakeholder(params['stakeholder']).subscribe(stakeholder => {
|
||||||
this.stakeholder = stakeholder;
|
this.stakeholder = stakeholder;
|
||||||
this.seoService.createLinkForCanonicalURL(url, false);
|
this.seoService.createLinkForCanonicalURL(url, false);
|
||||||
|
|
Loading…
Reference in New Issue