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
Qwen-Coder
@@ -15,27 +15,14 @@
|
||||
<div class="row">
|
||||
<div class="col-md-8 mb-4">
|
||||
<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="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 class="item-row border rounded p-3 mb-3 bg-light">
|
||||
<div class="row g-2">
|
||||
<div class="col-md-4">
|
||||
<label class="form-label small">Курс *</label>
|
||||
<!-- Строка 1: Курс -->
|
||||
<div class="col-md-12">
|
||||
<label class="form-label">Курс *</label>
|
||||
<x-searchable-select
|
||||
name="items[0][course_id]"
|
||||
url="{{ route('api.courses.search') }}"
|
||||
@@ -43,32 +30,45 @@
|
||||
:required="true"
|
||||
/>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label class="form-label small">Пользователь</label>
|
||||
<x-tags-input
|
||||
name="items[0][user_ids]"
|
||||
url="{{ route('api.users.search') }}"
|
||||
placeholder="Или выберите пользователей..."
|
||||
badge_color="success"
|
||||
|
||||
<!-- Строка 2: Получатели -->
|
||||
<div class="col-md-4">
|
||||
<label class="form-label">Организация</label>
|
||||
<x-searchable-select
|
||||
name="items[0][organization_id]"
|
||||
url="{{ route('api.organizations.search') }}"
|
||||
placeholder="Или оставьте пустым..."
|
||||
/>
|
||||
<small class="text-muted">Или</small>
|
||||
<small class="text-muted">И</small>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label class="form-label small">Группа</label>
|
||||
<div class="col-md-4">
|
||||
<label class="form-label">Группа</label>
|
||||
<x-tags-input
|
||||
name="items[0][group_ids]"
|
||||
url="{{ route('api.groups.search') }}"
|
||||
placeholder="Или выберите группы..."
|
||||
badge_color="info"
|
||||
/>
|
||||
<small class="text-muted">И</small>
|
||||
</div>
|
||||
<div class="col-md-2">
|
||||
<label class="form-label small">Дата начала *</label>
|
||||
<input type="date" name="items[0][start_date]" class="form-control form-control-sm" required>
|
||||
<div class="col-md-4">
|
||||
<label class="form-label">Пользователь</label>
|
||||
<x-tags-input
|
||||
name="items[0][user_ids]"
|
||||
url="{{ route('api.users.search') }}"
|
||||
placeholder="Или выберите пользователей..."
|
||||
badge_color="success"
|
||||
/>
|
||||
</div>
|
||||
<div class="col-md-2">
|
||||
<label class="form-label small">Дата окончания</label>
|
||||
<input type="date" name="items[0][end_date]" class="form-control form-control-sm">
|
||||
|
||||
<!-- Строка 3: Даты -->
|
||||
<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>
|
||||
<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.innerHTML = `
|
||||
<div class="row g-2">
|
||||
<div class="col-md-4">
|
||||
<label class="form-label small">Курс *</label>
|
||||
<select name="items[${itemCount}][course_id]" class="form-select form-select-sm" required>
|
||||
<!-- Строка 1: Курс -->
|
||||
<div class="col-md-12">
|
||||
<label class="form-label">Курс *</label>
|
||||
<select name="items[${itemCount}][course_id]" class="form-select" required>
|
||||
<option value="">Выберите курс</option>
|
||||
@foreach($courses as $id => $title)
|
||||
<option value="{{ $id }}">{{ $title }}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label class="form-label small">Пользователь</label>
|
||||
<input type="text" class="form-control form-control-sm" placeholder="ID пользователей (через запятую)" name="items[${itemCount}][user_ids]">
|
||||
<small class="text-muted">Или</small>
|
||||
|
||||
<!-- Строка 2: Получатели -->
|
||||
<div class="col-md-4">
|
||||
<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 class="col-md-3">
|
||||
<label class="form-label small">Группа</label>
|
||||
<input type="text" class="form-control form-control-sm" placeholder="ID групп (через запятую)" name="items[${itemCount}][group_ids]">
|
||||
<div class="col-md-4">
|
||||
<label class="form-label">Группа</label>
|
||||
<input type="text" class="form-control" placeholder="ID групп (через запятую)" name="items[${itemCount}][group_ids]">
|
||||
<small class="text-muted">И</small>
|
||||
</div>
|
||||
<div class="col-md-2">
|
||||
<label class="form-label small">Дата начала *</label>
|
||||
<input type="date" name="items[${itemCount}][start_date]" class="form-control form-control-sm" required>
|
||||
<div class="col-md-4">
|
||||
<label class="form-label">Пользователь</label>
|
||||
<input type="text" class="form-control" placeholder="ID пользователей (через запятую)" name="items[${itemCount}][user_ids]">
|
||||
</div>
|
||||
<div class="col-md-2">
|
||||
<label class="form-label small">Дата окончания</label>
|
||||
<input type="date" name="items[${itemCount}][end_date]" class="form-control form-control-sm">
|
||||
|
||||
<!-- Строка 3: Даты -->
|
||||
<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>
|
||||
<button type="button" class="btn btn-sm btn-outline-danger mt-2 remove-item"><i class="bi bi-trash"></i> Удалить</button>
|
||||
|
||||
Reference in New Issue
Block a user