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

Feat: AJAX для назначений + заметка + редактирование 

✅ AJAX добавление через modals
✅ AJAX удаление без перезагрузки
✅ Заметка показывается если есть
✅ Modal редактирования (дата, заметка)
✅ Кнопка редактировать назначение

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
This commit is contained in:
mirivlad 2026-03-31 09:01:23 +08:00
parent cb87a76570
commit ae5f09eedc
2 changed files with 189 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/Http/Controllers/Admin/CourseAssignmentController.php
View File

@ -93,12 +93,13 @@ class CourseAssignmentController extends Controller
// Создаём назначения для каждой комбинации // Создаём назначения для каждой комбинации
$created = 0; $created = 0;
$createdIds = [];
// Назначения пользователям // Назначения пользователям
if (!empty($userIds)) { if (!empty($userIds)) {
foreach ($userIds as $userId) { foreach ($userIds as $userId) {
foreach ($courseIds as $courseId) { foreach ($courseIds as $courseId) {
CourseAssignment::create([ $assignment = CourseAssignment::create([
'course_id' => $courseId, 'course_id' => $courseId,
'user_id' => $userId, 'user_id' => $userId,
'type' => 'individual', 'type' => 'individual',
@ -108,6 +109,7 @@ class CourseAssignmentController extends Controller
'created_by' => $validated['created_by'], 'created_by' => $validated['created_by'],
'is_active' => $validated['is_active'], 'is_active' => $validated['is_active'],
]); ]);
$createdIds[] = $assignment->id;
$created++; $created++;
} }
} }
@ -117,7 +119,7 @@ class CourseAssignmentController extends Controller
if (!empty($groupIds)) { if (!empty($groupIds)) {
foreach ($groupIds as $groupId) { foreach ($groupIds as $groupId) {
foreach ($courseIds as $courseId) { foreach ($courseIds as $courseId) {
CourseAssignment::create([ $assignment = CourseAssignment::create([
'course_id' => $courseId, 'course_id' => $courseId,
'group_id' => $groupId, 'group_id' => $groupId,
'type' => 'group', 'type' => 'group',
@ -127,6 +129,7 @@ class CourseAssignmentController extends Controller
'created_by' => $validated['created_by'], 'created_by' => $validated['created_by'],
'is_active' => $validated['is_active'], 'is_active' => $validated['is_active'],
]); ]);
$createdIds[] = $assignment->id;
$created++; $created++;
} }
} }
@ -136,7 +139,7 @@ class CourseAssignmentController extends Controller
if (!empty($organizationIds)) { if (!empty($organizationIds)) {
foreach ($organizationIds as $organizationId) { foreach ($organizationIds as $organizationId) {
foreach ($courseIds as $courseId) { foreach ($courseIds as $courseId) {
CourseAssignment::create([ $assignment = CourseAssignment::create([
'course_id' => $courseId, 'course_id' => $courseId,
'organization_id' => $organizationId, 'organization_id' => $organizationId,
'type' => 'organization', 'type' => 'organization',
@ -146,11 +149,21 @@ class CourseAssignmentController extends Controller
'created_by' => $validated['created_by'], 'created_by' => $validated['created_by'],
'is_active' => $validated['is_active'], 'is_active' => $validated['is_active'],
]); ]);
$createdIds[] = $assignment->id;
$created++; $created++;
} }
} }
} }
// Для AJAX запросов возвращаем JSON
if ($request->ajax()) {
return response()->json([
'success' => true,
'message' => "Добавлено: {$created}",
'ids' => $createdIds
]);
}
return redirect()->route('admin.course-assignments.index') return redirect()->route('admin.course-assignments.index')
->with('success', "Создано назначений: {$created}"); ->with('success', "Создано назначений: {$created}");
} }
@ -188,6 +201,11 @@ class CourseAssignmentController extends Controller
$course_assignment->delete(); $course_assignment->delete();
// Для AJAX запросов
if (request()->ajax()) {
return response()->json(['success' => true]);
}
return redirect()->route('admin.course-assignments.index') return redirect()->route('admin.course-assignments.index')
->with('success', 'Назначение успешно удалено.'); ->with('success', 'Назначение успешно удалено.');
} }

173
resources/views/admin/course-assignments/show.blade.php
View File

