Merge pull request #39 from arieeefajar/fix/master-rule
Fix/master rule
This commit is contained in:
Arie Fajar Bachtiar
GitHub
commit
925016b851
|
|
@ -12,9 +12,7 @@ class RuleController extends Controller
|
|||
{
|
||||
public function index()
|
||||
{
|
||||
$indicators = Indicator::with('rules')->get();
|
||||
// $indicators = Indicator::select('id', 'name')->get();
|
||||
// dd($indicators);
|
||||
$indicators = Indicator::with('rules')->orderBy('created_at', 'desc')->get();
|
||||
return view('master-data.aturan.index', compact('indicators'));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,21 @@
|
|||
document.addEventListener("DOMContentLoaded", function () {
|
||||
const indicatorField = document.getElementById("indicator-field");
|
||||
const indicatorVal = new Choices(indicatorField);
|
||||
const indicatorEditField = document.getElementById("indicator-edit-field");
|
||||
window.indicatorEditVal = new Choices(indicatorEditField);
|
||||
});
|
||||
|
||||
function updateData(rule) {
|
||||
var form = document.getElementById("edit-form");
|
||||
var indicatorType = form.querySelector("#indicator-type-edit-field");
|
||||
var categoryEditField = form.querySelector("#category-edit-field");
|
||||
var description = form.querySelector("#description-edit-field");
|
||||
var cf = form.querySelector("#cf-edit-field");
|
||||
form.action = "/data-aturan/" + rule.id;
|
||||
|
||||
indicatorType.value = rule.parameter_type;
|
||||
window.indicatorEditVal.setChoiceByValue(rule.indicator_id.toString());
|
||||
window.indicatorEditVal.passedElement.element.value =
|
||||
rule.indicator_id.toString();
|
||||
categoryEditField.value = rule.parameter_type;
|
||||
description.value = rule.description;
|
||||
cf.value = rule.cf;
|
||||
}
|
||||
|
|
@ -61,7 +71,7 @@ function validateCfInput(input) {
|
|||
|
||||
var perPage = 10,
|
||||
options = {
|
||||
valueNames: ["id", "category", "description", "status"],
|
||||
valueNames: ["id", "indicator", "category", "description", "status"],
|
||||
page: perPage,
|
||||
pagination: !0,
|
||||
plugins: [ListPagination({ left: 2, right: 2 })],
|
||||
|
|
@ -165,11 +175,11 @@ refreshCallbacks(),
|
|||
(document
|
||||
.getElementById("showModal")
|
||||
.querySelector(".modal-footer").style.display = "block"),
|
||||
// (document.getElementById("add-btn").style.display = "none"),
|
||||
(document.getElementById("add-btn").style.display = "none"),
|
||||
(document.getElementById("edit-btn").style.display = "block"))
|
||||
: e.relatedTarget.classList.contains("add-btn")
|
||||
? ((document.getElementById("exampleModalLabel").innerHTML =
|
||||
"Add Customer"),
|
||||
"Tambah Aturan"),
|
||||
(document
|
||||
.getElementById("showModal")
|
||||
.querySelector(".modal-footer").style.display = "block"),
|
||||
|
|
@ -184,7 +194,9 @@ refreshCallbacks(),
|
|||
ischeckboxcheck(),
|
||||
document
|
||||
.getElementById("showModal")
|
||||
.addEventListener("hidden.bs.modal", function () {}),
|
||||
.addEventListener("hidden.bs.modal", function () {
|
||||
clearFields();
|
||||
}),
|
||||
document
|
||||
.querySelector("#customerList")
|
||||
.addEventListener("click", function () {
|
||||
|
|
@ -236,7 +248,7 @@ editBtn.addEventListener("click", function (e) {
|
|||
document.getElementById("close-modal").click(),
|
||||
clearFields();
|
||||
});
|
||||
// var statusVal = new Choices(statusField);
|
||||
var statusVal = new Choices(statusField);
|
||||
function isStatus(e) {
|
||||
switch (e) {
|
||||
case "Active":
|
||||
|
|
@ -317,12 +329,12 @@ function refreshCallbacks() {
|
|||
});
|
||||
});
|
||||
}
|
||||
// function clearFields() {
|
||||
// (customerNameField.value = ""),
|
||||
// (emailField.value = ""),
|
||||
// (dateField.value = ""),
|
||||
// (phoneField.value = "");
|
||||
// }
|
||||
function clearFields() {
|
||||
(customerNameField.value = ""),
|
||||
(emailField.value = ""),
|
||||
(dateField.value = ""),
|
||||
(phoneField.value = "");
|
||||
}
|
||||
document
|
||||
.querySelector(".pagination-next")
|
||||
.addEventListener("click", function () {
|
||||
|
|
|
|||
|
|
@ -13,115 +13,29 @@
|
|||
</div>
|
||||
<!-- end page title -->
|
||||
|
||||
<div class="row g-4 mb-3">
|
||||
<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="#addModal">
|
||||
<i class="ri-add-line align-bottom me-1"></i> Tambah
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{-- @foreach ($rules as $rule)
|
||||
<div class="row">
|
||||
<div class="col lg-12">
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<h4 class="card-title mb-0">Indikator {{ $rule->name }}</h4>
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
<div id="customerList">
|
||||
<div class="row g-4 mb-3">
|
||||
<div class="col-sm-auto">
|
||||
<div class="d-flex justify-content-sm-end">
|
||||
<div class="search-box ms-2">
|
||||
<input type="text" class="form-control search"
|
||||
placeholder="Search..." />
|
||||
<i class="ri-search-line search-icon"></i>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="table-responsive table-card mt-3 mb-1">
|
||||
<table class="table align-middle table-nowrap" id="indicatorTable">
|
||||
<thead class="table-light">
|
||||
<tr class="text-center">
|
||||
<th class="sort" data-sort="no">No</th>
|
||||
<th class="sort" data-sort="indicator_type">Jenis Parameter</th>
|
||||
<th class="sort" data-sort="description">Deskirpsi</th>
|
||||
<th class="sort" data-status="status">
|
||||
CF(e)
|
||||
</th>
|
||||
<th class="sort" data-sort="action">Action</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class="list form-check-all">
|
||||
@foreach ($rule->rules as $item)
|
||||
<tr class="text-center">
|
||||
<td class="no">{{ $loop->iteration }}</td>
|
||||
<td class="id" style="display: none">
|
||||
<a href="javascript:void(0);"
|
||||
class="fw-medium link-primary">#VZ2101</a>
|
||||
</td>
|
||||
<td class="parameter_type">{{ $item->parameter_type }}</td>
|
||||
<td class="description">{{ $item->description }}</td>
|
||||
<td class="status">{{ $item->cf }}</td>
|
||||
<td>
|
||||
<div class="d-flex gap-2 justify-content-center">
|
||||
<div class="edit">
|
||||
<button class="btn btn-sm btn-warning edit-item-btn"
|
||||
data-bs-toggle="modal" data-bs-target="#showModal"
|
||||
onclick="updateData({{ $item }})">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({{ $item->id }})">Hapus</button>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</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">
|
||||
</lord-icon>
|
||||
<h5 class="mt-2">Maaf! Data Tidak Ditemukan</h5>
|
||||
<p class="text-muted mb-0">Silahkan gunakan kata kunci lain</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endforeach --}}
|
||||
|
||||
<div class="row">
|
||||
<div class="col lg-12">
|
||||
<div class="col-lg-12">
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<h4 class="card-title mb-0">Data Rule</h4>
|
||||
<h4 class="card-title mb-0">Data Aturan</h4>
|
||||
</div>
|
||||
<!-- end card header -->
|
||||
|
||||
<div class="card-body">
|
||||
<div id="customerList">
|
||||
<div class="row g-4 mb-3">
|
||||
<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>
|
||||
</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>
|
||||
|
|
@ -129,48 +43,57 @@ class="fw-medium link-primary">#VZ2101</a>
|
|||
</div>
|
||||
|
||||
<div class="table-responsive table-card mt-3 mb-1">
|
||||
<table class="table align-middle table-nowrap" id="indicatorTable">
|
||||
<table class="table align-middle table-nowrap" id="customerTable">
|
||||
<thead class="table-light">
|
||||
<tr class="text-center">
|
||||
<th class="sort" data-sort="no">No</th>
|
||||
<th class="sort" data-sort="indicator">Indikator</th>
|
||||
<th scope="col" data-sort="no">No</th>
|
||||
<th class="sort" data-sort="indicator">
|
||||
Indikator
|
||||
</th>
|
||||
<th class="sort" data-sort="category">Kategori</th>
|
||||
<th class="sort" data-sort="description">Deskripsi</th>
|
||||
<th class="sort" data-sort="status">CF(e)</th>
|
||||
<th class="sort" data-sort="status">
|
||||
CF(e)
|
||||
</th>
|
||||
<th class="sort" data-sort="action">Action</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@php
|
||||
$no = 1;
|
||||
@endphp
|
||||
<tbody class="list form-check-all">
|
||||
@foreach ($indicators as $indicator)
|
||||
@foreach ($indicator->rules as $index => $rule)
|
||||
<tr class="text-center">
|
||||
@if ($index === 0)
|
||||
<td rowspan="{{ $indicator->rules->count() }}">
|
||||
{{ $loop->iteration }}</td>
|
||||
<td class="indicator"
|
||||
rowspan="{{ $indicator->rules->count() }}">
|
||||
{{ $indicator->name }}</td>
|
||||
@endif
|
||||
<th class="no">
|
||||
{{ $no++ }}
|
||||
</th>
|
||||
<td class="id" style="display: none">
|
||||
<a href="javascript:void(0);"
|
||||
class="fw-medium link-primary">#VZ2101</a>
|
||||
</td>
|
||||
<td class="category">
|
||||
{{ $rule->parameter_type }}
|
||||
</td>
|
||||
<td class="indicator">{{ $indicator->name }}</td>
|
||||
<td class="category">{{ $rule->parameter_type }}</td>
|
||||
<td class="description">{{ $rule->description }}</td>
|
||||
<td class="status">{{ $rule->cf }}</td>
|
||||
<td class="status">
|
||||
<span>{{ $rule->cf }}</span>
|
||||
</td>
|
||||
<td>
|
||||
<div class="d-flex gap-2 justify-content-center">
|
||||
<div class="edit">
|
||||
<button class="btn btn-sm btn-warning edit-item-btn"
|
||||
data-bs-toggle="modal"
|
||||
data-bs-target="#showModal">Edit</button>
|
||||
data-bs-toggle="modal" data-bs-target="#editModal"
|
||||
onclick="updateData({{ $rule }})">
|
||||
Edit
|
||||
</button>
|
||||
</div>
|
||||
<div class="remove">
|
||||
<button class="btn btn-sm btn-danger remove-item-btn"
|
||||
data-bs-toggle="modal"
|
||||
data-bs-target="#deleteRecordModal">Hapus</button>
|
||||
data-bs-target="#deleteRecordModal"
|
||||
onclick="deleteData({{ $rule->id }})">
|
||||
Hapus
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
|
|
@ -179,19 +102,45 @@ class="fw-medium link-primary">#VZ2101</a>
|
|||
@endforeach
|
||||
</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">
|
||||
</lord-icon>
|
||||
<h5 class="mt-2">Maaf! Data Tidak Ditemukan</h5>
|
||||
<p class="text-muted mb-0">Silahkan gunakan kata kunci lain</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="d-flex justify-content-end">
|
||||
<div class="pagination-wrap hstack gap-2">
|
||||
<a class="page-item pagination-prev disabled" href="#">
|
||||
Previous
|
||||
</a>
|
||||
<ul class="pagination listjs-pagination mb-0"></ul>
|
||||
<a class="page-item pagination-next" href="#">
|
||||
Next
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- end card -->
|
||||
</div>
|
||||
<!-- end col -->
|
||||
</div>
|
||||
<!-- end col -->
|
||||
</div>
|
||||
<!-- end row -->
|
||||
|
||||
{{-- add modal --}}
|
||||
<div class="modal fade" id="addModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
|
||||
<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">
|
||||
<div class="modal-header bg-light p-3">
|
||||
<h5 class="modal-title" id="exampleModalLabel">Tambah Data Rule</h5>
|
||||
<h5 class="modal-title" id="exampleModalLabel">Tambah Aturan</h5>
|
||||
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"
|
||||
id="close-modal"></button>
|
||||
</div>
|
||||
|
|
@ -201,7 +150,8 @@ class="fw-medium link-primary">#VZ2101</a>
|
|||
<div class="modal-body">
|
||||
<div class="mb-3" id="modal-id" style="display: none">
|
||||
<label for="id-field" class="form-label">ID</label>
|
||||
<input type="text" id="id-field" class="form-control" placeholder="ID" readonly />
|
||||
<input type="text" id="id-field" class="form-control" placeholder="ID"
|
||||
readonly />
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
|
|
@ -218,11 +168,11 @@ class="fw-medium link-primary">#VZ2101</a>
|
|||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label for="indicator-type-field" class="form-label">Jenis Indikator</label>
|
||||
<input type="text" id="indicator-type-field" class="form-control"
|
||||
name="parameter_type" placeholder="Masukan jenis indikator" required />
|
||||
<label for="category-field" class="form-label">Kategori</label>
|
||||
<input type="text" id="category-field" class="form-control" name="parameter_type"
|
||||
placeholder="Masukan kategori" required />
|
||||
<div class="invalid-feedback">
|
||||
Masukan Jenis Indikator
|
||||
Masukan kategori
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -260,12 +210,12 @@ class="fw-medium link-primary">#VZ2101</a>
|
|||
</div>
|
||||
|
||||
{{-- edit modal --}}
|
||||
<div class="modal fade" id="showModal" tabindex="-1" aria-labelledby="exampleModalLabel"
|
||||
<div class="modal fade" id="editModal" tabindex="-1" aria-labelledby="exampleModalLabel"
|
||||
aria-hidden="true">
|
||||
<div class="modal-dialog modal-dialog-centered">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header bg-light p-3">
|
||||
<h5 class="modal-title" id="exampleModalLabel">Edit Data Rule</h5>
|
||||
<h5 class="modal-title" id="exampleModalLabel">Edit Aturan</h5>
|
||||
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"
|
||||
id="close-modal"></button>
|
||||
</div>
|
||||
|
|
@ -280,11 +230,24 @@ class="fw-medium link-primary">#VZ2101</a>
|
|||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label for="indicator-type-edit-field" class="form-label">Jenis Indikator</label>
|
||||
<input type="text" id="indicator-type-edit-field" class="form-control"
|
||||
name="parameter_type" placeholder="Masukan jenis parameter" required />
|
||||
<label for="indicator-edit-field" class="form-label">Indikator</label>
|
||||
<select name="indicator" class="form-control" id="indicator-edit-field">
|
||||
<option value="" selected disabled>Pilih Indikator</option>
|
||||
@foreach ($indicators as $indicator)
|
||||
<option value="{{ $indicator->id }}">{{ $indicator->name }}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
<div class="invalid-feedback">
|
||||
Masukan jenis parameter
|
||||
Harap pilih indikator
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label for="category-edit-field" class="form-label">Kategori</label>
|
||||
<input type="text" id="category-edit-field" class="form-control"
|
||||
name="parameter_type" placeholder="Masukan kategori" required />
|
||||
<div class="invalid-feedback">
|
||||
Masukan kategori
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -333,31 +296,25 @@ class="fw-medium link-primary">#VZ2101</a>
|
|||
<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>
|
||||
<form action="" method="POST" id="delete-form">
|
||||
<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-danger" id="delete-record">
|
||||
Ya, Hapus!
|
||||
</button>
|
||||
<button type="submit" class="btn w-sm btn-danger" id="delete-record">Ya
|
||||
Hapus!</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!--end modal -->
|
||||
</div>
|
||||
<!-- container-fluid -->
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue