From 4b103325f7cf245811b0bb11723f15507cff0ca6 Mon Sep 17 00:00:00 2001 From: f4ilji Date: Mon, 18 Nov 2024 01:37:28 +0500 Subject: [PATCH] Changes --- .../Components/Forms/UserDetailForm.php | 16 +++++----- .../TeachersRelationManager.php | 10 ++++-- .../WorkersRelationManager.php | 6 ++++ .../WorkersRelationManager.php | 6 ++++ .../WorkersRelationManager.php | 6 ++++ app/Models/Department.php | 4 +-- app/Models/Division.php | 2 +- app/Models/Faculty.php | 2 +- ...ail_phone_cabinet_to_workers_faculties.php | 32 +++++++++++++++++++ ...l_phone_cabinet_to_workers_departments.php | 32 +++++++++++++++++++ ..._phone_cabinet_to_teachers_departments.php | 32 +++++++++++++++++++ ...s_email_phone_cabinet_to_division_user.php | 32 +++++++++++++++++++ 12 files changed, 165 insertions(+), 15 deletions(-) create mode 100644 database/migrations/2024_11_18_010242_add_columns_email_phone_cabinet_to_workers_faculties.php create mode 100644 database/migrations/2024_11_18_010404_add_columns_email_phone_cabinet_to_workers_departments.php create mode 100644 database/migrations/2024_11_18_010438_add_columns_email_phone_cabinet_to_teachers_departments.php create mode 100644 database/migrations/2024_11_18_010926_add_columns_email_phone_cabinet_to_division_user.php diff --git a/app/Filament/Components/Forms/UserDetailForm.php b/app/Filament/Components/Forms/UserDetailForm.php index 5c17f6e..d104462 100644 --- a/app/Filament/Components/Forms/UserDetailForm.php +++ b/app/Filament/Components/Forms/UserDetailForm.php @@ -79,17 +79,17 @@ class UserDetailForm Forms\Components\TextInput::make('year')->label('Года обучения')->string()->required(), Forms\Components\TextInput::make('content')->label('Общая информация')->string()->required(), Forms\Components\TextInput::make('institution')->label('Учебное заведение')->string()->required() - ])->label('Образование'), + ])->label('Образование')->defaultItems(0), Forms\Components\Repeater::make('professionalRetraining')->schema([ Forms\Components\TextInput::make('item')->label('')->string()->required() - ])->label('Профессиональная переподготовка'), + ])->label('Профессиональная переподготовка')->defaultItems(0), Forms\Components\Repeater::make('professionalDevelopment') ->schema([ Forms\Components\TextInput::make('item')->label('')->string()->required() - ])->label('Повышение квалификации'), + ])->label('Повышение квалификации')->defaultItems(0), Forms\Components\Repeater::make('awards')->schema([ Forms\Components\TextInput::make('item')->label('')->string()->required() - ])->label('Награды'), + ])->label('Награды')->defaultItems(0), ]), Tabs\Tab::make('Преподавание') ->schema([ @@ -103,19 +103,19 @@ class UserDetailForm ]), Forms\Components\Repeater::make('professDisciplines')->schema([ Forms\Components\TextInput::make('item')->label('')->string()->required() - ])->label('Преподаваемые дисциплины'), + ])->label('Преподаваемые дисциплины')->defaultItems(0), ]), Tabs\Tab::make('Научная деятельность') ->schema([ Forms\Components\Repeater::make('attendedConferences')->schema([ Forms\Components\TextInput::make('item')->label('')->string()->required() - ])->label('Участие в конференциях'), + ])->label('Участие в конференциях')->defaultItems(0), Forms\Components\Repeater::make('participationScienceProjects')->schema([ Forms\Components\TextInput::make('item')->label('')->string()->required() - ])->label('Участие в научных проектах'), + ])->label('Участие в научных проектах')->defaultItems(0), Forms\Components\Repeater::make('publications')->schema([ Forms\Components\TextInput::make('item')->label('')->string()->required() - ])->label('Публикации'), + ])->label('Публикации')->defaultItems(0), ]), Tabs\Tab::make('Другое') ->schema([ diff --git a/app/Filament/Resources/DepartmentResource/RelationManagers/TeachersRelationManager.php b/app/Filament/Resources/DepartmentResource/RelationManagers/TeachersRelationManager.php index bcb24a5..bdf66c0 100644 --- a/app/Filament/Resources/DepartmentResource/RelationManagers/TeachersRelationManager.php +++ b/app/Filament/Resources/DepartmentResource/RelationManagers/TeachersRelationManager.php @@ -25,9 +25,10 @@ class TeachersRelationManager extends RelationManager { return $form ->schema([ - Forms\Components\TextInput::make('name') - ->required() - ->maxLength(255), + Forms\Components\TextInput::make('teaching_position')->label('Преподавательская должность')->required(), + Forms\Components\TextInput::make('service_email')->label('Служебная почта'), + Forms\Components\TextInput::make('service_phone')->label('Служебный телефон'), + Forms\Components\TextInput::make('cabinet')->label('Кабинет'), ]); } @@ -46,6 +47,9 @@ class TeachersRelationManager extends RelationManager ->form(fn (AttachAction $action): array => [ $action->getRecordSelect(), Forms\Components\TextInput::make('teaching_position')->label('Преподавательская должность')->required(), + Forms\Components\TextInput::make('service_email')->label('Служебная почта'), + Forms\Components\TextInput::make('service_phone')->label('Служебный телефон'), + Forms\Components\TextInput::make('cabinet')->label('Кабинет'), ]) ]) ->actions([ diff --git a/app/Filament/Resources/DepartmentResource/RelationManagers/WorkersRelationManager.php b/app/Filament/Resources/DepartmentResource/RelationManagers/WorkersRelationManager.php index ac47f64..b249d57 100644 --- a/app/Filament/Resources/DepartmentResource/RelationManagers/WorkersRelationManager.php +++ b/app/Filament/Resources/DepartmentResource/RelationManagers/WorkersRelationManager.php @@ -25,6 +25,9 @@ class WorkersRelationManager extends RelationManager return $form ->schema([ Forms\Components\TextInput::make('position')->label('Должность')->required(), + Forms\Components\TextInput::make('service_email')->label('Служебная почта'), + Forms\Components\TextInput::make('service_phone')->label('Служебный телефон'), + Forms\Components\TextInput::make('cabinet')->label('Кабинет'), ]); } @@ -44,6 +47,9 @@ class WorkersRelationManager extends RelationManager ->form(fn (AttachAction $action): array => [ $action->getRecordSelect(), Forms\Components\TextInput::make('position')->label('Должность')->required(), + Forms\Components\TextInput::make('service_email')->label('Служебная почта'), + Forms\Components\TextInput::make('service_phone')->label('Служебный телефон'), + Forms\Components\TextInput::make('cabinet')->label('Кабинет'), ]) ]) ->actions([ diff --git a/app/Filament/Resources/DivisionResource/RelationManagers/WorkersRelationManager.php b/app/Filament/Resources/DivisionResource/RelationManagers/WorkersRelationManager.php index 817870e..9704338 100644 --- a/app/Filament/Resources/DivisionResource/RelationManagers/WorkersRelationManager.php +++ b/app/Filament/Resources/DivisionResource/RelationManagers/WorkersRelationManager.php @@ -22,6 +22,9 @@ class WorkersRelationManager extends RelationManager return $form ->schema([ Forms\Components\TextInput::make('administrativePosition')->label('Должность')->required(), + Forms\Components\TextInput::make('service_email')->label('Служебная почта'), + Forms\Components\TextInput::make('service_phone')->label('Служебный телефон'), + Forms\Components\TextInput::make('cabinet')->label('Кабинет'), ]); } @@ -45,6 +48,9 @@ class WorkersRelationManager extends RelationManager ->form(fn (AttachAction $action): array => [ $action->getRecordSelect(), Forms\Components\TextInput::make('administrativePosition')->label('Должность')->required(), + Forms\Components\TextInput::make('service_email')->label('Служебная почта'), + Forms\Components\TextInput::make('service_phone')->label('Служебный телефон'), + Forms\Components\TextInput::make('cabinet')->label('Кабинет'), ]) ]) ->actions([ diff --git a/app/Filament/Resources/FacultyResource/RelationManagers/WorkersRelationManager.php b/app/Filament/Resources/FacultyResource/RelationManagers/WorkersRelationManager.php index 1dff63a..5420899 100644 --- a/app/Filament/Resources/FacultyResource/RelationManagers/WorkersRelationManager.php +++ b/app/Filament/Resources/FacultyResource/RelationManagers/WorkersRelationManager.php @@ -23,6 +23,9 @@ class WorkersRelationManager extends RelationManager return $form ->schema([ Forms\Components\TextInput::make('position')->label('Должность')->required(), + Forms\Components\TextInput::make('service_email')->label('Служебная почта'), + Forms\Components\TextInput::make('service_phone')->label('Служебный телефон'), + Forms\Components\TextInput::make('cabinet')->label('Кабинет'), ]); } @@ -45,6 +48,9 @@ class WorkersRelationManager extends RelationManager ->form(fn (AttachAction $action): array => [ $action->getRecordSelect()->preload(), Forms\Components\TextInput::make('position')->label('Должность')->required(), + Forms\Components\TextInput::make('service_email')->label('Служебная почта'), + Forms\Components\TextInput::make('service_phone')->label('Служебный телефон'), + Forms\Components\TextInput::make('cabinet')->label('Кабинет'), ]) ]) ->actions([ diff --git a/app/Models/Department.php b/app/Models/Department.php index 4b1b63c..820452c 100644 --- a/app/Models/Department.php +++ b/app/Models/Department.php @@ -27,7 +27,7 @@ class Department extends Model public function workers() { - return $this->belongsToMany(User::class, 'workers_departments')->withPivot(['position']); + return $this->belongsToMany(User::class, 'workers_departments')->withPivot(['position', 'sort', 'service_email', 'service_phone', 'cabinet']); } public function programs() @@ -37,6 +37,6 @@ class Department extends Model public function teachers() { - return $this->belongsToMany(User::class, 'teachers_departments')->withPivot(['teaching_position']); + return $this->belongsToMany(User::class, 'teachers_departments')->withPivot(['teaching_position', 'sort', 'service_email', 'service_phone', 'cabinet']); } } diff --git a/app/Models/Division.php b/app/Models/Division.php index 0fb34eb..1a7f423 100644 --- a/app/Models/Division.php +++ b/app/Models/Division.php @@ -22,6 +22,6 @@ class Division extends Model public function workers() { - return $this->belongsToMany(User::class, 'division_user')->withPivot(['administrativePosition', 'sort']); + return $this->belongsToMany(User::class, 'division_user')->withPivot(['administrativePosition', 'sort', 'service_email', 'service_phone', 'cabinet']); } } diff --git a/app/Models/Faculty.php b/app/Models/Faculty.php index be50b79..9ba8eb8 100644 --- a/app/Models/Faculty.php +++ b/app/Models/Faculty.php @@ -27,7 +27,7 @@ class Faculty extends Model public function workers() { - return $this->belongsToMany(User::class, 'workers_faculties')->withPivot(['position'])->whereHas('userDetail'); + return $this->belongsToMany(User::class, 'workers_faculties')->withPivot(['position', 'sort', 'service_email', 'service_phone', 'cabinet'])->whereHas('userDetail'); } diff --git a/database/migrations/2024_11_18_010242_add_columns_email_phone_cabinet_to_workers_faculties.php b/database/migrations/2024_11_18_010242_add_columns_email_phone_cabinet_to_workers_faculties.php new file mode 100644 index 0000000..b7a3151 --- /dev/null +++ b/database/migrations/2024_11_18_010242_add_columns_email_phone_cabinet_to_workers_faculties.php @@ -0,0 +1,32 @@ +string('service_email')->nullable()->after('position'); + $table->string('service_phone')->nullable()->after('service_email'); + $table->string('cabinet')->nullable()->after('service_phone'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('workers_faculties', function (Blueprint $table) { + $table->dropColumn('service_email'); + $table->dropColumn('service_phone'); + $table->dropColumn('cabinet'); + }); + } +}; diff --git a/database/migrations/2024_11_18_010404_add_columns_email_phone_cabinet_to_workers_departments.php b/database/migrations/2024_11_18_010404_add_columns_email_phone_cabinet_to_workers_departments.php new file mode 100644 index 0000000..1a78f2b --- /dev/null +++ b/database/migrations/2024_11_18_010404_add_columns_email_phone_cabinet_to_workers_departments.php @@ -0,0 +1,32 @@ +string('service_email')->nullable()->after('position'); + $table->string('service_phone')->nullable()->after('service_email'); + $table->string('cabinet')->nullable()->after('service_phone'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('workers_departments', function (Blueprint $table) { + $table->dropColumn('service_email'); + $table->dropColumn('service_phone'); + $table->dropColumn('cabinet'); + }); + } +}; diff --git a/database/migrations/2024_11_18_010438_add_columns_email_phone_cabinet_to_teachers_departments.php b/database/migrations/2024_11_18_010438_add_columns_email_phone_cabinet_to_teachers_departments.php new file mode 100644 index 0000000..a8b370c --- /dev/null +++ b/database/migrations/2024_11_18_010438_add_columns_email_phone_cabinet_to_teachers_departments.php @@ -0,0 +1,32 @@ +string('email')->nullable()->after('teaching_position'); + $table->string('phone')->nullable()->after('email'); + $table->string('cabinet')->nullable()->after('phone'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('teachers_departments', function (Blueprint $table) { + $table->dropColumn('email'); + $table->dropColumn('phone'); + $table->dropColumn('cabinet'); + }); + } +}; diff --git a/database/migrations/2024_11_18_010926_add_columns_email_phone_cabinet_to_division_user.php b/database/migrations/2024_11_18_010926_add_columns_email_phone_cabinet_to_division_user.php new file mode 100644 index 0000000..21d8978 --- /dev/null +++ b/database/migrations/2024_11_18_010926_add_columns_email_phone_cabinet_to_division_user.php @@ -0,0 +1,32 @@ +string('service_email')->nullable()->after('administrativePosition'); + $table->string('service_phone')->nullable()->after('service_email'); + $table->string('cabinet')->nullable()->after('service_phone'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('division_user', function (Blueprint $table) { + $table->dropColumn('service_email'); + $table->dropColumn('service_phone'); + $table->dropColumn('cabinet'); + }); + } +};