Skip to content

Commit b7a96d4

Browse files
authored
Merge pull request #348 from iteratec/feature/timeSeriesChartDataRestriction
Time series chart data restriction
2 parents b61114d + 8507f3d commit b7a96d4

27 files changed

+2042
-1630
lines changed

frontend/package-lock.json

Lines changed: 19 additions & 58 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<div class="card">
2+
<div class="time-series-chart">
3+
<osm-spinner [spinnerId]="'time-series-line-chart-spinner'"></osm-spinner>
4+
<div class="settings-row">
5+
<div *ngFor="let measurandGroup of dataTrimLabels | keyvalue">
6+
<span class="input-group dimension-group">
7+
<label
8+
class="input-group-addon settings-element dimension-label">{{'frontend.de.iteratec.isr.measurand.group.axisLabel.' + measurandGroup.key | translate}}</label>
9+
<input (focusout)="adjustInputRangeAndInputValues('min', 'max', measurandGroup.key)"
10+
(input)="adjustInputByEvent($event, 'min', 'max', measurandGroup.key)"
11+
[(ngModel)]="selectedTrimValues.min[measurandGroup.key]"
12+
[max]="dataTrimInputRange.max[measurandGroup.key]"
13+
[min]="dataTrimInputRange.min[measurandGroup.key]"
14+
[step]="dataTrimInputStep[measurandGroup.key]"
15+
class="form-control settings-element trim-value-input-field min-input"
16+
placeholder="{{'frontend.de.iteratec.osm.timeSeries.chart.settings.minimum' | translate}}"
17+
type="number">
18+
<input (focusout)="adjustInputRangeAndInputValues('max', 'min', measurandGroup.key)"
19+
(input)="adjustInputByEvent($event, 'max', 'min', measurandGroup.key)"
20+
[(ngModel)]="selectedTrimValues.max[measurandGroup.key]"
21+
[max]="dataTrimInputRange.max[measurandGroup.key]"
22+
[min]="dataTrimInputRange.min[measurandGroup.key]"
23+
[step]="dataTrimInputStep[measurandGroup.key]"
24+
class="form-control settings-element trim-value-input-field"
25+
placeholder="{{'frontend.de.iteratec.osm.timeSeries.chart.settings.maximum' | translate}}"
26+
type="number">
27+
<label *ngIf="measurandGroup.value !== '#'"
28+
class="input-group-addon settings-element dimension-label">{{measurandGroup.value}}</label>
29+
</span>
30+
</div>
31+
</div>
32+
33+
<div id="time-series-line-chart-container">
34+
<svg #svg/>
35+
</div>
36+
37+
</div>
38+
</div>
39+
40+
<ngx-smart-modal id="pointSelectionErrorModal" identifier="pointSelectionErrorModal">
41+
<header>
42+
<h2>{{ "frontend.de.iteratec.chart.errorHeader" | translate }}</h2>
43+
</header>
44+
<main>
45+
<div>{{ "frontend.de.iteratec.chart.datapointSelection.error.multipleServer" | translate }}</div>
46+
</main>
47+
<footer>
48+
<button (click)="this.ngxSmartModalService.close('pointSelectionErrorModal')" class="btn btn-default">
49+
{{ "frontend.default.button.cancel.label" | translate }}
50+
</button>
51+
</footer>
52+
</ngx-smart-modal>

0 commit comments

Comments
 (0)