From 58c92adfbc1997e739f9697ba8746e2379b93914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=91=D0=B0=D0=B1=D0=BA=D0=B8=D0=BD?= Date: Thu, 14 Jul 2022 12:39:41 +0300 Subject: [PATCH] MMC continue --- app/Http/Controllers/MMCController.php | 2 +- resources/views/mmc/list.blade.php | 17 ++++++++++++----- resources/views/mmc/tableAukChild.blade.php | 5 ++++- routes/web.php | 2 +- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/MMCController.php b/app/Http/Controllers/MMCController.php index acdf435..7559626 100644 --- a/app/Http/Controllers/MMCController.php +++ b/app/Http/Controllers/MMCController.php @@ -131,7 +131,7 @@ class MMCController extends Controller // return redirect()->route('users.index'); } - public function scan(Request $request) + public function scan(Request $request, $auk_id) { $project_id = $request->session()->get('project_id'); $project = Project::find($project_id); diff --git a/resources/views/mmc/list.blade.php b/resources/views/mmc/list.blade.php index 5bdd542..efa277c 100644 --- a/resources/views/mmc/list.blade.php +++ b/resources/views/mmc/list.blade.php @@ -62,20 +62,27 @@ @forelse ($top_auks as $top_auk) - {{ $top_auk->auk_name }} - + {{ $top_auk->auk_name }} + - {{-- @forelse ($top_auk->mmcs as $mmc) + @forelse ($top_auk->mmcs as $mmc) @empty - + - @endforelse --}} + @endforelse
{{ $mmc->filename }}
No MMCNo MMC + + + +
diff --git a/resources/views/mmc/tableAukChild.blade.php b/resources/views/mmc/tableAukChild.blade.php index a8fda72..1310121 100644 --- a/resources/views/mmc/tableAukChild.blade.php +++ b/resources/views/mmc/tableAukChild.blade.php @@ -1,8 +1,11 @@ @foreach ($childs as $child) - + {{ str_pad('', $level, '-') . ' ' . $child->auk_name }} + + + @if (count($child->childs)) @include('mmc.tableAukChild', [ diff --git a/routes/web.php b/routes/web.php index e114ec0..890a847 100644 --- a/routes/web.php +++ b/routes/web.php @@ -38,7 +38,7 @@ Route::resource('/projects', ProjectController::class)->middleware(['auth']); Route::post('/project/{project}/select',SelectProjectController::class)->middleware(['auth'])->name('project.select'); Route::resource('/mmc', MMCController::class)->middleware(['auth'])->only(['index','create']); -Route::get('/mmc/scan', [MMCController::class, 'scan'])->middleware(['auth'])->name('mmc.scan'); +Route::get('/mmc/scan/{auk}', [MMCController::class, 'scan'])->middleware(['auth'])->name('mmc.scan'); Route::resource('/documents', DocumentController::class)->except('show')->middleware(['auth']); Route::resource('/auks', AUKController::class)->except('show')->middleware(['auth']); Route::get('/auks/scan', [AUKController::class, 'scan'])->middleware(['auth'])->name('auks.scan');