mirivlad
/
LMS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Улучшена форма заявки на курсы 

✅ Организация - необязательна
✅ Новая структура элемента: Курс → Получатели → Даты
✅ Поддержка множественных user_ids/group_ids
✅ Обновлены create, edit, store, update, createAssignments

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
This commit is contained in:
mirivlad 2026-04-01 16:19:04 +08:00
parent 7ad06e85fa
commit c6f303fac7
3 changed files with 206 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
app/Http/Controllers/Admin/CourseRequestController.php
View File

@ -58,13 +58,16 @@ class CourseRequestController extends Controller
Gate::authorize('create', CourseRequest::class); Gate::authorize('create', CourseRequest::class);
$validated = $request->validate([ $validated = $request->validate([
'organization_id' => 'required|exists:organizations,id', 'organization_id' => 'nullable|exists:organizations,id',
'status' => 'nullable|in:pending,approved,rejected', 'status' => 'nullable|in:pending,approved,rejected',
'note' => 'nullable|string', 'note' => 'nullable|string',
'items' => 'required|array', 'items' => 'required|array',
'items.*.course_id' => 'required|exists:courses,id', 'items.*.course_id' => 'required|exists:courses,id',
'items.*.organization_id' => 'nullable|exists:organizations,id',
'items.*.user_id' => 'nullable|exists:users,id', 'items.*.user_id' => 'nullable|exists:users,id',
'items.*.user_ids' => 'nullable|string',
'items.*.group_id' => 'nullable|exists:groups,id', 'items.*.group_id' => 'nullable|exists:groups,id',
'items.*.group_ids' => 'nullable|string',
'items.*.start_date' => 'required|date', 'items.*.start_date' => 'required|date',
'items.*.end_date' => 'nullable|date|after:items.*.start_date', 'items.*.end_date' => 'nullable|date|after:items.*.start_date',
]); ]);
@ -80,9 +83,12 @@ class CourseRequestController extends Controller
DB::beginTransaction(); DB::beginTransaction();
try { try {
// Определяем организацию из первого элемента или общую
$organizationId = $validated['organization_id'] ?? null;
// Создаём заявку // Создаём заявку
$courseRequest = CourseRequest::create([ $courseRequest = CourseRequest::create([
'organization_id' => $validated['organization_id'], 'organization_id' => $organizationId,
'requested_by_user_id' => $user->id, 'requested_by_user_id' => $user->id,
'status' => $status, 'status' => $status,
'note' => $validated['note'] ?? null, 'note' => $validated['note'] ?? null,
@ -92,14 +98,64 @@ class CourseRequestController extends Controller
// Создаём элементы заявки // Создаём элементы заявки
foreach ($validated['items'] as $itemData) { foreach ($validated['items'] as $itemData) {
CourseRequestItem::create([ // Определяем тип назначения
'course_request_id' => $courseRequest->id, $hasUsers = !empty($itemData['user_ids']);
'course_id' => $itemData['course_id'], $hasGroups = !empty($itemData['group_ids']);
'user_id' => $itemData['user_id'] ?? null, $hasOrganization = !empty($itemData['organization_id']);
'group_id' => $itemData['group_id'] ?? null,
'start_date' => $itemData['start_date'], // Создаём отдельные записи для каждого пользователя
'end_date' => $itemData['end_date'] ?? null, if ($hasUsers) {
]); $userIds = array_map('intval', array_filter(explode(',', $itemData['user_ids'])));
foreach ($userIds as $userId) {
CourseRequestItem::create([
'course_request_id' => $courseRequest->id,
'course_id' => $itemData['course_id'],
'user_id' => $userId,
'group_id' => null,
'start_date' => $itemData['start_date'],
'end_date' => $itemData['end_date'] ?? null,
]);
}
}
// Создаём отдельные записи для каждой группы
if ($hasGroups) {
$groupIds = array_map('intval', array_filter(explode(',', $itemData['group_ids'])));
foreach ($groupIds as $groupId) {
CourseRequestItem::create([
'course_request_id' => $courseRequest->id,
'course_id' => $itemData['course_id'],
'user_id' => null,
'group_id' => $groupId,
'start_date' => $itemData['start_date'],
'end_date' => $itemData['end_date'] ?? null,
]);
}
}
// Если только организация (без пользователей и групп)
if (!$hasUsers && !$hasGroups && $hasOrganization) {
CourseRequestItem::create([
'course_request_id' => $courseRequest->id,
'course_id' => $itemData['course_id'],
'user_id' => null,
'group_id' => null,
'start_date' => $itemData['start_date'],
'end_date' => $itemData['end_date'] ?? null,
]);
}
// Если ничего не указано - создаём запись без привязки (для организации заявки)
if (!$hasUsers && !$hasGroups && !$hasOrganization) {
CourseRequestItem::create([
'course_request_id' => $courseRequest->id,
'course_id' => $itemData['course_id'],
'user_id' => null,
'group_id' => null,
'start_date' => $itemData['start_date'],
'end_date' => $itemData['end_date'] ?? null,
]);
}
} }
// Если заявка одобрена - сразу создаём назначения // Если заявка одобрена - сразу создаём назначения
@ -155,6 +211,7 @@ class CourseRequestController extends Controller
'items' => 'required|array', 'items' => 'required|array',
'items.*.id' => 'nullable|exists:course_request_items,id', 'items.*.id' => 'nullable|exists:course_request_items,id',
'items.*.course_id' => 'required|exists:courses,id', 'items.*.course_id' => 'required|exists:courses,id',
'items.*.organization_id' => 'nullable|exists:organizations,id',
'items.*.user_id' => 'nullable|exists:users,id', 'items.*.user_id' => 'nullable|exists:users,id',
'items.*.group_id' => 'nullable|exists:groups,id', 'items.*.group_id' => 'nullable|exists:groups,id',
'items.*.start_date' => 'required|date', 'items.*.start_date' => 'required|date',
@ -173,6 +230,7 @@ class CourseRequestController extends Controller
$item = CourseRequestItem::find($itemData['id']); $item = CourseRequestItem::find($itemData['id']);
$item->update([ $item->update([
'course_id' => $itemData['course_id'], 'course_id' => $itemData['course_id'],
'organization_id' => $itemData['organization_id'] ?? null,
'user_id' => $itemData['user_id'] ?? null, 'user_id' => $itemData['user_id'] ?? null,
'group_id' => $itemData['group_id'] ?? null, 'group_id' => $itemData['group_id'] ?? null,
'start_date' => $itemData['start_date'], 'start_date' => $itemData['start_date'],
@ -183,6 +241,7 @@ class CourseRequestController extends Controller
CourseRequestItem::create([ CourseRequestItem::create([
'course_request_id' => $courseRequest->id, 'course_request_id' => $courseRequest->id,
'course_id' => $itemData['course_id'], 'course_id' => $itemData['course_id'],
'organization_id' => $itemData['organization_id'] ?? null,
'user_id' => $itemData['user_id'] ?? null, 'user_id' => $itemData['user_id'] ?? null,
'group_id' => $itemData['group_id'] ?? null, 'group_id' => $itemData['group_id'] ?? null,
'start_date' => $itemData['start_date'], 'start_date' => $itemData['start_date'],
@ -263,11 +322,20 @@ class CourseRequestController extends Controller
private function createAssignments(CourseRequest $courseRequest): void private function createAssignments(CourseRequest $courseRequest): void
{ {
foreach ($courseRequest->items as $item) { foreach ($courseRequest->items as $item) {
$type = $item->type; // Определяем тип назначения
if ($item->user_id) {
$type = 'individual';
} elseif ($item->group_id) {
$type = 'group';
} elseif ($item->organization_id) {
$type = 'organization';
} else {
$type = 'organization'; // По умолчанию на организацию заявки
}
CourseAssignment::create([ CourseAssignment::create([
'course_id' => $item->course_id, 'course_id' => $item->course_id,
'organization_id' => $type === 'organization' ? $courseRequest->organization_id : null, 'organization_id' => $item->organization_id ?? ($type === 'organization' ? $courseRequest->organization_id : null),
'group_id' => $item->group_id, 'group_id' => $item->group_id,
'user_id' => $item->user_id, 'user_id' => $item->user_id,
'type' => $type, 'type' => $type,

113
resources/views/admin/course-requests/create.blade.php
View File

@ -15,27 +15,14 @@
<div class="row"> <div class="row">
<div class="col-md-8 mb-4"> <div class="col-md-8 mb-4">
<div class="card shadow-sm"> <div class="card shadow-sm">
<div class="card-header bg-primary text-white"><h5 class="mb-0">Курсы и получатели</h5></div> <div class="card-header bg-primary text-white"><h5 class="mb-0">Элементы заявки</h5></div>
<div class="card-body"> <div class="card-body">
<div class="mb-3">
<label class="form-label">Организация *</label>
<x-searchable-select
name="organization_id"
url="{{ route('api.organizations.search') }}"
placeholder="Начните вводить название организации..."
:required="true"
/>
@error('organization_id')<div class="invalid-feedback d-block">{{ $message }}</div>@enderror
</div>
<hr class="my-4">
<h6 class="mb-3">Элементы заявки</h6>
<div id="items-container"> <div id="items-container">
<div class="item-row border rounded p-3 mb-3 bg-light"> <div class="item-row border rounded p-3 mb-3 bg-light">
<div class="row g-2"> <div class="row g-2">
<div class="col-md-4"> <!-- Строка 1: Курс -->
<label class="form-label small">Курс *</label> <div class="col-md-12">
<label class="form-label">Курс *</label>
<x-searchable-select <x-searchable-select
name="items[0][course_id]" name="items[0][course_id]"
url="{{ route('api.courses.search') }}" url="{{ route('api.courses.search') }}"
@ -43,32 +30,45 @@
:required="true" :required="true"
/> />
</div> </div>
<div class="col-md-3">
<label class="form-label small">Пользователь</label> <!-- Строка 2: Получатели -->
<x-tags-input <div class="col-md-4">
name="items[0][user_ids]" <label class="form-label">Организация</label>
url="{{ route('api.users.search') }}" <x-searchable-select
placeholder="Или выберите пользователей..." name="items[0][organization_id]"
badge_color="success" url="{{ route('api.organizations.search') }}"
placeholder="Или оставьте пустым..."
/> />
<small class="text-muted">Или</small> <small class="text-muted">И</small>
</div> </div>
<div class="col-md-3"> <div class="col-md-4">
<label class="form-label small">Группа</label> <label class="form-label">Группа</label>
<x-tags-input <x-tags-input
name="items[0][group_ids]" name="items[0][group_ids]"
url="{{ route('api.groups.search') }}" url="{{ route('api.groups.search') }}"
placeholder="Или выберите группы..." placeholder="Или выберите группы..."
badge_color="info" badge_color="info"
/> />
<small class="text-muted">И</small>
</div> </div>
<div class="col-md-2"> <div class="col-md-4">
<label class="form-label small">Дата начала *</label> <label class="form-label">Пользователь</label>
<input type="date" name="items[0][start_date]" class="form-control form-control-sm" required> <x-tags-input
name="items[0][user_ids]"
url="{{ route('api.users.search') }}"
placeholder="Или выберите пользователей..."
badge_color="success"
/>
</div> </div>
<div class="col-md-2">
<label class="form-label small">Дата окончания</label> <!-- Строка 3: Даты -->
<input type="date" name="items[0][end_date]" class="form-control form-control-sm"> <div class="col-md-6">
<label class="form-label">Дата начала *</label>
<input type="date" name="items[0][start_date]" class="form-control" required>
</div>
<div class="col-md-6">
<label class="form-label">Дата окончания</label>
<input type="date" name="items[0][end_date]" class="form-control">
</div> </div>
</div> </div>
<button type="button" class="btn btn-sm btn-outline-danger mt-2 remove-item" style="display:none;"><i class="bi bi-trash"></i> Удалить</button> <button type="button" class="btn btn-sm btn-outline-danger mt-2 remove-item" style="display:none;"><i class="bi bi-trash"></i> Удалить</button>
@ -123,31 +123,46 @@ document.getElementById('add-item-btn').addEventListener('click', function() {
newItem.className = 'item-row border rounded p-3 mb-3 bg-light'; newItem.className = 'item-row border rounded p-3 mb-3 bg-light';
newItem.innerHTML = ` newItem.innerHTML = `
<div class="row g-2"> <div class="row g-2">
<div class="col-md-4"> <!-- Строка 1: Курс -->
<label class="form-label small">Курс *</label> <div class="col-md-12">
<select name="items[${itemCount}][course_id]" class="form-select form-select-sm" required> <label class="form-label">Курс *</label>
<select name="items[${itemCount}][course_id]" class="form-select" required>
<option value="">Выберите курс</option> <option value="">Выберите курс</option>
@foreach($courses as $id => $title) @foreach($courses as $id => $title)
<option value="{{ $id }}">{{ $title }}</option> <option value="{{ $id }}">{{ $title }}</option>
@endforeach @endforeach
</select> </select>
</div> </div>
<div class="col-md-3">
<label class="form-label small">Пользователь</label> <!-- Строка 2: Получатели -->
<input type="text" class="form-control form-control-sm" placeholder="ID пользователей (через запятую)" name="items[${itemCount}][user_ids]"> <div class="col-md-4">
<small class="text-muted">Или</small> <label class="form-label">Организация</label>
<select name="items[${itemCount}][organization_id]" class="form-select">
<option value="">Не выбрано</option>
@foreach($organizations as $id => $name)
<option value="{{ $id }}">{{ $name }}</option>
@endforeach
</select>
<small class="text-muted">И</small>
</div> </div>
<div class="col-md-3"> <div class="col-md-4">
<label class="form-label small">Группа</label> <label class="form-label">Группа</label>
<input type="text" class="form-control form-control-sm" placeholder="ID групп (через запятую)" name="items[${itemCount}][group_ids]"> <input type="text" class="form-control" placeholder="ID групп (через запятую)" name="items[${itemCount}][group_ids]">
<small class="text-muted">И</small>
</div> </div>
<div class="col-md-2"> <div class="col-md-4">
<label class="form-label small">Дата начала *</label> <label class="form-label">Пользователь</label>
<input type="date" name="items[${itemCount}][start_date]" class="form-control form-control-sm" required> <input type="text" class="form-control" placeholder="ID пользователей (через запятую)" name="items[${itemCount}][user_ids]">
</div> </div>
<div class="col-md-2">
<label class="form-label small">Дата окончания</label> <!-- Строка 3: Даты -->
<input type="date" name="items[${itemCount}][end_date]" class="form-control form-control-sm"> <div class="col-md-6">
<label class="form-label">Дата начала *</label>
<input type="date" name="items[${itemCount}][start_date]" class="form-control" required>
</div>
<div class="col-md-6">
<label class="form-label">Дата окончания</label>
<input type="date" name="items[${itemCount}][end_date]" class="form-control">
</div> </div>
</div> </div>
<button type="button" class="btn btn-sm btn-outline-danger mt-2 remove-item"><i class="bi bi-trash"></i> Удалить</button> <button type="button" class="btn btn-sm btn-outline-danger mt-2 remove-item"><i class="bi bi-trash"></i> Удалить</button>

94
resources/views/admin/course-requests/edit.blade.php
View File

@ -23,30 +23,45 @@
<div class="item-row border rounded p-3 mb-3 bg-light"> <div class="item-row border rounded p-3 mb-3 bg-light">
<input type="hidden" name="items[{{ $index }}][id]" value="{{ $item->id }}"> <input type="hidden" name="items[{{ $index }}][id]" value="{{ $item->id }}">
<div class="row g-2"> <div class="row g-2">
<div class="col-md-4"> <!-- Строка 1: Курс -->
<label class="form-label small">Курс *</label> <div class="col-md-12">
<select name="items[{{ $index }}][course_id]" class="form-select form-select-sm" required> <label class="form-label">Курс *</label>
<select name="items[{{ $index }}][course_id]" class="form-select" required>
@foreach($courses as $id => $title) @foreach($courses as $id => $title)
<option value="{{ $id }}" {{ $item->course_id == $id ? 'selected' : '' }}>{{ $title }}</option> <option value="{{ $id }}" {{ $item->course_id == $id ? 'selected' : '' }}>{{ $title }}</option>
@endforeach @endforeach
</select> </select>
</div> </div>
<div class="col-md-3">
<label class="form-label small">Пользователь</label> <!-- Строка 2: Получатели -->
<input type="text" class="form-control form-control-sm" value="{{ $item->user_id }}" placeholder="ID пользователей" name="items[{{ $index }}][user_id]"> <div class="col-md-4">
<small class="text-muted">Или</small> <label class="form-label">Организация</label>
<select name="items[{{ $index }}][organization_id]" class="form-select">
<option value="">Не выбрано</option>
@foreach($organizations as $id => $name)
<option value="{{ $id }}" {{ $item->organization_id == $id ? 'selected' : '' }}>{{ $name }}</option>
@endforeach
</select>
<small class="text-muted">И</small>
</div> </div>
<div class="col-md-3"> <div class="col-md-4">
<label class="form-label small">Группа</label> <label class="form-label">Группа</label>
<input type="text" class="form-control form-control-sm" value="{{ $item->group_id }}" placeholder="ID групп" name="items[{{ $index }}][group_id]"> <input type="text" class="form-control" value="{{ $item->group_id }}" placeholder="ID групп" name="items[{{ $index }}][group_id]">
<small class="text-muted">И</small>
</div> </div>
<div class="col-md-2"> <div class="col-md-4">
<label class="form-label small">Дата начала *</label> <label class="form-label">Пользователь</label>
<input type="date" name="items[{{ $index }}][start_date]" class="form-control form-control-sm" value="{{ $item->start_date->format('Y-m-d') }}" required> <input type="text" class="form-control" value="{{ $item->user_id }}" placeholder="ID пользователей" name="items[{{ $index }}][user_id]">
</div> </div>
<div class="col-md-2">
<label class="form-label small">Дата окончания</label> <!-- Строка 3: Даты -->
<input type="date" name="items[{{ $index }}][end_date]" class="form-control form-control-sm" value="{{ $item->end_date?->format('Y-m-d') }}"> <div class="col-md-6">
<label class="form-label">Дата начала *</label>
<input type="date" name="items[{{ $index }}][start_date]" class="form-control" value="{{ $item->start_date->format('Y-m-d') }}" required>
</div>
<div class="col-md-6">
<label class="form-label">Дата окончания</label>
<input type="date" name="items[{{ $index }}][end_date]" class="form-control" value="{{ $item->end_date?->format('Y-m-d') }}">
</div> </div>
</div> </div>
<button type="button" class="btn btn-sm btn-outline-danger mt-2 remove-item"><i class="bi bi-trash"></i> Удалить</button> <button type="button" class="btn btn-sm btn-outline-danger mt-2 remove-item"><i class="bi bi-trash"></i> Удалить</button>
@ -91,31 +106,46 @@ document.getElementById('add-item-btn').addEventListener('click', function() {
newItem.className = 'item-row border rounded p-3 mb-3 bg-light'; newItem.className = 'item-row border rounded p-3 mb-3 bg-light';
newItem.innerHTML = ` newItem.innerHTML = `
<div class="row g-2"> <div class="row g-2">
<div class="col-md-4"> <!-- Строка 1: Курс -->
<label class="form-label small">Курс *</label> <div class="col-md-12">
<select name="items[${itemCount}][course_id]" class="form-select form-select-sm" required> <label class="form-label">Курс *</label>
<select name="items[${itemCount}][course_id]" class="form-select" required>
<option value="">Выберите курс</option> <option value="">Выберите курс</option>
@foreach($courses as $id => $title) @foreach($courses as $id => $title)
<option value="{{ $id }}">{{ $title }}</option> <option value="{{ $id }}">{{ $title }}</option>
@endforeach @endforeach
</select> </select>
</div> </div>
<div class="col-md-3">
<label class="form-label small">Пользователь</label> <!-- Строка 2: Получатели -->
<input type="text" class="form-control form-control-sm" placeholder="ID пользователей" name="items[${itemCount}][user_id]"> <div class="col-md-4">
<small class="text-muted">Или</small> <label class="form-label">Организация</label>
<select name="items[${itemCount}][organization_id]" class="form-select">
<option value="">Не выбрано</option>
@foreach($organizations as $id => $name)
<option value="{{ $id }}">{{ $name }}</option>
@endforeach
</select>
<small class="text-muted">И</small>
</div> </div>
<div class="col-md-3"> <div class="col-md-4">
<label class="form-label small">Группа</label> <label class="form-label">Группа</label>
<input type="text" class="form-control form-control-sm" placeholder="ID групп" name="items[${itemCount}][group_id]"> <input type="text" class="form-control" placeholder="ID групп" name="items[${itemCount}][group_id]">
<small class="text-muted">И</small>
</div> </div>
<div class="col-md-2"> <div class="col-md-4">
<label class="form-label small">Дата начала *</label> <label class="form-label">Пользователь</label>
<input type="date" name="items[${itemCount}][start_date]" class="form-control form-control-sm" required> <input type="text" class="form-control" placeholder="ID пользователей" name="items[${itemCount}][user_id]">
</div> </div>
<div class="col-md-2">
<label class="form-label small">Дата окончания</label> <!-- Строка 3: Даты -->
<input type="date" name="items[${itemCount}][end_date]" class="form-control form-control-sm"> <div class="col-md-6">
<label class="form-label">Дата начала *</label>
<input type="date" name="items[${itemCount}][start_date]" class="form-control" required>
</div>
<div class="col-md-6">
<label class="form-label">Дата окончания</label>
<input type="date" name="items[${itemCount}][end_date]" class="form-control">
</div> </div>
</div> </div>
<button type="button" class="btn btn-sm btn-outline-danger mt-2 remove-item"><i class="bi bi-trash"></i> Удалить</button> <button type="button" class="btn btn-sm btn-outline-danger mt-2 remove-item"><i class="bi bi-trash"></i> Удалить</button>