diff --git a/app/Filament/Resources/FacultyResource.php b/app/Filament/Resources/FacultyResource.php index 0686944..ea86bc8 100644 --- a/app/Filament/Resources/FacultyResource.php +++ b/app/Filament/Resources/FacultyResource.php @@ -65,6 +65,7 @@ class FacultyResource extends Resource $set('seo.title', $state); }), TextInput::make('slug')->label('Slug')->unique(ignoreRecord: true)->readOnly()->required(), + TextInput::make('abbreviation')->label('Аббревиатура')->required(), Toggle::make('is_active')->default(true)->label('Активный факультет')->inline(false), ]), Tabs\Tab::make('Описание факультета') diff --git a/app/Http/Controllers/MainController.php b/app/Http/Controllers/MainController.php index 754f5d8..63ecf4a 100644 --- a/app/Http/Controllers/MainController.php +++ b/app/Http/Controllers/MainController.php @@ -27,6 +27,7 @@ use App\Services\Vicon\EducationalProgram\EducationalProgramService; use Carbon\Carbon; use DateTime; use Illuminate\Http\Request; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Route; use Inertia\Inertia; diff --git a/app/Http/Resources/ClientPersonDepartmentPreviewResource.php b/app/Http/Resources/ClientPersonDepartmentPreviewResource.php index 91c95b4..2118067 100644 --- a/app/Http/Resources/ClientPersonDepartmentPreviewResource.php +++ b/app/Http/Resources/ClientPersonDepartmentPreviewResource.php @@ -17,6 +17,7 @@ class ClientPersonDepartmentPreviewResource extends JsonResource return [ 'id' => $this->id, 'name' => $this->name, + 'slug' => $this->slug, 'academicTitle' => $this->userDetail->academicTitle, 'contactPhone' => $this->userDetail->contactPhone, 'contactEmail' => $this->userDetail->contactEmail, diff --git a/app/Http/Resources/ClientPersonDepartmentTeachPreviewResource.php b/app/Http/Resources/ClientPersonDepartmentTeachPreviewResource.php index 217e971..4c927c9 100644 --- a/app/Http/Resources/ClientPersonDepartmentTeachPreviewResource.php +++ b/app/Http/Resources/ClientPersonDepartmentTeachPreviewResource.php @@ -17,6 +17,7 @@ class ClientPersonDepartmentTeachPreviewResource extends JsonResource return [ 'id' => $this->id, 'name' => $this->name, + 'slug' => $this->slug, 'academicTitle' => $this->userDetail->academicTitle, 'contactPhone' => $this->userDetail->contactPhone, 'contactEmail' => $this->userDetail->contactEmail, diff --git a/app/Http/Resources/ClientPersonFacultyPreviewResource.php b/app/Http/Resources/ClientPersonFacultyPreviewResource.php index d72638b..31d1f01 100644 --- a/app/Http/Resources/ClientPersonFacultyPreviewResource.php +++ b/app/Http/Resources/ClientPersonFacultyPreviewResource.php @@ -17,6 +17,7 @@ class ClientPersonFacultyPreviewResource extends JsonResource return [ 'id' => $this->id, 'name' => $this->name, + 'slug' => $this->slug, 'academicTitle' => $this->userDetail->academicTitle, 'contactPhone' => $this->userDetail->contactPhone, 'contactEmail' => $this->userDetail->contactEmail, diff --git a/app/Http/Resources/FacultySearchResource.php b/app/Http/Resources/FacultySearchResource.php new file mode 100644 index 0000000..a394f9c --- /dev/null +++ b/app/Http/Resources/FacultySearchResource.php @@ -0,0 +1,19 @@ + + */ + public function toArray(Request $request): array + { + return parent::toArray($request); + } +} diff --git a/app/Http/Resources/UserResource.php b/app/Http/Resources/UserResource.php index a3451cb..8df285f 100644 --- a/app/Http/Resources/UserResource.php +++ b/app/Http/Resources/UserResource.php @@ -17,6 +17,7 @@ class UserResource extends JsonResource return [ 'id' => $this->id, 'name' => $this->name, + 'slug' => $this->slug, 'administrativePosition' => $this->pivot->administrativePosition, 'sort' => $this->pivot->sort, 'details' => $this->userDetail, diff --git a/resources/js/Components/PersonCards/ClientDivisionWorkerCard.vue b/resources/js/Components/PersonCards/ClientDivisionWorkerCard.vue new file mode 100644 index 0000000..62af176 --- /dev/null +++ b/resources/js/Components/PersonCards/ClientDivisionWorkerCard.vue @@ -0,0 +1,69 @@ + + + + + + + \ No newline at end of file diff --git a/resources/js/Components/Search/Items/ResultFacultyItem.vue b/resources/js/Components/Search/Items/ResultFacultyItem.vue index 70b3c38..3f52abf 100644 --- a/resources/js/Components/Search/Items/ResultFacultyItem.vue +++ b/resources/js/Components/Search/Items/ResultFacultyItem.vue @@ -1,5 +1,5 @@ - {{ console.log(person) }} -