diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index f958af0..6802ba4 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -29,26 +29,24 @@ class UserController extends Controller */ public function index() { - $users = User::orderBy('name'); + $users = User::with([ + 'module:id,name', + 'roles:name' + ])->orderBy('name'); QuerySupport::queryByKeys($users, ['name', 'email']); return ApiResponse::OK->response([ /* 'models' => $users->paginate(config('app.pagination')), */ - 'users' => $users->paginate(config('app.pagination'))->map(function($user) { - return [ - 'id' => $user->id, - 'name' => $user->full_name, - 'username' => $user->name, // username corto - 'email' => $user->email, - 'module' => $user->module ? [ - 'id' => $user->module->id, - 'name' => $user->module->name, - ] : null, - 'roles' => $user->roles->pluck('name')->toArray(), - 'status' => $user->deleted_at ? 'De Baja' : 'Activo', - ]; - }), + 'users' => $users->select([ + 'id', + 'name', + 'paternal', + 'maternal', + 'email', + 'module_id', + 'deleted_at' + ])->paginate(config('app.pagination')) ]); } diff --git a/database/migrations/2025_10_30_180018_add_nrpv_to_vehicle_table.php b/database/migrations/2025_10_30_180018_add_nrpv_to_vehicle_table.php new file mode 100644 index 0000000..eb05d7c --- /dev/null +++ b/database/migrations/2025_10_30_180018_add_nrpv_to_vehicle_table.php @@ -0,0 +1,28 @@ +string('nrpv')->nullable()->after('cve_vehi'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('vehicle', function (Blueprint $table) { + $table->dropColumn('nrpv'); + }); + } +};