Обновлен стартовый экран

Переписаны запросы для статистики, отчетов
Добавлена интеграция отчета сестры

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

@@ -9,10 +9,8 @@ class AdminController extends Controller
 {
     public function index()
     {
-        return Inertia::render('Admin/Index',
-            [
+        abort_unless(auth()->user()->isAdmin(), 403);
 
-            ]
-        );
+        return Inertia::render('Admin/Index', []);
     }
 }

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

@@ -0,0 +1,199 @@
+<?php
+
+namespace App\Http\Controllers\Web\Admin;
+
+use App\Http\Controllers\Controller;
+use App\Models\MetrikaGroup;
+use App\Models\MetrikaGroupItem;
+use App\Models\MetrikaItem;
+use Illuminate\Http\Request;
+use Illuminate\Support\Str;
+use Inertia\Inertia;
+
+class MetrikaController extends Controller
+{
+    public function index()
+    {
+        abort_unless(auth()->user()->isAdmin(), 403);
+
+        $groups = MetrikaGroup::withCount('groupItems')->get()->map(fn($g) => [
+            'id'          => $g->metrika_group_id,
+            'name'        => $g->name,
+            'description' => $g->description,
+            'items_count' => $g->group_items_count,
+        ]);
+
+        $items = MetrikaItem::all()->map(fn($i) => [
+            'id'          => $i->metrika_item_id,
+            'name'        => $i->name,
+            'description' => $i->description,
+            'data_type'   => $i->data_type,
+            'is_active'   => $i->is_active,
+            'code'        => $i->code,
+        ]);
+
+        return Inertia::render('Admin/Metrics/Index', [
+            'groups' => $groups,
+            'items'  => $items,
+        ]);
+    }
+
+    // ── Группы ──
+
+    public function createGroup()
+    {
+        abort_unless(auth()->user()->isAdmin(), 403);
+
+        return Inertia::render('Admin/Metrics/Group', [
+            'group'    => null,
+            'itemIds'  => [],
+            'allItems' => $this->allItems(),
+        ]);
+    }
+
+    public function storeGroup(Request $request)
+    {
+        abort_unless(auth()->user()->isAdmin(), 403);
+
+        $validated = $request->validate([
+            'name'        => 'required|string|max:255',
+            'description' => 'nullable|string',
+            'items'       => 'array',
+            'items.*'     => 'integer|exists:metrika_items,metrika_item_id',
+        ]);
+
+        $group = MetrikaGroup::create([
+            'name'        => $validated['name'],
+            'description' => $validated['description'] ?? null,
+        ]);
+
+        foreach ($validated['items'] ?? [] as $itemId) {
+            MetrikaGroupItem::create([
+                'rf_metrika_group_id' => $group->metrika_group_id,
+                'rf_metrika_item_id'  => $itemId,
+            ]);
+        }
+
+        return redirect('/admin/metrics')->with('success', 'Группа создана');
+    }
+
+    public function showGroup(MetrikaGroup $group)
+    {
+        abort_unless(auth()->user()->isAdmin(), 403);
+
+        $itemIds = MetrikaGroupItem::where('rf_metrika_group_id', $group->metrika_group_id)
+            ->pluck('rf_metrika_item_id')
+            ->toArray();
+
+        return Inertia::render('Admin/Metrics/Group', [
+            'group'    => ['id' => $group->metrika_group_id, 'name' => $group->name, 'description' => $group->description],
+            'itemIds'  => $itemIds,
+            'allItems' => $this->allItems(),
+        ]);
+    }
+
+    public function updateGroup(MetrikaGroup $group, Request $request)
+    {
+        abort_unless(auth()->user()->isAdmin(), 403);
+
+        $validated = $request->validate([
+            'name'        => 'required|string|max:255',
+            'description' => 'nullable|string',
+            'items'       => 'array',
+            'items.*'     => 'integer|exists:metrika_items,metrika_item_id',
+        ]);
+
+        $group->update([
+            'name'        => $validated['name'],
+            'description' => $validated['description'] ?? null,
+        ]);
+
+        MetrikaGroupItem::where('rf_metrika_group_id', $group->metrika_group_id)->delete();
+        foreach ($validated['items'] ?? [] as $itemId) {
+            MetrikaGroupItem::create([
+                'rf_metrika_group_id' => $group->metrika_group_id,
+                'rf_metrika_item_id'  => $itemId,
+            ]);
+        }
+
+        return redirect('/admin/metrics')->with('success', 'Группа сохранена');
+    }
+
+    // ── Показатели ──
+
+    public function createItem()
+    {
+        abort_unless(auth()->user()->isAdmin(), 403);
+
+        return Inertia::render('Admin/Metrics/Item', ['item' => null]);
+    }
+
+    public function storeItem(Request $request)
+    {
+        abort_unless(auth()->user()->isAdmin(), 403);
+
+        $validated = $request->validate([
+            'name'          => 'required|string|max:255',
+            'description'   => 'nullable|string',
+            'data_type'     => 'required|string|in:integer,float,string,text,boolean,select',
+            'is_active'     => 'required|boolean',
+            'is_required'   => 'boolean',
+            'default_value' => 'nullable|string',
+            'placeholder'   => 'nullable|string',
+        ]);
+
+        MetrikaItem::create([
+            ...$validated,
+            'code' => Str::slug($validated['name']),
+        ]);
+
+        return redirect('/admin/metrics')->with('success', 'Показатель создан');
+    }
+
+    public function showItem(MetrikaItem $item)
+    {
+        abort_unless(auth()->user()->isAdmin(), 403);
+
+        return Inertia::render('Admin/Metrics/Item', [
+            'item' => [
+                'id'            => $item->metrika_item_id,
+                'name'          => $item->name,
+                'description'   => $item->description,
+                'data_type'     => $item->data_type,
+                'is_active'     => $item->is_active,
+                'is_required'   => $item->is_required,
+                'default_value' => $item->default_value,
+                'placeholder'   => $item->placeholder,
+                'code'          => $item->code,
+            ],
+        ]);
+    }
+
+    public function updateItem(MetrikaItem $item, Request $request)
+    {
+        abort_unless(auth()->user()->isAdmin(), 403);
+
+        $validated = $request->validate([
+            'name'          => 'required|string|max:255',
+            'description'   => 'nullable|string',
+            'data_type'     => 'required|string|in:integer,float,string,text,boolean,select',
+            'is_active'     => 'required|boolean',
+            'is_required'   => 'boolean',
+            'default_value' => 'nullable|string',
+            'placeholder'   => 'nullable|string',
+        ]);
+
+        $item->update($validated);
+
+        return redirect('/admin/metrics')->with('success', 'Показатель сохранён');
+    }
+
+    private function allItems(): array
+    {
+        return MetrikaItem::where('is_active', true)->get()->map(fn($i) => [
+            'metrika_item_id' => $i->metrika_item_id,
+            'name'            => $i->name,
+            'data_type'       => $i->data_type,
+        ])->toArray();
+    }
+}

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

