diff --git a/app/Enums/FormEducation.php b/app/Enums/FormEducation.php index 44d612f..3404387 100644 --- a/app/Enums/FormEducation.php +++ b/app/Enums/FormEducation.php @@ -10,10 +10,14 @@ enum FormEducation: int implements HasLabel, HasColor case FULL_TIME = 1; // Очная форма обучения case PART_TIME = 2; // Заочная форма обучения + case FULL_PART_TIME = 3; // Заочная форма обучения + + public static function fromName(string $name): ?self { return match ($name) { 'FULL_TIME' => self::FULL_TIME, 'PART_TIME' => self::PART_TIME, + 'FULL_PART_TIME' => self::FULL_PART_TIME, default => null, }; } @@ -23,6 +27,7 @@ enum FormEducation: int implements HasLabel, HasColor return match ($this) { self::FULL_TIME => 'Очная форма обучения', self::PART_TIME => 'Заочная форма обучения', + self::FULL_PART_TIME => 'Очно-заочная форма обучения' }; } @@ -31,6 +36,7 @@ enum FormEducation: int implements HasLabel, HasColor return match ($this) { self::FULL_TIME => 'success', // Цвет для очной формы self::PART_TIME => 'warning', // Цвет для заочной формы + self::FULL_PART_TIME => 'info', }; } } \ No newline at end of file diff --git a/app/Filament/Resources/EducationalProgramResource/Pages/CreateEducationalProgram.php b/app/Filament/Resources/EducationalProgramResource/Pages/CreateEducationalProgram.php index 03bf770..3ac7eae 100644 --- a/app/Filament/Resources/EducationalProgramResource/Pages/CreateEducationalProgram.php +++ b/app/Filament/Resources/EducationalProgramResource/Pages/CreateEducationalProgram.php @@ -32,7 +32,7 @@ class CreateEducationalProgram extends CreateRecord private function generateSeo(array $data) : array { - $title = $data['title']; + $title = $data['name']; $rowData = $this->getFirstBlockByName('paragraph', $data['about_program']); if ($rowData !== null) { $description = strip_tags($rowData['data']['content']); diff --git a/app/Filament/Resources/EducationalProgramResource/Pages/EditEducationalProgram.php b/app/Filament/Resources/EducationalProgramResource/Pages/EditEducationalProgram.php index 09ebc54..2d9cbc8 100644 --- a/app/Filament/Resources/EducationalProgramResource/Pages/EditEducationalProgram.php +++ b/app/Filament/Resources/EducationalProgramResource/Pages/EditEducationalProgram.php @@ -18,7 +18,7 @@ class EditEducationalProgram extends EditRecord protected function mutateFormDataBeforeSave(array $data): array { $this->seoData = $this->generateSeo($data); - $data['search_data'] = $this->generateSearchData($data['content']); + $data['search_data'] = $this->generateSearchData($data['about_program']); return $data; } @@ -30,7 +30,7 @@ class EditEducationalProgram extends EditRecord private function generateSeo(array $data) : array { - $title = $data['title']; + $title = $data['name']; $rowData = $this->getFirstBlockByName('paragraph', $data['about_program']); if ($rowData !== null) { $description = strip_tags($rowData['data']['content']); diff --git a/app/Filament/Resources/EducationalProgramResource/RelationManagers/AdmissionPlansRelationManager.php b/app/Filament/Resources/EducationalProgramResource/RelationManagers/AdmissionPlansRelationManager.php index 14f3c4a..e04e5f1 100644 --- a/app/Filament/Resources/EducationalProgramResource/RelationManagers/AdmissionPlansRelationManager.php +++ b/app/Filament/Resources/EducationalProgramResource/RelationManagers/AdmissionPlansRelationManager.php @@ -80,7 +80,7 @@ class AdmissionPlansRelationManager extends RelationManager ]) ->actions([ Tables\Actions\EditAction::make(), - Tables\Actions\DetachAction::make(), + Tables\Actions\DeleteAction::make(), ]) ->bulkActions([ Tables\Actions\BulkActionGroup::make([ diff --git a/resources/js/Components/BuilderUi/AdditionalEducationPrograms/ProgramTitle.vue b/resources/js/Components/BuilderUi/AdditionalEducationPrograms/ProgramTitle.vue index a2a3709..1d75fcb 100644 --- a/resources/js/Components/BuilderUi/AdditionalEducationPrograms/ProgramTitle.vue +++ b/resources/js/Components/BuilderUi/AdditionalEducationPrograms/ProgramTitle.vue @@ -1,6 +1,6 @@