From f2cb2bdb3f6662e32e5fe8e46dcedc6fd2473f39 Mon Sep 17 00:00:00 2001
From: F4ilji <f4ilj@yandex.ru>
Date: Mon, 12 May 2025 11:53:17 +0500
Subject: [PATCH] fix minor bugs

---
 .../RelationManagers/ProgramsRelationManager.php           | 4 ++++
 .../RelationManagers/TeachersRelationManager.php           | 4 ++++
 .../RelationManagers/WorkersRelationManager.php            | 4 ++++
 .../RelationManagers/WorkersRelationManager.php            | 7 ++++++-
 app/Filament/Resources/FacultyResource.php                 | 2 +-
 .../RelationManagers/WorkersRelationManager.php            | 4 ++++
 resources/js/Pages/Client/Departments/Show.vue             | 2 +-
 resources/js/Pages/Client/Divisions/Show.vue               | 2 +-
 resources/js/Pages/Client/Faculties/Show.vue               | 2 +-
 .../departments/components/DepartmentItemBreadcrumbs.vue   | 2 +-
 10 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/app/Filament/Resources/DepartmentResource/RelationManagers/ProgramsRelationManager.php b/app/Filament/Resources/DepartmentResource/RelationManagers/ProgramsRelationManager.php
index 4108aa3..0d4d345 100644
--- a/app/Filament/Resources/DepartmentResource/RelationManagers/ProgramsRelationManager.php
+++ b/app/Filament/Resources/DepartmentResource/RelationManagers/ProgramsRelationManager.php
@@ -2,6 +2,7 @@
 
 namespace App\Filament\Resources\DepartmentResource\RelationManagers;
 
+use App\Services\App\Cache\DepartmentCacheService;
 use App\Ship\Enums\Education\EducationalProgramStatus;
 use Filament\Forms;
 use Filament\Forms\Form;
@@ -72,6 +73,9 @@ class ProgramsRelationManager extends RelationManager
                             ->searchable()
                             ->columnSpanFull()
                     )
+                    ->before(function () {
+                        app(DepartmentCacheService::class)->clearAllCacheByModel();
+                    })
             ])
             ->actions([
 
diff --git a/app/Filament/Resources/DepartmentResource/RelationManagers/TeachersRelationManager.php b/app/Filament/Resources/DepartmentResource/RelationManagers/TeachersRelationManager.php
index a11d8cd..cc7dbe6 100644
--- a/app/Filament/Resources/DepartmentResource/RelationManagers/TeachersRelationManager.php
+++ b/app/Filament/Resources/DepartmentResource/RelationManagers/TeachersRelationManager.php
@@ -2,6 +2,7 @@
 
 namespace App\Filament\Resources\DepartmentResource\RelationManagers;
 
+use App\Services\App\Cache\DepartmentCacheService;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationManager;
@@ -136,6 +137,9 @@ class TeachersRelationManager extends RelationManager
                             ->columns(1),
                     ])
                     ->modalSubmitActionLabel('Добавить')
+                    ->before(function () {
+                        app(DepartmentCacheService::class)->clearAllCacheByModel();
+                    })
             ])
             ->actions([
                 Tables\Actions\EditAction::make()
diff --git a/app/Filament/Resources/DepartmentResource/RelationManagers/WorkersRelationManager.php b/app/Filament/Resources/DepartmentResource/RelationManagers/WorkersRelationManager.php
index b13ca2e..a206657 100644
--- a/app/Filament/Resources/DepartmentResource/RelationManagers/WorkersRelationManager.php
+++ b/app/Filament/Resources/DepartmentResource/RelationManagers/WorkersRelationManager.php
@@ -2,6 +2,7 @@
 
 namespace App\Filament\Resources\DepartmentResource\RelationManagers;
 
+use App\Services\App\Cache\DepartmentCacheService;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationManager;
@@ -136,6 +137,9 @@ class WorkersRelationManager extends RelationManager
                             ->columns(2),
                     ])
                     ->modalSubmitActionLabel('Добавить')
+                    ->before(function () {
+                        app(DepartmentCacheService::class)->clearAllCacheByModel();
+                    })
             ])
             ->actions([
                 Tables\Actions\EditAction::make()
diff --git a/app/Filament/Resources/DivisionResource/RelationManagers/WorkersRelationManager.php b/app/Filament/Resources/DivisionResource/RelationManagers/WorkersRelationManager.php
index f1297fa..d5e9232 100644
--- a/app/Filament/Resources/DivisionResource/RelationManagers/WorkersRelationManager.php
+++ b/app/Filament/Resources/DivisionResource/RelationManagers/WorkersRelationManager.php
@@ -2,6 +2,7 @@
 
 namespace App\Filament\Resources\DivisionResource\RelationManagers;
 
+use App\Services\App\Cache\DivisionCacheService;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationManager;
@@ -145,7 +146,11 @@ class WorkersRelationManager extends RelationManager
                                     ->helperText('Номер кабинета в подразделении'),
                             ])
                             ->columns(2),