@@ -7,14 +7,17 @@ use App\Models\Department;
 use App\Models\Role;
 use App\Models\User;
 use App\Models\UserDepartment;
+use App\Models\UserRole;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Hash;
 use Inertia\Inertia;
 
 class UserController extends Controller
 {
     public function index()
     {
-        $users = User::with(['roles', 'department'])->get()->map(function ($user) {
+        abort_unless(auth()->user()->isAdmin(), 403);
+        $users = User::with(['appRoles', 'department'])->get()->map(function ($user) {
             return [
                 'id' => $user->id,
                 'name' => $user->name,
@@ -25,76 +28,169 @@ class UserController extends Controller
             ];
         });
 
-        return Inertia::render('Admin/Users/Index',
-            [
-                'users' => $users,
-            ]
-        );
+        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,
-            ];
-        });
+        abort_unless(auth()->user()->isAdmin(), 403);
 
         return Inertia::render('Admin/Users/Create', [
-            'departments' => $departmentData,
-            'roles' => $rolesData,
+            'departments' => $this->allDepartments(),
+            'roles' => $this->allRoles(),
         ]);
     }
 
     public function store(Request $request)
     {
+        abort_unless(auth()->user()->isAdmin(), 403);
+
         $validated = $request->validate([
-            'name' => 'required|string',
-            'login' => 'required|string',
-            'password' => 'required|string',
-            'is_active' => 'required|boolean',
+            'name'        => 'required|string|max:255',
+            'login'       => 'required|string|max:255|unique:users,login',
+            'password'    => 'required|string|min:6',
+            'is_active'   => 'required|boolean',
+            'department_id' => 'required|integer|exists:departments,department_id',
+            'departments' => 'array',
+            'departments.*' => 'integer|exists:departments,department_id',
+            'roles'       => 'required|array|min:1',
+            'roles.*'     => 'integer|exists:roles,role_id',
         ]);
 
-        dd($validated);
+        $user = User::create([
+            'name'             => $validated['name'],
+            'login'            => $validated['login'],
+            'password'         => Hash::make($validated['password']),
+            'is_active'        => $validated['is_active'],
+            'rf_department_id' => $validated['department_id'],
+        ]);
+
+        // Назначаем роли — первая роль становится дефолтной
+        foreach ($validated['roles'] as $i => $roleId) {
+            UserRole::create([
+                'rf_user_id' => $user->id,
+                'rf_role_id' => $roleId,
+                'is_active'  => true,
+                'is_default' => $i === 0,
+            ]);
+        }
+
+        // Привязываем дополнительные отделения
+        foreach ($validated['departments'] ?? [] as $i => $deptId) {
+            UserDepartment::create([
+                'rf_user_id'       => $user->id,
+                'rf_department_id' => $deptId,
+                'is_favorite'      => false,
+                'order'            => $i,
+            ]);
+        }
+
+        return redirect('/admin/users')->with('success', 'Пользователь создан');
     }
 
