Merge pull request #19 from arieeefajar/fix/master-user
fix(master-user): bug fix delete function
This commit is contained in:
Arie Fajar Bachtiar
GitHub
commit
5bbdac4ec6
|
|
@ -3,7 +3,6 @@
|
|||
namespace App\Http\Controllers\MasterData;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Mail\ActivationAccountMail;
|
||||
use App\Models\User;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
|
|
|
|||
|
|
@ -19,6 +19,22 @@ function deleteData(id) {
|
|||
form.action = "/data-pengguna/" + id;
|
||||
}
|
||||
|
||||
var checkAll = document.getElementById("checkAll");
|
||||
checkAll &&
|
||||
(checkAll.onclick = function () {
|
||||
for (
|
||||
var e = document.querySelectorAll(
|
||||
'.form-check-all input[type="checkbox"]'
|
||||
),
|
||||
t = 0;
|
||||
t < e.length;
|
||||
t++
|
||||
)
|
||||
(e[t].checked = this.checked),
|
||||
e[t].checked
|
||||
? e[t].closest("tr").classList.add("table-active")
|
||||
: e[t].closest("tr").classList.remove("table-active");
|
||||
});
|
||||
var perPage = 10,
|
||||
options = {
|
||||
valueNames: ["id", "fullname", "email", "username", "role", "status"],
|
||||
|
|
@ -121,7 +137,7 @@ refreshCallbacks(),
|
|||
.addEventListener("show.bs.modal", function (e) {
|
||||
e.relatedTarget.classList.contains("edit-item-btn")
|
||||
? ((document.getElementById("exampleModalLabel").innerHTML =
|
||||
"Edit Data Customer"),
|
||||
"Edit Customer"),
|
||||
(document
|
||||
.getElementById("showModal")
|
||||
.querySelector(".modal-footer").style.display = "block"),
|
||||
|
|
@ -129,7 +145,7 @@ refreshCallbacks(),
|
|||
(document.getElementById("edit-btn").style.display = "block"))
|
||||
: e.relatedTarget.classList.contains("add-btn")
|
||||
? ((document.getElementById("exampleModalLabel").innerHTML =
|
||||
"Tambah Data Pengguna"),
|
||||
"Tambah Pengguna"),
|
||||
(document
|
||||
.getElementById("showModal")
|
||||
.querySelector(".modal-footer").style.display = "block"),
|
||||
|
|
@ -313,24 +329,6 @@ document
|
|||
.querySelector(".active")
|
||||
.previousSibling.children[0].click());
|
||||
});
|
||||
var attroptions = {
|
||||
valueNames: [
|
||||
"name",
|
||||
"born",
|
||||
{ data: ["id"] },
|
||||
{ attr: "src", name: "image" },
|
||||
{ attr: "href", name: "link" },
|
||||
{ attr: "data-timestamp", name: "timestamp" },
|
||||
],
|
||||
},
|
||||
attrList = new List("users", attroptions);
|
||||
attrList.add({
|
||||
name: "Leia",
|
||||
born: "1954",
|
||||
image: "assets/images/users/avatar-5.jpg",
|
||||
id: 5,
|
||||
timestamp: "67893",
|
||||
});
|
||||
var existOptionsList = { valueNames: ["contact-name", "contact-message"] },
|
||||
existList = new List("contact-existing-list", existOptionsList),
|
||||
fuzzySearchList = new List("fuzzysearch-list", { valueNames: ["name"] }),
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
@section('content')
|
||||
<div class="page-content">
|
||||
<div class="container-fluid">
|
||||
|
||||
<!-- start page title -->
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
|
|
@ -12,11 +11,12 @@
|
|||
|
||||
<div class="page-title-right">
|
||||
<ol class="breadcrumb m-0">
|
||||
<li class="breadcrumb-item"><a href="javascript: void(0);">Master Data</a></li>
|
||||
<li class="breadcrumb-item">
|
||||
<a href="javascript: void(0);">Master Data</a>
|
||||
</li>
|
||||
<li class="breadcrumb-item active">Data Pengguna</li>
|
||||
</ol>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -27,7 +27,8 @@
|
|||
<div class="card">
|
||||
<div class="card-header">
|
||||
<h4 class="card-title mb-0">Data Pengguna</h4>
|
||||
</div><!-- end card header -->
|
||||
</div>
|
||||
<!-- end card header -->
|
||||
|
||||
<div class="card-body">
|
||||
<div id="customerList">
|
||||
|
|
@ -35,14 +36,15 @@
|
|||
<div class="col-sm-auto">
|
||||
<div>
|
||||
<button type="button" class="btn btn-success add-btn" data-bs-toggle="modal"
|
||||
id="create-btn" data-bs-target="#showModal"><i
|
||||
class="ri-add-line align-bottom me-1"></i> Tambah</button>
|
||||
id="create-btn" data-bs-target="#showModal">
|
||||
<i class="ri-add-line align-bottom me-1"></i> Tambah
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm">
|
||||
<div class="d-flex justify-content-sm-end">
|
||||
<div class="search-box ms-2">
|
||||
<input type="text" class="form-control search" placeholder="Search...">
|
||||
<input type="text" class="form-control search" placeholder="Search..." />
|
||||
<i class="ri-search-line search-icon"></i>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -56,26 +58,32 @@ class="ri-add-line align-bottom me-1"></i> Tambah</button>
|
|||
<th class="sort" data-sort="no">
|
||||
No
|
||||
</th>
|
||||
<th class="sort" data-sort="fullname">Nama Lengkap</th>
|
||||
<th class="sort" data-sort="fullname">
|
||||
Nama Lengkap
|
||||
</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>
|
||||
<th class="sort" data-sort="role">
|
||||
Role
|
||||
</th>
|
||||
<th class="sort" data-sort="status">
|
||||
Status
|
||||
</th>
|
||||
<th class="sort" data-sort="action">Action</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class="list form-check-all">
|
||||
@foreach ($users as $user)
|
||||
<tr class="text-center">
|
||||
<th class="no">
|
||||
{{ $loop->iteration }}
|
||||
</th>
|
||||
<td class="id" style="display:none;"><a href="javascript:void(0);"
|
||||
class="fw-medium link-primary">#VZ2101</a></td>
|
||||
<td>{{ $loop->iteration }}</td>
|
||||
<td class="id" style="display: none">
|
||||
<a href="javascript:void(0);"
|
||||
class="fw-medium link-primary">#VZ2101</a>
|
||||
</td>
|
||||
<td class="fullname">{{ $user->name }}</td>
|
||||
<td class="username">{{ $user->username }}</td>
|
||||
<td class="email">{{ $user->email }}</td>
|
||||
<td class="role text-capitalize">{{ $user->role }}</td>
|
||||
<td class="role">{{ $user->role }}</td>
|
||||
<td class="status">
|
||||
@if ($user->is_active == 0)
|
||||
<span class="badge badge-soft-danger text-uppercase">Tidak
|
||||
|
|
@ -90,24 +98,58 @@ class="badge badge-soft-success text-uppercase">Aktif</span>
|
|||
<div class="edit">
|
||||
<button class="btn btn-sm btn-warning edit-item-btn"
|
||||
data-bs-toggle="modal" data-bs-target="#editModal"
|
||||
onclick="updateData({{ $user }})">Edit</button>
|
||||
onclick="updateData({{ $user }})">
|
||||
Edit
|
||||
</button>
|
||||
</div>
|
||||
<div class="remove">
|
||||
<button class="btn btn-sm btn-danger remove-item-btn"
|
||||
data-bs-toggle="modal"
|
||||
data-bs-target="#deleteRecordModal"
|
||||
onclick="deleteData({{ $user->id }})">Hapus</button>
|
||||
onclick="deleteData({{ $user->id }})">
|
||||
Hapus
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
{{-- <tr class="text-center">
|
||||
<td>1</td>
|
||||
<td class="id" style="display: none">
|
||||
<a href="javascript:void(0);" class="fw-medium link-primary">#VZ2101</a>
|
||||
</td>
|
||||
<td class="fullname">Mary Cousar</td>
|
||||
<td class="username">marycousar</td>
|
||||
<td class="email">marycousar@velzon.com</td>
|
||||
<td class="role">06 Apr, 2021</td>
|
||||
<td class="status">
|
||||
<span class="badge badge-soft-success text-uppercase">Active</span>
|
||||
</td>
|
||||
<td>
|
||||
<div class="d-flex gap-2 justify-content-center">
|
||||
<div class="edit">
|
||||
<button class="btn btn-sm btn-primary edit-item-btn"
|
||||
data-bs-toggle="modal" data-bs-target="#showModal">
|
||||
Edit
|
||||
</button>
|
||||
</div>
|
||||
<div class="remove">
|
||||
<button class="btn btn-sm btn-success remove-item-btn"
|
||||
data-bs-toggle="modal" data-bs-target="#deleteRecordModal">
|
||||
Hapus
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr> --}}
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="noresult" style="display: none">
|
||||
<div class="text-center">
|
||||
<lord-icon src="https://cdn.lordicon.com/msoeawqm.json" trigger="loop"
|
||||
colors="primary:#25a0e2,secondary:#00bd9d" style="width:75px;height:75px">
|
||||
colors="primary:#25a0e2,secondary:#00bd9d"
|
||||
style="width: 75px; height: 75px">
|
||||
</lord-icon>
|
||||
<h5 class="mt-2">Maaf! Data Tidak Ditemukan</h5>
|
||||
<p class="text-muted mb-0">Silahkan gunakan kata kunci lain</p>
|
||||
|
|
@ -118,7 +160,7 @@ class="badge badge-soft-success text-uppercase">Aktif</span>
|
|||
<div class="d-flex justify-content-end">
|
||||
<div class="pagination-wrap hstack gap-2">
|
||||
<a class="page-item pagination-prev disabled" href="#">
|
||||
Kembali
|
||||
Sebelumnya
|
||||
</a>
|
||||
<ul class="pagination listjs-pagination mb-0"></ul>
|
||||
<a class="page-item pagination-next" href="#">
|
||||
|
|
@ -127,7 +169,8 @@ class="badge badge-soft-success text-uppercase">Aktif</span>
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div><!-- end card -->
|
||||
</div>
|
||||
<!-- end card -->
|
||||
</div>
|
||||
<!-- end col -->
|
||||
</div>
|
||||
|
|
@ -135,6 +178,7 @@ class="badge badge-soft-success text-uppercase">Aktif</span>
|
|||
</div>
|
||||
<!-- end row -->
|
||||
|
||||
{{-- add modal --}}
|
||||
<div class="modal fade" id="showModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
|
||||
<div class="modal-dialog modal-dialog-centered">
|
||||
<div class="modal-content">
|
||||
|
|
@ -314,18 +358,22 @@ class="badge badge-soft-success text-uppercase">Aktif</span>
|
|||
<div class="mt-2 text-center">
|
||||
<lord-icon src="https://cdn.lordicon.com/gsqxdxog.json" trigger="loop"
|
||||
colors="primary:#25a0e2,secondary:#00bd9d"
|
||||
style="width:100px;height:100px"></lord-icon>
|
||||
style="width: 100px; height: 100px"></lord-icon>
|
||||
<div class="mt-4 pt-2 fs-15 mx-4 mx-sm-5">
|
||||
<h4>Anda yakin ?</h4>
|
||||
<p class="text-muted mx-4 mb-0">Anda yakin akan menghapus data ini ?</p>
|
||||
<p class="text-muted mx-4 mb-0">
|
||||
Anda yakin akan menghapus data ini ?
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="d-flex gap-2 justify-content-center mt-4 mb-2">
|
||||
<button type="button" class="btn w-sm btn-light" data-bs-dismiss="modal">Tutup</button>
|
||||
<button type="button" class="btn w-sm btn-light" data-bs-dismiss="modal">
|
||||
Tutup
|
||||
</button>
|
||||
<form action="" method="POST" id="delete-form">
|
||||
@csrf
|
||||
@method('DELETE')
|
||||
<button type="submit" class="btn w-sm btn-primary" id="delete-record">Ya,
|
||||
<button type="submit" class="btn w-sm btn-danger" id="delete-record">Ya,
|
||||
Hapus!</button>
|
||||
</form>
|
||||
</div>
|
||||
|
|
@ -334,10 +382,10 @@ class="badge badge-soft-success text-uppercase">Aktif</span>
|
|||
</div>
|
||||
</div>
|
||||
<!--end modal -->
|
||||
|
||||
</div>
|
||||
<!-- container-fluid -->
|
||||
</div>
|
||||
<!-- End Page-content -->
|
||||
|
||||
@push('other-js')
|
||||
<!-- prismjs plugin -->
|
||||
|
|
|
|||
Loading…
Reference in New Issue