Fix: Имя переменной $course_assignment вместо $assignment
✅ Исправлено Route Model Binding ✅ Параметр {course_assignment} в маршруте ✅ Переменная $course_assignment в контроллере ✅ Обновлены все view файлы Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
This commit is contained in:
mirivlad
parent
d412d287c2
commit
90a49b0f37
|
|
@ -146,28 +146,28 @@ class CourseAssignmentController extends Controller
|
|||
->with('success', "Создано назначений: {$created}");
|
||||
}
|
||||
|
||||
public function show(CourseAssignment $assignment)
|
||||
public function show(CourseAssignment $course_assignment)
|
||||
{
|
||||
Gate::authorize('view', $assignment);
|
||||
|
||||
$assignment->load(['course', 'user', 'group', 'organization', 'creator']);
|
||||
|
||||
return view('admin.course-assignments.show', compact('assignment'));
|
||||
Gate::authorize('view', $course_assignment);
|
||||
|
||||
$course_assignment->load(['course', 'user', 'group', 'organization', 'creator']);
|
||||
|
||||
return view('admin.course-assignments.show', compact('course_assignment'));
|
||||
}
|
||||
|
||||
public function edit(CourseAssignment $assignment)
|
||||
public function edit(CourseAssignment $course_assignment)
|
||||
{
|
||||
Gate::authorize('update', $assignment);
|
||||
|
||||
Gate::authorize('update', $course_assignment);
|
||||
|
||||
$courses = Course::pluck('title', 'id');
|
||||
|
||||
return view('admin.course-assignments.edit', compact('assignment', 'courses'));
|
||||
|
||||
return view('admin.course-assignments.edit', compact('course_assignment', 'courses'));
|
||||
}
|
||||
|
||||
public function update(Request $request, CourseAssignment $assignment)
|
||||
public function update(Request $request, CourseAssignment $course_assignment)
|
||||
{
|
||||
Gate::authorize('update', $assignment);
|
||||
|
||||
Gate::authorize('update', $course_assignment);
|
||||
|
||||
$validated = $request->validate([
|
||||
'course_id' => 'required|exists:courses,id',
|
||||
'start_date' => 'required|date',
|
||||
|
|
@ -176,18 +176,18 @@ class CourseAssignmentController extends Controller
|
|||
'is_active' => 'boolean',
|
||||
]);
|
||||
|
||||
$assignment->update($validated);
|
||||
|
||||
return redirect()->route('admin.course-assignments.show', $assignment)
|
||||
$course_assignment->update($validated);
|
||||
|
||||
return redirect()->route('admin.course-assignments.show', $course_assignment)
|
||||
->with('success', 'Назначение успешно обновлено.');
|
||||
}
|
||||
|
||||
public function destroy(CourseAssignment $assignment)
|
||||
public function destroy(CourseAssignment $course_assignment)
|
||||
{
|
||||
Gate::authorize('delete', $assignment);
|
||||
|
||||
$assignment->delete();
|
||||
|
||||
Gate::authorize('delete', $course_assignment);
|
||||
|
||||
$course_assignment->delete();
|
||||
|
||||
return redirect()->route('admin.course-assignments.index')
|
||||
->with('success', 'Назначение успешно удалено.');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@
|
|||
<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">
|
||||
<h1 class="h2">Редактировать назначение</h1>
|
||||
<a href="{{ route('admin.course-assignments.show', $assignment) }}" class="btn btn-secondary btn-sm">Назад</a>
|
||||
<a href="{{ route('admin.course-assignments.show', $course_assignment) }}" class="btn btn-secondary btn-sm">Назад</a>
|
||||
</div>
|
||||
|
||||
<form action="{{ route('admin.course-assignments.update', $assignment) }}" method="POST">
|
||||
<form action="{{ route('admin.course-assignments.update', $course_assignment) }}" method="POST">
|
||||
@csrf @method('PUT')
|
||||
<div class="row">
|
||||
<div class="col-md-8 mb-4">
|
||||
|
|
@ -19,22 +19,22 @@
|
|||
<div class="card-body">
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Курс</label>
|
||||
<input type="text" class="form-control" value="{{ $assignment->course->title }}" disabled>
|
||||
<input type="text" class="form-control" value="{{ $course_assignment->course->title }}" disabled>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Тип</label>
|
||||
<input type="text" class="form-control" value="@if($assignment->type === 'individual')Индивидуально@elseif($assignment->type === 'group')Группе@elseОрганизации@endif" disabled>
|
||||
<input type="text" class="form-control" value="@if($course_assignment->type === 'individual')Индивидуально@elseif($course_assignment->type === 'group')Группе@elseОрганизации@endif" disabled>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Назначено</label>
|
||||
<input type="text" class="form-control" value="@if($assignment->type === 'individual'){{ $assignment->user?->name }}@elseif($assignment->type === 'group'){{ $assignment->group?->name }}@else{{ $assignment->organization?->name }}@endif" disabled>
|
||||
<input type="text" class="form-control" value="@if($course_assignment->type === 'individual'){{ $course_assignment->user?->name }}@elseif($course_assignment->type === 'group'){{ $course_assignment->group?->name }}@else{{ $course_assignment->organization?->name }}@endif" disabled>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Заметка</label>
|
||||
<textarea name="note" class="form-control" rows="3">{{ old('note', $assignment->note) }}</textarea>
|
||||
<textarea name="note" class="form-control" rows="3">{{ old('note', $course_assignment->note) }}</textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -46,17 +46,17 @@
|
|||
<div class="card-body">
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Дата начала *</label>
|
||||
<input type="date" name="start_date" class="form-control @error('start_date') is-invalid @enderror" value="{{ old('start_date', $assignment->start_date->format('Y-m-d')) }}" required>
|
||||
<input type="date" name="start_date" class="form-control @error('start_date') is-invalid @enderror" value="{{ old('start_date', $course_assignment->start_date->format('Y-m-d')) }}" required>
|
||||
@error('start_date')<div class="invalid-feedback">{{ $message }}</div>@enderror
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Дата окончания</label>
|
||||
<input type="date" name="end_date" class="form-control @error('end_date') is-invalid @enderror" value="{{ old('end_date', $assignment->end_date?->format('Y-m-d')) }}">
|
||||
<input type="date" name="end_date" class="form-control @error('end_date') is-invalid @enderror" value="{{ old('end_date', $course_assignment->end_date?->format('Y-m-d')) }}">
|
||||
<small class="text-muted">Оставьте пустым для бессрочного доступа</small>
|
||||
@error('end_date')<div class="invalid-feedback">{{ $message }}</div>@enderror
|
||||
</div>
|
||||
<div class="form-check mb-3">
|
||||
<input type="checkbox" name="is_active" value="1" class="form-check-input" {{ old('is_active', $assignment->is_active) ? 'checked' : '' }}>
|
||||
<input type="checkbox" name="is_active" value="1" class="form-check-input" {{ old('is_active', $course_assignment->is_active) ? 'checked' : '' }}>
|
||||
<label class="form-check-label">Активно</label>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -65,7 +65,7 @@
|
|||
</div>
|
||||
|
||||
<button type="submit" class="btn btn-primary">Сохранить</button>
|
||||
<a href="{{ route('admin.course-assignments.show', $assignment) }}" class="btn btn-secondary">Отмена</a>
|
||||
<a href="{{ route('admin.course-assignments.show', $course_assignment) }}" class="btn btn-secondary">Отмена</a>
|
||||
</form>
|
||||
</main>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -52,35 +52,35 @@
|
|||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@forelse($assignments as $assignment)
|
||||
@forelse($course_assignments as $course_assignment)
|
||||
<tr>
|
||||
<td><strong>{{ $assignment->course->title }}</strong></td>
|
||||
<td><strong>{{ $course_assignment->course->title }}</strong></td>
|
||||
<td>
|
||||
@if($assignment->type === 'individual')
|
||||
@if($course_assignment->type === 'individual')
|
||||
<span class="badge bg-success"><i class="bi bi-person"></i> Индивидуально</span>
|
||||
@elseif($assignment->type === 'group')
|
||||
@elseif($course_assignment->type === 'group')
|
||||
<span class="badge bg-info"><i class="bi bi-people"></i> Группе</span>
|
||||
@else
|
||||
<span class="badge bg-primary"><i class="bi bi-building"></i> Организации</span>
|
||||
@endif
|
||||
</td>
|
||||
<td>
|
||||
@if($assignment->type === 'individual')
|
||||
{{ $assignment->user?->name ?? '—' }}
|
||||
@elseif($assignment->type === 'group')
|
||||
{{ $assignment->group?->name ?? '—' }}
|
||||
@if($course_assignment->type === 'individual')
|
||||
{{ $course_assignment->user?->name ?? '—' }}
|
||||
@elseif($course_assignment->type === 'group')
|
||||
{{ $course_assignment->group?->name ?? '—' }}
|
||||
@else
|
||||
{{ $assignment->organization?->name ?? '—' }}
|
||||
{{ $course_assignment->organization?->name ?? '—' }}
|
||||
@endif
|
||||
</td>
|
||||
<td>
|
||||
<small>{{ $assignment->start_date->format('d.m.Y') }}</small>
|
||||
@if($assignment->end_date)
|
||||
<br><small>→ {{ $assignment->end_date->format('d.m.Y') }}</small>
|
||||
<small>{{ $course_assignment->start_date->format('d.m.Y') }}</small>
|
||||
@if($course_assignment->end_date)
|
||||
<br><small>→ {{ $course_assignment->end_date->format('d.m.Y') }}</small>
|
||||
@endif
|
||||
</td>
|
||||
<td>
|
||||
@if($assignment->is_active)
|
||||
@if($course_assignment->is_active)
|
||||
<span class="badge bg-success">Активно</span>
|
||||
@else
|
||||
<span class="badge bg-secondary">Не активно</span>
|
||||
|
|
@ -88,9 +88,9 @@
|
|||
</td>
|
||||
<td>
|
||||
<div class="btn-group btn-group-sm">
|
||||
<a href="{{ route('admin.course-assignments.show', $assignment) }}" class="btn btn-outline-primary" title="Просмотр"><i class="bi bi-eye"></i></a>
|
||||
<a href="{{ route('admin.course-assignments.edit', $assignment) }}" class="btn btn-outline-warning" title="Редактировать"><i class="bi bi-pencil"></i></a>
|
||||
<form action="{{ route('admin.course-assignments.destroy', $assignment) }}" method="POST" class="d-inline" onsubmit="return confirm('Удалить?')">
|
||||
<a href="{{ route('admin.course-assignments.show', $course_assignment) }}" class="btn btn-outline-primary" title="Просмотр"><i class="bi bi-eye"></i></a>
|
||||
<a href="{{ route('admin.course-assignments.edit', $course_assignment) }}" class="btn btn-outline-warning" title="Редактировать"><i class="bi bi-pencil"></i></a>
|
||||
<form action="{{ route('admin.course-assignments.destroy', $course_assignment) }}" method="POST" class="d-inline" onsubmit="return confirm('Удалить?')">
|
||||
@csrf @method('DELETE')
|
||||
<button class="btn btn-outline-danger" title="Удалить"><i class="bi bi-trash"></i></button>
|
||||
</form>
|
||||
|
|
@ -110,7 +110,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{{ $assignments->links() }}
|
||||
{{ $course_assignments->links() }}
|
||||
</main>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<div class="d-flex justify-content-between align-items-center pt-3 pb-2 mb-3 border-bottom">
|
||||
<h1 class="h2">Назначение курса</h1>
|
||||
<div>
|
||||
<a href="{{ route('admin.course-assignments.edit', $assignment) }}" class="btn btn-warning btn-sm me-2">Редактировать</a>
|
||||
<a href="{{ route('admin.course-assignments.edit', $course_assignment) }}" class="btn btn-warning btn-sm me-2">Редактировать</a>
|
||||
<a href="{{ route('admin.course-assignments.index') }}" class="btn btn-secondary btn-sm">Назад</a>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -21,14 +21,14 @@
|
|||
<table class="table table-sm">
|
||||
<tr>
|
||||
<th width="40%">Курс:</th>
|
||||
<td><strong>{{ $assignment->course->title }}</strong></td>
|
||||
<td><strong>{{ $course_assignment->course->title }}</strong></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Тип:</th>
|
||||
<td>
|
||||
@if($assignment->type === 'individual')
|
||||
@if($course_assignment->type === 'individual')
|
||||
<span class="badge bg-success"><i class="bi bi-person"></i> Индивидуально</span>
|
||||
@elseif($assignment->type === 'group')
|
||||
@elseif($course_assignment->type === 'group')
|
||||
<span class="badge bg-info"><i class="bi bi-people"></i> Группе</span>
|
||||
@else
|
||||
<span class="badge bg-primary"><i class="bi bi-building"></i> Организации</span>
|
||||
|
|
@ -38,22 +38,22 @@
|
|||
<tr>
|
||||
<th>Назначено:</th>
|
||||
<td>
|
||||
@if($assignment->type === 'individual')
|
||||
{{ $assignment->user?->name ?? '—' }}
|
||||
@elseif($assignment->type === 'group')
|
||||
{{ $assignment->group?->name ?? '—' }}
|
||||
@if($course_assignment->type === 'individual')
|
||||
{{ $course_assignment->user?->name ?? '—' }}
|
||||
@elseif($course_assignment->type === 'group')
|
||||
{{ $course_assignment->group?->name ?? '—' }}
|
||||
@else
|
||||
{{ $assignment->organization?->name ?? '—' }}
|
||||
{{ $course_assignment->organization?->name ?? '—' }}
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Заметка:</th>
|
||||
<td>{{ $assignment->note ?? '—' }}</td>
|
||||
<td>{{ $course_assignment->note ?? '—' }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Создано:</th>
|
||||
<td>{{ $assignment->creator?->name ?? '—' }}, {{ $assignment->created_at->format('d.m.Y H:i') }}</td>
|
||||
<td>{{ $course_assignment->creator?->name ?? '—' }}, {{ $course_assignment->created_at->format('d.m.Y H:i') }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
|
@ -66,13 +66,13 @@
|
|||
<div class="card-body">
|
||||
<div class="mb-3">
|
||||
<label class="text-muted small">Дата начала</label>
|
||||
<div class="fs-5">{{ $assignment->start_date->format('d.m.Y') }}</div>
|
||||
<div class="fs-5">{{ $course_assignment->start_date->format('d.m.Y') }}</div>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label class="text-muted small">Дата окончания</label>
|
||||
<div class="fs-5">
|
||||
@if($assignment->end_date)
|
||||
{{ $assignment->end_date->format('d.m.Y') }}
|
||||
@if($course_assignment->end_date)
|
||||
{{ $course_assignment->end_date->format('d.m.Y') }}
|
||||
@else
|
||||
<span class="text-muted">Бессрочно</span>
|
||||
@endif
|
||||
|
|
@ -81,7 +81,7 @@
|
|||
<hr>
|
||||
<div>
|
||||
<label class="text-muted small">Статус</label>
|
||||
@if($assignment->is_active)
|
||||
@if($course_assignment->is_active)
|
||||
<span class="badge bg-success">Активно</span>
|
||||
@else
|
||||
<span class="badge bg-secondary">Не активно</span>
|
||||
|
|
|
|||
Loading…
Reference in New Issue