wip

Author: gheorghelupu17

app/Filament/Organizations/Resources/BeneficiaryResource/Pages/CreateBeneficiary.php

@@ -165,13 +165,13 @@ function (Get $get, Set $set) {
                                                 fn (EloquentBuilder $query) => $query->whereIn(
                                                     'organization_id',
                                                     auth()->user()
-                                                        ->whereHas(
-                                                            'organizations',
-                                                            fn (EloquentBuilder $query) => $query
-                                                                ->where('institution_id', Filament::getTenant()->institution_id)
+                                                        ->organizations
+                                                        ->filter(
+                                                            fn (Organization $organization) => $organization->institution_id == Filament::getTenant()->institution_id
                                                         )
-                                                )->pluck('id')
-                                                    ->toArray()
+                                                        ->pluck('id')
+                                                        ->toArray()
+                                                )
                                             )
                                             ->withoutGlobalScope(BelongsToCurrentTenant::class)
                                             ->first();

app/Filament/Organizations/Resources/BeneficiaryResource/Pages/EditChildrenIdentity.php

@@ -9,6 +9,7 @@
 use App\Enums\GenderShortValues;
 use App\Filament\Organizations\Resources\BeneficiaryResource;
 use App\Forms\Components\DatePicker;
+use App\Forms\Components\Repeater;
 use App\Forms\Components\Select;
 use App\Services\Breadcrumb\BeneficiaryBreadcrumb;
 use Carbon\Carbon;

app/Filament/Organizations/Resources/BeneficiaryResource/Pages/ViewBeneficiary.php

@@ -270,7 +270,7 @@ protected function personalInformationSection(): Section
                                     return \sprintf('%s (%s)', $state->getLabel(), $agressorTypes);
                                 }
 
-                                return $state ? $state->getLabel() : null;
+                                return $state ?? null;
                             })
 
                             ->label(__('field.aggressor_has_violence_history')),
@@ -305,13 +305,13 @@ private function initialEvaluation(): Section
                 ->columnSpan(1)
                 ->headerActions([
                     ViewDetailsAction::make('view')
-                        ->url(fn (Beneficiary $record) => BeneficiaryResource::getUrl('view_initial_evaluation', ['record' => $record]))
-                        ->visible(fn (Beneficiary $record) => $record->violence?->violence_types),
+                        ->url(fn (?Beneficiary $record) => $record ? BeneficiaryResource::getUrl('view_initial_evaluation', ['record' => $record]) : '#')
+                        ->visible(fn (?Beneficiary $record) => $record?->violence?->violence_types ?? false),
                 ])
                 ->schema([
                     Group::make()
                         ->columns()
-                        ->visible(fn (Beneficiary $record) => $record->violence?->violence_types)
+                        ->visible(fn (?Beneficiary $record) => $record?->violence?->violence_types ?? false)
                         ->schema([
                             DateEntry::make('evaluateDetails.registered_date')
                                 ->label(__('beneficiary.section.initial_evaluation.labels.registered_date')),
@@ -326,7 +326,7 @@ private function initialEvaluation(): Section
                                 ->icon(false),
                         ]),
                     Group::make()
-                        ->visible(fn (Beneficiary $record) => ! $record->violence?->violence_types)
+                        ->visible(fn (?Beneficiary $record) => ! ($record?->violence?->violence_types ?? false))
                         ->schema([
                             TextEntry::make('empty_state_heading')
                                 ->hiddenLabel()
@@ -346,7 +346,7 @@ private function initialEvaluation(): Section
                                     ActionGroup::make([
                                         Action::make('create_initial_evaluation')
                                             ->label(__('beneficiary.action.start_evaluation'))
-                                            ->url(fn (Beneficiary $record) => BeneficiaryResource::getUrl('create_initial_evaluation', ['record' => $record]))
+                                            ->url(fn (?Beneficiary $record) => $record ? BeneficiaryResource::getUrl('create_initial_evaluation', ['record' => $record]) : '#')
                                             ->outlined(),
                                     ])
                                 )
@@ -363,21 +363,21 @@ private function detailedEvaluation(): Section
                 ->headerActions(
                     [
                         ViewDetailsAction::make('view')
-                            ->url(fn (Beneficiary $record) => BeneficiaryResource::getUrl('view_detailed_evaluation', ['record' => $record]))
-                            ->visible(fn (Beneficiary $record) => $record->detailedEvaluationResult),
+                            ->url(fn (?Beneficiary $record) => $record ? BeneficiaryResource::getUrl('view_detailed_evaluation', ['record' => $record]) : '#')
+                            ->visible(fn (?Beneficiary $record) => $record?->detailedEvaluationResult ?? false),
                     ]
                 )
                 ->schema([
                     Group::make()
                         ->relationship('detailedEvaluationResult')
-                        ->visible(fn (Beneficiary $record) => $record->detailedEvaluationResult)
+                        ->visible(fn (?Beneficiary $record) => $record?->detailedEvaluationResult ?? false)
                         ->schema([
                             TextEntry::make('recommendation_services')
                                 ->label(__('beneficiary.section.detailed_evaluation.heading.recommendation_services'))
                                 ->listWithLineBreaks(),
                         ]),
                     Group::make()
-                        ->visible(fn (Beneficiary $record) => ! $record->detailedEvaluationResult)
+                        ->visible(fn (?Beneficiary $record) => ! ($record?->detailedEvaluationResult ?? false))
                         ->schema([
                             TextEntry::make('empty_state_heading')
                                 ->hiddenLabel()
@@ -397,7 +397,7 @@ private function detailedEvaluation(): Section
                                     ActionGroup::make([
                                         Action::make('create_detailed_evaluation')
                                             ->label(__('beneficiary.action.start_evaluation'))
-                                            ->url(fn (Beneficiary $record) => BeneficiaryResource::getUrl('create_detailed_evaluation', ['record' => $record]))
+                                            ->url(fn (?Beneficiary $record) => $record ? BeneficiaryResource::getUrl('create_detailed_evaluation', ['record' => $record]) : '#')
                                             ->outlined(),
                                     ])
                                 )

app/Forms/Components/Notice.php

@@ -6,15 +6,10 @@
 
 use Filament\Forms\Components\Concerns\HasAffixes;
 use Filament\Forms\Components\Placeholder;
-use Filament\Support\Concerns\HasColor;
-use Filament\Support\Concerns\HasIcon;
-use Filament\Support\Concerns\HasIconColor;
 
 class Notice extends Placeholder implements \Filament\Schemas\Components\Contracts\HasAffixActions
 {
-    use HasIcon;
-    use HasColor;
-    use HasIconColor;
+    // HasIcon, HasColor, HasIconColor are already available from TextEntry (via Placeholder)
     use HasAffixes;
     use \Filament\Schemas\Components\Concerns\HasKey;
 

resources/views/forms/components/spacer.blade.php

@@ -0,0 +1 @@
+<div {{ $attributes->merge($getExtraAttributes(), escape: false)->class(['fi-spacer h-4']) }}></div>