Merge PR25 to Master

Author: heloufir

app/Filament/Resources/ActivityResource/Pages/CreateActivity.php

@@ -3,19 +3,9 @@
 namespace App\Filament\Resources\ActivityResource\Pages;
 
 use App\Filament\Resources\ActivityResource;
-use App\Models\TicketType;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateActivity extends CreateRecord
 {
     protected static string $resource = ActivityResource::class;
-
-    protected function afterCreate(): void
-    {
-        if ($this->record->is_default) {
-            TicketType::where('id', '<>', $this->record->id)
-                ->where('is_default', true)
-                ->update(['is_default' => false]);
-        }
-    }
 }

app/Filament/Resources/ActivityResource/Pages/EditActivity.php

@@ -3,7 +3,6 @@
 namespace App\Filament\Resources\ActivityResource\Pages;
 
 use App\Filament\Resources\ActivityResource;
-use App\Models\TicketStatus;
 use Filament\Pages\Actions;
 use Filament\Resources\Pages\EditRecord;
 
@@ -18,13 +17,4 @@ protected function getActions(): array
             Actions\DeleteAction::make(),
         ];
     }
-
-    protected function afterSave(): void
-    {
-        if ($this->record->is_default) {
-            TicketStatus::where('id', '<>', $this->record->id)
-                ->where('is_default', true)
-                ->update(['is_default' => false]);
-        }
-    }
 }

app/Models/Activity.php

@@ -4,10 +4,11 @@
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Activity extends Model
 {
-    use HasFactory;
+    use HasFactory, SoftDeletes;
 
     protected $fillable = [
         'name',

app/Policies/ActivityPolicy.php

@@ -0,0 +1,94 @@
+<?php
+
+namespace App\Policies;
+
+use App\Models\Activity;
+use App\Models\User;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class ActivityPolicy
+{
+    use HandlesAuthorization;
+
+    /**
+     * Determine whether the user can view any models.
+     *
+     * @param  \App\Models\User  $user
+     * @return \Illuminate\Auth\Access\Response|bool
+     */
+    public function viewAny(User $user)
+    {
+        return $user->can('List activities');
+    }
+
+    /**
+     * Determine whether the user can view the model.
+     *
+     * @param  \App\Models\User  $user
+     * @param  \App\Models\Activity  $activity
+     * @return \Illuminate\Auth\Access\Response|bool
+     */
+    public function view(User $user, Activity $activity)
+    {
+        return $user->can('View activity');
+    }
+
+    /**
+     * Determine whether the user can create models.
+     *
+     * @param  \App\Models\User  $user
+     * @return \Illuminate\Auth\Access\Response|bool
+     */
+    public function create(User $user)
+    {
+        return $user->can('Create activity');
+    }
+
+    /**
+     * Determine whether the user can update the model.
+     *
+     * @param  \App\Models\User  $user
+     * @param  \App\Models\Activity  $activity
+     * @return \Illuminate\Auth\Access\Response|bool
+     */
+    public function update(User $user, Activity $activity)
+    {
+        return $user->can('Update activity');
+    }
+
+    /**
+     * Determine whether the user can delete the model.
+     *
+     * @param  \App\Models\User  $user
+     * @param  \App\Models\Activity  $activity
+     * @return \Illuminate\Auth\Access\Response|bool
+     */
+    public function delete(User $user, Activity $activity)
+    {
+        return $user->can('Delete activity');
+    }
+
+    /**
+     * Determine whether the user can restore the model.
+     *
+     * @param  \App\Models\User  $user
+     * @param  \App\Models\Activity  $activity
+     * @return \Illuminate\Auth\Access\Response|bool
+     */
+    public function restore(User $user, Activity $activity)
+    {
+        //
+    }
+
+    /**
+     * Determine whether the user can permanently delete the model.
+     *
+     * @param  \App\Models\User  $user
+     * @param  \App\Models\Activity  $activity
+     * @return \Illuminate\Auth\Access\Response|bool
+     */
+    public function forceDelete(User $user, Activity $activity)
+    {
+        //
+    }
+}

database/migrations/2023_01_09_113159_create_activities_table.php

@@ -20,6 +20,7 @@ public function up()
             $table->mediumText('description');
 
             $table->timestamps();
+            $table->softDeletes();
         });
     }
 

database/referential.sql

@@ -14,10 +14,22 @@ INSERT INTO `ticket_types` (`id`, `name`, `icon`, `color`, `is_default`, `delete
 (2, 'Evolution', 'heroicon-o-clipboard-list', '#008000', 0, NULL, '2022-11-14 12:06:56', '2022-11-14 12:06:56'),
 (3, 'Bug', 'heroicon-o-x', '#ff0000', 0, NULL, '2022-11-14 12:06:56', '2022-11-14 12:06:56');
 
+
+INSERT INTO `activities` (`id`, `name`, `description`, `created_at`, `updated_at`, `deleted_at`) VALUES
+(1, 'Programming', 'Programming related activities', '2023-01-09 13:10:52', '2023-01-09 13:10:52', NULL),
+(2, 'Testing', 'Testing related activities', '2023-01-09 13:10:52', '2023-01-09 13:10:52', NULL),
+(3, 'Learning', 'Activities related to learning and training', '2023-01-09 13:10:52', '2023-01-09 13:10:52', NULL),
+(4, 'Research', 'Activities related to research', '2023-01-09 13:10:52', '2023-01-09 13:10:52', NULL),
+(5, 'Other', 'Other activities', '2023-01-09 13:10:52', '2023-01-09 13:10:52', NULL);
+
 ALTER TABLE `ticket_priorities`
   MODIFY `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=4;
 
 ALTER TABLE `ticket_statuses`
   MODIFY `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=5;
+
 ALTER TABLE `ticket_types`
   MODIFY `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=4;
+
+ALTER TABLE `activities`
+    MODIFY `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=6;