Changes
This commit is contained in:
@@ -10,10 +10,14 @@ enum FormEducation: int implements HasLabel, HasColor
|
|||||||
case FULL_TIME = 1; // Очная форма обучения
|
case FULL_TIME = 1; // Очная форма обучения
|
||||||
case PART_TIME = 2; // Заочная форма обучения
|
case PART_TIME = 2; // Заочная форма обучения
|
||||||
|
|
||||||
|
case FULL_PART_TIME = 3; // Заочная форма обучения
|
||||||
|
|
||||||
|
|
||||||
public static function fromName(string $name): ?self {
|
public static function fromName(string $name): ?self {
|
||||||
return match ($name) {
|
return match ($name) {
|
||||||
'FULL_TIME' => self::FULL_TIME,
|
'FULL_TIME' => self::FULL_TIME,
|
||||||
'PART_TIME' => self::PART_TIME,
|
'PART_TIME' => self::PART_TIME,
|
||||||
|
'FULL_PART_TIME' => self::FULL_PART_TIME,
|
||||||
default => null,
|
default => null,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -23,6 +27,7 @@ enum FormEducation: int implements HasLabel, HasColor
|
|||||||
return match ($this) {
|
return match ($this) {
|
||||||
self::FULL_TIME => 'Очная форма обучения',
|
self::FULL_TIME => 'Очная форма обучения',
|
||||||
self::PART_TIME => 'Заочная форма обучения',
|
self::PART_TIME => 'Заочная форма обучения',
|
||||||
|
self::FULL_PART_TIME => 'Очно-заочная форма обучения'
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -31,6 +36,7 @@ enum FormEducation: int implements HasLabel, HasColor
|
|||||||
return match ($this) {
|
return match ($this) {
|
||||||
self::FULL_TIME => 'success', // Цвет для очной формы
|
self::FULL_TIME => 'success', // Цвет для очной формы
|
||||||
self::PART_TIME => 'warning', // Цвет для заочной формы
|
self::PART_TIME => 'warning', // Цвет для заочной формы
|
||||||
|
self::FULL_PART_TIME => 'info',
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+1
-1
@@ -32,7 +32,7 @@ class CreateEducationalProgram extends CreateRecord
|
|||||||
|
|
||||||
private function generateSeo(array $data) : array
|
private function generateSeo(array $data) : array
|
||||||
{
|
{
|
||||||
$title = $data['title'];
|
$title = $data['name'];
|
||||||
$rowData = $this->getFirstBlockByName('paragraph', $data['about_program']);
|
$rowData = $this->getFirstBlockByName('paragraph', $data['about_program']);
|
||||||
if ($rowData !== null) {
|
if ($rowData !== null) {
|
||||||
$description = strip_tags($rowData['data']['content']);
|
$description = strip_tags($rowData['data']['content']);
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ class EditEducationalProgram extends EditRecord
|
|||||||
protected function mutateFormDataBeforeSave(array $data): array
|
protected function mutateFormDataBeforeSave(array $data): array
|
||||||
{
|
{
|
||||||
$this->seoData = $this->generateSeo($data);
|
$this->seoData = $this->generateSeo($data);
|
||||||
$data['search_data'] = $this->generateSearchData($data['content']);
|
$data['search_data'] = $this->generateSearchData($data['about_program']);
|
||||||
|
|
||||||
return $data;
|
return $data;
|
||||||
}
|
}
|
||||||
@@ -30,7 +30,7 @@ class EditEducationalProgram extends EditRecord
|
|||||||
|
|
||||||
private function generateSeo(array $data) : array
|
private function generateSeo(array $data) : array
|
||||||
{
|
{
|
||||||
$title = $data['title'];
|
$title = $data['name'];
|
||||||
$rowData = $this->getFirstBlockByName('paragraph', $data['about_program']);
|
$rowData = $this->getFirstBlockByName('paragraph', $data['about_program']);
|
||||||
if ($rowData !== null) {
|
if ($rowData !== null) {
|
||||||
$description = strip_tags($rowData['data']['content']);
|
$description = strip_tags($rowData['data']['content']);
|
||||||
|
|||||||
+1
-1
@@ -80,7 +80,7 @@ class AdmissionPlansRelationManager extends RelationManager
|
|||||||
])
|
])
|
||||||
->actions([
|
->actions([
|
||||||
Tables\Actions\EditAction::make(),
|
Tables\Actions\EditAction::make(),
|
||||||
Tables\Actions\DetachAction::make(),
|
Tables\Actions\DeleteAction::make(),
|
||||||
])
|
])
|
||||||
->bulkActions([
|
->bulkActions([
|
||||||
Tables\Actions\BulkActionGroup::make([
|
Tables\Actions\BulkActionGroup::make([
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
|
|
||||||
<h1 class="text-brand-primary text-2xl mb-3 mt-2 md:text-3xl font-semibold tracking-tight dark:text-white lg:text-[40px] lg:leading-tight">
|
<h1 class="text-brand-primary text-2xl md:text-center mb-3 mt-2 md:text-3xl font-semibold tracking-tight dark:text-white lg:text-[40px] lg:leading-tight">
|
||||||
{{ header }}
|
{{ header }}
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user