diff --git a/app/Filament/Admin/Resources/OrganizationResource/RelationManagers/SheltersRelationManager.php b/app/Filament/Admin/Resources/OrganizationResource/RelationManagers/SheltersRelationManager.php index 6d001fb..59fd557 100644 --- a/app/Filament/Admin/Resources/OrganizationResource/RelationManagers/SheltersRelationManager.php +++ b/app/Filament/Admin/Resources/OrganizationResource/RelationManagers/SheltersRelationManager.php @@ -13,6 +13,7 @@ use Filament\Tables\Columns\IconColumn; use Filament\Tables\Columns\TextColumn; use Filament\Tables\Table; +use Illuminate\Database\Eloquent\Builder; class SheltersRelationManager extends RelationManager { @@ -46,6 +47,24 @@ public function table(Table $table): Table ->alignRight() ->shrink(), + TextColumn::make('current_stays_count') + ->label(__('app.field.occupancy')) + ->counts([ + 'stays as current_stays_count' => fn (Builder $query) => $query->whereCurrent(), + ]) + ->sortable() + ->numeric() + ->alignRight() + ->shrink(), + + TextColumn::make('stays_count') + ->label(__('app.field.all_time_beneficiaries')) + ->counts('stays') + ->sortable() + ->numeric() + ->alignRight() + ->shrink(), + TextColumn::make('country.name') ->label(__('app.field.country')) ->searchable() diff --git a/lang/en/app.php b/lang/en/app.php index 0b81504..8ab6ce5 100644 --- a/lang/en/app.php +++ b/lang/en/app.php @@ -20,6 +20,7 @@ 'address' => 'Address', 'admins' => 'Administrators', 'age' => 'Age', + 'all_time_beneficiaries' => 'All time beneficiaries', 'beneficiary' => 'Beneficiary', 'capacity' => 'Capacity', 'children_count' => 'Number of children', @@ -73,6 +74,7 @@ 'native_name' => 'Native name', 'not_applicable' => 'Not applicable', 'notes' => 'Observations', + 'occupancy' => 'Occupancy', 'options' => 'Options', 'order' => 'Order', 'organization_type' => 'Organization type',