diff --git a/src/api/TotalRecordsController.php b/src/api/TotalRecordsController.php index 8a07433..14271d1 100644 --- a/src/api/TotalRecordsController.php +++ b/src/api/TotalRecordsController.php @@ -63,7 +63,7 @@ public function handle(NovaRequest $request) } $seriesSql .= "then ".$calculation." else 0 end) as '".$labelList[$seriesKey]."'"; } else { - $seriesSql .= ", SUM(CASE WHEN ".$filter->key." ".($filter->operator ?? "=")." '".$filter->value."' then ".$calculation." else 0 end) as '".$labelList[$seriesKey]."'"; + $seriesSql .= ", SUM(CASE WHEN ".$filter->key." ".($filter->operator ?? "=")." '".$filter->value."' then ".$calculation." else 0 end) as \"".$labelList[$seriesKey]."\""; } } } @@ -134,7 +134,14 @@ public function handle(NovaRequest $request) $query = $model::selectRaw('HOUR('.$xAxisColumn.') AS cat, HOUR('.$xAxisColumn.') AS catorder, sum('.$calculation.') counted'.$seriesSql) ->join($joinInformation['joinTable'], $joinInformation['joinColumnFirst'], $joinInformation['joinEqual'], $joinInformation['joinColumnSecond']); } else { - $query = $model::selectRaw('HOUR('.$xAxisColumn.') AS cat, HOUR('.$xAxisColumn.') AS catorder, sum('.$calculation.') counted'.$seriesSql); + if($connectionName == 'pgsql'){ + $query = $model::selectRaw("to_char(DATE_TRUNC('hour', ".$xAxisColumn."), 'HH24:MI:SS') AS cat, to_char(DATE_TRUNC('hour', ".$xAxisColumn."), 'HH24:MI:SS') AS catorder, sum(".$calculation.") counted".$seriesSql); + + } + else{ + $query = $model::selectRaw('HOUR('.$xAxisColumn.') AS cat, HOUR('.$xAxisColumn.') AS catorder, sum('.$calculation.') counted'.$seriesSql); + + } } if(is_numeric($advanceFilterSelected)){