refactoring

This commit is contained in:
frankknoll
2023-04-15 21:59:13 +02:00
parent 2cb9b4256b
commit c0edd89606
2 changed files with 13 additions and 12 deletions

View File

@@ -3,12 +3,13 @@ class BatchCodeDetailsView {
#uiContainer; #uiContainer;
#adverseReactionReportsChartView; #adverseReactionReportsChartView;
#histogramChartView; #histogramChartView;
#chartWithSlider;
constructor(uiContainer) { constructor(uiContainer) {
this.#uiContainer = uiContainer this.#uiContainer = uiContainer
this.#adverseReactionReportsChartView = new AdverseReactionReportsChartView(this.#uiContainer.querySelector('#adverseReactionReportsChartView')); this.#adverseReactionReportsChartView = new AdverseReactionReportsChartView(this.#uiContainer.querySelector('#adverseReactionReportsChartView'));
const chartWithSlider = this.#uiContainer.querySelector('.chartWithSlider'); this.#chartWithSlider = this.#uiContainer.querySelector('.chartWithSlider');
this.#histogramChartView = new HistogramChartView(chartWithSlider.querySelector("canvas")); this.#histogramChartView = new HistogramChartView(this.#chartWithSlider.querySelector("canvas"));
} }
// FK-TODO: unbind all events here and in HistogramChartView // FK-TODO: unbind all events here and in HistogramChartView
@@ -32,10 +33,9 @@ class BatchCodeDetailsView {
#displayHistogramViewForHistoDescrs(histoDescrs) { #displayHistogramViewForHistoDescrs(histoDescrs) {
this.#displayHeading(histoDescrs.batchcode); this.#displayHeading(histoDescrs.batchcode);
this.#displayData(histoDescrs); this.#displayData(histoDescrs);
const chartWithSlider = this.#uiContainer.querySelector('.chartWithSlider');
this.#displayAdverseReactionReportsChart(histoDescrs); this.#displayAdverseReactionReportsChart(histoDescrs);
this.#displaySelectBatchcodeCombination(histoDescrs.histograms, this.#histogramChartView, chartWithSlider); this.#displaySelectBatchcodeCombination(histoDescrs.histograms);
this.#displayHistogram(histoDescrs.histograms[0], this.#histogramChartView, chartWithSlider); this.#displayHistogram(histoDescrs.histograms[0]);
} }
#displayHeading(batchcode) { #displayHeading(batchcode) {
@@ -66,28 +66,28 @@ class BatchCodeDetailsView {
this.#uiContainer.appendChild(p); this.#uiContainer.appendChild(p);
} }
#displaySelectBatchcodeCombination(histograms, histogramChartView, chartWithSlider) { #displaySelectBatchcodeCombination(histograms) {
const selectBatchcodeCombinationElement = this.#uiContainer.querySelector("#selectBatchcodeCombination"); const selectBatchcodeCombinationElement = this.#uiContainer.querySelector("#selectBatchcodeCombination");
BatchcodeCombinationSelection.configureSelectBatchcodeCombinationElement( BatchcodeCombinationSelection.configureSelectBatchcodeCombinationElement(
{ {
selectBatchcodeCombinationElement: selectBatchcodeCombinationElement, selectBatchcodeCombinationElement: selectBatchcodeCombinationElement,
histograms: histograms, histograms: histograms,
onSelect: histoDescr => this.#displayHistogram(histoDescr, histogramChartView, chartWithSlider) onSelect: histoDescr => this.#displayHistogram(histoDescr)
}); });
} }
#displayHistogram(histoDescr, histogramChartView, chartWithSlider) { #displayHistogram(histoDescr) {
histogramChartView.displayChart(histoDescr); this.#histogramChartView.displayChart(histoDescr);
this.#createSlider( this.#createSlider(
{ {
sliderElement: chartWithSlider.querySelector(".slider"), sliderElement: this.#chartWithSlider.querySelector(".slider"),
range: { range: {
min: 0, min: 0,
max: Object.keys(histoDescr.histogram).length max: Object.keys(histoDescr.histogram).length
}, },
orientation: 'vertical', orientation: 'vertical',
height: chartWithSlider.querySelector("canvas").style.height, height: this.#chartWithSlider.querySelector("canvas").style.height,
onUpdate: range => histogramChartView.setData(this.#slice(histoDescr, range)) onUpdate: range => this.#histogramChartView.setData(this.#slice(histoDescr, range))
}); });
} }

View File

@@ -9,6 +9,7 @@ class BatchcodeCombinationSelection {
const histoDescr = histograms[event.target.value]; const histoDescr = histograms[event.target.value];
onSelect(histoDescr); onSelect(histoDescr);
}); });
onSelect(histograms[0]);
} }
static #addBatchcodeCombinationOptions(batchcodesSelect, histograms) { static #addBatchcodeCombinationOptions(batchcodesSelect, histograms) {