Reorder nomenclature items

code4romania · Jan 10, 2025 · 156f90e · 156f90e
1 parent 7a60c0f
commit 156f90e
Show file tree

Hide file tree

Showing 17 changed files with 1,454 additions and 16 deletions.
diff --git a/app/Concerns/HasSortOrder.php b/app/Concerns/HasSortOrder.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Concerns;
+
+use App\Models\Scopes\SortOrder;
+
+trait HasSortOrder
+{
+    public function initializeHasSortOrder(): void
+    {
+        $this->fillable[] = 'sort';
+    }
+
+    protected static function bootHasSortOrder(): void
+    {
+        static::addGlobalScope(new SortOrder);
+    }
+}
diff --git a/app/Filament/Admin/Resources/BenefitResource.php b/app/Filament/Admin/Resources/BenefitResource.php
@@ -16,6 +16,7 @@
 use Filament\Forms\Components\Toggle;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
+use Filament\Tables\Actions\Action as TableAction;
 use Filament\Tables\Actions\CreateAction;
 use Filament\Tables\Actions\ViewAction;
 use Filament\Tables\Columns\TextColumn;
@@ -87,6 +88,15 @@ public static function table(Table $table): Table
                     ->url(self::getUrl('create')),
             ])
             ->heading(__('nomenclature.headings.benefit_table'))
+            ->reorderable('sort')
+            ->defaultSort('sort')
+            ->reorderRecordsTriggerAction(
+                fn (TableAction $action) => $action
+                    ->icon(null)
+                    ->button()
+                    ->outlined()
+                    ->color('primary')
+            )
             ->columns([
                 TextColumn::make('name')
                     ->label(__('nomenclature.labels.benefit')),

diff --git a/app/Filament/Admin/Resources/ResultResource.php b/app/Filament/Admin/Resources/ResultResource.php
@@ -13,6 +13,7 @@
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
+use Filament\Tables\Actions\Action as TableAction;
 use Filament\Tables\Actions\CreateAction;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
@@ -48,6 +49,15 @@ public static function table(Table $table): Table
                 CreateAction::make()
                     ->label(__('nomenclature.actions.add_result')),
             ])
+            ->reorderable('sort')
+            ->defaultSort('sort')
+            ->reorderRecordsTriggerAction(
+                fn (TableAction $action) => $action
+                    ->icon(null)
+                    ->button()
+                    ->outlined()
+                    ->color('primary')
+            )
             ->columns([
                 TextColumn::make('name')
                     ->label(__('nomenclature.labels.result_name')),

diff --git a/app/Filament/Admin/Resources/RoleResource.php b/app/Filament/Admin/Resources/RoleResource.php
@@ -18,6 +18,7 @@
 use Filament\Forms\Components\Toggle;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
+use Filament\Tables\Actions\Action as TableAction;
 use Filament\Tables\Actions\CreateAction;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Filters\SelectFilter;
@@ -81,6 +82,15 @@ public static function table(Table $table): Table
                     ->label(__('nomenclature.actions.add_role')),
 
             ])
