fix project

app/Filament/Resources/ProjectResource/Pages/CreateProject.php

@@ -4,13 +4,16 @@ namespace App\Filament\Resources\ProjectResource\Pages;
 
 use App\Filament\Resources\ProjectResource;
 use App\Models\Project;
-use Filament\Actions;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateProject extends CreateRecord
 {
     protected static string $resource = ProjectResource::class;
 
+    protected array $badgesTargetData = [];
+
+    protected array $badgesAwardData = [];
+
     protected function getRedirectUrl(): string
     {
         return $this->getResource()::getUrl('index');
@@ -28,28 +31,31 @@ class CreateProject extends CreateRecord
             $this->badgesAwardData = $data['badgesAward'];
             unset($data['badgesAward']);
         }
+
         return $data;
     }
 
     protected function afterCreate(): void
     {
         $syncData = [];
-        if (!empty($this->badgesTargetData)) {
-            foreach ($this->badgesTargetData as $item) {
-                $syncData[$item['badge_id'] . '_1'] = [
+        if (! empty($this->badgesTargetData)) {
+            foreach ($this->badgesTargetData as $index => $item) {
+                $syncData[$item['badge_id'].'_1'] = [
                     'badge_id' => $item['badge_id'],
                     'award_type' => 1,
                     'award_date' => null,
+                    'sort_order' => $index,
                 ];
             }
         }
 
-        if (!empty($this->badgesAwardData)) {
-            foreach ($this->badgesAwardData as $item) {
-                $syncData[$item['badge_id'] . '_2'] = [
+        if (! empty($this->badgesAwardData)) {
+            foreach ($this->badgesAwardData as $index => $item) {
+                $syncData[$item['badge_id'].'_2'] = [
                     'badge_id' => $item['badge_id'],
                     'award_type' => 2,
-                    'award_date' => $item['award_date'] . "-01",
+                    'award_date' => $item['award_date'].'-01',
+                    'sort_order' => $index,
                 ];
             }
         }
@@ -61,6 +67,7 @@ class CreateProject extends CreateRecord
                 'badgeable_type' => Project::class,
                 'award_type' => $data['award_type'],
                 'award_date' => $data['award_date'],
+                'sort_order' => $data['sort_order'],
                 'created_at' => now(),
                 'updated_at' => now(),
             ]);

app/Filament/Resources/ProjectResource/Pages/EditProject.php

@@ -4,13 +4,16 @@ namespace App\Filament\Resources\ProjectResource\Pages;
 
 use App\Filament\Resources\ProjectResource;
 use App\Models\Project;
-use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 
 class EditProject extends EditRecord
 {
     protected static string $resource = ProjectResource::class;
 
+    protected array $badgesTargetData = [];
+
+    protected array $badgesAwardData = [];
+
     protected function getRedirectUrl(): string
     {
         return $this->getResource()::getUrl('index');
@@ -24,6 +27,7 @@ class EditProject extends EditRecord
             ->where('badgeable_id', $project->id)
             ->where('badgeable_type', Project::class)
             ->where('award_type', 1)
+            ->orderBy('sort_order')
             ->get()
             ->map(fn ($item) => [
                 'badge_id' => $item->badge_id,
@@ -31,15 +35,17 @@ class EditProject extends EditRecord
             ])->toArray();
 
         $data['badgesAward'] = \DB::table('badgeables')
-        ->where('badgeable_id', $project->id)
-        ->where('badgeable_type', Project::class)
-        ->where('award_type', 2)
-        ->get()
-        ->map(fn ($item) => [
-            'badge_id' => $item->badge_id,
-            'award_date' => $item->award_date,
-            'award_type' => $item->award_type,
-        ])->toArray();
+            ->where('badgeable_id', $project->id)
+            ->where('badgeable_type', Project::class)
+            ->where('award_type', 2)
+            ->orderBy('sort_order')
+            ->get()
+            ->map(fn ($item) => [
+                'badge_id' => $item->badge_id,
+                'award_date' => $item->award_date,
+                'award_type' => $item->award_type,
+            ])->toArray();
+
         return $data;
     }
 
@@ -55,6 +61,7 @@ class EditProject extends EditRecord
             $this->badgesAwardData = $data['badgesAward'];
             unset($data['badgesAward']);
         }
+
         return $data;
     }
 
@@ -67,22 +74,24 @@ class EditProject extends EditRecord
             ->where('badgeable_type', Project::class)
             ->delete();
 
-        if (!empty($this->badgesTargetData)) {
-            foreach ($this->badgesTargetData as $item) {
-                $syncData[$item['badge_id'] . '_1'] = [
+        if (! empty($this->badgesTargetData)) {
+            foreach ($this->badgesTargetData as $index => $item) {
+                $syncData[$item['badge_id'].'_1'] = [
                     'badge_id' => $item['badge_id'],
                     'award_type' => 1,
                     'award_date' => null,
+                    'sort_order' => $index,
                 ];
             }
         }
 
-        if (!empty($this->badgesAwardData)) {
-            foreach ($this->badgesAwardData as $item) {
-                $syncData[$item['badge_id'] . '_2'] = [
+        if (! empty($this->badgesAwardData)) {
+            foreach ($this->badgesAwardData as $index => $item) {
+                $syncData[$item['badge_id'].'_2'] = [
                     'badge_id' => $item['badge_id'],
                     'award_type' => 2,
-                    'award_date' => $item['award_date'] . "-01",
+                    'award_date' => $item['award_date'].'-01',
+                    'sort_order' => $index,
                 ];
             }
         }
@@ -94,6 +103,7 @@ class EditProject extends EditRecord
                 'badgeable_type' => Project::class,
                 'award_type' => $data['award_type'],
                 'award_date' => $data['award_date'],
+                'sort_order' => $data['sort_order'],
                 'created_at' => now(),
                 'updated_at' => now(),
             ]);