MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Production release June 2024 [Monitor Dashboard, Irish Monitor] #45

Merged
k.triantafyllou merged 10 commits from develop into master 2024-06-20 11:31:07 +02:00
Conversation 0 Commits 10 Files Changed 13 +10 -3
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit deaa358cea - Show all commits

8
monitor-admin/topic/indicators.component.html
View File

@ -565,9 +565,11 @@
<div *ngIf="getParameter(i, 'yAxisTitle')" input class="uk-width-1-3@s" <div *ngIf="getParameter(i, 'yAxisTitle')" input class="uk-width-1-3@s"
[formInput]="getParameter(i, 'yAxisTitle').get('value')" [formInput]="getParameter(i, 'yAxisTitle').get('value')"
placeholder="Y-Axis Title"></div> placeholder="Y-Axis Title"></div>
<div *ngFor="let dataTitle of dataTitles(i); let j=index" input class="uk-width-1-3@s" <ng-container *ngIf="isLegendEnabled(indicator, i)">
[formInput]="getParameter(i, dataTitle).get('value')" <div *ngFor="let dataTitle of dataTitles(i); let j=index" input class="uk-width-1-3@s"
[placeholder]="'Data Title ' + (j + 1)"></div> [formInput]="getParameter(i, dataTitle).get('value')"
[placeholder]="'Data Title ' + (j + 1)"></div>
</ng-container>
<div *ngIf="getParameter(i, 'start_year')" input class="uk-width-1-3@s" <div *ngIf="getParameter(i, 'start_year')" input class="uk-width-1-3@s"
[formInput]="getParameter(i, 'start_year').get('value')" [formInput]="getParameter(i, 'start_year').get('value')"
placeholder="Year (From)"></div> placeholder="Year (From)"></div>

5
monitor-admin/topic/indicators.component.ts
View File

@ -1547,4 +1547,9 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
get isEditable(): boolean { get isEditable(): boolean {
return this.stakeholder.copy || this.stakeholder.defaultId == null || this.stakeholder.defaultId == '-1'; return this.stakeholder.copy || this.stakeholder.defaultId == null || this.stakeholder.defaultId == '-1';
} }
isLegendEnabled(indicator, i){
let chartObject = JSON.parse(indicator.indicatorPaths[i].chartObject, indicator.indicatorPaths[i].chartObject)
return !chartObject || !chartObject.chartDescription.legend || chartObject.chartDescription.legend.enabled
}
} }