wip

app/Filament/Admin/Resources/CandidateResource.php

@@ -21,7 +21,24 @@ class CandidateResource extends Resource
 {
     protected static ?string $model = Candidate::class;
 
-    protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
+    protected static ?string $navigationIcon = 'heroicon-o-user';
+
+    protected static ?int $navigationSort = 21;
+
+    public static function getNavigationGroup(): ?string
+    {
+        return __('app.navigation.nomenclature');
+    }
+
+    public static function getModelLabel(): string
+    {
+        return __('app.candidate.label.singular');
+    }
+
+    public static function getPluralModelLabel(): string
+    {
+        return __('app.candidate.label.plural');
+    }
 
     public static function form(Form $form): Form
     {

app/Filament/Admin/Resources/CountryResource.php

@@ -22,6 +22,23 @@ class CountryResource extends Resource
 
     protected static bool $isScopedToTenant = false;
 
+    protected static ?int $navigationSort = 29;
+
+    public static function getNavigationGroup(): ?string
+    {
+        return __('app.navigation.nomenclature');
+    }
+
+    public static function getModelLabel(): string
+    {
+        return __('app.country.label.singular');
+    }
+
+    public static function getPluralModelLabel(): string
+    {
+        return __('app.country.label.plural');
+    }
+
     public static function form(Form $form): Form
     {
         return $form

app/Filament/Admin/Resources/CountyResource.php

@@ -17,10 +17,27 @@ class CountyResource extends Resource
 {
     protected static ?string $model = County::class;
 
-    protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
+    protected static ?string $navigationIcon = 'heroicon-o-map';
 
     protected static bool $isScopedToTenant = false;
 
+    protected static ?int $navigationSort = 28;
+
+    public static function getNavigationGroup(): ?string
+    {
+        return __('app.navigation.nomenclature');
+    }
+
+    public static function getModelLabel(): string
+    {
+        return __('app.county.label.singular');
+    }
+
+    public static function getPluralModelLabel(): string
+    {
+        return __('app.county.label.plural');
+    }
+
     public static function form(Form $form): Form
     {
         return $form
@@ -52,7 +69,6 @@ public static function table(Table $table): Table
             ])
             ->actions([
                 Tables\Actions\EditAction::make(),
-                Tables\Actions\DeleteAction::make(),
             ]);
     }
 

app/Filament/Admin/Resources/LocalityResource.php

@@ -19,10 +19,27 @@ class LocalityResource extends Resource
 {
     protected static ?string $model = Locality::class;
 
-    protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
+    protected static ?string $navigationIcon = 'heroicon-o-map-pin';
 
     protected static bool $isScopedToTenant = false;
 
+    protected static ?int $navigationSort = 27;
+
+    public static function getNavigationGroup(): ?string
+    {
+        return __('app.navigation.nomenclature');
+    }
+
+    public static function getModelLabel(): string
+    {
+        return __('app.locality.label.singular');
+    }
+
+    public static function getPluralModelLabel(): string
+    {
+        return __('app.locality.label.plural');
+    }
+
     public static function form(Form $form): Form
     {
         return $form
@@ -85,12 +102,6 @@ public static function table(Table $table): Table
             ])
             ->actions([
                 Tables\Actions\EditAction::make(),
-                Tables\Actions\DeleteAction::make(),
-            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
-                ]),
             ]);
     }
 

app/Filament/Admin/Resources/PartyResource.php

@@ -21,7 +21,14 @@ class PartyResource extends Resource
 {
     protected static ?string $model = Party::class;
 
-    protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
+    protected static ?string $navigationIcon = 'heroicon-o-user-group';
+
+    protected static ?int $navigationSort = 20;
+
+    public static function getNavigationGroup(): ?string
+    {
+        return __('app.navigation.nomenclature');
+    }
 
     public static function getModelLabel(): string
     {

app/Filament/Admin/Resources/RecordResource.php

@@ -6,7 +6,6 @@
 
 use App\Filament\Admin\Resources\RecordResource\Pages;
 use App\Models\Record;
-use App\Models\Result;
 use App\Tables\Columns\LocationColumn;
 use Filament\Resources\Resource;
 use Filament\Tables\Columns\TextColumn;
@@ -19,14 +18,19 @@ class RecordResource extends Resource
 
     protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
 
+    public static function getNavigationGroup(): ?string
+    {
+        return __('app.navigation.election_data');
+    }
+
     public static function getModelLabel(): string
     {
-        return __('app.result.label.singular');
+        return __('app.record.label.singular');
     }
 
     public static function getPluralModelLabel(): string
     {
-        return __('app.result.label.plural');
+        return __('app.record.label.plural');
     }
 
     public static function table(Table $table): Table
@@ -36,6 +40,8 @@ public static function table(Table $table): Table
             ->columns([
                 LocationColumn::make('location'),
 
+                TextColumn::make('part'),
+
                 TextColumn::make('eligible_voters_total')
                     ->label(__('app.field.eligible_voters_total'))
                     ->numeric()
@@ -107,7 +113,7 @@ public static function table(Table $table): Table
             ])
             ->paginated([10, 25, 50, 100])
             ->deferLoading()
-            ->recordClasses(fn (Result $result) => $result->has_issues ? 'bg-warning-50 dark:bg-warning-400/10' : null);
+            ->recordClasses(fn (Record $record) => $record->has_issues ? 'bg-warning-50 dark:bg-warning-400/10' : null);
     }
 
     public static function getRelations(): array

app/Filament/Admin/Resources/TurnoutResource.php

@@ -18,6 +18,11 @@ class TurnoutResource extends Resource
 
     protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
 
+    public static function getNavigationGroup(): ?string
+    {
+        return __('app.navigation.election_data');
+    }
+
     public static function getModelLabel(): string
     {
         return __('app.turnout.label');

app/Filament/Imports/SimpleCandidateImporter.php

@@ -4,9 +4,9 @@
 
 namespace App\Filament\Imports;
 
-use App\Actions\CheckVotable;
 use App\Models\Candidate;
 use App\Models\Party;
+use App\Services\RecordService;
 use Carbon\CarbonInterface;
 use Filament\Actions\Imports\ImportColumn;
 use Filament\Actions\Imports\Importer;
@@ -33,7 +33,7 @@ public function getJobRetryUntil(): ?CarbonInterface
 
     public function resolveRecord(): Candidate|Party
     {
-        static::$model = app(CheckVotable::class)->isIndependentCandidate($this->data['name'])
+        static::$model = RecordService::isIndependentCandidate($this->data['name'])
             ? Candidate::class
             : Party::class;
 
@@ -45,7 +45,7 @@ public function resolveRecord(): Candidate|Party
 
     protected function afterValidate(): void
     {
-        $this->data['name'] = app(CheckVotable::class)->getName($this->data['name']);
+        $this->data['name'] = RecordService::getName($this->data['name']);
     }
 
     public static function getCompletedNotificationBody(Import $import): string