Merge remote-tracking branch 'origin/dev' into dev

romo4ko · Oct 26, 2024 · f828a13 · f828a13
2 parents c61cf87 + db86d4e
commit f828a13
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 10 deletions.
diff --git a/.env.example b/.env.example
@@ -3,7 +3,7 @@ APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
 APP_URL=http://localhost
-APP_LOCALE=en
+APP_LOCALE=ru
 
 # Hostname without http
 APP_HOST=localhost

diff --git a/app/Filament/Resources/ChallengeResource.php b/app/Filament/Resources/ChallengeResource.php
@@ -2,6 +2,7 @@
 
 namespace App\Filament\Resources;
 
+use App\Enums\ChallengeType;
 use App\Filament\Resources\ChallengeResource\Pages;
 use App\Models\Challenge;
 use Filament\Forms;
@@ -33,12 +34,27 @@ class ChallengeResource extends Resource
 
     public static function form(Form $form): Form
     {
+        $record = $form->getRecord();
+
         return $form
             ->schema([
                 Forms\Components\TextInput::make('name')
                     ->label('Название')
                     ->required()
                     ->maxWidth('sm'),
+                Forms\Components\Select::make('type')
+                    ->label('Тип')
+                    ->options([
+                        'personal' => 'Персональный',
+                        'team' => 'Командный',
+                    ])
+                    ->disabled(
+                        function ($record) {
+                            return $record->teams->count() > 0 || $record->users->count() > 0;
+                        }
+                    )
+                    ->required()
+                    ->maxWidth('sm'),
                 Forms\Components\Textarea::make('description')
                     ->label('Описание')
                     ->rows(5),
@@ -67,7 +83,20 @@ public static function form(Form $form): Form
                     ->directory('achievements')
                     ->visibility('public')
                     ->maxWidth('xs')
-                    ->label('Изображение')
+                    ->label('Изображение'),
+                Forms\Components\Section::make()
+                    ->schema([
+                        $record->type === ChallengeType::PERSONAL->value ? Forms\Components\Select::make( 'users')
+                            ->label('Участники челленджа')
+                            ->relationship('users', 'name')
+                            ->preload()
+                            ->multiple() :
+                        Forms\Components\Select::make('teams')
+                            ->label('Команды челленджа')
+                            ->relationship('teams', 'name')
+                            ->preload()
+                            ->multiple(),
+                    ])->columns(2),
             ])->columns(1);
     }
 
@@ -81,6 +110,8 @@ public static function table(Table $table): Table
                 Tables\Columns\TextColumn::make('description')
                     ->label('Описание')
                     ->limit(30),
+                Tables\Columns\TextColumn::make('type_name')
+                    ->label('Тип'),
                 Tables\Columns\TextColumn::make('start_date')
                     ->dateTime('d F')
                     ->label('Дата начала'),

diff --git a/app/Filament/Resources/TeamResource.php b/app/Filament/Resources/TeamResource.php
@@ -68,6 +68,7 @@ function (Challenge $record) {
                                     return $record->name . ' ' . ($record->is_finished ? '(Завершён)' : '');
                                 })
                             ->preload()
+                            ->disabled()
                             ->multiple(),
                     ])->columns(1)
             ])->columns(1);

diff --git a/app/Filament/Resources/UserResource.php b/app/Filament/Resources/UserResource.php
@@ -85,6 +85,7 @@ public static function form(Form $form): Form
                                 function (Challenge $record) {
                                     return $record->name . ' ' . ($record->is_finished ? '(Завершён)' : '');
                                 })
+                            ->disabled()
                             ->preload()
                             ->multiple(),
                     ])->columns(1)

diff --git a/app/Models/Challenge.php b/app/Models/Challenge.php
@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Enums\ChallengeType;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -25,6 +26,12 @@ class Challenge extends Model
         'type'
     ];
 
+    protected $appends = [
+        'is_finished',
+        'is_in_progress',
+        'type_name'
+    ];
+
     public function users(): belongsToMany
     {
         return $this->belongsToMany(User::class, 'users_challenges');
@@ -44,4 +51,14 @@ public function getIsFinishedAttribute(): bool
     {
         return $this->end_date < Carbon::now();
     }
+
+    public function getIsInProgressAttribute(): bool
+    {
+        return $this->start_date < Carbon::now() && $this->end_date > Carbon::now();
+    }
+
+    public function getTypeNameAttribute()
+    {
+        return $this->type == ChallengeType::PERSONAL->value ? 'Персональный' : 'Командный';
+    }
 }
diff --git a/database/seeders/ChallengesSeeder.php b/database/seeders/ChallengesSeeder.php
@@ -13,8 +13,12 @@ public function run(): void
     {
         $challenges = config('base.challenges');
 
-        foreach ($challenges as $challenge) {
-            Challenge::factory()->create($challenge);
+        if (env('APP_DEBUG')) {
+            Challenge::factory(10)->create();
+        } else {
+            foreach ($challenges as $challenge) {
+                Challenge::factory()->create($challenge);
+            }
         }
     }
 }
diff --git a/database/seeders/TeamsChallengesSeeder.php b/database/seeders/TeamsChallengesSeeder.php
@@ -4,12 +4,10 @@
 
 namespace Database\Seeders;
 
-use App\Models\Achievement;
+use App\Enums\ChallengeType;
 use App\Models\Challenge;
 use App\Models\Team;
-use Illuminate\Database\Console\Seeds\WithoutModelEvents;
 use Illuminate\Database\Seeder;
-use App\Models\User;
 
 class TeamsChallengesSeeder extends Seeder
 {
@@ -19,7 +17,10 @@ class TeamsChallengesSeeder extends Seeder
     public function run(): void
     {
         $teams = Team::query()->limit(5)->get();
-        $challenges = Challenge::query()->limit(5)->get();
+        $challenges = Challenge::query()
+            ->where('type', ChallengeType::TEAM)
+            ->limit(5)
+            ->get();
 
         foreach ($teams as $team) {
             foreach ($challenges as $challenge) {

diff --git a/database/seeders/UserChallengesSeeder.php b/database/seeders/UserChallengesSeeder.php
@@ -4,8 +4,8 @@
 
 namespace Database\Seeders;
 
+use App\Enums\ChallengeType;
 use App\Models\Challenge;
-use Illuminate\Database\Console\Seeds\WithoutModelEvents;
 use Illuminate\Database\Seeder;
 use App\Models\User;
 
@@ -17,7 +17,10 @@ class UserChallengesSeeder extends Seeder
     public function run(): void
     {
         $users = User::query()->limit(5)->get();
-        $challenges = Challenge::query()->limit(5)->get();
+        $challenges = Challenge::query()
+            ->where('type', ChallengeType::PERSONAL)
+            ->limit(5)
+            ->get();
 
         foreach ($users as $user) {
             foreach ($challenges as $challenge) {