Change description overlay. Fix a bug in case of more than one sections has no indicators. Make numbers with fixed width
This commit is contained in:
parent
10c756c091
commit
9ee588df82
|
@ -91,11 +91,8 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="!privateStakeholder && stakeholder">
|
<div *ngIf="!privateStakeholder && stakeholder">
|
||||||
<div *ngIf="(activeSubCategory && (activeSubCategory.charts.length == 0 ||
|
<div *ngIf="(activeSubCategory && (activeSubCategory.charts.length == 0 || countSectionsWithIndicatorsToShow(activeSubCategory.charts) == 0))
|
||||||
(activeSubCategory.charts.length == 1 && countIndicatorsToShow(activeSubCategory.charts[0].indicators) == 0)))
|
&& ((activeSubCategory && activeSubCategory.description && activeSubCategory.description.length > 0) ||
|
||||||
&& ((activeSubCategory &&
|
|
||||||
activeSubCategory.description &&
|
|
||||||
activeSubCategory.description.length > 0) ||
|
|
||||||
(activeCategory && activeCategory.description && activeCategory.description.length > 0) ||
|
(activeCategory && activeCategory.description && activeCategory.description.length > 0) ||
|
||||||
(activeTopic && activeTopic.description && activeTopic.description.length > 0))"
|
(activeTopic && activeTopic.description && activeTopic.description.length > 0))"
|
||||||
class="uk-text-center">
|
class="uk-text-center">
|
||||||
|
@ -104,15 +101,12 @@
|
||||||
: (activeCategory && activeCategory.description && activeCategory.description.length > 0 ? activeCategory.description :
|
: (activeCategory && activeCategory.description && activeCategory.description.length > 0 ? activeCategory.description :
|
||||||
(activeTopic.description && activeTopic.description.length > 0 ? activeTopic.description : ""))}}
|
(activeTopic.description && activeTopic.description.length > 0 ? activeTopic.description : ""))}}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<ng-template [ngIf]="!loading && !privateStakeholder &&
|
<ng-template [ngIf]="!loading && !privateStakeholder &&
|
||||||
(!activeSubCategory ||
|
(!activeSubCategory ||
|
||||||
(
|
((activeSubCategory.numbers.length == 0 || countSectionsWithIndicatorsToShow(activeSubCategory.numbers) == 0) &&
|
||||||
(activeSubCategory.numbers.length == 0 || (activeSubCategory.numbers.length == 1 && countIndicatorsToShow(activeSubCategory.numbers[0].indicators) == 0))
|
(activeSubCategory.charts.length == 0 || countSectionsWithIndicatorsToShow(activeSubCategory.charts) == 0))
|
||||||
&&
|
|| !activeTopic || !activeCategory || !activeSubCategory)" [ngIfElse]="content">
|
||||||
(activeSubCategory.charts.length == 0 || (activeSubCategory.charts.length == 1 && countIndicatorsToShow(activeSubCategory.charts[0].indicators) == 0))
|
|
||||||
) || !activeTopic || !activeCategory || !activeSubCategory)" [ngIfElse]="content">
|
|
||||||
<div class="message uk-text-center">
|
<div class="message uk-text-center">
|
||||||
<h3>
|
<h3>
|
||||||
No indicators available yet. Stay tuned!
|
No indicators available yet. Stay tuned!
|
||||||
|
@ -126,9 +120,8 @@
|
||||||
<h5 *ngIf="countIndicatorsToShow(number.indicators)> 0 "
|
<h5 *ngIf="countIndicatorsToShow(number.indicators)> 0 "
|
||||||
class="uk-width-1-1 uk-margin-bottom">{{number.title}}</h5>
|
class="uk-width-1-1 uk-margin-bottom">{{number.title}}</h5>
|
||||||
<ng-template ngFor [ngForOf]="number.indicators" let-indicator let-j="index">
|
<ng-template ngFor [ngForOf]="number.indicators" let-indicator let-j="index">
|
||||||
<div *ngIf="isPublicOrIsMember(indicator.visibility)"
|
<div *ngIf="isPublicOrIsMember(indicator.visibility)" class="uk-width-medium uk-margin-bottom">
|
||||||
[ngClass]="getNumberClassBySize(indicator.width)" class=" uk-margin-bottom">
|
<div class="uk-card uk-card-default uk-flex uk-flex-column uk-flex-center"
|
||||||
<div class="uk-card uk-card-default"
|
|
||||||
[class.uk-disabled]="indicator.indicatorPaths[0].filtersApplied < countSelectedFilters()"
|
[class.uk-disabled]="indicator.indicatorPaths[0].filtersApplied < countSelectedFilters()"
|
||||||
[class.semiFiltered]="indicator.indicatorPaths[0].filtersApplied < countSelectedFilters()">
|
[class.semiFiltered]="indicator.indicatorPaths[0].filtersApplied < countSelectedFilters()">
|
||||||
<div class="uk-card-body uk-text-center">
|
<div class="uk-card-body uk-text-center">
|
||||||
|
@ -202,7 +195,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="indicator.description || indicator.additionalDescription"
|
<div *ngIf="indicator.description || indicator.additionalDescription"
|
||||||
class="uk-overlay uk-position-bottom">
|
class="uk-overlay uk-position-bottom">
|
||||||
<div class="uk-padding-small multi-line-ellipsis lines-3">
|
<div class="uk-padding multi-line-ellipsis lines-3">
|
||||||
<p class="uk-margin-remove">
|
<p class="uk-margin-remove">
|
||||||
<span *ngIf="indicator.description">
|
<span *ngIf="indicator.description">
|
||||||
{{indicator.description}}
|
{{indicator.description}}
|
||||||
|
@ -231,8 +224,7 @@
|
||||||
</div>
|
</div>
|
||||||
<!--Feedback-->
|
<!--Feedback-->
|
||||||
<div class="uk-width-expand uk-text-right">
|
<div class="uk-width-expand uk-text-right">
|
||||||
<span class="uk-text-muted">Send us your <a [href]="mailText" target="_self"
|
<span class="uk-text-muted">Send us your <a [href]="feedback" target="_self">feedback</a>.</span>
|
||||||
(click)="mailMe()">feedback</a>.</span>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
|
|
|
@ -12,7 +12,7 @@ import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service";
|
||||||
import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service";
|
import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service";
|
||||||
import {
|
import {
|
||||||
Category, Indicator,
|
Category, Indicator,
|
||||||
IndicatorPath, IndicatorSize,
|
IndicatorPath, IndicatorSize, Section,
|
||||||
Stakeholder,
|
Stakeholder,
|
||||||
SubCategory,
|
SubCategory,
|
||||||
Topic,
|
Topic,
|
||||||
|
@ -77,6 +77,7 @@ export class MonitorComponent implements OnInit, OnDestroy {
|
||||||
privateStakeholder = false;
|
privateStakeholder = false;
|
||||||
public keyword: FormControl;
|
public keyword: FormControl;
|
||||||
public statsUpdateDate: Date;
|
public statsUpdateDate: Date;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private route: ActivatedRoute,
|
private route: ActivatedRoute,
|
||||||
private _router: Router,
|
private _router: Router,
|
||||||
|
@ -170,7 +171,7 @@ export class MonitorComponent implements OnInit, OnDestroy {
|
||||||
this.seoService.createLinkForCanonicalURL(url, false);
|
this.seoService.createLinkForCanonicalURL(url, false);
|
||||||
this._meta.updateTag({content: url}, "property='og:url'");
|
this._meta.updateTag({content: url}, "property='og:url'");
|
||||||
this.description = "Monitor Dashboard | " + this.stakeholder.name;
|
this.description = "Monitor Dashboard | " + this.stakeholder.name;
|
||||||
this.title = "Monitor Dashboard | " + this.stakeholder.name;
|
this.title = "Monitor Dashboard | " + this.stakeholder.name;
|
||||||
this._meta.updateTag({content: this.description}, "name='description'");
|
this._meta.updateTag({content: this.description}, "name='description'");
|
||||||
this._meta.updateTag({content: this.description}, "property='og:description'");
|
this._meta.updateTag({content: this.description}, "property='og:description'");
|
||||||
this._meta.updateTag({content: this.title}, "property='og:title'");
|
this._meta.updateTag({content: this.title}, "property='og:title'");
|
||||||
|
@ -184,7 +185,7 @@ export class MonitorComponent implements OnInit, OnDestroy {
|
||||||
this.subscriptions.push(this._piwikService.trackView(this.properties, this.title, this.piwikSiteId).subscribe());
|
this.subscriptions.push(this._piwikService.trackView(this.properties, this.title, this.piwikSiteId).subscribe());
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
|
||||||
}
|
}
|
||||||
if (this.isPublicOrIsMember(stakeholder.visibility)) {
|
if (this.isPublicOrIsMember(stakeholder.visibility)) {
|
||||||
//this.getDivContents();
|
//this.getDivContents();
|
||||||
|
@ -198,7 +199,7 @@ export class MonitorComponent implements OnInit, OnDestroy {
|
||||||
subscription.unsubscribe();
|
subscription.unsubscribe();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}else{
|
} else {
|
||||||
this.navigateToError();
|
this.navigateToError();
|
||||||
if (subscription) {
|
if (subscription) {
|
||||||
subscription.unsubscribe();
|
subscription.unsubscribe();
|
||||||
|
@ -410,7 +411,7 @@ export class MonitorComponent implements OnInit, OnDestroy {
|
||||||
|
|
||||||
private getfl0() {
|
private getfl0() {
|
||||||
if (this.queryParams["relfundinglevel0_id"] && this.filters.length > 0) {
|
if (this.queryParams["relfundinglevel0_id"] && this.filters.length > 0) {
|
||||||
let value = StringUtils.URIDecode(StringUtils.unquote(this.queryParams["relfundinglevel0_id"] ));
|
let value = StringUtils.URIDecode(StringUtils.unquote(this.queryParams["relfundinglevel0_id"]));
|
||||||
return value.split("::")[value.split("::").length - 1];
|
return value.split("::")[value.split("::").length - 1];
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
|
@ -418,7 +419,7 @@ export class MonitorComponent implements OnInit, OnDestroy {
|
||||||
|
|
||||||
private getCoFunded() {
|
private getCoFunded() {
|
||||||
if (this.queryParams["co-funded"] && this.filters.length > 0) {
|
if (this.queryParams["co-funded"] && this.filters.length > 0) {
|
||||||
return this.queryParams["co-funded"] && StringUtils.URIDecode(StringUtils.unquote(this.queryParams["co-funded"] )) == "co-funded-results";
|
return this.queryParams["co-funded"] && StringUtils.URIDecode(StringUtils.unquote(this.queryParams["co-funded"])) == "co-funded-results";
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -534,41 +535,36 @@ export class MonitorComponent implements OnInit, OnDestroy {
|
||||||
return counter;
|
return counter;
|
||||||
}
|
}
|
||||||
|
|
||||||
public countIndicatorsToShow(indicators: Indicator[]): number {
|
public countSectionsWithIndicatorsToShow(sections: Section[]):number {
|
||||||
let counter = 0;
|
let counter = 0;
|
||||||
for (let i of indicators) {
|
sections.forEach(section => {
|
||||||
if (this.isPublicOrIsMember(i.visibility)) {
|
section.indicators.forEach(indicator => {
|
||||||
counter++;
|
if (this.isPublicOrIsMember(indicator.visibility)) {
|
||||||
}
|
counter++;
|
||||||
}
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
return counter;
|
return counter;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
public countIndicatorsToShow(indicators: Indicator[]): number {
|
||||||
Feedback mail
|
let counter = 0;
|
||||||
*/
|
indicators.forEach(indicator => {
|
||||||
public get mailText() {
|
if (this.isPublicOrIsMember(indicator.visibility)) {
|
||||||
|
counter++;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return counter;
|
||||||
|
}
|
||||||
|
|
||||||
|
public get feedback() {
|
||||||
return "mailto:" + this.properties.feedbackmail + "?subject=%5BOpenAIRE%20Monitor%5D%20" + (this.stakeholder ? this.stakeholder.name : "") + "%20dashboard%20feedback"
|
return "mailto:" + this.properties.feedbackmail + "?subject=%5BOpenAIRE%20Monitor%5D%20" + (this.stakeholder ? this.stakeholder.name : "") + "%20dashboard%20feedback"
|
||||||
}
|
}
|
||||||
|
|
||||||
mailMe() {
|
|
||||||
window.location.href = this.mailText;
|
|
||||||
}
|
|
||||||
|
|
||||||
public getNumberClassBySize(size: IndicatorSize) {
|
|
||||||
if(size === 'small') {
|
|
||||||
return 'uk-width-1-4@xl uk-width-1-3@l uk-width-1-2@m uk-width-1-1';
|
|
||||||
} else if(size === 'medium') {
|
|
||||||
return 'uk-width-1-3@l uk-width-1-2@m uk-width-1-1';
|
|
||||||
} else {
|
|
||||||
return 'uk-width-1-2@l uk-width-1-1@m uk-width-1-1';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public getChartClassBySize(size: IndicatorSize) {
|
public getChartClassBySize(size: IndicatorSize) {
|
||||||
if(size === 'small') {
|
if (size === 'small') {
|
||||||
return 'uk-width-1-3@xl uk-width-1-2@m uk-width-1-1';
|
return 'uk-width-1-3@xl uk-width-1-2@m uk-width-1-1';
|
||||||
} else if(size === 'medium') {
|
} else if (size === 'medium') {
|
||||||
return 'uk-width-1-2@l uk-width-1-1';
|
return 'uk-width-1-2@l uk-width-1-1';
|
||||||
} else {
|
} else {
|
||||||
return 'uk-width-1-1';
|
return 'uk-width-1-1';
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 64051887ce031b36d74349496912e5c337801c15
|
Subproject commit 5c7430ae7cde032c1b6b4d9bd990f761cd6b73e3
|
|
@ -43,69 +43,76 @@
|
||||||
</div>
|
</div>
|
||||||
<ng-template ngFor [ngForOf]="number.indicators" let-indicator let-j="index">
|
<ng-template ngFor [ngForOf]="number.indicators" let-indicator let-j="index">
|
||||||
<div *ngIf="indicator" [id]="indicator._id"
|
<div *ngIf="indicator" [id]="indicator._id"
|
||||||
[ngClass]="getNumberClassBySize(indicator.width)"
|
class="uk-width-medium"
|
||||||
[class.disable-sortable]="!canReorder"
|
[class.disable-sortable]="!canReorder"
|
||||||
[class.uk-sortable-nodrag]="!canReorder">
|
[class.uk-sortable-nodrag]="!canReorder">
|
||||||
<div class="uk-card uk-card-default uk-card-body uk-position-relative" [class.uk-card-hover]="canReorder">
|
<div class="uk-card uk-card-default uk-flex uk-flex-column uk-flex-center uk-position-relative" [class.uk-card-hover]="canReorder">
|
||||||
<ng-container
|
<div class="uk-card-body">
|
||||||
*ngTemplateOutlet="visibilityOptions; context:{indicator: indicator, sectionId: number._id}"></ng-container>
|
<ng-container
|
||||||
<div [attr.uk-tooltip]="exportLoading ? 'title:Edit is disabled, while exporting indicators; cls:uk-active' : 'cls: uk-invisible'"
|
*ngTemplateOutlet="visibilityOptions; context:{indicator: indicator, sectionId: number._id}"></ng-container>
|
||||||
class="uk-position-top-right uk-margin-small-right uk-margin-small-top clickable">
|
<div
|
||||||
<i [class]="exportLoading ? 'uk-disabled ' : ' '" uk-icon="more-vertical" (click)="$event.stopPropagation();$event.preventDefault()"></i>
|
[attr.uk-tooltip]="exportLoading ? 'title:Edit is disabled, while exporting indicators; cls:uk-active' : 'cls: uk-invisible'"
|
||||||
<div #element uk-dropdown="mode: click; pos: bottom-right; delay-hide: 0; flip: false">
|
class="uk-position-top-right uk-margin-small-right uk-margin-small-top clickable">
|
||||||
<ul class="uk-nav uk-dropdown-nav">
|
<i [class]="exportLoading ? 'uk-disabled ' : ' '" uk-icon="more-vertical"
|
||||||
<li *ngIf="!editing"><a
|
(click)="$event.stopPropagation();$event.preventDefault()"></i>
|
||||||
(click)="editNumberIndicatorOpen(number, indicator._id)">Edit</a></li>
|
<div #element uk-dropdown="mode: click; pos: bottom-right; delay-hide: 0; flip: false">
|
||||||
<ng-template ngFor [ngForOf]="stakeholderUtils.visibility" let-v>
|
<ul class="uk-nav uk-dropdown-nav">
|
||||||
<li *ngIf="indicator.visibility != v.value"><a (click)="changeIndicatorStatus(number._id,
|
<li *ngIf="!editing"><a
|
||||||
|
(click)="editNumberIndicatorOpen(number, indicator._id)">Edit</a></li>
|
||||||
|
<ng-template ngFor [ngForOf]="stakeholderUtils.visibility" let-v>
|
||||||
|
<li *ngIf="indicator.visibility != v.value"><a (click)="changeIndicatorStatus(number._id,
|
||||||
indicator, v.value); hide(element)">
|
indicator, v.value); hide(element)">
|
||||||
{{'Make ' + v.label.toLowerCase()}}</a>
|
{{'Make ' + v.label.toLowerCase()}}</a>
|
||||||
|
</li>
|
||||||
|
</ng-template>
|
||||||
|
<hr *ngIf="!indicator.defaultId" class="uk-nav-divider">
|
||||||
|
<li *ngIf="!indicator.defaultId && !editing"><a
|
||||||
|
(click)="deleteIndicatorOpen(number, indicator._id, 'number', 'delete');hide(element)">Delete</a>
|
||||||
|
<!-- <ng-container *ngIf="!stakeholder.defaultId">-->
|
||||||
|
<!-- <a (click)="deleteIndicatorOpen(number, indicator._id, 'number', 'delete');hide(element)">Delete from all profiles</a>-->
|
||||||
|
<!-- <a (click)="deleteIndicatorOpen(number, indicator._id, 'number', 'disconnect');hide(element)">Delete and disconnect from all profiles</a>-->
|
||||||
|
<!-- </ng-container>-->
|
||||||
</li>
|
</li>
|
||||||
</ng-template>
|
</ul>
|
||||||
<hr *ngIf="!indicator.defaultId" class="uk-nav-divider">
|
</div>
|
||||||
<li *ngIf="!indicator.defaultId && !editing"><a
|
|
||||||
(click)="deleteIndicatorOpen(number, indicator._id, 'number', 'delete');hide(element)">Delete</a>
|
|
||||||
<!-- <ng-container *ngIf="!stakeholder.defaultId">-->
|
|
||||||
<!-- <a (click)="deleteIndicatorOpen(number, indicator._id, 'number', 'delete');hide(element)">Delete from all profiles</a>-->
|
|
||||||
<!-- <a (click)="deleteIndicatorOpen(number, indicator._id, 'number', 'disconnect');hide(element)">Delete and disconnect from all profiles</a>-->
|
|
||||||
<!-- </ng-container>-->
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div>
|
||||||
<div>
|
<div class="uk-text-center uk-text-bold">
|
||||||
<div class="uk-text-center uk-text-bold">
|
{{indicator.name ? indicator.name : 'No title available'}}
|
||||||
{{indicator.name ? indicator.name : 'No title available'}}
|
</div>
|
||||||
|
<h3 class="uk-margin-medium-top uk-text-center uk-text-bold">
|
||||||
|
<span *ngIf="numberResults.get(i + '-' + j)">{{numberResults.get(i + '-' + j) | number}}</span>
|
||||||
|
<span *ngIf="!numberResults.get(i + '-' + j)">--</span>
|
||||||
|
</h3>
|
||||||
|
<!--<ng-container *ngTemplateOutlet="description; context: {indicator:indicator}"></ng-container>-->
|
||||||
</div>
|
</div>
|
||||||
<h3 class="uk-margin-medium-top uk-text-center uk-text-bold">
|
<div *ngIf="indicator.description || indicator.additionalDescription"
|
||||||
<span *ngIf="numberResults.get(i + '-' + j)">{{numberResults.get(i + '-' + j) | number}}</span>
|
class="uk-overlay uk-position-bottom">
|
||||||
<span *ngIf="!numberResults.get(i + '-' + j)">--</span>
|
<div class="uk-padding multi-line-ellipsis lines-3">
|
||||||
</h3>
|
<p class="uk-margin-remove">
|
||||||
<!--<ng-container *ngTemplateOutlet="description; context: {indicator:indicator}"></ng-container>-->
|
|
||||||
</div>
|
|
||||||
<div *ngIf="indicator.description || indicator.additionalDescription" class="uk-overlay uk-position-bottom">
|
|
||||||
<p class="uk-margin-remove">
|
|
||||||
<span *ngIf="indicator.description">
|
<span *ngIf="indicator.description">
|
||||||
{{indicator.description}}
|
{{indicator.description}}
|
||||||
</span>
|
</span>
|
||||||
<br>
|
<br>
|
||||||
<span *ngIf="indicator.additionalDescription">
|
<span *ngIf="indicator.additionalDescription">
|
||||||
{{indicator.additionalDescription}}
|
{{indicator.additionalDescription}}
|
||||||
</span>
|
</span>
|
||||||
</p>
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
<div class="disable-sortable uk-sortable-nodrag uk-width-1-1">
|
<div class="disable-sortable uk-sortable-nodrag uk-width-1-1">
|
||||||
<div class="uk-grid uk-grid-small" uk-grid>
|
<div class="uk-grid uk-grid-small" uk-grid>
|
||||||
<div class="uk-width-1-4@xl uk-width-1-3@l uk-width-1-2@m uk-width-1-1">
|
<div class="uk-width-medium">
|
||||||
<div class="uk-card uk-card-default uk-card-body clickable" (click)="editNumberIndicatorOpen(number)">
|
<div class="uk-card uk-card-default uk-card-body clickable" (click)="editNumberIndicatorOpen(number)">
|
||||||
<h5 class="uk-text-bold">
|
<h6 class="uk-text-bold uk-text-center">
|
||||||
Create a new number Indicator
|
Create a new number Indicator
|
||||||
</h5>
|
</h6>
|
||||||
<div class="uk-flex uk-flex-center uk-text-secondary uk-margin-large-top">
|
<div class="uk-flex uk-flex-center uk-text-secondary uk-margin-large-top">
|
||||||
<icon name="add" ratio="5"></icon>
|
<icon name="add" ratio="4"></icon>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -165,9 +172,11 @@
|
||||||
<div class="uk-card uk-card-default uk-card-body uk-position-relative" [class.uk-card-hover]="canReorder">
|
<div class="uk-card uk-card-default uk-card-body uk-position-relative" [class.uk-card-hover]="canReorder">
|
||||||
<ng-container
|
<ng-container
|
||||||
*ngTemplateOutlet="visibilityOptions; context:{indicator: indicator, sectionId: chart._id}"></ng-container>
|
*ngTemplateOutlet="visibilityOptions; context:{indicator: indicator, sectionId: chart._id}"></ng-container>
|
||||||
<div [attr.uk-tooltip]="exportLoading ? 'title:Edit is disabled, while exporting indicators; cls:uk-active' : 'cls: uk-invisible'"
|
<div
|
||||||
class="uk-position-top-right uk-margin-small-right uk-margin-small-top clickable">
|
[attr.uk-tooltip]="exportLoading ? 'title:Edit is disabled, while exporting indicators; cls:uk-active' : 'cls: uk-invisible'"
|
||||||
<i [class]="exportLoading ? 'uk-disabled ' : ' '" uk-icon="more-vertical" (click)="$event.stopPropagation();$event.preventDefault()"></i>
|
class="uk-position-top-right uk-margin-small-right uk-margin-small-top clickable">
|
||||||
|
<i [class]="exportLoading ? 'uk-disabled ' : ' '" uk-icon="more-vertical"
|
||||||
|
(click)="$event.stopPropagation();$event.preventDefault()"></i>
|
||||||
<div #element uk-dropdown="mode: click; pos: bottom-right; delay-hide: 0; flip: false">
|
<div #element uk-dropdown="mode: click; pos: bottom-right; delay-hide: 0; flip: false">
|
||||||
<ul class="uk-nav uk-dropdown-nav">
|
<ul class="uk-nav uk-dropdown-nav">
|
||||||
<li *ngIf="!editing"><a
|
<li *ngIf="!editing"><a
|
||||||
|
@ -212,8 +221,9 @@
|
||||||
</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 *ngIf="indicator.description || indicator.additionalDescription"
|
||||||
<div class="uk-padding-small multi-line-ellipsis lines-3">
|
class="uk-overlay uk-position-bottom">
|
||||||
|
<div class="uk-padding multi-line-ellipsis lines-3">
|
||||||
<p class="uk-margin-remove">
|
<p class="uk-margin-remove">
|
||||||
<span *ngIf="indicator.description">
|
<span *ngIf="indicator.description">
|
||||||
{{indicator.description}}
|
{{indicator.description}}
|
||||||
|
@ -251,7 +261,6 @@
|
||||||
<ng-container *ngTemplateOutlet="new_section; context:{type: 'chart'}"></ng-container>
|
<ng-container *ngTemplateOutlet="new_section; context:{type: 'chart'}"></ng-container>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<modal-alert #editNumberModal
|
<modal-alert #editNumberModal
|
||||||
[large]="true"
|
[large]="true"
|
||||||
(alertOutput)="saveIndicator()"
|
(alertOutput)="saveIndicator()"
|
||||||
|
@ -275,10 +284,10 @@
|
||||||
placeholder="Select a status"
|
placeholder="Select a status"
|
||||||
label="Visibility" [options]="stakeholderUtils.visibility" type="select">
|
label="Visibility" [options]="stakeholderUtils.visibility" type="select">
|
||||||
</div>
|
</div>
|
||||||
<div dashboard-input class="uk-width-1-2@m" [formInput]="numberIndicatorFb.get('width')"
|
<!--<div dashboard-input class="uk-width-1-2@m" [formInput]="numberIndicatorFb.get('width')"
|
||||||
type="select" [options]="indicatorUtils.indicatorSizes"
|
type="select" [options]="indicatorUtils.indicatorSizes"
|
||||||
placeholder="Select a size" label="Number Size">
|
placeholder="Select a size" label="Number Size">
|
||||||
</div>
|
</div>-->
|
||||||
<div *ngIf="numberIndicatorPaths" formArrayName="indicatorPaths">
|
<div *ngIf="numberIndicatorPaths" formArrayName="indicatorPaths">
|
||||||
<div *ngFor="let indicatorPath of numberIndicatorPaths.controls; let i=index"
|
<div *ngFor="let indicatorPath of numberIndicatorPaths.controls; let i=index"
|
||||||
[formGroup]="indicatorPath">
|
[formGroup]="indicatorPath">
|
||||||
|
@ -293,7 +302,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="showCheckForSchemaEnhancements" class=" uk-width-1-1 ">
|
<div *ngIf="showCheckForSchemaEnhancements" class=" uk-width-1-1 ">
|
||||||
<div class="uk-alert uk-alert-warning">
|
<div class="uk-alert uk-alert-warning">
|
||||||
There are schema enchancements that can be applied in this query. <a
|
There are schema enhancements that can be applied in this query. <a
|
||||||
(click)="indicatorPath.get('url').setValue(indicatorUtils.applySchemaEnhancements(indicatorPath.get('url').value)); indicatorPath.get('url').markAsDirty()">Apply
|
(click)="indicatorPath.get('url').setValue(indicatorUtils.applySchemaEnhancements(indicatorPath.get('url').value)); indicatorPath.get('url').markAsDirty()">Apply
|
||||||
now</a>
|
now</a>
|
||||||
</div>
|
</div>
|
||||||
|
@ -555,8 +564,10 @@
|
||||||
Are you sure you want to proceed?
|
Are you sure you want to proceed?
|
||||||
</modal-alert>-->
|
</modal-alert>-->
|
||||||
<ng-template #visibilityOptions let-indicator="indicator" let-sectionId="sectionId">
|
<ng-template #visibilityOptions let-indicator="indicator" let-sectionId="sectionId">
|
||||||
<span [attr.uk-tooltip]="exportLoading ? 'title:Edit is disabled, while exporting indicators; cls:uk-active' : 'cls: uk-invisible'"
|
<span
|
||||||
class="uk-position-top-left uk-margin-small-left uk-margin-small-top visibility" [class]="exportLoading ? '' : ' clickable '">
|
[attr.uk-tooltip]="exportLoading ? 'title:Edit is disabled, while exporting indicators; cls:uk-active' : 'cls: uk-invisible'"
|
||||||
|
class="uk-position-top-left uk-margin-small-left uk-margin-small-top visibility"
|
||||||
|
[class]="exportLoading ? '' : ' clickable '">
|
||||||
<span [class]="exportLoading ? 'uk-disabled ' : ' '" class="clickable color">
|
<span [class]="exportLoading ? 'uk-disabled ' : ' '" class="clickable color">
|
||||||
<icon [name]="stakeholderUtils.visibilityIcon.get(indicator.visibility)"></icon>
|
<icon [name]="stakeholderUtils.visibilityIcon.get(indicator.visibility)"></icon>
|
||||||
</span>
|
</span>
|
||||||
|
|
|
@ -436,16 +436,6 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
|
||||||
return this.chartIndicatorFb.get('indicatorPaths') as FormArray;
|
return this.chartIndicatorFb.get('indicatorPaths') as FormArray;
|
||||||
}
|
}
|
||||||
|
|
||||||
public getNumberClassBySize(size: IndicatorSize) {
|
|
||||||
if (size === 'small') {
|
|
||||||
return 'uk-width-1-4@xl uk-width-1-3@l uk-width-1-2@m uk-width-1-1';
|
|
||||||
} else if (size === 'medium') {
|
|
||||||
return 'uk-width-1-3@l uk-width-1-2@m uk-width-1-1';
|
|
||||||
} else {
|
|
||||||
return 'uk-width-1-2@l uk-width-1-1@m uk-width-1-1';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public getChartClassBySize(size: IndicatorSize) {
|
public getChartClassBySize(size: IndicatorSize) {
|
||||||
if (size === 'small') {
|
if (size === 'small') {
|
||||||
return 'uk-width-1-3@xl uk-width-1-2@m uk-width-1-1';
|
return 'uk-width-1-3@xl uk-width-1-2@m uk-width-1-1';
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 363790356aeb20339fab6d36516864ab44931dd7
|
Subproject commit 443ef4d544d370c698ed0856481b71e489a044d8
|
|
@ -1 +1 @@
|
||||||
Subproject commit 72f3272e41d93e82042a293e8e85493fe8cfe6c2
|
Subproject commit 8f656664973f82d9f6f0228968a77643964da805
|
Loading…
Reference in New Issue