Merge branch 'main' into pages

This commit is contained in:
frankknoll
2022-03-31 15:56:37 +02:00
3 changed files with 19 additions and 8 deletions

View File

@@ -4905,6 +4905,16 @@ table thead .checkbox.radio { margin-top:-7px;margin-top:-21px; }
/*prevent datatables overflowing its container*/ /*prevent datatables overflowing its container*/
} }
.noUi-target { .chartWithSlider {
height: 300px; display: flex;
flex-wrap: nowrap;
flex-direction: row;
}
.chartWithSlider .chart {
flex: 95%;
}
.chartWithSlider .slider {
flex: 5%;
} }

View File

@@ -104,14 +104,13 @@
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
<div class="x_content"> <div class="x_content">
<div class="row"> <div class="chartWithSlider">
<div class="col-xs-11"> <div class="chart">
<canvas id="medianOfFreeBedsByKreis"></canvas> <canvas id="medianOfFreeBedsByKreis"></canvas>
</div> </div>
<div class="col-xs-1"> <div class="slider">
<div id="slider"></div> <div id="slider"></div>
</div> </div>
<div class="clearfix"></div>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -61,10 +61,11 @@ function _displayMedianOfFreeBedsByKreisChart(canvas, sliderElement, data) {
min: 0, min: 0,
max: data.length - 1 max: data.length - 1
}, },
canvas.style.height,
([start, end]) => medianOfFreeBedsByKreisChartView.setData(data.slice(start, end + 1))); ([start, end]) => medianOfFreeBedsByKreisChartView.setData(data.slice(start, end + 1)));
} }
function createSlider(sliderElement, range, onUpdate) { function createSlider(sliderElement, range, height, onUpdate) {
noUiSlider.create( noUiSlider.create(
sliderElement, sliderElement,
{ {
@@ -75,4 +76,5 @@ function createSlider(sliderElement, range, onUpdate) {
orientation: 'vertical' orientation: 'vertical'
}); });
sliderElement.noUiSlider.on('update', onUpdate); sliderElement.noUiSlider.on('update', onUpdate);
sliderElement.style.height = height;
} }