diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 7b52432..e45eae5 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -46,7 +46,9 @@ class UserController extends Controller 'name' => $request->name, 'email' => $request->email, 'password' => bcrypt($request->password), - 'role_id' => $request->role_id + 'role_id' => $request->role_id, + 'group' => $request->group, + 'region' => $request->region ]); return redirect()->route('users.index'); @@ -73,7 +75,7 @@ class UserController extends Controller ]); } - $user->update($request->only(['name', 'email', 'role_id'])); + $user->update($request->only(['name', 'email', 'role_id', 'group', 'region'])); if ($request->password != null) { $user->update(['password' => bcrypt($request->password)]); } diff --git a/app/Models/User.php b/app/Models/User.php index 1a24f4f..e17417e 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -8,6 +8,8 @@ use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; use Laravel\Sanctum\HasApiTokens; +use function PHPSTORM_META\map; + class User extends Authenticatable { use HasApiTokens, HasFactory, Notifiable; @@ -22,7 +24,9 @@ class User extends Authenticatable 'email', 'password', 'is_admin', - 'role_id' + 'role_id', + 'group', + 'region' ]; /** diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index 81672c3..ec17533 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -20,6 +20,8 @@ return new class extends Migration { $table->string('password'); $table->smallInteger('is_admin')->default(0); $table->bigInteger('role_id')->nullable(); + $table->string('group')->nullable(); + $table->string('region')->nullable(); $table->rememberToken(); $table->timestamps(); }); diff --git a/resources/js/Pages/User/Index.jsx b/resources/js/Pages/User/Index.jsx index d0fe787..4aaa78f 100644 --- a/resources/js/Pages/User/Index.jsx +++ b/resources/js/Pages/User/Index.jsx @@ -96,6 +96,8 @@ export default function Users(props) { Nama Email Role + Group + Region @@ -106,6 +108,8 @@ export default function Users(props) { {user.name} {user.email} {user?.role?.name} + {user.group} + {user.region} {canUpdate && (
{ @@ -55,7 +57,9 @@ export default function UserFormModal(props) { name: user?.name, email: user?.email, role_id: user?.role_id, - is_admin: user?.is_admin + is_admin: user?.is_admin, + group: user?.group, + region: user?.region }) }, [user]) @@ -131,6 +135,42 @@ export default function UserFormModal(props) {
+
+ + + +
+
+ + + +
{(user === null || +user?.is_admin === 0) && (