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

romo4ko · Oct 26, 2024 · ecc18fb · ecc18fb
2 parents ebc30e8 + 7010552
commit ecc18fb
Show file tree

Hide file tree

Showing 14 changed files with 133 additions and 22 deletions.
diff --git a/app/Filament/Resources/AchievementResource.php b/app/Filament/Resources/AchievementResource.php
@@ -78,7 +78,7 @@ public static function table(Table $table): Table
                 //
             ])
             ->actions([
-                Tables\Actions\EditAction::make(),
+                Tables\Actions\EditAction::make()->label('Управление'),
             ])
             ->bulkActions([
                 Tables\Actions\BulkActionGroup::make([

diff --git a/app/Filament/Resources/AchievementResource/Pages/EditAchievement.php b/app/Filament/Resources/AchievementResource/Pages/EditAchievement.php
@@ -10,7 +10,7 @@ class EditAchievement extends EditRecord
 {
     public function getHeading(): string
     {
-        return 'Изменить ачивку';
+        return 'Управление ачивкой';
     }
 
     protected static string $resource = AchievementResource::class;

diff --git a/app/Filament/Resources/ChallengeResource.php b/app/Filament/Resources/ChallengeResource.php
@@ -56,6 +56,7 @@ public static function form(Form $form): Form
                 Forms\Components\Select::make('achievement_id')
                     ->label('Ачивка')
                     ->relationship('achievement', 'name')
+                    ->searchable()
                     ->nullable(),
                 FileUpload::make('image')
                     ->rules(['image'])
@@ -105,7 +106,7 @@ public static function table(Table $table): Table
                 //
             ])
             ->actions([
-                Tables\Actions\EditAction::make(),
+                Tables\Actions\EditAction::make()->label('Управление'),
             ])
             ->bulkActions([
                 Tables\Actions\BulkActionGroup::make([

diff --git a/app/Filament/Resources/ChallengeResource/Pages/EditChallenge.php b/app/Filament/Resources/ChallengeResource/Pages/EditChallenge.php
@@ -10,7 +10,7 @@ class EditChallenge extends EditRecord
 {
     public function getHeading(): string
     {
-        return 'Изменить челлендж';
+        return 'Управление челленджем';
     }
 
     protected static string $resource = ChallengeResource::class;

diff --git a/app/Filament/Resources/TeamResource.php b/app/Filament/Resources/TeamResource.php
@@ -3,6 +3,7 @@
 namespace App\Filament\Resources;
 
 use App\Filament\Resources\TeamResource\Pages;
+use App\Models\Challenge;
 use App\Models\Team;
 use Filament\Forms;
 use Filament\Forms\Form;
@@ -39,17 +40,36 @@ public static function form(Form $form): Form
                 Forms\Components\Textarea::make('description')
                     ->label('Описание')
                     ->rows(5),
+                Forms\Components\Select::make('captain_id')
+                    ->label('Капитан')
+                    ->relationship('users', 'name')
+                    ->searchable()
+                    ->preload(),
                 Forms\Components\Section::make()
                     ->schema([
                         Forms\Components\Select::make('users')
-                            ->label('Участники')
+                            ->label('Участники команды')
                             ->relationship('users', 'name')
+                            ->preload()
                             ->multiple(),
                         Forms\Components\Select::make('achievements')
-                            ->label('Достижения')
+                            ->label('Достижения команды')
                             ->relationship('achievements', 'name')
+                            ->preload()
                             ->multiple(),
-                    ])->columns(2)
+                    ])->columns(2),
+                Forms\Components\Section::make()
+                    ->schema([
+                        Forms\Components\Select::make('challenges')
+                            ->label('Челленджи команды')
+                            ->relationship('challenges', 'name')
+                            ->getOptionLabelFromRecordUsing(
+                                function (Challenge $record) {
+                                    return $record->name . ' ' . ($record->is_finished ? '(Завершён)' : '');
+                                })
+                            ->preload()
+                            ->multiple(),
+                    ])->columns(1)
             ])->columns(1);
     }
 
@@ -70,7 +90,8 @@ public static function table(Table $table): Table
                         fn($record) => $record->users->count() > 0
                             ? 'success' : 'danger'
                     )
-                    ->label('Участников'),
+                    ->label('Участников')
+                    ->sortable(),
                 Tables\Columns\TextColumn::make('achievements_count')
                     ->counts('achievements')
                     ->badge()
@@ -79,12 +100,22 @@ public static function table(Table $table): Table
                             ? 'success' : 'danger'
                     )
                     ->label('Достижений')
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('challenges_count')
+                    ->counts('challenges')
+                    ->badge()
+                    ->color(
+                        fn($record) => $record->challenges->count() > 0
+                            ? 'success' : 'danger'
+                    )
+                    ->label('Челленджей')
+                    ->sortable(),
             ])
             ->filters([
                 //
             ])
             ->actions([
-                Tables\Actions\EditAction::make(),
+                Tables\Actions\EditAction::make()->label('Управление'),
             ])
             ->bulkActions([
                 Tables\Actions\BulkActionGroup::make([

diff --git a/app/Filament/Resources/TeamResource/Pages/EditTeam.php b/app/Filament/Resources/TeamResource/Pages/EditTeam.php
@@ -10,7 +10,7 @@ class EditTeam extends EditRecord
 {
     public function getHeading(): string
     {
-        return 'Изменить команду';
+        return 'Управление командой';
     }
     protected static string $resource = TeamResource::class;
 

diff --git a/app/Filament/Resources/UserResource.php b/app/Filament/Resources/UserResource.php
@@ -4,6 +4,7 @@
 
 use App\Filament\Resources\UserResource\Pages;
 use App\Filament\Resources\UserResource\RelationManagers;
+use App\Models\Challenge;
 use App\Models\User;
 use Filament\Forms;
 use Filament\Forms\Form;
@@ -62,6 +63,31 @@ public static function form(Form $form): Form
                     Forms\Components\TextInput::make('patronymic')->label('Отчество'),
                     Forms\Components\Textarea::make('about')->label('О себе')->rows(5),
                 ])->columns(),
+                Forms\Components\Section::make()
+                    ->schema([
+                        Forms\Components\Select::make('teams')
+                            ->label('Команды, в которых состоит пользователь')
+                            ->relationship('teams', 'name')
+                            ->preload()
+                            ->multiple(),
+                        Forms\Components\Select::make('achievements')
+                            ->label('Достижения пользователя')
+                            ->relationship('achievements', 'name')
+                            ->preload()
+                            ->multiple(),
+                    ])->columns(2),
+                Forms\Components\Section::make()
+                    ->schema([
+                        Forms\Components\Select::make('challenges')
+                            ->label('Челленджи пользователя')
+                            ->relationship('challenges', 'name')
+                            ->getOptionLabelFromRecordUsing(
+                                function (Challenge $record) {
+                                    return $record->name . ' ' . ($record->is_finished ? '(Завершён)' : '');
+                                })
+                            ->preload()
+                            ->multiple(),
+                    ])->columns(1)
             ]);
     }
 
