refactoring

This commit is contained in:
frankknoll
2023-01-30 23:10:22 +01:00
parent 08c434faf6
commit a994d437e8

View File

@@ -20,17 +20,18 @@ class HistogramView {
loadingText.remove(); loadingText.remove();
return response.json(); return response.json();
}) })
.then(histoDescrs => {
histoDescrs.histograms.sort((histoDescr1, histoDescr2) => histoDescr1.batchcodes.length - histoDescr2.batchcodes.length);
return histoDescrs;
});
} }
#displayHistogramViewForHistoDescrs(histoDescrs) { #displayHistogramViewForHistoDescrs(histoDescrs) {
const chartWithSlider = UIUtils.instantiateTemplate('template-chartWithSlider'); const chartWithSlider = UIUtils.instantiateTemplate('template-chartWithSlider');
const histogramChartView = new HistogramChartView(chartWithSlider.querySelector("canvas")); const histogramChartView = new HistogramChartView(chartWithSlider.querySelector("canvas"));
const selectBatchcodeCombination = this.#displaySelectBatchcodeCombination(histoDescrs.histograms, histogramChartView, chartWithSlider); this.#displaySelectBatchcodeCombination(histoDescrs.histograms, histogramChartView, chartWithSlider);
this.#uiContainer.appendChild(chartWithSlider); this.#uiContainer.appendChild(chartWithSlider);
this.#displayHistogram( this.#displayHistogram(histoDescrs.histograms[0], histogramChartView, chartWithSlider);
this.#getSelectedHistoDescr(selectBatchcodeCombination, histoDescrs.histograms),
histogramChartView,
chartWithSlider);
} }
#displaySelectBatchcodeCombination(histograms, histogramChartView, chartWithSlider) { #displaySelectBatchcodeCombination(histograms, histogramChartView, chartWithSlider) {
@@ -44,12 +45,6 @@ class HistogramView {
this.#displayHistogram(histoDescr, histogramChartView, chartWithSlider); this.#displayHistogram(histoDescr, histogramChartView, chartWithSlider);
}); });
this.#uiContainer.appendChild(selectBatchcodeCombination); this.#uiContainer.appendChild(selectBatchcodeCombination);
return selectBatchcodeCombination;
}
#getSelectedHistoDescr(selectBatchcodeCombination, histograms) {
const selectedIndex = UIUtils.getSelectedOption(selectBatchcodeCombination.querySelector('#batchcodesSelect')).value;
return histograms[selectedIndex];
} }
#addBatchcodeCombinationOptions(batchcodesSelect, histograms) { #addBatchcodeCombinationOptions(batchcodesSelect, histograms) {
@@ -57,20 +52,7 @@ class HistogramView {
} }
#getBatchcodeCombinationOptions(histograms) { #getBatchcodeCombinationOptions(histograms) {
const options = histograms.map(this.#getBatchcodeCombinationOption); return histograms.map(this.#getBatchcodeCombinationOption);
const mapped = histograms.map((histoDescr, index) => ({ index: index, value: histoDescr.batchcodes.length }));
mapped.sort((a, b) => {
if (a.value > b.value) {
return 1;
}
if (a.value < b.value) {
return -1;
}
return 0;
});
const optionsSorted = mapped.map(v => options[v.index]);
optionsSorted[0].selected = true;
return optionsSorted;
} }
#getBatchcodeCombinationOption(histoDescr, index) { #getBatchcodeCombinationOption(histoDescr, index) {