Add description overlay in indicators
This commit is contained in:
parent
5ef7c8d8a1
commit
8b65f4f5b0
|
@ -143,6 +143,16 @@
|
||||||
</h3>
|
</h3>
|
||||||
<!--<ng-container *ngTemplateOutlet="description; context: {indicator:indicator}"></ng-container>-->
|
<!--<ng-container *ngTemplateOutlet="description; context: {indicator:indicator}"></ng-container>-->
|
||||||
</div>
|
</div>
|
||||||
|
<div *ngIf="indicator.description || indicator.additionalDescription" class="uk-overlay uk-position-bottom">
|
||||||
|
<div class="uk-padding-small">
|
||||||
|
<div *ngIf="indicator.description">
|
||||||
|
{{indicator.description}}
|
||||||
|
</div>
|
||||||
|
<div *ngIf="indicator.additionalDescription">
|
||||||
|
{{indicator.additionalDescription}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
|
@ -190,6 +200,20 @@
|
||||||
(indicator.height?indicator.height.toLowerCase():'medium')">
|
(indicator.height?indicator.height.toLowerCase():'medium')">
|
||||||
<!--<ng-container *ngTemplateOutlet="description; context: {indicator:indicator}"></ng-container>-->
|
<!--<ng-container *ngTemplateOutlet="description; context: {indicator:indicator}"></ng-container>-->
|
||||||
</div>
|
</div>
|
||||||
|
<div *ngIf="indicator.description || indicator.additionalDescription"
|
||||||
|
class="uk-overlay uk-position-bottom">
|
||||||
|
<div class="uk-padding-small multi-line-ellipsis lines-3">
|
||||||
|
<p class="uk-margin-remove">
|
||||||
|
<span *ngIf="indicator.description">
|
||||||
|
{{indicator.description}}
|
||||||
|
</span>
|
||||||
|
<br>
|
||||||
|
<span *ngIf="indicator.additionalDescription">
|
||||||
|
{{indicator.additionalDescription}}
|
||||||
|
</span>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
|
|
|
@ -83,6 +83,17 @@
|
||||||
</h3>
|
</h3>
|
||||||
<!--<ng-container *ngTemplateOutlet="description; context: {indicator:indicator}"></ng-container>-->
|
<!--<ng-container *ngTemplateOutlet="description; context: {indicator:indicator}"></ng-container>-->
|
||||||
</div>
|
</div>
|
||||||
|
<div *ngIf="indicator.description || indicator.additionalDescription" class="uk-overlay uk-position-bottom">
|
||||||
|
<p class="uk-margin-remove">
|
||||||
|
<span *ngIf="indicator.description">
|
||||||
|
{{indicator.description}}
|
||||||
|
</span>
|
||||||
|
<br>
|
||||||
|
<span *ngIf="indicator.additionalDescription">
|
||||||
|
{{indicator.additionalDescription}}
|
||||||
|
</span>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
|
@ -201,6 +212,19 @@
|
||||||
</div>
|
</div>
|
||||||
<!--<ng-container *ngTemplateOutlet="description; context: {indicator:indicator}"></ng-container>-->
|
<!--<ng-container *ngTemplateOutlet="description; context: {indicator:indicator}"></ng-container>-->
|
||||||
</div>
|
</div>
|
||||||
|
<div *ngIf="indicator.description || indicator.additionalDescription" class="uk-overlay uk-position-bottom">
|
||||||
|
<div class="uk-padding-small multi-line-ellipsis lines-3">
|
||||||
|
<p class="uk-margin-remove">
|
||||||
|
<span *ngIf="indicator.description">
|
||||||
|
{{indicator.description}}
|
||||||
|
</span>
|
||||||
|
<br>
|
||||||
|
<span *ngIf="indicator.additionalDescription">
|
||||||
|
{{indicator.additionalDescription}}
|
||||||
|
</span>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
|
@ -366,8 +390,8 @@
|
||||||
<div *ngIf="chartIndicatorFb" [formGroup]="chartIndicatorFb" class="uk-grid" uk-grid>
|
<div *ngIf="chartIndicatorFb" [formGroup]="chartIndicatorFb" class="uk-grid" uk-grid>
|
||||||
<div dashboard-input class="uk-width-1-1" [formInput]="chartIndicatorFb.get('name')" placeholder="Write a title"
|
<div dashboard-input class="uk-width-1-1" [formInput]="chartIndicatorFb.get('name')" placeholder="Write a title"
|
||||||
label="Title"></div>
|
label="Title"></div>
|
||||||
<div dashboard-input class="uk-width-1-1" *ngIf="stakeholder.defaultId !=-1 && ( (indicator.description &&
|
<div dashboard-input class="uk-width-1-1" *ngIf="stakeholder.defaultId !=-1 &&
|
||||||
indicator.description.length > 0) || !stakeholder.defaultId)"
|
((indicator.description && indicator.description.length > 0) || !stakeholder.defaultId)"
|
||||||
[formInput]="chartIndicatorFb.get('description')" placeholder="Write a description"
|
[formInput]="chartIndicatorFb.get('description')" placeholder="Write a description"
|
||||||
label="Default Description" type="textarea">
|
label="Default Description" type="textarea">
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 3e966ab23829756c256c266a2201042785f83963
|
Subproject commit 72f3272e41d93e82042a293e8e85493fe8cfe6c2
|
Loading…
Reference in New Issue