Фикс выбора отделения
This commit is contained in:
@@ -239,6 +239,7 @@ class ReportsController extends Controller
|
||||
{
|
||||
$datasetKey = (string) $request->input('dataset');
|
||||
abort_unless($this->datasets->has($datasetKey), 422);
|
||||
$departmentId = $request->input('departmentId');
|
||||
|
||||
$dataset = $this->datasets->get($datasetKey);
|
||||
$customMeasures = $this->customMeasuresFor($datasetKey);
|
||||
@@ -263,6 +264,8 @@ class ReportsController extends Controller
|
||||
$detalization = in_array($request->input('detalization'), ['day', 'week', 'month'], true)
|
||||
? $request->input('detalization') : 'month';
|
||||
|
||||
$department = Department::find($departmentId);
|
||||
|
||||
return new AnalyticsQuery(
|
||||
datasetKey: $datasetKey,
|
||||
dimensions: $dimensions,
|
||||
@@ -270,7 +273,7 @@ class ReportsController extends Controller
|
||||
filters: $filters,
|
||||
mode: $mode,
|
||||
detalization: $detalization,
|
||||
department: $this->resolveDepartment($request, $user),
|
||||
department: $department,
|
||||
dateRange: $this->dateRangeService->getDateRangeFromRequest($request, $user),
|
||||
chart: (array) $request->input('chart', []),
|
||||
customMeasures: $customMeasures,
|
||||
|
||||
Reference in New Issue
Block a user