-    public function show(User $user, Request $request)
+    public function show(User $user)
     {
+        abort_unless(auth()->user()->isAdmin(), 403);
+
         $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'),
+            'id'          => $user->id,
+            'name'        => $user->name,
+            'login'       => $user->login,
+            'is_active'   => $user->is_active,
+            'department_id' => $user->rf_department_id,
+            '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,
-            ];
-        });
+        $userRoleIds = $user->userRoles()->pluck('rf_role_id')->toArray();
 
-        $departmentData = $user->departments->map(function (UserDepartment $userDepartment) {
-            return [
-                'department_id' => $userDepartment->department->department_id,
-                'name_full' => $userDepartment->department->name_full,
-            ];
-        });
+        $userDepartmentIds = UserDepartment::where('rf_user_id', $user->id)
+            ->pluck('rf_department_id')
+            ->toArray();
 
         return Inertia::render('Admin/Users/User', [
-            'userData' => $userData,
-            'roles' => $rolesData,
-            'departments' => $departmentData,
+            'userData'          => $userData,
+            'userRoleIds'       => $userRoleIds,
+            'userDepartmentIds' => $userDepartmentIds,
+            'allRoles'          => $this->allRoles(),
+            'allDepartments'    => $this->allDepartments(),
         ]);
     }
+
+    public function update(User $user, Request $request)
+    {
+        abort_unless(auth()->user()->isAdmin(), 403);
+
+        $validated = $request->validate([
+            'name'          => 'required|string|max:255',
+            'login'         => 'required|string|max:255|unique:users,login,' . $user->id,
+            'is_active'     => 'required|boolean',
+            'department_id' => 'required|integer|exists:departments,department_id',
+            'departments'   => 'array',
+            'departments.*' => 'integer|exists:departments,department_id',
+            'roles'         => 'required|array|min:1',
+            'roles.*'       => 'integer|exists:roles,role_id',
+        ]);
+
+        $user->update([
+            'name'             => $validated['name'],
+            'login'            => $validated['login'],
+            'is_active'        => $validated['is_active'],
+            'rf_department_id' => $validated['department_id'],
+        ]);
+
+        // Синхронизируем роли
+        UserRole::where('rf_user_id', $user->id)->delete();
+        foreach ($validated['roles'] as $i => $roleId) {
+            UserRole::create([
+                'rf_user_id' => $user->id,
+                'rf_role_id' => $roleId,
+                'is_active'  => true,
+                'is_default' => $i === 0,
+            ]);
+        }
+
+        // Синхронизируем доп. отделения через updateOrCreate
+        $newDeptIds = $validated['departments'] ?? [];
+        UserDepartment::where('rf_user_id', $user->id)
+            ->whereNotIn('rf_department_id', $newDeptIds)
+            ->delete();
+        foreach ($newDeptIds as $i => $deptId) {
+            UserDepartment::updateOrCreate(
+                ['rf_user_id' => $user->id, 'rf_department_id' => $deptId],
+                ['is_favorite' => false, 'order' => $i]
+            );
+        }
+
+        return redirect('/admin/users/' . $user->id)->with('success', 'Данные сохранены');
+    }
+
+    public function resetPassword(User $user, Request $request)
+    {
+        abort_unless(auth()->user()->isAdmin(), 403);
+
+        $request->validate([
+            'password' => 'required|string|min:6|confirmed',
+        ]);
+
+        $user->update(['password' => Hash::make($request->password)]);
+
+        return redirect('/admin/users/' . $user->id)->with('success', 'Пароль изменён');
+    }
+
+    private function allRoles(): array
+    {
+        return Role::all()->map(fn($r) => [
+            'role_id' => $r->role_id,
+            'name'    => $r->name,
+        ])->toArray();
+    }
+
+    private function allDepartments(): array
+    {
+        return Department::orderBy('name_full')->get()->map(fn($d) => [
+            'department_id' => $d->department_id,
+            'name_full'     => $d->name_full,
+        ])->toArray();
+    }
 }