Merge branch 'main' into 397-specialist-general-incorrect-user-permis…

…sions-in-the-comunitatea-sunrise-section
code4romania · Dec 17, 2024 · 4f72acb · 4f72acb
2 parents 061ae5a + 415911e
commit 4f72acb
Show file tree

Hide file tree

Showing 20 changed files with 144 additions and 36 deletions.
diff --git a/app/Concerns/HasBirthdate.php b/app/Concerns/HasBirthdate.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Concerns;
+
+use Carbon\Carbon;
+
+trait HasBirthdate
+{
+    public function initializeHasBirthdate()
+    {
+        $this->casts['birthdate'] = 'date';
+
+        $this->fillable[] = 'birthdate';
+    }
+
+    public function setBirthdateAttribute(?string $value = null): void
+    {
+        $date = $value ? Carbon::createFromFormat('d-m-Y', $value) : null;
+
+        $this->attributes['birthdate'] = $date?->format('Y-m-d');
+    }
+}
diff --git a/app/Filament/Organizations/Resources/BeneficiaryResource/Pages/EditBeneficiaryIdentity.php b/app/Filament/Organizations/Resources/BeneficiaryResource/Pages/EditBeneficiaryIdentity.php
@@ -13,7 +13,7 @@
 use App\Enums\Gender;
 use App\Enums\IDType;
 use App\Filament\Organizations\Resources\BeneficiaryResource;
-use App\Forms\Components\DatePicker;
+use App\Forms\Components\DateInput;
 use App\Forms\Components\Location;
 use App\Forms\Components\Select;
 use App\Forms\Components\Spacer;
@@ -136,7 +136,7 @@ public static function getBeneficiaryIdentityFormSchema(?Beneficiary $parentBene
                         return;
                     }
 
-                    if (filled($birthdate = (new Cnp($state))->getBirthDateFromCNP())) {
+                    if (filled($birthdate = (new Cnp($state))->getBirthDateFromCNP('d-m-Y'))) {
                         $set('birthdate', $birthdate);
                     }
                 });
