failj/ntspi-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor educational components and API routes; update form handling in various actions and Vue components, enhance user interface for form display, and improve data retrieval logic in CreateAdmissionPlan job

Browse Source
This commit is contained in:
F4ilji
2025-07-27 12:52:04 +05:00
parent 9a1fcbbf9d
commit a4bdde6382
20 changed files with 961 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Containers/AdditionalEducation/Actions/GetAdditionalEducationBySlugAction.php
+2 -3
View File
@@ -4,7 +4,6 @@ namespace App\Containers\AdditionalEducation\Actions;
use App\Containers\AdditionalEducation\Data\Resources\AdditionalEducationResource;
use App\Containers\AdditionalEducation\Tasks\FindAdditionalEducationBySlugTask;
use App\Ship\Actions\Action;
use App\Ship\Contracts\SeoServiceInterface;
use Illuminate\Http\Request;
@@ -22,8 +21,8 @@ class GetAdditionalEducationBySlugAction
$settingsPage = $request->attributes->get('settings_page') ?? [];
if (array_key_exists('custom_form', $settingsPage)) {
$form = $settingsPage['custom_form'];
if (array_key_exists('form', $settingsPage)) {
$form = $settingsPage['form'];
} else {
$form = null;
}
app/Containers/Education/Actions/GetEducationalProgramAction.php
+9 -1
View File
@@ -23,8 +23,16 @@ class GetEducationalProgramAction
$formsEdu = $this->getEducationalFormsTask->run();
$seo = $this->getSeoForModelTask->run($this->seoPageProvider, $programModel);
$settingsPage = request()->attributes->get('settings_page') ?? [];
if (array_key_exists('form', $settingsPage)) {
$form = $settingsPage['form'];
} else {
$form = null;
}
$program = new EducationalProgramResource($programModel);
return compact('program', 'formsEdu', 'seo');
return compact('program', 'formsEdu', 'seo', 'form');
}
}
app/Containers/Education/Jobs/CreateAdmissionPlan.php
+137
View File
@@ -0,0 +1,137 @@
<?php
namespace App\Containers\Education\Jobs;
use App\Containers\Education\Models\AdmissionCampaign;
use App\Containers\Education\Models\AdmissionPlan;
use App\Containers\Education\Models\EducationalProgram;
use App\Services\Vicon\DirectionStudy\AdmissionPlanService;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\Log;
class CreateAdmissionPlan implements ShouldQueue
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
/**
* Create a new job instance.
*/
private AdmissionPlanService $admissionPlanService;
public function __construct()
{
$this->admissionPlanService = app(AdmissionPlanService::class);
}
/**
* Execute the job.
*/
public function handle(): void
{
AdmissionPlan::truncate();
try {
$items = $this->admissionPlanService->getCampaigns();
if (empty($items)) {
Log::warning('Empty campaigns list received');
return; // или обработка пустого случая
}
$campaign = $this->admissionPlanService->findActiveCampaign($items);
if (empty($campaign)) {
Log::warning('No active campaign found in the list');
return;
}
$levels_codes = $this->admissionPlanService->getLevelEducationCodes($campaign);
if (empty($levels_codes)) {
Log::warning('No education level codes found for campaign');
return;
}
foreach ($levels_codes as $code) {
$admissionPlans = $this->admissionPlanService->getAdmissionPlans($code);
// Проверка на пустой результат или отсутствие нужного свойства
if (empty($admissionPlans) || !isset($admissionPlans->competitons_groups)) {
Log::warning("Empty admission plans or missing property for code: {$code}", [
'admissionPlans' => $admissionPlans
]);
continue;
}
$filteredPlans = $this->admissionPlanService->filterEmptyNaprOrProg($admissionPlans->competitons_groups);
if (empty($filteredPlans)) {
Log::info("No valid plans after filtering for code: {$code}");
continue;
}
$items = $this->admissionPlanService->transformData($filteredPlans);
if (empty($items)) {
Log::info("No items after transformation for code: {$code}");
continue;
}
foreach ($items as $item) {
// Проверка структуры $item
if (!isset($item['id'], $item['plan']->competitions, $item['plan']->exams)) {
Log::warning("Invalid item structure", ['item' => $item]);
continue;
}
$eduPrograms = EducationalProgram::where('inner_code', $item['id'])->get();
if ($eduPrograms->isEmpty()) {
Log::info("No educational programs found for inner_code: {$item['id']}");
continue;
}
try {
$contestData = $this->admissionPlanService->convertToSaveContestData($item['plan']->competitions);
$examData = $this->admissionPlanService->convertToSaveExamData($item['plan']->exams);
foreach ($eduPrograms as $eduProgram) {
$eduProgram->admission_plans()->updateOrCreate([
'admission_campaigns_id' => $this->getActiveCampaign()->id,
'exams' => $examData,
'contests' => $contestData,
]);
}
} catch (\Exception $e) {
Log::error("Error processing admission plan for item: {$item['id']}", [
'error' => $e->getMessage(),
'item' => $item
]);
continue;
}
}
}
} catch (\Exception $e) {
Log::error('Error in admission plans processing', [
'error' => $e->getMessage(),
'trace' => $e->getTraceAsString()
]);
}
}
private function getActiveCampaign()
{
$activeCampaign = AdmissionCampaign::where('status', 1)->first();
if (!$activeCampaign) {
throw new \Exception('No active admission campaign found');
}
return $activeCampaign;
}
}
app/Containers/Education/Jobs/CreateDirectionStudy.php
+67
View File
@@ -0,0 +1,67 @@
<?php
namespace App\Containers\Education\Jobs;
use App\Containers\Education\Models\DirectionStudy;
use App\Services\Vicon\DirectionStudy\DirectionStudyService;
use App\Ship\Enums\Education\LevelEducational;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Str;
class CreateDirectionStudy implements ShouldQueue
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
private $directionStudyService;
/**
* Create a new job instance.
*/
public function __construct()
{
$this->directionStudyService = new DirectionStudyService();
}
/**
* Execute the job.
*/
public function handle(): void
{
$naprs = [];
$naprsUuid = $this->directionStudyService->getAllNaprsUuid();
foreach ($naprsUuid as $uuid) {
array_push($naprs, $this->directionStudyService->getNapr($uuid));
}
foreach ($naprs as $napr) {
$slug = $this->generateUniqueSlug($napr->name_napr, DirectionStudy::class, LevelEducational::from($napr->lvl_edu));
DirectionStudy::updateOrCreate(
['uuid' => $napr->uuid],
[
'name' => $napr->name_napr,
'slug' => $slug,
'code' => $napr->kod_napr,
'lvl_edu' => $napr->lvl_edu,
]
);
};
}
private function generateUniqueSlug($name, $model, $levelEducational) {
$slug = Str::slug($name);
$originalSlug = $slug;
$slug = $originalSlug . '-' . Str::lower($levelEducational->name);
$count = 1;
while ($model::where('slug', $slug)->exists()) {
$slug = $originalSlug . '-' . $count;
$count++;
}
return $slug;
}
}
app/Containers/Education/Jobs/CreateEducationalProgram.php
+83
View File
@@ -0,0 +1,83 @@
<?php
namespace App\Containers\Education\Jobs;
use App\Containers\Education\Models\DirectionStudy;
use App\Containers\Education\Models\EducationalProgram;
use App\Services\Vicon\EducationalProgram\EducationalProgramService;
use App\Ship\Enums\Education\LevelEducational;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Str;
class CreateEducationalProgram implements ShouldQueue
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
/**
* Create a new job instance.
*/
private EducationalProgramService $educatinalProgramService;
public function __construct()
{
$this->educatinalProgramService = app(EducationalProgramService::class);
}
/**
* Execute the job.
*/
public function handle(): void
{
$programs = [];
$programsUuid = $this->educatinalProgramService->getAllProgramsUuid();
foreach ($programsUuid as $uuid) {
$program = $this->educatinalProgramService->getProgram($uuid);
if ($program !== null) {
array_push($programs, $program);
} else {
Log::error("Не удалось получить данные о программе с UUID: $uuid");
}
}
foreach ($programs as $program) {
$direction = DirectionStudy::where('uuid', $program->napr_uuid)->first();
if ($direction !== null) {
$slug = $this->generateUniqueSlug($program->name_op, EducationalProgram::class, LevelEducational::from($program->lvl_edu));
EducationalProgram::updateOrCreate(
['uuid' => $program->uuid],
[
'name' => $program->name_op,
'slug' => $slug, // Добавляем slug
'inner_code' => $program->inner_code,
'lvl_edu' => $program->lvl_edu,
'status' => $program->status,
'learning_forms' => $program->learning_forms,
'direction_study_id' => $direction->id,
]
);
} else {
Log::error("Не удалось найти направление обучения с UUID: {$program->napr_uuid}");
}
}
}
private function generateUniqueSlug($name, $model, $levelEducational) {
$slug = Str::slug($name);
$originalSlug = $slug;
$slug = $originalSlug . '-' . Str::lower($levelEducational->name);
$count = 1;
while ($model::where('slug', $slug)->exists()) {
$slug = $originalSlug . '-' . $count;
$count++;
}
return $slug;
}
}
app/Containers/Education/Jobs/UpdateAdmissionCampaign.php
+28
View File
@@ -0,0 +1,28 @@
<?php
namespace App\Containers\Education\Jobs;
use App\Containers\Education\Models\AdmissionCampaign;
use App\Containers\Education\Models\AdmissionPlan;
use App\Containers\Education\Models\EducationalProgram;
use App\Services\Vicon\DirectionStudy\AdmissionPlanService;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\Log;
class UpdateAdmissionCampaign implements ShouldQueue
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
public function __construct(private string|int $id){}
public function handle(): void
{
// $ac = AdmissionCampaign::query()->find($this->id);
// $ap = AdmissionPlan::query()->all();
// $uep = $ap->
}
}
app/Containers/Education/UI/API/Controllers/UpdateAdmissionCampaignDataApiController.php
+77
View File
@@ -0,0 +1,77 @@
<?php
namespace App\Containers\Education\UI\API\Controllers;
use App\Containers\Education\Jobs\UpdateAdmissionCampaign;
use App\Containers\Education\Models\AdmissionCampaign;
use App\Containers\Education\Models\AdmissionPlan;
use App\Http\Controllers\Controller;
use App\Jobs\CreateAdmissionPlan;
use App\Jobs\CreateDirectionStudy;
use App\Jobs\CreateEducationalProgram;
use App\Services\Vicon\EducationalProgram\EducationalProgramService;
use App\Ship\Enums\Education\BudgetEducation;
use App\Ship\Enums\Education\FormEducation;
class UpdateAdmissionCampaignDataApiController extends Controller
{
public function update(string|int $id)
{
$this->updateAdmissionCampaignData($id);
return redirect()->route('index');
}
private function updateAdmissionCampaignData($id) : void
{
$ac = AdmissionCampaign::query()->find($id);
$ap = AdmissionPlan::with('educationalProgram')->get();
$info = [];
$ap->map(function ($item) use (&$info) {
$lvlEduKey = is_object($item->educationalProgram->lvl_edu)
? $item->educationalProgram->lvl_edu->value
: $item->educationalProgram->lvl_edu;
// Инициализируем поля для нового ключа, если он еще не существует
if (!isset($info[$lvlEduKey])) {
$info[$lvlEduKey] = [
'total_programs' => 0,
'och_count' => 0,
'zaoch_count' => 0,
'budget_places' => 0,
'non_budget_places' => 0
];
}
// Увеличиваем счетчик total_programs
$info[$lvlEduKey]['total_programs'] += 1;
// Итерируемся по contests и агрегируем данные
// Передаем $info и $lvlEduKey по ссылке во внутреннее замыкание
foreach ($item->contests as $contest) {
$formEdu = $contest['form_education'];
$formBudget = $contest['places']['form_budget'];
$places = $contest['places']['count'];
// Агрегируем значения
$info[$lvlEduKey]['och_count'] += ($formEdu == 1) ? $places : 0;
$info[$lvlEduKey]['zaoch_count'] += ($formEdu == 3) ? $places : 0;
$info[$lvlEduKey]['budget_places'] += ($formBudget == 1) ? $places : 0;
$info[$lvlEduKey]['non_budget_places'] += ($formBudget == 4) ? $places : 0;
}
});
$result = [];
foreach ($info as $edu_name_key => $data) {
// Создаем новый массив, добавляя 'edu_name' как свойство
$data['edu_name'] = $edu_name_key;
// Добавляем преобразованный массив в результат
$result[] = $data;
}
$ac->update(['info' => $result]);
// dispatch(new UpdateAdmissionCampaign($id));
}
}
app/Containers/Education/UI/API/Controllers/UpdateAdmissionPlansDataApiController.php
+1 -4
View File
@@ -2,11 +2,8 @@
namespace App\Containers\Education\UI\API\Controllers;
use App\Containers\Education\Jobs\CreateAdmissionPlan;
use App\Http\Controllers\Controller;
use App\Jobs\CreateAdmissionPlan;
use App\Jobs\CreateDirectionStudy;
use App\Jobs\CreateEducationalProgram;
use App\Services\Vicon\EducationalProgram\EducationalProgramService;
class UpdateAdmissionPlansDataApiController extends Controller
{
app/Containers/Education/UI/API/Controllers/UpdateEduDataApiController.php
+2 -2
View File
@@ -2,9 +2,9 @@
namespace App\Containers\Education\UI\API\Controllers;
use App\Containers\Education\Jobs\CreateDirectionStudy;
use App\Containers\Education\Jobs\CreateEducationalProgram;
use App\Http\Controllers\Controller;
use App\Jobs\CreateDirectionStudy;
use App\Jobs\CreateEducationalProgram;
class UpdateEduDataApiController extends Controller
{
app/Containers/Education/UI/API/Routes/api.php
+2
View File
@@ -1,6 +1,7 @@
<?php
use App\Containers\Education\UI\API\Controllers\AcademicYearController;
use App\Containers\Education\UI\API\Controllers\UpdateAdmissionCampaignDataApiController;
use App\Containers\Education\UI\API\Controllers\UpdateAdmissionPlansDataApiController;
use App\Containers\Education\UI\API\Controllers\UpdateEduDataApiController;
use Illuminate\Support\Facades\Route;
@@ -10,4 +11,5 @@ Route::get('/getAcademicYear', AcademicYearController::class)->name('academic.ye
Route::middleware(['web', 'superadmin'])->group(function () {
Route::get('/get-edu-program-data', [UpdateEduDataApiController::class, 'index']);
Route::get('/get-admission-plans-data', [UpdateAdmissionPlansDataApiController::class, 'index']);
Route::get('/update-admission-campaign-data/{id}', [UpdateAdmissionCampaignDataApiController::class, 'update']);
});
app/Filament/Components/Forms/PageForm.php
+12 -3
View File
@@ -142,12 +142,21 @@ class PageForm
->label('Скрыть хлебные крошки')
->helperText('Скрывает навигационную цепочку вверху страницы')
->columnSpan(1),
Select::make('settings.custom_form')->label('Прикрепить форму для страницы')
])
->columns(2),
Section::make('Отображение плавающей формы на странице')
->description('Управление плавающей формой на странице')
->collapsible()
->schema([
Select::make('settings.form.id')->label('Прикрепить форму для страницы')
->searchable()
->preload()
->options(CustomForm::query()
->where('status', CustomFormStatus::PUBLISHED)->pluck('title', 'form_id'))
->columnSpanFull()
->columnSpanFull(),
Textinput::make('settings.form.title')->label('Заголовок плавающего окна'),
Textinput::make('settings.form.description')->label('Описание плавающего окна'),
Textinput::make('settings.form.button')->label('Текст кнопки'),
])
->columns(2),
]),
@@ -155,4 +164,4 @@ class PageForm
])
]);
}
}
}
app/Filament/Resources/AdmissionCampaignResource/Pages/EditAdmissionCampaign.php
+45
View File
@@ -4,6 +4,7 @@ namespace App\Filament\Resources\AdmissionCampaignResource\Pages;
use App\Filament\Resources\AdmissionCampaignResource;
use Filament\Actions;
use Filament\Notifications\Notification;
use Filament\Resources\Pages\EditRecord;
class EditAdmissionCampaign extends EditRecord
@@ -13,6 +14,50 @@ class EditAdmissionCampaign extends EditRecord
protected function getHeaderActions(): array
{
return [
Actions\Action::make('fetchData') // Кастомная кнопка
->label('Обновить данные о местах набора')
->color('primary') // Цвет кнопки
->icon('heroicon-o-arrow-path') // Иконка
->action(function () {
// Отправляем запрос в фоновом режиме
$this->js(<<<JS
fetch('/api/get-admission-plans-data', {
method: 'GET',
headers: {
'Content-Type': 'application/json',
'X-CSRF-TOKEN': document.querySelector('meta[name="csrf-token"]').content
}
})
.then(response => response.json())
.then(() => {
// Показываем уведомление об успешном завершении
window.dispatchEvent(new CustomEvent('filament-notify', {
detail: {
type: 'success',
title: 'Данные обновлены',
body: 'Данные успешно обновлены.'
}
}));
})
.catch(() => {
// Показываем уведомление об ошибке
window.dispatchEvent(new CustomEvent('filament-notify', {
detail: {
type: 'danger',
title: 'Ошибка',
body: 'Произошла ошибка при обновлении данных.'
}
}));
});
JS);
// Показываем уведомление
Notification::make()
->title('Данные обновляются')
->body('Данные обновляются в фоновом режиме.')
->success()
->send();
}),
Actions\DeleteAction::make(),
];
}
app/Http/Middleware/AccessCheck.php
+1 -1
View File
@@ -35,4 +35,4 @@ class AccessCheck
// Если все проверки пройдены, продолжаем выполнение запроса
return $next($request);
}
}
}
app/Jobs/CreateAdmissionPlan.php
+3 -1
View File
@@ -3,6 +3,7 @@
namespace App\Jobs;
use App\Containers\Education\Models\AdmissionCampaign;
use App\Containers\Education\Models\AdmissionPlan;
use App\Containers\Education\Models\EducationalProgram;
use App\Services\Vicon\DirectionStudy\AdmissionPlanService;
use Illuminate\Bus\Queueable;
@@ -32,6 +33,7 @@ class CreateAdmissionPlan implements ShouldQueue
*/
public function handle(): void
{
AdmissionPlan::truncate();
try {
$items = $this->admissionPlanService->getCampaigns();
@@ -98,7 +100,7 @@ class CreateAdmissionPlan implements ShouldQueue
$examData = $this->admissionPlanService->convertToSaveExamData($item['plan']->exams);
foreach ($eduPrograms as $eduProgram) {
$eduProgram->admission_plans()->create([
$eduProgram->admission_plans()->updateOrCreate([
'admission_campaigns_id' => $this->getActiveCampaign()->id,
'exams' => $examData,
'contests' => $contestData,