diff --git a/app/Http/Controllers/ProvinceDashboard/SystemMessages/SupervisorController.php b/app/Http/Controllers/ProvinceDashboard/SystemMessages/SupervisorController.php index af3cbac..914f594 100644 --- a/app/Http/Controllers/ProvinceDashboard/SystemMessages/SupervisorController.php +++ b/app/Http/Controllers/ProvinceDashboard/SystemMessages/SupervisorController.php @@ -34,6 +34,7 @@ class SupervisorController extends Controller $systemMessage->update([ 'message_quality' => $request->message_quality, 'format_quality' => $request->format_quality, + 'description' => $request->description, ]); return $this->successResponse(); } diff --git a/app/Services/Dashboard/Province/PeopleMessages/DataTableService.php b/app/Services/Dashboard/Province/PeopleMessages/DataTableService.php index 6fe18db..b34f33a 100644 --- a/app/Services/Dashboard/Province/PeopleMessages/DataTableService.php +++ b/app/Services/Dashboard/Province/PeopleMessages/DataTableService.php @@ -10,12 +10,8 @@ class DataTableService { public function index(Request $request) { - $user = auth()->user(); - - $query = PeopleMessage::query()->where('edare_shahri_id', '=', $user->edarate_shahri_id); - return DataTableFacade::run( - $query, + PeopleMessage::query()->orderBy('id'), $request, allowedFilters: ['*'], allowedSortings: ['*'], diff --git a/app/Services/Dashboard/Province/SystemMessages/OperatorService.php b/app/Services/Dashboard/Province/SystemMessages/OperatorService.php index cf5cc20..453f242 100644 --- a/app/Services/Dashboard/Province/SystemMessages/OperatorService.php +++ b/app/Services/Dashboard/Province/SystemMessages/OperatorService.php @@ -11,7 +11,7 @@ class OperatorService public function dataTable(Request $request) { return DataTableFacade::run( - SystemMessage::query(), + SystemMessage::query()->orderBy('id'), $request, allowedFilters: ['*'], allowedSortings: ['*'], diff --git a/app/Services/Dashboard/Province/SystemMessages/SupervisorService.php b/app/Services/Dashboard/Province/SystemMessages/SupervisorService.php index 8f6584c..52a254d 100644 --- a/app/Services/Dashboard/Province/SystemMessages/SupervisorService.php +++ b/app/Services/Dashboard/Province/SystemMessages/SupervisorService.php @@ -10,14 +10,12 @@ class SupervisorService { public function dataTable(Request $request) { - $query = SystemMessage::query(); - return DataTableFacade::run( - $query, + SystemMessage::query()->orderBy('id'), $request, allowedFilters: ['*'], allowedSortings: ['*'], - allowedSelects: ['id','duration','date', 'voice', 'message_quality', 'format_quality', 'type_id', 'type_name'] + allowedSelects: ['id','duration','date', 'voice', 'message_quality', 'format_quality', 'type_id', 'type_name', 'description'] ); } } diff --git a/database/factories/PeopleMessageFactory.php b/database/factories/PeopleMessageFactory.php index b3f7e32..e2c0107 100644 --- a/database/factories/PeopleMessageFactory.php +++ b/database/factories/PeopleMessageFactory.php @@ -24,7 +24,7 @@ class PeopleMessageFactory extends Factory 'review_duration' => $this->faker->numberBetween(30, 60), 'listen_at' => $this->faker->dateTime, 'is_listen' => $this->faker->boolean(), - 'action_id' => $this->faker->randomElement([PeopleMessageActions::x->value, PeopleMessageActions::y->value]), + 'action_id' => $this->faker->randomElement([PeopleMessageActions::ADAM_NIAZ_BE_SABT_MOSHKEL_AVAREZI->value, PeopleMessageActions::SABT_SAVANEH_MOSHKEL_RAH->value]), 'action_name' => $this->faker->word(), 'description' => $this->faker->text(), 'savaneh_id' => $this->faker->randomElement([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]), diff --git a/database/migrations/2025_07_29_063532_create_system_messages_table.php b/database/migrations/2025_07_29_063532_create_system_messages_table.php index f658bee..15b7ff5 100644 --- a/database/migrations/2025_07_29_063532_create_system_messages_table.php +++ b/database/migrations/2025_07_29_063532_create_system_messages_table.php @@ -17,8 +17,8 @@ return new class extends Migration $table->dateTime('date'); $table->string('voice'); $table->string('description')->nullable(); - $table->integer('message_quality'); - $table->integer('format_quality'); + $table->integer('message_quality')->nullable(); + $table->integer('format_quality')->nullable(); $table->integer('type_id'); $table->string('type_name'); $table->timestamps();