@@ -154,10 +154,8 @@ public static function getBeneficiaryIdentityFormSchema(?Beneficiary $parentBene
                         ->options(Gender::options())
                         ->enum(Gender::class),
 
-                    DatePicker::make('birthdate')
+                    DateInput::make('birthdate')
                         ->label(__('field.birthdate'))
-                        ->maxDate(today()->endOfDay())
-                        ->nullable()
                         ->live(),
 
                     TextInput::make('birthplace')

diff --git a/app/Filament/Organizations/Resources/BeneficiaryResource/Pages/ViewBeneficiary.php b/app/Filament/Organizations/Resources/BeneficiaryResource/Pages/ViewBeneficiary.php
@@ -179,7 +179,7 @@ protected function identitySectionSection(): Section
 
                 TextEntry::make('birthdate')
                     ->label(__('field.birthdate'))
-                    ->formatStateUsing(fn ($state) => $state === '-' ? $state : $state->toDateString()),
+                    ->formatStateUsing(fn ($state) => $state !== '-' ? $state->format('m-d-Y') : $state),
 
                 EnumEntry::make('gender')
                     ->label(__('field.gender')),

diff --git a/app/Filament/Organizations/Resources/BeneficiaryResource/Pages/ViewBeneficiaryIdentity.php b/app/Filament/Organizations/Resources/BeneficiaryResource/Pages/ViewBeneficiaryIdentity.php
@@ -124,7 +124,7 @@ protected static function identitySchema(): array
 
                     TextEntry::make('birthdate')
                         ->label(__('field.birthdate'))
-                        ->formatStateUsing(fn ($state) => $state !== '-' ? $state->format('Y-m-d') : $state),
+                        ->formatStateUsing(fn ($state) => $state !== '-' ? $state->format('d-m-Y') : $state),
 
                     TextEntry::make('birthplace')
                         ->label(__('field.birthplace'))
@@ -278,7 +278,8 @@ public static function childrenSchema(): array
                         ->label(__('field.gender')),
 
                     TextEntry::make('birthdate')
-                        ->label(__('field.birthdate')),
+                        ->label(__('field.birthdate'))
+                        ->formatStateUsing(fn ($state) => $state !== '-' ? $state->format('d-m-Y') : $state),
 
                     TextEntry::make('current_address')
                         ->label(__('field.current_address')),

diff --git a/app/Filament/Organizations/Resources/CommunityProfileResource/Pages/EditCommunityProfile.php b/app/Filament/Organizations/Resources/CommunityProfileResource/Pages/EditCommunityProfile.php
@@ -16,6 +16,11 @@ class EditCommunityProfile extends EditRecord
 
     protected static string $view = 'filament.organizations.pages.empty-page';
 
+    public function getBreadcrumbs(): array
+    {
+        return [];
+    }
+
     public function getTitle(): string|Htmlable
     {
         return __('community.headings.empty_state_title');

diff --git a/app/Filament/Organizations/Resources/CommunityResource/Pages/ListCommunityProfiles.php b/app/Filament/Organizations/Resources/CommunityResource/Pages/ListCommunityProfiles.php
@@ -14,6 +14,11 @@ class ListCommunityProfiles extends ListRecords
 
     protected static string $view = 'filament.organizations.pages.empty-page';
 
+    public function getBreadcrumbs(): array
+    {
+        return [];
+    }
+
     public function getTitle(): string|Htmlable
     {
         return __('community.headings.empty_state_title');

diff --git a/app/Filament/Organizations/Resources/MonitoringResource/Pages/CreateMonitoring.php b/app/Filament/Organizations/Resources/MonitoringResource/Pages/CreateMonitoring.php
@@ -10,6 +10,7 @@
 use App\Models\Monitoring;
 use App\Models\Specialist;
 use App\Services\Breadcrumb\BeneficiaryBreadcrumb;
+use Carbon\Carbon;
 use Filament\Actions\Action;
 use Filament\Forms\Components\Wizard;
 use Filament\Forms\Set;
@@ -70,6 +71,10 @@ protected function afterFill(): void
             ->first()
             ?->load(['children', 'specialistsTeam']);
         $this->children = $this->getChildren();
+        foreach ($this->children as &$child) {
+            $child['birthdate'] = $child['birthdate'] ? Carbon::parse($child['birthdate'])->format('d-m-Y') : null;
+        }
+
         $this->specialistTeam = $this->getSpecialists();
 
         $data = [

diff --git a/app/Filament/Organizations/Resources/MonitoringResource/Pages/EditChildren.php b/app/Filament/Organizations/Resources/MonitoringResource/Pages/EditChildren.php
@@ -9,7 +9,7 @@
 use App\Enums\ChildAggressorRelationship;
 use App\Enums\MaintenanceSources;
 use App\Filament\Organizations\Resources\MonitoringResource;
-use App\Forms\Components\DatePicker;
+use App\Forms\Components\DateInput;
 use App\Forms\Components\Repeater;
 use App\Forms\Components\Select;
 use App\Services\Breadcrumb\BeneficiaryBreadcrumb;
@@ -83,7 +83,7 @@ public static function getSchema(): array
                                 ->maxLength(2)
                                 ->mask('99'),
 
-                            DatePicker::make('birthdate')
+                            DateInput::make('birthdate')
                                 ->label(__('monitoring.labels.birthdate')),
 
                             Select::make('aggressor_relationship')

diff --git a/app/Filament/Organizations/Resources/MonitoringResource/Pages/ViewMonitoring.php b/app/Filament/Organizations/Resources/MonitoringResource/Pages/ViewMonitoring.php
@@ -128,7 +128,8 @@ public function infolist(Infolist $infolist): Infolist
                                                         ->label(__('monitoring.labels.age')),
 
                                                     TextEntry::make('birthdate')
-                                                        ->label(__('monitoring.labels.birthdate')),
+                                                        ->label(__('monitoring.labels.birthdate'))
+                                                        ->formatStateUsing(fn ($state) => $state !== '-' ? $state->format('d-m-Y') : $state),
 
                                                     TextEntry::make('aggressor_relationship')
                                                         ->label(__('monitoring.labels.aggressor_relationship')),

diff --git a/app/Filament/Organizations/Resources/UserResource.php b/app/Filament/Organizations/Resources/UserResource.php
@@ -170,8 +170,18 @@ public static function getSchema(): array
                         ->afterStateUpdated(self::setDefaultCaseAndNgoAdminPermissions()),
 
                     Placeholder::make('obs')
-                        ->content(new HtmlString(__('user.placeholders.obs')))
-                        ->label('')
+                        ->hiddenLabel()
+                        ->content(function (Get $get) {
+
+                            foreach ($get('role_id') as $roleID) {
+                                $role = self::getRole($roleID);
+                                if ($role->case_permissions->contains(CasePermission::HAS_ACCESS_TO_ALL_CASES))
+                                {
+                                    return new HtmlString(__('user.placeholders.user_role_with_permissions_for_all_cases'));
+                                }
+                            }
+                            return new HtmlString(__('user.placeholders.user_role_without_permissions_for_all_cases'));
+                        })
                         ->columnSpanFull(),
 
                     Group::make()

diff --git a/app/Filament/Organizations/Resources/UserResource/Pages/ListUsers.php b/app/Filament/Organizations/Resources/UserResource/Pages/ListUsers.php
@@ -18,4 +18,9 @@ protected function getHeaderActions(): array
             Actions\CreateAction::make(),
         ];
     }
+
+    public function getBreadcrumbs(): array
+    {
+        return [];
+    }
 }
diff --git a/app/Filament/Organizations/Resources/UserResource/Pages/ViewUser.php b/app/Filament/Organizations/Resources/UserResource/Pages/ViewUser.php
@@ -62,16 +62,13 @@ public function infolist(Infolist $infolist): Infolist
                         ->label(__('user.labels.phone_number')),
 
                     TextEntry::make('rolesInOrganization.name')
-                        ->label(__('user.labels.select_roles'))
-                        ->columnSpanFull(),
-
-                    TextEntry::make('obs')
-                        ->default(
-                            Str::of(__('user.placeholders.obs'))
-                                ->toHtmlString()
-                        )
-                        ->hiddenLabel()
-                        ->columnSpanFull(),
+                        ->label(__('user.labels.select_roles')),
+
+                    TextEntry::make('can_be_case_manager')
+                        ->label(__('user.labels.can_be_case_manager'))
+                        ->state(fn (User $record) => Ternary::tryFrom((int)$record->canBeCaseManager())),
+
+
 
                     Group::make()
                         ->columnSpanFull()

diff --git a/app/Forms/Components/DateInput.php b/app/Forms/Components/DateInput.php
@@ -16,7 +16,7 @@ protected function setUp(): void
 
         $this->placeholder('dd-mm-yyyy');
         $this->mask('99-99-9999');
-        $this->formatStateUsing(fn (string $state) => $state ? Carbon::parse($state)->format('d-m-Y') : null);
+        $this->formatStateUsing(fn (?string $state) => $state ? Carbon::parse($state)->format('d-m-Y') : null);
         $this->rules([
             'date_format:d-m-Y',
             fn (): Closure => function (string $attribute, $value, Closure $fail) {

diff --git a/app/Models/Beneficiary.php b/app/Models/Beneficiary.php
@@ -5,6 +5,7 @@
 namespace App\Models;
 
 use App\Concerns\BelongsToOrganization;
+use App\Concerns\HasBirthdate;
 use App\Concerns\HasCaseStatus;
 use App\Concerns\HasCitizenship;
 use App\Concerns\HasEffectiveAddress;
@@ -36,6 +37,7 @@ class Beneficiary extends Model
     use LogsActivity;
     use LogsActivityOptions;
     use HasSpecialistsTeam;
+    use HasBirthdate;
 
     protected $fillable = [
         'initial_id',
@@ -47,7 +49,6 @@ class Beneficiary extends Model
         'cnp',
         'gender',
 
-        'birthdate',
         'birthplace',
         'ethnicity',
 
@@ -80,7 +81,6 @@ class Beneficiary extends Model
 
     protected $casts = [
         'id_type' => IDType::class,
-        'birthdate' => 'date',
         'children_18_care_count' => 'integer',
         'children_accompanying_count' => 'integer',
         'children_care_count' => 'integer',

diff --git a/app/Models/Children.php b/app/Models/Children.php
@@ -5,6 +5,7 @@
 namespace App\Models;
 
 use App\Concerns\BelongsToBeneficiary;
+use App\Concerns\HasBirthdate;
 use App\Enums\GenderShortValues;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -14,10 +15,10 @@ class Children extends Model
 {
     use HasFactory;
     use BelongsToBeneficiary;
+    use HasBirthdate;
 
     protected $fillable = [
         'name',
-        'birthdate',
         'current_address',
         'status',
         'gender',
@@ -34,10 +35,4 @@ public function getAgeAttribute(): int | string | null
 
         return $age === 0 ? '<1' : $age;
     }
-
-    public function setBirthdateAttribute(?string $value = null): void
-    {
-        $date = Carbon::createFromFormat('d-m-Y', $value);
-        $this->attributes['birthdate'] = $date->format('Y-m-d');
-    }
 }
diff --git a/app/Models/MonitoringChild.php b/app/Models/MonitoringChild.php
@@ -4,6 +4,7 @@
 
 namespace App\Models;
 
+use App\Concerns\HasBirthdate;
 use App\Enums\ChildAggressorRelationship;
 use App\Enums\MaintenanceSources;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -13,13 +14,13 @@
 class MonitoringChild extends Model
 {
     use HasFactory;
+    use HasBirthdate;
 
     protected $fillable = [
         'monitoring_id',
         'name',
         'status',
         'age',
-        'birthdate',
         'aggressor_relationship',
         'maintenance_sources',
         'location',

diff --git a/database/factories/ChildrenFactory.php b/database/factories/ChildrenFactory.php
@@ -20,7 +20,6 @@ public function definition(): array
     {
         return [
             'name' => fake()->name(),
-            'age' => fake()->boolean() ? fake()->numberBetween(0, 20) : null,
             'birthdate' => fake()->date(),
             'current_address' => fake()->boolean() ? fake()->address() : null,
             'status' => fake()->boolean() ? fake()->words(asText: true) : null,

diff --git a/...rations/2024_12_10_123621_drop_column_start_date_from_beneficiary_interventions_table.php b/...rations/2024_12_10_123621_drop_column_start_date_from_beneficiary_interventions_table.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('beneficiary_interventions', function (Blueprint $table) {
+            $table->dropColumn('start_date');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('beneficiary_interventions', function (Blueprint $table) {
+            //
+        });
+    }
+};
diff --git a/database/migrations/2024_12_10_140201_drop_column_start_date_from_intervention_services.php b/database/migrations/2024_12_10_140201_drop_column_start_date_from_intervention_services.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('intervention_services', function (Blueprint $table) {
+            $table->dropColumn('start_date');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('intervention_services', function (Blueprint $table) {
+            //
+        });
+    }
+};
diff --git a/lang/ro/user.php b/lang/ro/user.php
@@ -30,6 +30,7 @@
         'case_permissions' => 'Permisiuni cazuri',
         'admin_permissions' => 'Permisiuni administrare',
         'last_login_at_date_time' => 'Data și ora ultimei accesări',
+        'can_be_case_manager' => 'Poate lua rol de manager de caz',
     ],
 
     'stats' => [
@@ -52,7 +53,8 @@
     ],
 
     'placeholders' => [
-        'obs' => 'Acest tip de utilizator <span class="italic">are acces doar la cazurile din echipa cărora face parte</span> și nu deține drepturi de administrare ale sistemului. Puteți oferi permisiuni suplimentare din lista de mai jos.',
+        'user_role_without_permissions_for_all_cases' => 'Acest tip de utilizator <span class="italic">are acces doar la cazurile din echipa cărora face parte</span> și nu deține drepturi de administrare ale sistemului. Puteți oferi permisiuni suplimentare din lista de mai jos.',
+        'user_role_with_permissions_for_all_cases' => 'Acest tip de rol are acces <span class="italic">la toate cazurile din cadrul Centrului</span>, însă nu deține drepturi de administrare ale sistemului. Puteți oferi permisiuni suplimentare din lista de mai jos.',
         'dashboard_cart' => 'Distribuția pe luni a numărului total de utilizatori activi Sunrise. Un utilizator este considerat activ dacă a avut cel puțin o accesare a platformei în luna calendaristică respectivă.',
     ],