nothing

app/Http/Controllers/Web/Admin/AdminController.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Web\Admin;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Inertia\Inertia;
+
+class AdminController extends Controller
+{
+    public function index()
+    {
+        return Inertia::render('Admin/Index',
+            [
+
+            ]
+        );
+    }
+}

app/Http/Controllers/Web/Admin/UserController.php

@@ -0,0 +1,100 @@
+<?php
+
+namespace App\Http\Controllers\Web\Admin;
+
+use App\Http\Controllers\Controller;
+use App\Models\Department;
+use App\Models\Role;
+use App\Models\User;
+use App\Models\UserDepartment;
+use Illuminate\Http\Request;
+use Inertia\Inertia;
+
+class UserController extends Controller
+{
+    public function index()
+    {
+        $users = User::with(['roles', 'department'])->get()->map(function ($user) {
+            return [
+                'id' => $user->id,
+                'name' => $user->name,
+                'login' => $user->login,
+                'is_active' => $user->is_active,
+                'created_at' => $user->created_at->format('d.m.Y H:i:s'),
+                'updated_at' => $user->updated_at->format('d.m.Y H:i:s'),
+            ];
+        });
+
+        return Inertia::render('Admin/Users/Index',
+            [
+                'users' => $users,
+            ]
+        );
+    }
+
+    public function create()
+    {
+        $rolesData = Role::all()->map(function ($role) {
+            return [
+                'role_id' => $role->role_id,
+                'name' => $role->name,
+            ];
+        });
+
+        $departmentData = Department::all()->map(function (Department $department) {
+            return [
+                'department_id' => $department->department_id,
+                'name_full' => $department->name_full,
+            ];
+        });
+
+        return Inertia::render('Admin/Users/Create', [
+            'departments' => $departmentData,
+            'roles' => $rolesData,
+        ]);
+    }
+
+    public function store(Request $request)
+    {
+        $validated = $request->validate([
+            'name' => 'required|string',
+            'login' => 'required|string',
+            'password' => 'required|string',
+            'is_active' => 'required|boolean',
+        ]);
+
+        dd($validated);
+    }
+
+    public function show(User $user, Request $request)
+    {
+        $userData = [
+            'id' => $user->id,
+            'name' => $user->name,
+            'login' => $user->login,
+            'is_active' => $user->is_active,
+            'created_at' => $user->created_at->format('d.m.Y H:i:s'),
+            'updated_at' => $user->updated_at->format('d.m.Y H:i:s'),
+        ];
+
+        $rolesData = $user->roles->map(function ($role) {
+            return [
+                'role_id' => $role->role_id,
+                'name' => $role->name,
+            ];
+        });
+
+        $departmentData = $user->departments->map(function (UserDepartment $userDepartment) {
+            return [
+                'department_id' => $userDepartment->department->department_id,
+                'name_full' => $userDepartment->department->name_full,
+            ];
+        });
+
+        return Inertia::render('Admin/Users/User', [
+            'userData' => $userData,
+            'roles' => $rolesData,
+            'departments' => $departmentData,
+        ]);
+    }
+}

app/Http/Controllers/Web/ReportController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Web;
 
 use App\Http\Controllers\Controller;
 use App\Http\Resources\Mis\FormattedPatientResource;
+use App\Models\Department;
 use App\Models\MetrikaGroup;
 use App\Models\MisLpuDoctor;
 use App\Models\Report;
@@ -25,22 +26,25 @@ class ReportController extends Controller
     public function index(Request $request)
     {
         $user = Auth::user();
-        $department = $user->department;
+        $departmentId = $request->query('departmentId', $user->department->department_id);
+        $department = Department::where('department_id', $departmentId)->first(); //$user->department;
 
         $dateRange = $this->dateRangeService->getDateRangeFromRequest($request, $user);
 
         // Получаем статистику
-        $statistics = $this->reportService->getReportStatistics($user, $dateRange);
+        $statistics = $this->reportService->getReportStatistics($department, $user, $dateRange);
 
         // Получаем метрики
         $metrikaGroup = MetrikaGroup::whereMetrikaGroupId(2)->first();
         $metrikaItems = $metrikaGroup->metrikaItems;
 
         // Получаем информацию о текущем отчете
-        $reportInfo = $this->reportService->getCurrentReportInfo($user, $dateRange);
+        $reportInfo = $this->reportService->getCurrentReportInfo($department, $user, $dateRange);
 
         return Inertia::render('Report/Index', [
             'department' => [
+                'department_name' => $department->name_full,
+                'department_id' => $department->department_id,
                 'beds' => $department->beds,
                 'percentLoadedBeds' => $this->calculateBedOccupancy($department, $user),
                 ...$statistics,
@@ -88,7 +92,7 @@ class ReportController extends Controller
         $patients = $this->reportService->getPatientsByStatus(
             Auth::user(),
             $validated['status'],
-            $dateRange
+            $dateRange,
         );
 
         return response()->json(FormattedPatientResource::collection($patients));
@@ -143,10 +147,10 @@ class ReportController extends Controller
     /**
      * Рассчитать загруженность коек
      */
-    private function calculateBedOccupancy($department, $user): int
+    private function calculateBedOccupancy(Department $department, $user): int
     {
         $beds = (int)$department->metrikaDefault()->where('rf_metrika_item_id', 1)->first()->value;
-        $occupiedBeds = optional(Report::where('rf_department_id', $user->rf_department_id)
+        $occupiedBeds = optional(Report::where('rf_department_id', $department->department_id)
             ->join('metrika_results', 'reports.report_id', '=', 'metrika_results.rf_report_id')
             ->where('metrika_results.rf_metrika_item_id', 8)
             ->orderBy('sent_at', 'desc')