AOKB/onboard
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Фикс выбора отделения

Browse Source
This commit is contained in:
brusnitsyn
2026-06-22 17:09:57 +09:00
parent 13dfcc3e05
commit 8e6bbc5f91
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Web/ReportsController.php
View File

@@ -239,6 +239,7 @@ class ReportsController extends Controller
{ {
$datasetKey = (string) $request->input('dataset'); $datasetKey = (string) $request->input('dataset');
abort_unless($this->datasets->has($datasetKey), 422); abort_unless($this->datasets->has($datasetKey), 422);
$departmentId = $request->input('departmentId');
$dataset = $this->datasets->get($datasetKey); $dataset = $this->datasets->get($datasetKey);
$customMeasures = $this->customMeasuresFor($datasetKey); $customMeasures = $this->customMeasuresFor($datasetKey);
@@ -263,6 +264,8 @@ class ReportsController extends Controller
$detalization = in_array($request->input('detalization'), ['day', 'week', 'month'], true) $detalization = in_array($request->input('detalization'), ['day', 'week', 'month'], true)
? $request->input('detalization') : 'month'; ? $request->input('detalization') : 'month';
$department = Department::find($departmentId);
return new AnalyticsQuery( return new AnalyticsQuery(
datasetKey: $datasetKey, datasetKey: $datasetKey,
dimensions: $dimensions, dimensions: $dimensions,
@@ -270,7 +273,7 @@ class ReportsController extends Controller
filters: $filters, filters: $filters,
mode: $mode, mode: $mode,
detalization: $detalization, detalization: $detalization,
department: $this->resolveDepartment($request, $user), department: $department,
dateRange: $this->dateRangeService->getDateRangeFromRequest($request, $user), dateRange: $this->dateRangeService->getDateRangeFromRequest($request, $user),
chart: (array) $request->input('chart', []), chart: (array) $request->input('chart', []),
customMeasures: $customMeasures, customMeasures: $customMeasures,