Merge pull request #171 from TMCApplications/count-object-fix

Argument #1 ($value) must be of type Countable|array, stdClass given
coroo · Nov 21, 2023 · 49627b5 · 49627b5
2 parents 5c638da + 3130d45
commit 49627b5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/api/TotalCircleController.php b/src/api/TotalCircleController.php
@@ -26,7 +26,6 @@ public function handle(NovaRequest $request)
  $options = is_string($request->options) ? json_decode($request->options, true) : $request->input('options', []);
  $join = is_string($request->join) ? json_decode($request->join, true) : $request->input('join', []);
 
- $showTotal = $options['showTotal'] ?? true;
  $advanceFilterSelected = $options['advanceFilterSelected'] ?? false;
  $dataForLast = $options['latestData'] ?? 3;
  $calculation = $options['sum'] ?? 1;
@@ -52,8 +51,9 @@ public function handle(NovaRequest $request)
  $seriesSql .= ", SUM(CASE WHEN ".$filter->key." ".$filter->operator." then ".$calculation." else 0 end) as \"".$labelList[$seriesKey]."\"";
  } else if(empty($filter->value)){
  $seriesSql .= ", SUM(CASE WHEN ";
- $countFilter = count($filter);
+ $countFilter = count((array) $filter);
  foreach($filter as $keyFilter => $listFilter){
+ $listFilter = (object) $listFilter;
  $seriesSql .= " ".$listFilter->key." ".($listFilter->operator ?? "=")." '".$listFilter->value."' ";
  $seriesSql .= $countFilter-1 != $keyFilter ? " AND " : "";
  }

diff --git a/src/api/TotalRecordsController.php b/src/api/TotalRecordsController.php
@@ -27,7 +27,7 @@ public function handle(NovaRequest $request)
  $options = is_string($request->options) ? json_decode($request->options, true) : $request->input('options', []);
  $join = is_string($request->join) ? json_decode($request->join, true) : $request->input('join', []);
 
- $showTotal = $options['showTotal'] ?? true;
+ $showTotal = (bool) json_decode($options['showTotal'] ?? true);
  $totalLabel = $options['totalLabel'] ?? 'Total';
  $chartType = $request->type ?? 'bar';
  $advanceFilterSelected = $options['advanceFilterSelected'] ?? false;
@@ -62,8 +62,9 @@ public function handle(NovaRequest $request)
  $seriesSql .= ", SUM(CASE WHEN ".$filter->key." ".$filter->operator." then ".$calculation." else 0 end) as \"".$labelList[$seriesKey]."\"";
  } else if(empty($filter->value)){
  $seriesSql .= ", SUM(CASE WHEN ";
- $countFilter = count($filter);
+ $countFilter = count((array) $filter);
  foreach($filter as $keyFilter => $listFilter){
+ $listFilter = (object) $listFilter;
  $seriesSql .= " ".$listFilter->key." ".($listFilter->operator ?? "=")." '".$listFilter->value."' ";
  $seriesSql .= $countFilter-1 != $keyFilter ? " AND " : "";
  }
@@ -255,7 +256,7 @@ public function handle(NovaRequest $request)
  });
  $countKey++;
  }
- if($showTotal == true){
+ if($showTotal){
  $yAxis[$countKey] = $this->counted($dataSet, $defaultColor[$countKey], 'line', $totalLabel);
  }
  } else {