wip

app/Concerns/BelongsToNurse.php

@@ -22,13 +22,7 @@ public static function bootBelongsToNurse(): void
                 return;
             }
 
-            if (auth()->user()->isNurse()) {
-                $builder->forNurse(auth()->user());
-            }
-
-            if (auth()->user()->isCoordinator()) {
-                $builder->forNurseInCounty(auth()->user()->county_id);
-            }
+            return $builder->forUser(auth()->user());
         });
     }
 
@@ -37,15 +31,16 @@ public function nurse(): BelongsTo
         return $this->belongsTo(User::class)->onlyNurses();
     }
 
-    public function scopeForNurse(Builder $query, User $user): Builder
+    public function scopeForUser(Builder $query, User $user): Builder
     {
-        return $query->where('nurse_id', $user->id);
-    }
+        if ($user->isNurse()) {
+            return $query->where('nurse_id', $user->id);
+        }
 
-    public function scopeForNurseInCounty(Builder $query, int $county_id): Builder
-    {
-        return $query->whereHas('nurse', function (Builder $query) use ($county_id) {
-            $query->activatesInCounty($county_id);
-        });
+        if ($user->isCoordinator()) {
+            return $query->whereRelation('nurse', 'activity_county_id', $user->county_id);
+        }
+
+        return $query;
     }
 }

app/Filament/Forms/Components/ReportContent.php

@@ -53,7 +53,7 @@ protected function tables(): Group
                                 View::make('vendor.tables.components.empty-state.index')
                                     ->visible(blank(data_get($table, 'data')))
                                     ->viewData([
-                                        'icon' => 'icon-clipboard',
+                                        'icon' => 'heroicon-o-x',
                                         'heading' => __('report.no-results.title'),
                                         'description' => __('report.no-results.description'),
                                     ]),

app/Models/Beneficiary.php

@@ -215,6 +215,6 @@ public function scopeWhereHasVulnerabilities(Builder $query, callable $callback)
                     })
                     ->leftJoin('cities', 'beneficiaries.city_id', '=', 'cities.id')
                     ->leftJoin('counties', 'beneficiaries.county_id', '=', 'counties.id');
-            }, 'activity_log');
+            }, 'beneficiaries');
     }
 }

app/Reports/Queries/Child/C01.php

@@ -24,7 +24,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/Child/C02.php

@@ -24,7 +24,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/Child/C04.php

@@ -4,10 +4,10 @@
 
 namespace App\Reports\Queries\Child;
 
+use App\Filament\Resources\BeneficiaryResource;
 use App\Models\Beneficiary;
 use App\Reports\Queries\ReportQuery;
 use Illuminate\Database\Eloquent\Builder;
-use App\Filament\Resources\BeneficiaryResource;
 
 class C04 extends ReportQuery
 {
@@ -29,7 +29,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/Child/C05.php

@@ -4,10 +4,10 @@
 
 namespace App\Reports\Queries\Child;
 
+use App\Filament\Resources\BeneficiaryResource;
 use App\Models\Beneficiary;
 use App\Reports\Queries\ReportQuery;
 use Illuminate\Database\Eloquent\Builder;
-use App\Filament\Resources\BeneficiaryResource;
 
 class C05 extends ReportQuery
 {
@@ -29,7 +29,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/Child/C06.php

@@ -4,10 +4,10 @@
 
 namespace App\Reports\Queries\Child;
 
+use App\Filament\Resources\BeneficiaryResource;
 use App\Models\Beneficiary;
 use App\Reports\Queries\ReportQuery;
 use Illuminate\Database\Eloquent\Builder;
-use App\Filament\Resources\BeneficiaryResource;
 
 class C06 extends ReportQuery
 {
@@ -29,7 +29,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/Child/C07.php

@@ -29,7 +29,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/Child/C08.php

@@ -29,7 +29,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/Child/C09.php

@@ -29,7 +29,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/Child/C10.php

@@ -29,7 +29,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/Child/C11.php

@@ -29,7 +29,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/Child/C12.php

@@ -29,7 +29,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/Child/C13.php

@@ -29,7 +29,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/Child/C15.php

@@ -29,7 +29,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/Child/C16.php

@@ -29,7 +29,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/Child/C19.php

@@ -29,7 +29,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/Child/C22.php

@@ -24,7 +24,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/Child/C23.php

@@ -24,7 +24,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/Child/C24.php

@@ -33,7 +33,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/Child/C25.php

@@ -29,7 +29,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/Child/C26.php

@@ -29,7 +29,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/Child/C27.php

@@ -31,7 +31,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/Child/C28.php

@@ -4,10 +4,10 @@
 
 namespace App\Reports\Queries\Child;
 
+use App\Filament\Resources\BeneficiaryResource;
 use App\Models\Beneficiary;
 use App\Reports\Queries\ReportQuery;
 use Illuminate\Database\Eloquent\Builder;
-use App\Filament\Resources\BeneficiaryResource;
 
 class C28 extends ReportQuery
 {
@@ -29,7 +29,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/Child/C29.php

@@ -29,7 +29,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/Child/C30.php

@@ -29,7 +29,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/General/G01.php

@@ -24,7 +24,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/General/G02.php

@@ -24,7 +24,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/General/G03.php

@@ -24,7 +24,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/General/G04.php

@@ -24,7 +24,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/General/G05.php

@@ -24,7 +24,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/General/G06.php

@@ -24,7 +24,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/General/G07.php

@@ -25,7 +25,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array

app/Reports/Queries/General/G08.php

@@ -24,7 +24,7 @@ public static function query(): Builder
 
     public static function dateColumn(): string
     {
-        return 'activity_log.created_at';
+        return 'beneficiaries.created_at';
     }
 
     public static function columns(): array