+            ->reorderable('sort')
+            ->defaultSort('sort')
+            ->reorderRecordsTriggerAction(
+                fn (TableAction $action) => $action
+                    ->icon(null)
+                    ->button()
+                    ->outlined()
+                    ->color('primary')
+            )
             ->columns([
                 TextColumn::make('name')
                     ->label(__('nomenclature.labels.role_name')),

diff --git a/app/Filament/Admin/Resources/ServiceResource.php b/app/Filament/Admin/Resources/ServiceResource.php
@@ -21,6 +21,7 @@
 use Filament\Forms\Form;
 use Filament\Forms\Get;
 use Filament\Resources\Resource;
+use Filament\Tables\Actions\Action as TableAction;
 use Filament\Tables\Actions\CreateAction;
 use Filament\Tables\Actions\ViewAction;
 use Filament\Tables\Columns\TextColumn;
@@ -141,6 +142,15 @@ public static function table(Table $table): Table
     {
         return $table
             ->modifyQueryUsing(fn (Builder $query) => $query->withCount(['organizationServices']))
+            ->reorderable('sort')
+            ->defaultSort('sort')
+            ->reorderRecordsTriggerAction(
+                fn (TableAction $action) => $action
+                    ->icon(null)
+                    ->button()
+                    ->outlined()
+                    ->color('primary')
+            )
             ->columns([
                 TextColumn::make('name')
                     ->label(__('nomenclature.labels.name'))

diff --git a/app/Models/Benefit.php b/app/Models/Benefit.php
@@ -5,6 +5,7 @@
 namespace App\Models;
 
 use App\Concerns\HasGeneralStatus;
+use App\Concerns\HasSortOrder;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -14,6 +15,7 @@ class Benefit extends Model
 {
     use HasFactory;
     use HasGeneralStatus;
+    use HasSortOrder;
 
     protected $fillable = [
         'name',

diff --git a/app/Models/BenefitType.php b/app/Models/BenefitType.php
@@ -5,7 +5,7 @@
 namespace App\Models;
 
 use App\Concerns\HasGeneralStatus;
-use App\Models\Scopes\SortOrder;
+use App\Concerns\HasSortOrder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -14,19 +14,13 @@ class BenefitType extends Model
 {
     use HasFactory;
     use HasGeneralStatus;
+    use HasSortOrder;
 
     protected $fillable = [
         'benefit_id',
         'name',
-        'sort',
     ];
 
-    protected static function booted()
-    {
-        parent::booted();
-        static::addGlobalScope(new SortOrder);
-    }
-
     public function benefit(): BelongsTo
     {
         return $this->belongsTo(Benefit::class);

diff --git a/app/Models/Result.php b/app/Models/Result.php
@@ -5,6 +5,7 @@
 namespace App\Models;
 
 use App\Concerns\HasGeneralStatus;
+use App\Concerns\HasSortOrder;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -14,6 +15,7 @@ class Result extends Model
 {
     use HasFactory;
     use HasGeneralStatus;
+    use HasSortOrder;
 
     protected $fillable = [
         'name',

diff --git a/app/Models/Role.php b/app/Models/Role.php
@@ -5,6 +5,7 @@
 namespace App\Models;
 
 use App\Concerns\HasGeneralStatus;
+use App\Concerns\HasSortOrder;
 use App\Enums\AdminPermission;
 use App\Enums\CasePermission;
 use Illuminate\Database\Eloquent\Casts\AsEnumCollection;
@@ -16,6 +17,7 @@ class Role extends Model
 {
     use HasFactory;
     use HasGeneralStatus;
+    use HasSortOrder;
 
     protected $fillable = [
         'name',

diff --git a/app/Models/Service.php b/app/Models/Service.php
@@ -5,6 +5,7 @@
 namespace App\Models;
 
 use App\Concerns\HasGeneralStatus;
+use App\Concerns\HasSortOrder;
 use App\Enums\CounselingSheet;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -15,6 +16,7 @@ class Service extends Model
 {
     use HasFactory;
     use HasGeneralStatus;
+    use HasSortOrder;
 
     protected $fillable = [
         'name',

diff --git a/app/Models/ServiceIntervention.php b/app/Models/ServiceIntervention.php
@@ -5,7 +5,7 @@
 namespace App\Models;
 
 use App\Concerns\HasGeneralStatus;
-use App\Models\Scopes\SortOrder;
+use App\Concerns\HasSortOrder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -16,19 +16,13 @@ class ServiceIntervention extends Model
 {
     use HasFactory;
     use HasGeneralStatus;
+    use HasSortOrder;
 
     protected $fillable = [
         'service_id',
         'name',
-        'sort',
     ];
 
-    protected static function booted()
-    {
-        parent::booted();
-        static::addGlobalScope(new SortOrder);
-    }
-
     public function service(): BelongsTo
     {
         return $this->belongsTo(Service::class);

diff --git a/database/migrations/2025_01_10_004906_add_sort_column_in_services_table.php b/database/migrations/2025_01_10_004906_add_sort_column_in_services_table.php
@@ -0,0 +1,17 @@
+<?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
+{
+    public function up(): void
+    {
+        Schema::table('services', function (Blueprint $table) {
+            $table->integer('sort')->default(0);
+        });
+    }
+};
diff --git a/database/migrations/2025_01_10_005052_add_sort_column_in_benefits_table.php b/database/migrations/2025_01_10_005052_add_sort_column_in_benefits_table.php
@@ -0,0 +1,17 @@
+<?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
+{
+    public function up(): void
+    {
+        Schema::table('benefits', function (Blueprint $table) {
+            $table->integer('sort')->default(0);
+        });
+    }
+};
diff --git a/database/migrations/2025_01_10_005204_add_sort_column_in_results_table.php b/database/migrations/2025_01_10_005204_add_sort_column_in_results_table.php
@@ -0,0 +1,17 @@
+<?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
+{
+    public function up(): void
+    {
+        Schema::table('results', function (Blueprint $table) {
+            $table->integer('sort')->default(0);
+        });
+    }
+};
diff --git a/database/migrations/2025_01_10_005232_add_sort_column_in_roles_table.php b/database/migrations/2025_01_10_005232_add_sort_column_in_roles_table.php
@@ -0,0 +1,17 @@
+<?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
+{
+    public function up(): void
+    {
+        Schema::table('roles', function (Blueprint $table) {
+            $table->integer('sort')->default(0);
+        });
+    }
+};
diff --git a/lang/vendor/filament-tables/ro/table.php b/lang/vendor/filament-tables/ro/table.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'actions' => [
+
+        'disable_reordering' => [
+            'label' => 'Salvează modificările',
+        ],
+
+        'enable_reordering' => [
+            'label' => 'Ordonează lista',
+        ],
+    ],
+];