-                    ]),
+                    ])
+                    ->before(function () {
+                        app(DivisionCacheService::class)->clearAllCacheByModel();
+                    })
+
             ])
             ->actions([
                 Tables\Actions\EditAction::make()
diff --git a/app/Filament/Resources/FacultyResource.php b/app/Filament/Resources/FacultyResource.php
index 43ec6cf..c6b59b4 100644
--- a/app/Filament/Resources/FacultyResource.php
+++ b/app/Filament/Resources/FacultyResource.php
@@ -158,7 +158,7 @@ class FacultyResource extends Resource
     {
         return [
             WorkersRelationManager::class,
-            DepartmentsRelationManager::class,
+//            DepartmentsRelationManager::class,
         ];
     }
 
diff --git a/app/Filament/Resources/FacultyResource/RelationManagers/WorkersRelationManager.php b/app/Filament/Resources/FacultyResource/RelationManagers/WorkersRelationManager.php
index 5f442ce..ccde7cb 100644
--- a/app/Filament/Resources/FacultyResource/RelationManagers/WorkersRelationManager.php
+++ b/app/Filament/Resources/FacultyResource/RelationManagers/WorkersRelationManager.php
@@ -2,6 +2,7 @@
 
 namespace App\Filament\Resources\FacultyResource\RelationManagers;
 
+use App\Services\App\Cache\FacultyCacheService;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationManager;
@@ -135,6 +136,9 @@ class WorkersRelationManager extends RelationManager
                     ->modalHeading('Добавить сотрудника')
                     ->modalSubmitActionLabel('Добавить')
                     ->modalButton('Добавить')
+                    ->before(function () {
+                        app(FacultyCacheService::class)->clearAllCacheByModel();
+                    })
             ])
             ->actions([
                 Tables\Actions\EditAction::make()
diff --git a/resources/js/Pages/Client/Departments/Show.vue b/resources/js/Pages/Client/Departments/Show.vue
index 395cb62..1592760 100644
--- a/resources/js/Pages/Client/Departments/Show.vue
+++ b/resources/js/Pages/Client/Departments/Show.vue
@@ -73,7 +73,7 @@
         <div class="space-y-5 md:space-y-5">
 
           <div class="flex justify-between items-center mb-6">
-            <div class="flex w-full sm:items-center gap-x-5 sm:gap-x-3">
+            <div class="flex w-full sm:items-center gap-x-5 sm:gap-x-3 truncate">
               <div class="grow">
                 <div class="grid sm:flex sm:justify-between sm:items-center gap-2">
                   <DepartmentItemBreadcrumbs :faculty="department.data.faculty" :department-title="department.data.title" />
diff --git a/resources/js/Pages/Client/Divisions/Show.vue b/resources/js/Pages/Client/Divisions/Show.vue
index 7956cc5..175e4fc 100644
--- a/resources/js/Pages/Client/Divisions/Show.vue
+++ b/resources/js/Pages/Client/Divisions/Show.vue
@@ -57,7 +57,7 @@
 				<main class="w-full min-w-0 mt-1 max-w-6xl px-1 md:px-6" style="">
 					<div class="space-y-5 md:space-y-5">
 						<div class="flex justify-between items-center mb-6">
-							<div class="flex w-full sm:items-center gap-x-5 sm:gap-x-3">
+							<div class="flex w-full sm:items-center gap-x-5 sm:gap-x-3 truncate">
 								<div class="grow">
 									<div class="grid sm:flex sm:justify-between sm:items-center gap-2">
 										<DivisionItemBreadcrumbs :division-title="division.data.title" />
diff --git a/resources/js/Pages/Client/Faculties/Show.vue b/resources/js/Pages/Client/Faculties/Show.vue
index 5881a5b..7eb0172 100644
--- a/resources/js/Pages/Client/Faculties/Show.vue
+++ b/resources/js/Pages/Client/Faculties/Show.vue
@@ -62,7 +62,7 @@
       <article class="w-full min-w-0 mt-1 max-w-6xl px-1 md:px-6" style="">
         <div class="space-y-5 md:space-y-5">
           <div class="flex justify-between items-center mb-6">
-            <div class="flex w-full sm:items-center gap-x-5 sm:gap-x-3">
+            <div class="flex w-full sm:items-center gap-x-5 sm:gap-x-3 truncate">
               <div class="grow">
                 <div class="grid sm:flex sm:justify-between sm:items-center gap-2">
                   <FacultyItemBreadcrumbs :faculty-title="faculty.data.shortTitle" />
diff --git a/resources/js/componentss/features/departments/components/DepartmentItemBreadcrumbs.vue b/resources/js/componentss/features/departments/components/DepartmentItemBreadcrumbs.vue
index daaf5b6..e964604 100644
--- a/resources/js/componentss/features/departments/components/DepartmentItemBreadcrumbs.vue
+++ b/resources/js/componentss/features/departments/components/DepartmentItemBreadcrumbs.vue
@@ -90,7 +90,7 @@
 									<path d="M5 1L10.6869 7.16086C10.8637 7.35239 10.8637 7.64761 10.6869 7.83914L5 14"
 												stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
 								</svg>
-								{{ faculty.title }}
+								{{ faculty.abbreviation }}
 							</Link>
 						</li>
 						<li class="text-sm">