.

laraxot · Sep 17, 2024 · e1ec2d9 · e1ec2d9
1 parent e547d32
commit e1ec2d9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 24 deletions.
diff --git a/Actions/JpGraph/V1/Pie1Action.php b/Actions/JpGraph/V1/Pie1Action.php
@@ -21,14 +21,9 @@ public function execute(AnswersChartData $answersChartData): Graph
         $data = $answersChartData->answers->toCollection()->pluck('avg')->all();
         $chart = $answersChartData->chart;
         // dddx(['labels' => $labels, 'data' => $data, 'chart' => $chart]);
-        // dddx($chart->max);
+
         if (isset($chart->max)) {
-            // $sum = collect($data)->sum();
-            if(is_array($data)){
-                $sum = collect($data[0])->sum();
-            }else{
-                $sum = collect($data)->sum();
-            }
+            $sum = collect($data)->sum();
             $other = $chart->max - $sum;
             // dddx([$sum, $other, $this->vars['max']]);
             if ($other > 0.01) {

diff --git a/Actions/JpGraph/V1/PieAvgAction.php b/Actions/JpGraph/V1/PieAvgAction.php
@@ -23,12 +23,6 @@ public function execute(AnswersChartData $answersChartData): Graph
         $chart = $answersChartData->chart;
         if (isset($chart->max)) {
             $sum = collect($data)->sum();
-            // if(is_array($data)){
-            //     $sum = collect($data[0])->sum();
-            // }else{
-            //     $sum = collect($data)->sum();
-            // }
-
             $other = $chart->max - $sum;
             // $other = $chart->max - $chart->avg;
             if ($other > 0.01) {

diff --git a/Datas/AnswersChartData.php b/Datas/AnswersChartData.php
@@ -72,11 +72,6 @@ public function getChartJsData(): array
 
             if (isset($this->chart->max)) {
                 $sum = collect($data)->sum();
-                // if(is_array($data)){
-                //     $sum = collect($data[0])->sum();
-                // }else{
-                //     $sum = collect($data)->sum();
-                // }
                 $other = $this->chart->max - $sum;
                 if ($other > 0.01) {
                     $data[] = $other;
@@ -107,12 +102,7 @@ public function getChartJsData(): array
             }
 
             if (isset($this->chart->max)) {
-                // $sum = collect($data)->sum();
-                if(is_array($data)){
-                    $sum = collect($data[0])->sum();
-                }else{
-                    $sum = collect($data)->sum();
-                }
+                $sum = collect($data)->sum();
                 $other = $this->chart->max - $sum;
                 if ($other > 0.01) {
                     $data[] = $other;