Set report grouping-type on export

excelwebzone · excelwebzone · commit 013a31d4b9a3 · 2021-01-28T09:01:52.000-08:00
diff --git a/src/Controller/Admin/Api/AbstractReportController.php b/src/Controller/Admin/Api/AbstractReportController.php
@@ -61,6 +61,7 @@ public function chart(Request $request, Report $report): JsonResponse
     public function export(Request $request, Packages $assetsManager, Report $report): JsonResponse
     {
         // get consts
+        $groupingType = $request->query->get('groupingType', 'monthly');
         $sort = $request->query->get('sort');
 
         // convert request filters into query
@@ -75,6 +76,7 @@ public function export(Request $request, Packages $assetsManager, Report $report
         }
 
         $report->setCriteria($criteria);
+        $report->setGroupingType($groupingType);
         $report->setSort($sort);
 
         /** @var array $items */

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ public function chart(Request $request, Report $report): JsonResponse`
`61`	`61`	`public function export(Request $request, Packages $assetsManager, Report $report): JsonResponse`
`62`	`62`	`{`
`63`	`63`	`// get consts`
	`64`	`+ $groupingType = $request->query->get('groupingType', 'monthly');`
`64`	`65`	`$sort = $request->query->get('sort');`
`65`	`66`
`66`	`67`	`// convert request filters into query`
`@@ -75,6 +76,7 @@ public function export(Request $request, Packages $assetsManager, Report $report`
`75`	`76`	`}`
`76`	`77`
`77`	`78`	`$report->setCriteria($criteria);`
	`79`	`+ $report->setGroupingType($groupingType);`
`78`	`80`	`$report->setSort($sort);`
`79`	`81`
`80`	`82`	`/** @var array $items */`