Merge branch 'redesign' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into redesign

# Conflicts:
#	frontend/src/app/_pages/experiment/experiment.component.ts

2 files changed, 19 insertions, 5 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 bf5e3fd6..07976da3 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
@@ -28,10 +28,28 @@ export class BoxPlotComponent implements AfterViewInit {
   updateChart(min: number, max: number, q1: number, q3: number, median: number) {
     if (this.myChart) {
       this.boxplotData.datasets[0].data = [[min, q1, median, q3, max]]
-      this.myChart.update();
+      this.myChart?.update();
     }
+    /*this.boxplotData.datasets = [{
+      data: [[min, q1, median, q3, max]],
+    }]*/
+
   };
 
+  /*
+  updatePieChart(uniqueValues: string[], uniqueValuesPercent: number[]){
+    //console.log(this.uniqueValues, this.uniqueValuesPercent);
+    this.pieChartData.datasets =  [{
+        label: "%",
+        backgroundColor: ["#3e95cd", "#8e5ea2","#3cba9f","#e8c3b9","#c45850", "#000000"],
+        data: uniqueValuesPercent,
+      }];
+      this.pieChartData.labels = uniqueValues
+      console.log(this.uniqueValues, this.uniqueValuesPercent);
+      this.myChart?.update() 
+    };
+  */
+
   @ViewChild('boxplot') chartRef!: ElementRef;
   constructor() {
     //this.updateChart();
diff --git a/frontend/src/app/_elements/_charts/pie-chart/pie-chart.component.ts b/frontend/src/app/_elements/_charts/pie-chart/pie-chart.component.ts
index cba5252a..9264e41c 100644
--- a/frontend/src/app/_elements/_charts/pie-chart/pie-chart.component.ts
+++ b/frontend/src/app/_elements/_charts/pie-chart/pie-chart.component.ts
@@ -58,10 +58,6 @@ export class PieChartComponent implements AfterViewInit {
     data: data     
   ,
     options: {
-      /*title: {
-        display: true,
-        text: 'Predicted world population (millions) in 2050'
-      }*/
       plugins:{   
         legend: {
           display: false