[Monitor Dashboard | Trunk]
-call setSidebar when stakeholder is already available from admin -hide section title when there are no indicators - git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59789 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
parent
d4d41adcfc
commit
2ce065b70e
|
@ -17,7 +17,8 @@
|
||||||
'monitor.openaire.eu'" queryParamsHandling="preserve"
|
'monitor.openaire.eu'" queryParamsHandling="preserve"
|
||||||
></dashboard-sidebar>
|
></dashboard-sidebar>
|
||||||
<dashboard-sidebar *ngIf="hasAdminMenu" [items]="adminMenuItems" headerName="Admin"
|
<dashboard-sidebar *ngIf="hasAdminMenu" [items]="adminMenuItems" headerName="Admin"
|
||||||
headerDashboard="Administration Panel" [headerUrl]="properties.domain + properties.baseLink"
|
headerDashboard="Administration Panel" [headerUrl]="'https://' + (properties.environment == 'beta' ? 'beta.' : '') +
|
||||||
|
'monitor.openaire.eu'"
|
||||||
[specialMenuItem]="specialSideBarMenuItem"
|
[specialMenuItem]="specialSideBarMenuItem"
|
||||||
></dashboard-sidebar>
|
></dashboard-sidebar>
|
||||||
<router-outlet></router-outlet>
|
<router-outlet></router-outlet>
|
||||||
|
|
|
@ -124,7 +124,7 @@ export class AppComponent implements OnInit, OnDestroy {
|
||||||
} else {
|
} else {
|
||||||
this.activeTopic = this.stakeholder.topics.find(topic => this.isPublicOrIsMember(topic.visibility));
|
this.activeTopic = this.stakeholder.topics.find(topic => this.isPublicOrIsMember(topic.visibility));
|
||||||
}
|
}
|
||||||
// this.setSideBar();
|
this.setSideBar();
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
} else {
|
} else {
|
||||||
LinksResolver.resetProperties();
|
LinksResolver.resetProperties();
|
||||||
|
@ -147,6 +147,7 @@ export class AppComponent implements OnInit, OnDestroy {
|
||||||
} else {
|
} else {
|
||||||
this.activeTopic = this.stakeholder.topics.find(topic => this.isPublicOrIsMember(topic.visibility));
|
this.activeTopic = this.stakeholder.topics.find(topic => this.isPublicOrIsMember(topic.visibility));
|
||||||
}
|
}
|
||||||
|
this.setSideBar();
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -226,7 +227,6 @@ export class AppComponent implements OnInit, OnDestroy {
|
||||||
}
|
}
|
||||||
if (this.stakeholder) {
|
if (this.stakeholder) {
|
||||||
if (this.isFrontPage) {
|
if (this.isFrontPage) {
|
||||||
this.setSideBar();
|
|
||||||
this.menuHeader = {
|
this.menuHeader = {
|
||||||
route: "/" + this.stakeholder.alias,
|
route: "/" + this.stakeholder.alias,
|
||||||
url: null,
|
url: null,
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
.uk-card {
|
.uk-card {
|
||||||
min-height: 270px;
|
min-height: 150px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.uk-card-body {
|
.uk-card-body {
|
||||||
|
|
|
@ -124,7 +124,7 @@
|
||||||
<div class="uk-text-small uk-text-muted">
|
<div class="uk-text-small uk-text-muted">
|
||||||
{{text}}
|
{{text}}
|
||||||
</div>
|
</div>
|
||||||
<div class="uk-margin-medium-top">
|
<div class="uk-margin-medium-top uk-margin-small-bottom">
|
||||||
<span class="uk-text-secondary">
|
<span class="uk-text-secondary">
|
||||||
<icon name="add" [ratio]="3"></icon>
|
<icon name="add" [ratio]="3"></icon>
|
||||||
</span>
|
</span>
|
||||||
|
|
|
@ -123,7 +123,7 @@
|
||||||
<div *ngIf="activeSubCategory" class="uk-grid uk-grid-medium uk-margin-bottom uk-margin-top"
|
<div *ngIf="activeSubCategory" class="uk-grid uk-grid-medium uk-margin-bottom uk-margin-top"
|
||||||
uk-height-match="target: div.uk-card">
|
uk-height-match="target: div.uk-card">
|
||||||
<ng-template ngFor [ngForOf]="activeSubCategory.numbers" let-number let-i="index">
|
<ng-template ngFor [ngForOf]="activeSubCategory.numbers" let-number let-i="index">
|
||||||
<h4 class="uk-width-1-1">{{number.title}}</h4>
|
<h4 *ngIf="countIndicatorsToShow(number.indicators)> 0 " class="uk-width-1-1">{{number.title}}</h4>
|
||||||
<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-1-3@m]="indicator.width === 'small'"
|
[class.uk-width-1-3@m]="indicator.width === 'small'"
|
||||||
|
@ -153,7 +153,8 @@
|
||||||
class="uk-grid uk-grid-medium uk-margin-bottom uk-flex uk-flex-bottom "
|
class="uk-grid uk-grid-medium uk-margin-bottom uk-flex uk-flex-bottom "
|
||||||
uk-height-match="target: div > div > .chartTitle">
|
uk-height-match="target: div > div > .chartTitle">
|
||||||
|
|
||||||
<h3 *ngIf="chart.title && chart.title.length > 0" class="uk-width-1-1 uk-margin-top">{{chart.title}}</h3>
|
<h3 *ngIf="chart.title && chart.title.length > 0 && countIndicatorsToShow(chart.indicators) > 0 "
|
||||||
|
class="uk-width-1-1 uk-margin-top">{{chart.title}}</h3>
|
||||||
<ng-template ngFor [ngForOf]="chart.indicators" let-indicator let-j="index">
|
<ng-template ngFor [ngForOf]="chart.indicators" let-indicator let-j="index">
|
||||||
<div
|
<div
|
||||||
*ngIf="isPublicOrIsMember(indicator.visibility) && chartsActiveType.get(i + '-' + j)"
|
*ngIf="isPublicOrIsMember(indicator.visibility) && chartsActiveType.get(i + '-' + j)"
|
||||||
|
|
|
@ -11,7 +11,7 @@ import {HelperService} from "../openaireLibrary/utils/helper/helper.service";
|
||||||
import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service";
|
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,
|
Category, Indicator,
|
||||||
IndicatorPath,
|
IndicatorPath,
|
||||||
Stakeholder,
|
Stakeholder,
|
||||||
SubCategory,
|
SubCategory,
|
||||||
|
@ -450,6 +450,15 @@ export class MonitorComponent implements OnInit, OnDestroy {
|
||||||
}
|
}
|
||||||
return counter;
|
return counter;
|
||||||
}
|
}
|
||||||
|
public countIndicatorsToShow(indicators:Indicator[]): number {
|
||||||
|
let counter = 0;
|
||||||
|
for (let i of indicators) {
|
||||||
|
if(this.isPublicOrIsMember(i.visibility)) {
|
||||||
|
counter++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return counter;
|
||||||
|
}
|
||||||
/*
|
/*
|
||||||
Feedback mail
|
Feedback mail
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue