fixes

code4romania · Jun 7, 2024 · 74ce8c8 · 74ce8c8
1 parent 2360ec5
commit 74ce8c8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/.../Organizations/Resources/BeneficiaryResource/Pages/EditBeneficiaryPersonalInformation.php b/.../Organizations/Resources/BeneficiaryResource/Pages/EditBeneficiaryPersonalInformation.php
@@ -183,6 +183,7 @@ protected static function aggressorSection(): array
                 ->relationship('aggressor')
                 ->columnSpanFull()
                 ->hiddenLabel()
+                ->columns()
                 ->addActionLabel(__('beneficiary.section.personal_information.actions.add_aggressor'))
                 ->schema([
                     Select::make('relationship')
@@ -241,7 +242,7 @@ protected static function aggressorSection(): array
                             Select::make('violence_types')
                                 ->label(__('field.aggressor_violence_types'))
                                 ->placeholder(__('placeholder.select_many'))
-                                ->visible(fn (Get $get) => Ternary::isYes($get('violence_history')))
+                                ->visible(fn (Get $get) => Ternary::isYes($get('has_violence_history')))
                                 ->options(Violence::options())
                                 ->rule(new MultipleIn(Violence::values()))
                                 ->multiple(),
@@ -259,7 +260,7 @@ protected static function aggressorSection(): array
 
                             TextInput::make('psychiatric_history_notes')
                                 ->label(__('field.aggressor_psychiatric_history_notes'))
-                                ->visible(fn (Get $get) => Ternary::isYes($get('psychiatric_history'))),
+                                ->visible(fn (Get $get) => Ternary::isYes($get('has_psychiatric_history'))),
                         ]),
 
                     Grid::make()
@@ -285,7 +286,7 @@ protected static function aggressorSection(): array
                             Select::make('legal_history')
                                 ->label(__('field.aggressor_legal_history'))
                                 ->placeholder(__('placeholder.select_many'))
-                                ->visible(fn (Get $get) => Ternary::isYes($get('violence_history')))
+                                ->visible(fn (Get $get) => Ternary::isYes($get('has_violence_history')))
                                 ->options(AggressorLegalHistory::options())
                                 ->rule(new MultipleIn(AggressorLegalHistory::values()))
                                 ->multiple()

diff --git a/.../Organizations/Resources/BeneficiaryResource/Pages/ViewBeneficiaryPersonalInformation.php b/.../Organizations/Resources/BeneficiaryResource/Pages/ViewBeneficiaryPersonalInformation.php
@@ -201,7 +201,8 @@ protected static function aggressorSection(): array
 
                                     EnumEntry::make('violence_types')
                                         ->label(__('field.aggressor_violence_types'))
-                                        ->placeholder(__('placeholder.select_many')),
+                                        ->placeholder(__('placeholder.select_many'))
+                                        ->badge(),
 
                                 ]),
 
@@ -220,24 +221,19 @@ protected static function aggressorSection(): array
                                     EnumEntry::make('has_drug_history')
                                         ->label(__('field.aggressor_has_drug_history'))
                                         ->placeholder(__('placeholder.select_one')),
-                                  
+
                                     EnumEntry::make('drugs')
                                         ->label(__('field.aggressor_drugs'))
                                         ->placeholder(__('placeholder.select_many'))
                                         ->badge(),
-
-                                    //                    TextEntry::make('drugs')
-                                    //                        ->label(__('field.aggressor_drugs'))
-                                    //                        ->placeholder(__('placeholder.select_many'))
-                                    //                        ->formatStateUsing(fn ($state) => dd($state)),
                                 ]),
 
                             Grid::make()
                                 ->schema([
                                     EnumEntry::make('legal_history')
                                         ->label(__('field.aggressor_legal_history'))
-                                        ->placeholder(__('placeholder.select_many')),
-                                    // observatii aspecte legale agresor
+                                        ->placeholder(__('placeholder.select_many'))
+                                        ->badge(),
                                 ]),
 
                             Grid::make()