From 5af1101c0239bbcf634a476a54c40891f192ee12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= <jeremy.munsch@ldc.fr>
Date: Sun, 22 May 2022 13:23:50 +0200
Subject: [PATCH 1/2] Macro Planning: add link to project label

---
 resources/js/components/MacroPlanningComponent.vue | 2 +-
 resources/views/macroplanning/view.blade.php       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/MacroPlanningComponent.vue b/resources/js/components/MacroPlanningComponent.vue
index a18fd5c..11f3a98 100644
--- a/resources/js/components/MacroPlanningComponent.vue
+++ b/resources/js/components/MacroPlanningComponent.vue
@@ -61,7 +61,7 @@
                     <template v-if="isAdmin">
                         <tr v-for="project of projects" :key="project.id" class="projectRow">
                             <th scope="col">
-                                <span :class="'rounded-1 p-1 project text-nowrap text-truncate overflow-hidden bg-enum-'+project.status">{{ project.name | str_limit(45) }}</span>
+                                <a :href="route('projects.show', {PROJECT: project.id })" :class="'rounded-1 p-1 project text-nowrap text-truncate overflow-hidden bg-enum-'+project.status">{{ project.name | str_limit(45) }}</a>
                             </th>
                             <td>
                                 <span class="fw-bold text-nowrap text-truncate overflow-hidden">{{ projectStatusEnum[project.status].label }}</span>
diff --git a/resources/views/macroplanning/view.blade.php b/resources/views/macroplanning/view.blade.php
index 6f932f0..0ccf393 100644
--- a/resources/views/macroplanning/view.blade.php
+++ b/resources/views/macroplanning/view.blade.php
@@ -21,6 +21,7 @@
 <script>
     window._routes = {
         "macroplanning.activity": "{{ route('macroplanning.activity') }}",
+        "projects.show": "{{ route('projects.show', ['project' => 'PROJECT']) }}",
     };
 </script>
 @endpush

From e52d02bf7b07973186fc1519c012a521e9845eaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= <jeremy.munsch@ldc.fr>
Date: Mon, 23 May 2022 10:42:14 +0200
Subject: [PATCH 2/2] Fix Project markers showing all markers

---
 app/Http/Controllers/MarkerController.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/app/Http/Controllers/MarkerController.php b/app/Http/Controllers/MarkerController.php
index a980b5e..c72619f 100644
--- a/app/Http/Controllers/MarkerController.php
+++ b/app/Http/Controllers/MarkerController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\MacroSchedule\Marker;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\View;
@@ -22,6 +23,23 @@ class MarkerController extends Controller
      */
     public static $layout = 'layout.app';
 
+    /**
+     * Crud index Hook
+     *
+     * @param Builder $query
+     * @return Builder
+     */
+    public function indexQuery(Builder $query): Builder
+    {
+        $parent = request()->project;
+        if ($parent) {
+            $query->whereHas('project', function ($q) use ($parent) {
+                return $q->whereId($parent->id);
+            });
+        }
+        return $query;
+    }
+
     /**
      * Show create page middleware
      *