diff --git a/app/Http/Controllers/DocumentController.php b/app/Http/Controllers/DocumentController.php index 6650ad7..bd1bcd0 100644 --- a/app/Http/Controllers/DocumentController.php +++ b/app/Http/Controllers/DocumentController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use App\Models\Document; +use App\Models\Project; class DocumentController extends Controller { @@ -16,18 +17,23 @@ class DocumentController extends Controller public function index(Request $request) { $project_id = $request->session()->get('project_id'); + $project = Project::find($project_id); $documents = Document::find($project_id); - return view('documents.list', ['documents' => $documents]); + return view('documents.list', ['project' => $project, 'documents' => $documents]); } /** * Show the form for creating a new resource. * + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ - public function create() + public function create(Request $request) { - // + $project_id = $request->session()->get('project_id'); + $project = Project::find($project_id); + $documents = Document::find($project_id); + return view('documents.create', ['project' => $project, 'documents' => $documents]); } /** diff --git a/app/Http/Controllers/MMCController.php b/app/Http/Controllers/MMCController.php index 75e566b..7cd9bf9 100644 --- a/app/Http/Controllers/MMCController.php +++ b/app/Http/Controllers/MMCController.php @@ -17,7 +17,7 @@ class MMCController extends Controller { $project_id = $request->session()->get('project_id'); $project = Project::find($project_id); - return view('mmc.show', ['project' => $project]); + return view('mmc.list', ['project' => $project]); } /** diff --git a/resources/views/documents/create.blade.php b/resources/views/documents/create.blade.php index 2560339..14e6571 100644 --- a/resources/views/documents/create.blade.php +++ b/resources/views/documents/create.blade.php @@ -1,7 +1,7 @@

- {{ __('Create project') }} + {{ $project->name }}: {{ __('Create document') }}

@@ -19,35 +19,34 @@ @endif -
+ @csrf - +
- -
- +
+ - + {{-- + + --}} +
- -
- - - -
diff --git a/resources/views/documents/list.blade.php b/resources/views/documents/list.blade.php index e8f2d01..15f10ab 100644 --- a/resources/views/documents/list.blade.php +++ b/resources/views/documents/list.blade.php @@ -1,7 +1,7 @@

- {{ __('Project list') }} + {{ $project->name }}: {{ __('Document list') }}

@@ -9,13 +9,13 @@
- + -
+ {{--
@endforelse
@@ -60,7 +60,7 @@
-
+
--}}
diff --git a/resources/views/mmc/list.blade.php b/resources/views/mmc/list.blade.php new file mode 100644 index 0000000..cc924ba --- /dev/null +++ b/resources/views/mmc/list.blade.php @@ -0,0 +1,31 @@ + + +

+
+
+ {{ $project->name }}: {{ __('MMC List')}} +
+
+

+
+ +
+
+
+
+ + + + +
+ TODO: MMC table + +
+
+
+
+
+
+