@ -7,35 +7,50 @@
<main class="col-md-9 ms-sm-auto col-lg-10 px-md-4 main-content"> <main class="col-md-9 ms-sm-auto col-lg-10 px-md-4 main-content">
<div class="d-flex justify-content-between align-items-center pt-3 pb-2 mb-3 border-bottom"> <div class="d-flex justify-content-between align-items-center pt-3 pb-2 mb-3 border-bottom">
<h1 class="h2">{{ $courseModel->title }}</h1> <h1 class="h2">{{ $courseModel->title }}</h1>
<div>
<button class="btn btn-warning btn-sm me-2" data-bs-toggle="modal" data-bs-target="#editAssignmentModal">
<i class="bi bi-pencil"></i> Редактировать
</button>
<a href="{{ route('admin.course-assignments.index') }}" class="btn btn-secondary btn-sm">Назад</a> <a href="{{ route('admin.course-assignments.index') }}" class="btn btn-secondary btn-sm">Назад</a>
</div> </div>
</div>
<div class="row mb-4"> <div class="row mb-4">
<div class="col-md-4"> <div class="col-md-8">
<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="row">
<div class="col-6">
<div><strong>Начало:</strong> {{ \Carbon\Carbon::parse($start_date)->format('d.m.Y') }}</div> <div><strong>Начало:</strong> {{ \Carbon\Carbon::parse($start_date)->format('d.m.Y') }}</div>
<div><strong>Окончание:</strong> {{ $end_date ? \Carbon\Carbon::parse($end_date)->format('d.m.Y') : 'Бессрочно' }}</div> <div><strong>Окончание:</strong> {{ $end_date ? \Carbon\Carbon::parse($end_date)->format('d.m.Y') : 'Бессрочно' }}</div>
</div> </div>
@if($assignments->first()?->note)
<div class="col-6 border-start">
<div><strong>Заметка:</strong></div>
<p class="mb-0 text-muted">{{ $assignments->first()->note }}</p>
</div>
@endif
</div> </div>
</div> </div>
<div class="col-md-8"> </div>
</div>
<div class="col-md-4">
<div class="card shadow-sm"> <div class="card shadow-sm">
<div class="card-header bg-success text-white"><h5 class="mb-0">Статистика</h5></div> <div class="card-header bg-success text-white"><h5 class="mb-0">Статистика</h5></div>
<div class="card-body"> <div class="card-body">
<div class="row text-center"> <div class="row text-center">
<div class="col-4"> <div class="col-4">
<div class="display-6 text-success">{{ $individual->count() }}</div> <div class="display-6 text-success" id="individual-count">{{ $individual->count() }}</div>
<div class="text-muted"><i class="bi bi-person"></i> Пользователей</div> <div class="text-muted"><i class="bi bi-person"></i></div>
</div> </div>
<div class="col-4"> <div class="col-4">
<div class="display-6 text-info">{{ $groups->count() }}</div> <div class="display-6 text-info" id="group-count">{{ $groups->count() }}</div>
<div class="text-muted"><i class="bi bi-people"></i> Групп</div> <div class="text-muted"><i class="bi bi-people"></i></div>
</div> </div>
<div class="col-4"> <div class="col-4">
<div class="display-6 text-primary">{{ $organizations->count() }}</div> <div class="display-6 text-primary" id="organization-count">{{ $organizations->count() }}</div>
<div class="text-muted"><i class="bi bi-building"></i> Организаций</div> <div class="text-muted"><i class="bi bi-building"></i></div>
</div> </div>
</div> </div>
</div> </div>
@ -51,24 +66,23 @@
<button class="btn btn-sm btn-light" data-bs-toggle="modal" data-bs-target="#addUserModal"><i class="bi bi-plus-lg"></i></button> <button class="btn btn-sm btn-light" data-bs-toggle="modal" data-bs-target="#addUserModal"><i class="bi bi-plus-lg"></i></button>
</div> </div>
<div class="card-body p-0"> <div class="card-body p-0">
<div id="users-list">
@if($individual->count() > 0) @if($individual->count() > 0)
<ul class="list-group list-group-flush"> <ul class="list-group list-group-flush" id="users-ul">
@foreach($individual as $a) @foreach($individual as $a)
<li class="list-group-item d-flex justify-content-between align-items-center"> <li class="list-group-item d-flex justify-content-between align-items-center" id="user-li-{{ $a->id }}">
<a href="{{ route('admin.users.show', $a->user) }}">{{ $a->user?->name ?? '—' }}</a> <a href="{{ route('admin.users.show', $a->user) }}">{{ $a->user?->name ?? '—' }}</a>
<form action="{{ route('admin.course-assignments.destroy', $a) }}" method="POST" class="d-inline"> <button onclick="removeAssignment({{ $a->id }}, 'user')" class="btn btn-sm btn-outline-danger"><i class="bi bi-x-lg"></i></button>
@csrf @method('DELETE')
<button class="btn btn-sm btn-outline-danger"><i class="bi bi-x-lg"></i></button>
</form>
</li> </li>
@endforeach @endforeach
</ul> </ul>
@else @else
<p class="text-muted text-center py-4">Нет пользователей</p> <p class="text-muted text-center py-4" id="users-empty">Нет пользователей</p>
@endif @endif
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="col-md-4 mb-4"> <div class="col-md-4 mb-4">
<div class="card shadow-sm h-100"> <div class="card shadow-sm h-100">
@ -77,24 +91,23 @@
<button class="btn btn-sm btn-light" data-bs-toggle="modal" data-bs-target="#addGroupModal"><i class="bi bi-plus-lg"></i></button> <button class="btn btn-sm btn-light" data-bs-toggle="modal" data-bs-target="#addGroupModal"><i class="bi bi-plus-lg"></i></button>
</div> </div>
<div class="card-body p-0"> <div class="card-body p-0">
<div id="groups-list">
@if($groups->count() > 0) @if($groups->count() > 0)
<ul class="list-group list-group-flush"> <ul class="list-group list-group-flush" id="groups-ul">
@foreach($groups as $a) @foreach($groups as $a)
<li class="list-group-item d-flex justify-content-between align-items-center"> <li class="list-group-item d-flex justify-content-between align-items-center" id="group-li-{{ $a->id }}">
<a href="{{ route('admin.groups.show', $a->group) }}">{{ $a->group?->name ?? '—' }}</a> <a href="{{ route('admin.groups.show', $a->group) }}">{{ $a->group?->name ?? '—' }}</a>
<form action="{{ route('admin.course-assignments.destroy', $a) }}" method="POST" class="d-inline"> <button onclick="removeAssignment({{ $a->id }}, 'group')" class="btn btn-sm btn-outline-danger"><i class="bi bi-x-lg"></i></button>
@csrf @method('DELETE')
<button class="btn btn-sm btn-outline-danger"><i class="bi bi-x-lg"></i></button>
</form>
</li> </li>
@endforeach @endforeach
</ul> </ul>
@else @else
<p class="text-muted text-center py-4">Нет групп</p> <p class="text-muted text-center py-4" id="groups-empty">Нет групп</p>
@endif @endif
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="col-md-4 mb-4"> <div class="col-md-4 mb-4">
<div class="card shadow-sm h-100"> <div class="card shadow-sm h-100">
@ -103,25 +116,24 @@
<button class="btn btn-sm btn-light" data-bs-toggle="modal" data-bs-target="#addOrganizationModal"><i class="bi bi-plus-lg"></i></button> <button class="btn btn-sm btn-light" data-bs-toggle="modal" data-bs-target="#addOrganizationModal"><i class="bi bi-plus-lg"></i></button>
</div> </div>
<div class="card-body p-0"> <div class="card-body p-0">
<div id="organizations-list">
@if($organizations->count() > 0) @if($organizations->count() > 0)
<ul class="list-group list-group-flush"> <ul class="list-group list-group-flush" id="organizations-ul">
@foreach($organizations as $a) @foreach($organizations as $a)
<li class="list-group-item d-flex justify-content-between align-items-center"> <li class="list-group-item d-flex justify-content-between align-items-center" id="organization-li-{{ $a->id }}">
<a href="{{ route('admin.organizations.show', $a->organization) }}">{{ $a->organization?->name ?? '—' }}</a> <a href="{{ route('admin.organizations.show', $a->organization) }}">{{ $a->organization?->name ?? '—' }}</a>
<form action="{{ route('admin.course-assignments.destroy', $a) }}" method="POST" class="d-inline"> <button onclick="removeAssignment({{ $a->id }}, 'organization')" class="btn btn-sm btn-outline-danger"><i class="bi bi-x-lg"></i></button>
@csrf @method('DELETE')
<button class="btn btn-sm btn-outline-danger"><i class="bi bi-x-lg"></i></button>
</form>
</li> </li>
@endforeach @endforeach
</ul> </ul>
@else @else
<p class="text-muted text-center py-4">Нет организаций</p> <p class="text-muted text-center py-4" id="organizations-empty">Нет организаций</p>
@endif @endif
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
</main> </main>
</div> </div>
</div> </div>
@ -130,7 +142,7 @@
<div class="modal fade" id="addUserModal" tabindex="-1"> <div class="modal fade" id="addUserModal" tabindex="-1">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<form action="{{ route('admin.course-assignments.store') }}" method="POST"> <form id="addUserForm">
@csrf @csrf
<input type="hidden" name="course_ids" value="{{ $courseModel->id }}"> <input type="hidden" name="course_ids" value="{{ $courseModel->id }}">
<input type="hidden" name="start_date" value="{{ $start_date }}"> <input type="hidden" name="start_date" value="{{ $start_date }}">
@ -155,7 +167,7 @@
<div class="modal fade" id="addGroupModal" tabindex="-1"> <div class="modal fade" id="addGroupModal" tabindex="-1">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<form action="{{ route('admin.course-assignments.store') }}" method="POST"> <form id="addGroupForm">
@csrf @csrf
<input type="hidden" name="course_ids" value="{{ $courseModel->id }}"> <input type="hidden" name="course_ids" value="{{ $courseModel->id }}">
<input type="hidden" name="start_date" value="{{ $start_date }}"> <input type="hidden" name="start_date" value="{{ $start_date }}">
@ -180,7 +192,7 @@
<div class="modal fade" id="addOrganizationModal" tabindex="-1"> <div class="modal fade" id="addOrganizationModal" tabindex="-1">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<form action="{{ route('admin.course-assignments.store') }}" method="POST"> <form id="addOrganizationForm">
@csrf @csrf
<input type="hidden" name="course_ids" value="{{ $courseModel->id }}"> <input type="hidden" name="course_ids" value="{{ $courseModel->id }}">
<input type="hidden" name="start_date" value="{{ $start_date }}"> <input type="hidden" name="start_date" value="{{ $start_date }}">
@ -200,4 +212,101 @@
</div> </div>
</div> </div>
</div> </div>
<!-- Modal редактирования назначения -->
<div class="modal fade" id="editAssignmentModal" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
<form action="{{ route('admin.course-assignments.store') }}" method="POST">
@csrf
<input type="hidden" name="course_ids" value="{{ $courseModel->id }}">
<input type="hidden" name="start_date" value="{{ $start_date }}">
<div class="modal-header">
<h5 class="modal-title">Редактировать назначение</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
</div>
<div class="modal-body">
<div class="mb-3">
<label class="form-label">Дата окончания</label>
<input type="date" name="end_date" class="form-control" value="{{ $end_date }}">
<small class="text-muted">Оставьте пустым для бессрочного</small>
</div>
<div class="mb-3">
<label class="form-label">Заметка</label>
<textarea name="note" class="form-control" rows="3">{{ $assignments->first()?->note }}</textarea>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Отмена</button>
<button type="submit" class="btn btn-warning">Сохранить</button>
</div>
</form>
</div>
</div>
</div>
@push('scripts')
<script>
// AJAX добавление
function setupAjaxForm(formId, type) {
document.getElementById(formId).addEventListener('submit', function(e) {
e.preventDefault();
const formData = new FormData(this);
fetch('{{ route('admin.course-assignments.store') }}', {
method: 'POST',
body: formData,
headers: {
'X-Requested-With': 'XMLHttpRequest',
'X-CSRF-TOKEN': '{{ csrf_token() }}'
}
})
.then(response => response.json())
.then(data => {
if (data.success) {
location.reload();
}
})
.catch(err => console.error(err));
});
}
setupAjaxForm('addUserForm', 'user');
setupAjaxForm('addGroupForm', 'group');
setupAjaxForm('addOrganizationForm', 'organization');
// AJAX удаление
function removeAssignment(id, type) {
if (!confirm('Удалить это назначение?')) return;
fetch('/admin/course-assignments/' + id, {
method: 'DELETE',
headers: {
'X-Requested-With': 'XMLHttpRequest',
'X-CSRF-TOKEN': '{{ csrf_token() }}'
}
})
.then(response => response.json())
.then(data => {
if (data.success) {
// Удаляем элемент из списка
const li = document.getElementById(type + '-li-' + id);
if (li) li.remove();
// Обновляем счётчик
const countEl = document.getElementById(type + '-count');
if (countEl) countEl.textContent = parseInt(countEl.textContent) - 1;
// Показываем "нет элементов" если пусто
const ul = document.getElementById(type + 's-ul');
const empty = document.getElementById(type + 's-empty');
if (ul && ul.children.length === 0 && empty) {
empty.style.display = 'block';
}
}
})
.catch(err => console.error(err));
}
</script>
@endpush
@endsection @endsection