From e1ec2d95c55945053ff81d8d0ac52e8f86580b3d Mon Sep 17 00:00:00 2001 From: Malebestia Date: Tue, 17 Sep 2024 17:10:18 +0200 Subject: [PATCH] . --- Actions/JpGraph/V1/Pie1Action.php | 9 ++------- Actions/JpGraph/V1/PieAvgAction.php | 6 ------ Datas/AnswersChartData.php | 12 +----------- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/Actions/JpGraph/V1/Pie1Action.php b/Actions/JpGraph/V1/Pie1Action.php index 6a9ef5f9..a3f7b739 100755 --- 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 index d2d1f01d..c3a4291d 100755 --- 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 index 269c4614..bacb152f 100755 --- 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;