@@ -76,15 +102,29 @@ public static function table(Table $table): Table
                     ->label('Фамилия')
                     ->default('-')
                     ->searchable(),
-                Tables\Columns\TextColumn::make('patronymic')
-                    ->label('Отчество')
-                    ->default('-')
-                    ->searchable(),
                 Tables\Columns\TextColumn::make('email')
                     ->label('Почта')
                     ->searchable(),
                 CheckboxColumn::make('is_confirmed')
-                    ->label('Верифицирован'),
+                    ->label('Проверен'),
+                Tables\Columns\TextColumn::make('challenges_count')
+                    ->counts('challenges')
+                    ->badge()
+                    ->color(
+                        fn($record) => $record->challenges->count() > 0
+                            ? 'success' : 'danger'
+                    )
+                    ->label('Челленджей')
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('achievements_count')
+                    ->counts('achievements')
+                    ->badge()
+                    ->color(
+                        fn($record) => $record->achievements->count() > 0
+                            ? 'success' : 'danger'
+                    )
+                    ->label('Достижений')
+                    ->sortable()
             ])
             ->defaultSort('created_at', 'desc')
             ->filters([
@@ -94,7 +134,7 @@ public static function table(Table $table): Table
                     ->label('Не верифицированные'),
             ])
             ->actions([
-                Tables\Actions\EditAction::make(),
+                Tables\Actions\EditAction::make()->label('Управление'),
             ])
             ->bulkActions([
                 Tables\Actions\BulkActionGroup::make([

diff --git a/app/Filament/Resources/UserResource/Pages/EditUser.php b/app/Filament/Resources/UserResource/Pages/EditUser.php
@@ -10,7 +10,7 @@ class EditUser extends EditRecord
 {
     public function getHeading(): string
     {
-        return 'Изменить пользователя';
+        return 'Управление пользователем';
     }
 
     protected static string $resource = UserResource::class;

diff --git a/app/Models/Challenge.php b/app/Models/Challenge.php
@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
@@ -38,4 +39,9 @@ public function teams(): belongsToMany
     {
         return $this->belongsToMany(Team::class, 'teams_challenges');
     }
+
+    public function getIsFinishedAttribute(): bool
+    {
+        return $this->end_date < Carbon::now();
+    }
 }
diff --git a/app/Models/Team.php b/app/Models/Team.php
@@ -2,20 +2,35 @@
 
 namespace App\Models;
 
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\HasOne;
 
 class Team extends Model
 {
     use HasFactory;
 
+    public $timestamps = true;
+
     protected $fillable = [
         'name',
         'description',
-        'image'
+        'captain_id'
+    ];
+
+    protected $appends = [
+        'active_challenges',
+        'completed_challenges'
     ];
 
+    public function captain(): HasOne
+    {
+        return $this->hasOne(User::class, 'captain_id');
+    }
+
     public function users(): belongsToMany
     {
         return $this->belongsToMany(User::class, 'users_teams', 'team_id', 'user_id');
@@ -30,4 +45,20 @@ public function achievements(): belongsToMany
     {
         return $this->belongsToMany(Achievement::class, 'teams_achievements');
     }
+
+    public function getActiveChallengesAttribute(): Collection
+    {
+        return $this->challenges()
+            ->where('start_date', '<=', Carbon::now())
+            ->where('end_date', '>=', Carbon::now())
+            ->get();
+    }
+
+    public function getCompletedChallengesAttribute(): Collection
+    {
+        return $this->challenges()
+            ->where('end_date', '<', Carbon::now())
+            ->get();
+    }
+
 }
diff --git a/config/app.php b/config/app.php
@@ -78,11 +78,11 @@
     |
     */
 
-    'locale' => env('APP_LOCALE', 'en'),
+    'locale' => env('APP_LOCALE', 'ru'),
 
-    'fallback_locale' => env('APP_FALLBACK_LOCALE', 'en'),
+    'fallback_locale' => env('APP_FALLBACK_LOCALE', 'ru'),
 
-    'faker_locale' => env('APP_FAKER_LOCALE', 'en_US'),
+    'faker_locale' => env('APP_FAKER_LOCALE', 'ru_RU'),
 
     /*
     |--------------------------------------------------------------------------

diff --git a/database/factories/TeamFactory.php b/database/factories/TeamFactory.php
@@ -5,6 +5,7 @@
 namespace Database\Factories;
 
 use App\Models\Team;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
@@ -24,6 +25,7 @@ public function definition(): array
         return [
             'name' => $this->faker->company,
             'description' => $this->faker->sentence,
+            'captain_id' => User::query()->first()->id,
         ];
     }
 }
diff --git a/database/migrations/2024_10_26_081419_create_teams_table.php b/database/migrations/2024_10_26_081419_create_teams_table.php
@@ -16,6 +16,7 @@ public function up(): void
             $table->string('name');
             $table->string('image')->nullable();
             $table->text('description');
+            $table->foreignId('captain_id')->constrained('users')->onDelete('cascade');
             $table->timestamps();
         });
     }

diff --git a/database/migrations/2024_10_26_081833_create_users_teams_table.php b/database/migrations/2024_10_26_081833_create_users_teams_table.php
@@ -15,7 +15,6 @@ public function up(): void
             $table->id();
             $table->foreignId('user_id')->constrained('users')->onDelete('cascade');
             $table->foreignId('team_id')->constrained('teams')->onDelete('cascade');
-            $table->boolean('is_captain')->default(false);
             $table->timestamps();
         });
     }