Merge branch 'enhanc-project-index' into dev

app/ModelFilters/ProjectAssetFilter.php

@@ -3,6 +3,7 @@
 namespace App\ModelFilters;
 
 use App\Models\Asset;
+use App\Models\Project;
 use App\Models\ProjectAsset;
 use EloquentFilter\ModelFilter;
 
@@ -19,7 +20,7 @@ class ProjectAssetFilter extends ModelFilter
     {
         return $query;
     }
-    public function assetId($assetId){
+    public function asset($assetId){
 
         $asset = Asset::find($assetId);
         $assetIds=[];
@@ -28,4 +29,10 @@ class ProjectAssetFilter extends ModelFilter
         }
         return $this->whereIn('asset_id',$assetIds);
     }
+
+    public function status($status){
+
+        $projectIds = Project::where('status',$status)->get('id');
+        return $this->whereIn('project_id',$projectIds);
+    }
 }