fix(master-user): remove admin data, fix crud function
This commit is contained in:
arieeefajar
parent
e8fd2f06ae
commit
b5b3ef486f
|
|
@ -15,7 +15,7 @@ class UserController extends Controller
|
|||
{
|
||||
public function index()
|
||||
{
|
||||
$users = User::orderBy('created_at', 'desc')->get();
|
||||
$users = User::where('role', '!=', 'admin')->orderBy('created_at', 'desc')->get();
|
||||
return view('master-data.pengguna.index', compact('users'));
|
||||
}
|
||||
|
||||
|
|
@ -35,9 +35,6 @@ public function store(Request $request)
|
|||
'email.email' => 'Email tidak valid',
|
||||
'email.unique' => 'Email sudah terdaftar',
|
||||
|
||||
'role.required' => 'Role wajib diisi',
|
||||
'role.in' => 'Role tidak valid',
|
||||
|
||||
'status.required' => 'Status wajib diisi',
|
||||
'status.in' => 'Status tidak valid',
|
||||
];
|
||||
|
|
@ -46,7 +43,6 @@ public function store(Request $request)
|
|||
'fullname' => 'required|string|max:255',
|
||||
'username' => 'required|string|max:12',
|
||||
'email' => 'required|string|email|max:255|unique:users',
|
||||
'role' => 'required|in:admin,user',
|
||||
'status' => 'required|in:1,0',
|
||||
], $customMessage);
|
||||
|
||||
|
|
@ -59,8 +55,7 @@ public function store(Request $request)
|
|||
$user->name = $request->fullname;
|
||||
$user->username = $request->username;
|
||||
$user->email = $request->email;
|
||||
$user->password = Hash::make("12344321");
|
||||
$user->role = $request->role;
|
||||
$user->password = Hash::make("petugas123");
|
||||
|
||||
if ($request->status == 0) {
|
||||
$activationCode = Str::random(4);
|
||||
|
|
@ -96,9 +91,6 @@ public function update(Request $request, $id)
|
|||
'email.email' => 'Email tidak valid',
|
||||
'email.unique' => 'Email sudah terdaftar',
|
||||
|
||||
'role.required' => 'Role wajib diisi',
|
||||
'role.in' => 'Role tidak valid',
|
||||
|
||||
'status.required' => 'Status wajib diisi',
|
||||
'status.in' => 'Status tidak valid',
|
||||
];
|
||||
|
|
@ -107,7 +99,6 @@ public function update(Request $request, $id)
|
|||
'fullname' => 'required|string|max:255',
|
||||
'username' => 'required|string|max:12',
|
||||
'email' => 'required|string|email|max:255|unique:users,email,' . $id,
|
||||
'role' => 'required|in:admin,user',
|
||||
'status' => 'required|in:1,0',
|
||||
], $customMessage);
|
||||
|
||||
|
|
@ -120,7 +111,6 @@ public function update(Request $request, $id)
|
|||
$user->name = $request->fullname;
|
||||
$user->username = $request->username;
|
||||
$user->email = $request->email;
|
||||
$user->role = $request->role;
|
||||
$user->is_active = $request->status;
|
||||
|
||||
try {
|
||||
|
|
@ -132,7 +122,6 @@ public function update(Request $request, $id)
|
|||
return redirect()->back();
|
||||
}
|
||||
}
|
||||
|
||||
public function destroy($id)
|
||||
{
|
||||
$user = User::find($id);
|
||||
|
|
|
|||
|
|
@ -3,13 +3,11 @@ function updateData(user) {
|
|||
var fullname = document.getElementById("fullname-edit-field");
|
||||
var username = document.getElementById("username-edit-field");
|
||||
var email = document.getElementById("email-edit-field");
|
||||
var role = document.getElementById("role-edit-field");
|
||||
var status = document.getElementById("status-edit-field");
|
||||
|
||||
fullname.value = user.name;
|
||||
username.value = user.username;
|
||||
email.value = user.email;
|
||||
role.value = user.role;
|
||||
status.value = user.is_active;
|
||||
form.action = "/data-pengguna/" + user.id;
|
||||
}
|
||||
|
|
@ -37,7 +35,7 @@ checkAll &&
|
|||
});
|
||||
var perPage = 10,
|
||||
options = {
|
||||
valueNames: ["id", "fullname", "email", "username", "role", "status"],
|
||||
valueNames: ["id", "fullname", "email", "username", "status"],
|
||||
page: perPage,
|
||||
pagination: !0,
|
||||
plugins: [ListPagination({ left: 2, right: 2 })],
|
||||
|
|
|
|||
|
|
@ -54,9 +54,6 @@
|
|||
</th>
|
||||
<th class="sort" data-sort="username">Username</th>
|
||||
<th class="sort" data-sort="email">Email</th>
|
||||
<th class="sort" data-sort="role">
|
||||
Role
|
||||
</th>
|
||||
<th class="sort" data-sort="status">
|
||||
Status
|
||||
</th>
|
||||
|
|
@ -74,7 +71,6 @@ class="fw-medium link-primary">#VZ2101</a>
|
|||
<td class="fullname">{{ $user->name }}</td>
|
||||
<td class="username">{{ $user->username }}</td>
|
||||
<td class="email">{{ $user->email }}</td>
|
||||
<td class="role">{{ $user->role }}</td>
|
||||
<td class="status">
|
||||
@if ($user->is_active == 0)
|
||||
<span class="badge badge-soft-danger text-uppercase">Tidak
|
||||
|
|
@ -187,18 +183,6 @@ class="badge badge-soft-success text-uppercase">Aktif</span>
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label for="date-field" class="form-label">Role</label>
|
||||
<select name="role" id="role-field" data-trigger class="form-control" required>
|
||||
<option value="" selected disabled>Pilih Role</option>
|
||||
<option value="admin">Admin</option>
|
||||
<option value="user">User</option>
|
||||
</select>
|
||||
<div class="invalid-feedback">
|
||||
Pilih Role
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="status-field" class="form-label">Status</label>
|
||||
<select class="form-control" data-trigger name="status" id="status-field" required>
|
||||
|
|
@ -270,19 +254,6 @@ class="badge badge-soft-success text-uppercase">Aktif</span>
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label for="date-field" class="form-label">Role</label>
|
||||
<select name="role" id="role-edit-field" data-trigger class="form-control"
|
||||
required>
|
||||
<option value="" selected disabled>Pilih Role</option>
|
||||
<option value="admin">Admin</option>
|
||||
<option value="user">User</option>
|
||||
</select>
|
||||
<div class="invalid-feedback">
|
||||
Pilih Role
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="status-field" class="form-label">Status</label>
|
||||
<select class="form-control" data-trigger name="status" id="status-edit-field"
|
||||
|
|
|
|||
Loading…
Reference in New Issue