wip

Author: andreiio

app/Concerns/HasActivityAreas.php

@@ -32,6 +32,11 @@ public function scopeActivatesInCounty(Builder $query, int $county_id): Builder
         return $query->where('activity_county_id', $county_id);
     }
 
+    public function scopeActivatesInCurrentUserCounty(Builder $query): Builder
+    {
+        return $query->where('activity_county_id', auth()->user()->activity_county_id ?? auth()->user()->county_id);
+    }
+
     public function scopeWithActivityAreas(Builder $query): Builder
     {
         return $query->with('activityCounty', 'activityCities');

app/Filament/Resources/Beneficiaries/Pages/CreateBeneficiary.php

@@ -52,7 +52,6 @@ public function form(Schema $schema): Schema
                         Group::make()
                             ->visible(fn (Get $get) => Type::OCASIONAL->is($get('type')))
                             ->components(fn (Schema $schema) => OcasionalBeneficiaryForm::configure($schema)),
-
                     ]),
             ]);
     }

app/Filament/Resources/Beneficiaries/Schemas/RegularBeneficiaryForm.php

@@ -13,6 +13,7 @@
 use App\Filament\Forms\Components\Household;
 use App\Filament\Forms\Components\Location;
 use App\Filament\Schemas\Components\Subsection;
+use App\Models\Beneficiary;
 use App\Rules\ValidCNP;
 use Filament\Forms\Components\Checkbox;
 use Filament\Forms\Components\DatePicker;
@@ -50,16 +51,41 @@ public static function configure(Schema $schema, bool $includeProgram = false):
                                 TextEntry::make('type')
                                     ->label(__('field.beneficiary_type')),
 
-                                TextEntry::make('nurse.full_name')
-                                    ->label(__('field.allocated_nurse')),
+                                Select::make('nurse_id')
+                                    ->label(__('field.allocated_nurse'))
+                                    ->placeholder(__('placeholder.choose'))
+                                    ->relationship(
+                                        'nurse',
+                                        'full_name',
+                                        fn (Builder $query): Builder => $query
+                                            ->onlyNurses()
+                                            ->activatesInCurrentUserCounty()
+                                            ->select([
+                                                'id', 'full_name',
+                                            ])
+                                    )
+                                    ->searchable()
+                                    ->preload()
+                                    ->visible(fn () => auth()->user()?->isMediator())
+                                    ->disabled(fn (Beneficiary $record): bool => filled($record->nurse_id)),
 
                                 Select::make('mediator_id')
                                     ->label(__('field.allocated_mediator'))
                                     ->placeholder(__('placeholder.choose'))
-                                    ->relationship('mediator', 'full_name', fn (Builder $query) => $query->onlyMediators())
+                                    ->relationship(
+                                        'mediator',
+                                        'full_name',
+                                        fn (Builder $query): Builder => $query
+                                            ->onlyMediators()
+                                            ->activatesInCurrentUserCounty()
+                                            ->select([
+                                                'id', 'full_name',
+                                            ])
+                                    )
                                     ->searchable()
                                     ->preload()
-                                    ->visible(fn () => auth()->user()?->isNurse()),
+                                    ->visible(fn () => auth()->user()?->isNurse())
+                                    ->disabled(fn (Beneficiary $record): bool => filled($record->mediator_id)),
 
                                 Select::make('integrated')
                                     ->label(__('field.integrated'))

app/Filament/Resources/CommunityActivities/Schemas/AdministrativeActivityForm.php

@@ -36,7 +36,7 @@ public static function configure(Schema $schema): Schema
                             ->relationship(
                                 'nurse',
                                 'full_name',
-                                fn (Builder $query) => $query->activatesInCounty(auth()->user()->activity_county_id)
+                                fn (Builder $query) => $query->activatesInCurrentUserCounty()
                             )
                             ->searchable()
                             ->preload()
@@ -48,7 +48,7 @@ public static function configure(Schema $schema): Schema
                             ->relationship(
                                 'mediator',
                                 'full_name',
-                                fn (Builder $query) => $query->activatesInCounty(auth()->user()->activity_county_id)
+                                fn (Builder $query) => $query->activatesInCurrentUserCounty()
                             )
                             ->searchable()
                             ->preload()

app/Filament/Resources/CommunityActivities/Schemas/CampaignForm.php

@@ -38,7 +38,7 @@ public static function configure(Schema $schema): Schema
                             ->relationship(
                                 'nurse',
                                 'full_name',
-                                fn (Builder $query) => $query->activatesInCounty(auth()->user()->activity_county_id)
+                                fn (Builder $query) => $query->activatesInCurrentUserCounty()
                             )
                             ->searchable()
                             ->preload()
@@ -50,7 +50,7 @@ public static function configure(Schema $schema): Schema
                             ->relationship(
                                 'mediator',
                                 'full_name',
-                                fn (Builder $query) => $query->activatesInCounty(auth()->user()->activity_county_id)
+                                fn (Builder $query) => $query->activatesInCurrentUserCounty()
                             )
                             ->searchable()
                             ->preload()

app/Filament/Resources/Reports/Schemas/ReportForm.php

@@ -62,7 +62,7 @@ public static function configure(Schema $schema): Schema
                             ->options(
                                 fn () => User::query()
                                     ->onlyNurses()
-                                    ->activatesInCounty(auth()->user()->county_id)
+                                    ->activatesInCurrentUserCounty()
                                     ->withActivityAreas()
                                     ->get()
                                     ->mapWithKeys(fn (User $nurse) => [

app/Filament/Resources/Users/Tables/MediatorsTable.php

@@ -21,7 +21,7 @@ public static function configure(Table $table): Table
                     ->when(
                         auth()->user()->isCoordinator(),
                         fn (Builder $query): Builder => $query
-                            ->activatesInCounty(auth()->user()->county_id)
+                            ->activatesInCurrentUserCounty()
                     );
             })
             ->columns([

app/Filament/Resources/Users/Tables/NursesTable.php

@@ -21,7 +21,7 @@ public static function configure(Table $table): Table
                     ->when(
                         auth()->user()->isCoordinator(),
                         fn (Builder $query): Builder => $query
-                            ->activatesInCounty(auth()->user()->county_id)
+                            ->activatesInCurrentUserCounty()
                     );
             })
             ->columns([

app/Models/Beneficiary.php

@@ -64,7 +64,6 @@ class Beneficiary extends Model
         'reason_removed',
         'reason_removed_notes',
 
-        'nurse_id',
         'family_id',
 
         'does_not_have_cnp',