aboutsummaryrefslogtreecommitdiff
path: root/frontend/src/app/_elements
diff options
context:
space:
mode:
Diffstat (limited to 'frontend/src/app/_elements')
-rw-r--r--frontend/src/app/_elements/_charts/box-plot/box-plot.component.ts25
-rw-r--r--frontend/src/app/_elements/column-table/column-table.component.ts17
2 files changed, 39 insertions, 3 deletions
diff --git a/frontend/src/app/_elements/_charts/box-plot/box-plot.component.ts b/frontend/src/app/_elements/_charts/box-plot/box-plot.component.ts
index 9addd6bb..0b952392 100644
--- a/frontend/src/app/_elements/_charts/box-plot/box-plot.component.ts
+++ b/frontend/src/app/_elements/_charts/box-plot/box-plot.component.ts
@@ -25,8 +25,31 @@ export class BoxPlotComponent implements AfterViewInit {
@Input()q1?: number;
@Input()q3?: number;
+ updateChart(min: number, max: number, q1: number, q3: number, median: number){
+ console.log(this.min, this.max);
+ const newBoxPlotData = {
+ labels: [""],
+ datasets: [{
+ label: 'Dataset 1',
+ backgroundColor: '#0063AB',
+ borderColor: '#dfd7d7',
+ borderWidth: 1,
+ outlierColor: '#999999',
+ scaleFontColor: '#0063AB',
+ padding: 10,
+ itemRadius: 0,
+ data: [
+ {min, q1, median, q3, max}/*,
+ [0, 25, 51, 75, 99]*/
+ ]}]
+ };
+ Object.assign(this.boxplotData, newBoxPlotData);
+ };
+
@ViewChild('boxplot') chartRef!: ElementRef;
- constructor() { }
+ constructor() {
+ //this.updateChart();
+ }
boxplotData = {
// define label tree
diff --git a/frontend/src/app/_elements/column-table/column-table.component.ts b/frontend/src/app/_elements/column-table/column-table.component.ts
index 44a15f22..b3fcf9a3 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.ts
+++ b/frontend/src/app/_elements/column-table/column-table.component.ts
@@ -12,6 +12,8 @@ import { ExperimentsService } from 'src/app/_services/experiments.service';
import { SaveExperimentDialogComponent } from 'src/app/_modals/save-experiment-dialog/save-experiment-dialog.component';
import { AlertDialogComponent } from 'src/app/_modals/alert-dialog/alert-dialog.component';
import Shared from 'src/app/Shared';
+import { PieChartComponent } from '../_charts/pie-chart/pie-chart.component';
+import { BoxPlotComponent } from '../_charts/box-plot/box-plot.component';
@Component({
selector: 'app-column-table',
@@ -20,6 +22,8 @@ import Shared from 'src/app/Shared';
})
export class ColumnTableComponent implements AfterViewInit {
+ @ViewChildren(BoxPlotComponent) boxplotComp!: BoxPlotComponent[];
+ @ViewChildren(PieChartComponent) piechartComp!: PieChartComponent[];
@Input() dataset?: Dataset;
@Input() experiment!: Experiment;
@Output() okPressed: EventEmitter<string> = new EventEmitter();
@@ -42,9 +46,13 @@ export class ColumnTableComponent implements AfterViewInit {
//ovo mi nece trebati jer primam dataset iz druge komponente
}
+ updateCharts(){
+ //this.boxplotComp.forEach(bp => bp.updateChart());
+ }
+
loadDataset(dataset: Dataset) {
this.dataset = dataset;
-
+ this.updateCharts();
this.setColumnTypeInitial();
this.dataset.columnInfo.forEach(column => {
@@ -70,7 +78,8 @@ export class ColumnTableComponent implements AfterViewInit {
}
ngAfterViewInit(): void {
-
+ console.log(this.dataset?.columnInfo);
+
}
setColumnTypeInitial() {
@@ -367,3 +376,7 @@ export class Tab {
public value: Table
) { }
}
+function BoxplotComponent(BoxplotComponent: any) {
+ throw new Error('Function not implemented.');
+}
+