Compare commits

...

10 Commits

Author SHA1 Message Date
arieeefajar 3c8db3613d fix(assessment-form): store function 2025-06-18 14:44:52 +07:00
arieeefajar ef3bf37156 fix(assessment-form): func get indicators 2025-06-18 10:29:00 +07:00
Arie Fajar Bachtiar 1dd28b1afd
Merge pull request #43 from arieeefajar/fix/master-rule
Fix/master rule
2025-06-17 14:31:51 +07:00
arieeefajar cb5b89e1b8 fix(master-rule): clear conflict 2025-06-17 14:31:27 +07:00
Arie Fajar Bachtiar 258b89d88e
Merge pull request #42 from arieeefajar/fix/master-land
Fix/master land
2025-06-17 13:51:47 +07:00
arieeefajar e609b773c8 fix(master-rule): create crud func expert rule 2025-06-14 22:08:28 +07:00
arieeefajar 023ce6fa19 fix(master-rule): add func read and create rule expert 2025-06-14 17:17:26 +07:00
arieeefajar e9d20b60ff fix(master-rule): crud func rule user 2025-06-14 15:24:06 +07:00
arieeefajar 27d71bc1c5 fix(master-land): create, update func admin 2025-06-14 08:18:10 +07:00
arieeefajar 28f4f4ffc6 fix(master-land): optimize func upodate 2025-06-13 23:23:52 +07:00
16 changed files with 661 additions and 432 deletions

View File

@ -18,7 +18,14 @@ public function index()
$lands = Land::select('id', 'owner')->whereNotIn('id', function ($query) {
$query->select('land_id')->from('evaluation');
})->orderBy('created_at', 'desc')->get();
$indicators = Indicator::select('id', 'name')->whereHas('rules')->with('rules')->get();
$indicators = Indicator::select('id', 'name')
->withCount(['rules as rules_with_param_count' => function ($query) {
$query->whereNotNull('parameter_type');
}])
->having('rules_with_param_count', '>=', 2)
->whereHas('expertRules')
->with(['rules', 'expertRules'])
->get();
return view('assessment.form', compact('lands', 'indicators'));
}
@ -35,7 +42,6 @@ public function calculateCFc($cf1, $cf2)
public function store(Request $request)
{
dd($request->all());
$customMessages = [
'land.required' => 'Harap pilih lahan',
'land.exists' => 'Lahan tidak ditemukan',

View File

@ -87,7 +87,6 @@ public function store(Request $request)
public function edit($id)
{
$land = Land::with('detailLands')->findOrFail($id);
$provinces = Province::all();
$landDetails = $land->detailLands->map(function ($detail) {
return [
'lat' => $detail->lat,
@ -95,47 +94,26 @@ public function edit($id)
];
});
return view('master-data.lahan.edit', compact('id', 'provinces', 'land', 'landDetails'));
return view('master-data.lahan.edit', compact('id', 'land', 'landDetails'));
}
public function update(Request $request, $id)
{
$customMessage = [
'owner.required' => 'Nama pemilik wajib diisi',
'owner.max' => 'Nama pemilik maksimal 25 karakter',
'owner.string' => 'Nama pemilik harus berupa string',
'province_id.required' => 'Provinsi wajib diisi',
'province_id.exists' => 'Provinsi tidak ditemukan',
'regency_id.required' => 'Kota wajib diisi',
'regency_id.exists' => 'Kota tidak ditemukan',
'district_id.required' => 'Kecamatan wajib diisi',
'district_id.exists' => 'Kecamatan tidak ditemukan',
'address.required' => 'Alamat wajib diisi',
'address.max' => 'Alamat maksimal 100 karakter',
'address.string' => 'Alamat harus berupa string',
'lat.required' => 'Latitude wajib diisi',
'lat.numeric' => 'Latitude harus berupa angka',
'lng.required' => 'Longitude wajib diisi',
'lng.numeric' => 'Longitude harus berupa angka',
'polygon.required' => 'Petak lahan wajib digambar',
];
$validator = Validator::make($request->all(), [
'owner' => 'required|string|max:25',
'province_id' => 'required|exists:provinces,id',
'regency_id' => 'required|exists:regencies,id',
'district_id' => 'required|exists:districts,id',
'address' => 'required|string|max:100',
'lat' => 'required|numeric',
'lng' => 'required|numeric',
'polygon' => 'required',
], $customMessage);
@ -151,12 +129,7 @@ public function update(Request $request, $id)
$land = Land::findOrFail($id);
$land->user_id = Auth::user()->id;
$land->owner = $request->owner;
$land->province_code = $request->province_id;
$land->regency_code = $request->regency_id;
$land->district_code = $request->district_id;
$land->address = $request->address;
$land->latitude = $request->lat;
$land->longitude = $request->lng;
$land->save();
LandDetails::where('land_id', $land->id)->delete();
@ -174,7 +147,6 @@ public function update(Request $request, $id)
return redirect()->route('lahan.index');
} catch (\Throwable $th) {
DB::rollBack();
dd($th->getMessage());
toast('Terjadi kesalahan', 'error')->position('top')->autoclose(3000);
return redirect()->back();
}

View File

@ -21,8 +21,7 @@ public function index()
public function create()
{
$provinces = Province::all();
return view('master-data.lahan.create', compact('provinces'));
return view('master-data.lahan.create');
}
public function store(Request $request)
@ -32,36 +31,16 @@ public function store(Request $request)
'owner.max' => 'Nama pemilik maksimal 25 karakter',
'owner.string' => 'Nama pemilik harus berupa string',
'province_id.required' => 'Provinsi wajib diisi',
'province_id.exists' => 'Provinsi tidak ditemukan',
'regency_id.required' => 'Kota wajib diisi',
'regency_id.exists' => 'Kota tidak ditemukan',
'district_id.required' => 'Kecamatan wajib diisi',
'district_id.exists' => 'Kecamatan tidak ditemukan',
'address.required' => 'Alamat wajib diisi',
'address.max' => 'Alamat maksimal 100 karakter',
'address.string' => 'Alamat harus berupa string',
'lat.required' => 'Latitude wajib diisi',
'lat.numeric' => 'Latitude harus berupa angka',
'lng.required' => 'Longitude wajib diisi',
'lng.numeric' => 'Longitude harus berupa angka',
'polygon.required' => 'Petak lahan wajib digambar',
];
$validator = Validator::make($request->all(), [
'owner' => 'required|string|max:25',
'province_id' => 'required|exists:provinces,id',
'regency_id' => 'required|exists:regencies,id',
'district_id' => 'required|exists:districts,id',
'address' => 'required|string|max:100',
'lat' => 'required|numeric',
'lng' => 'required|numeric',
'polygon' => 'required',
], $customMessage);
@ -77,12 +56,7 @@ public function store(Request $request)
$land = new Land();
$land->user_id = Auth::user()->id;
$land->owner = $request->owner;
$land->province_code = $request->province_id;
$land->regency_code = $request->regency_id;
$land->district_code = $request->district_id;
$land->address = $request->address;
$land->latitude = $request->lat;
$land->longitude = $request->lng;
$land->save();
foreach ($polygon as $point) {
@ -110,7 +84,6 @@ public function store(Request $request)
public function edit($id)
{
$land = Land::with('detailLands')->findOrFail($id);
$provinces = Province::all();
$landDetails = $land->detailLands->map(function ($detail) {
return [
'lat' => $detail->lat,
@ -118,7 +91,7 @@ public function edit($id)
];
});
return view('master-data.lahan.edit', compact('id', 'provinces', 'land', 'landDetails'));
return view('master-data.lahan.edit', compact('id', 'land', 'landDetails'));
}
public function update(Request $request, $id)

View File

@ -13,7 +13,7 @@ class RuleController extends Controller
public function index()
{
$indicators = Indicator::with('rules')->orderBy('created_at', 'desc')->get();
return view('master-data.aturan.index', compact('indicators'));
return view('master-data.aturan.rule_user', compact('indicators'));
}
public function store(Request $request)
@ -61,7 +61,6 @@ public function store(Request $request)
public function update(Request $request, $id)
{
// dd($request->all());
$customMessage = [
'parameter_type.required' => 'Jenis parameter wajib diisi',
'parameter_type.string' => 'Jenis parameter harus berupa teks',

View File

@ -0,0 +1,123 @@
<?php
namespace App\Http\Controllers\MasterData;
use App\Http\Controllers\Controller;
use App\Models\Indicator;
use App\Models\RuleExpert;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Validator;
use PhpParser\Node\Stmt\TryCatch;
class RuleExpertController extends Controller
{
public function index()
{
$indicators = Indicator::with('expertRules')->orderBy('created_at', 'desc')->get();
$parameters = Indicator::whereDoesntHave('expertRules')->get();
return view('master-data.aturan.rule_expert', compact('indicators', 'parameters'));
}
public function store(Request $request)
{
$customMessage = [
'indicator.required' => 'Harap pilih indikator',
'indicator.exists' => 'Indikator tidak ditemukan',
'parameter_type.required' => 'Jenis parameter wajib diisi',
'parameter_type.string' => 'Jenis parameter harus berupa teks',
'parameter_type.max' => 'Jenis parameter maksimal 25 karakter',
'description.required' => 'Deskripsi wajib diisi',
'description.string' => 'Deskripsi harus berupa teks',
'description.max' => 'Deskripsi maksimal 40 karakter',
'cf.required' => 'Nilai CF wajib diisi',
'cf.numeric' => 'Nilai CF harus berupa angka',
'cf.max' => 'Nilai CF maksimal 1',
];
$validator = Validator::make($request->all(), [
'indicator' => 'required|exists:indicators,id',
'parameter_type' => 'required|string|max:25',
'description' => 'required|string|max:40',
'cf' => 'required|numeric|min:-1|max:1',
], $customMessage);
if ($validator->fails()) {
toast($validator->messages()->all()[0], 'error')->position('top-right')->autoclose(3000);
return redirect()->back()->withInput();
}
try {
$expertRule = new RuleExpert();
$expertRule->indicator_id = $request->indicator;
$expertRule->parameter_type = $request->parameter_type;
$expertRule->description = $request->description;
$expertRule->cf = $request->cf;
$expertRule->save();
toast('Data berhasil disimpan', 'success')->position('top-right')->autoclose(3000);
return redirect()->back();
} catch (\Throwable $th) {
//throw $th;
toast('Terjadi kesalahan', 'error')->position('top')->autoclose(3000);
return redirect()->back();
}
}
public function update(Request $request, $id)
{
$customMessage = [
'parameter_type.required' => 'Jenis parameter wajib diisi',
'parameter_type.string' => 'Jenis parameter harus berupa teks',
'parameter_type.max' => 'Jenis parameter maksimal 25 karakter',
'description.required' => 'Deskripsi wajib diisi',
'description.string' => 'Deskripsi harus berupa teks',
'description.max' => 'Deskripsi maksimal 40 karakter',
'cf.required' => 'Nilai CF wajib diisi',
'cf.numeric' => 'Nilai CF harus berupa angka',
'cf.min' => 'Nilai CF minimal -1',
'cf.max' => 'Nilai CF maksimal 1',
];
$validator = Validator::make($request->all(), [
'parameter_type' => 'required|string|max:25',
'description' => 'required|string|max:40',
'cf' => 'required|numeric|min:-1|max:1',
], $customMessage);
if ($validator->fails()) {
toast($validator->messages()->all()[0], 'error')->position('top')->autoclose(3000);
return redirect()->back()->withInput();
}
try {
$expertRule = RuleExpert::find($id);
$expertRule->parameter_type = $request->parameter_type;
$expertRule->description = $request->description;
$expertRule->cf = $request->cf;
$expertRule->save();
toast('Data berhasil disimpan', 'success')->position('top-right')->autoclose(3000);
return redirect()->back();
} catch (\Throwable $th) {
//throw $th;
toast('Terjadi kesalahan', 'error')->position('top')->autoclose(3000);
return redirect()->back();
}
}
public function destroy($id)
{
$expertRule = RuleExpert::find($id);
try {
$expertRule->delete();
toast('Data berhasil dihapus', 'success')->position('top-right')->autoclose(3000);
return redirect()->back();
} catch (\Throwable $th) {
toast('Terjadi kesalahan', 'error')->position('top')->autoclose(3000);
return redirect()->back();
}
}
}

View File

@ -18,6 +18,11 @@ public function rules()
return $this->hasMany(Rule::class, 'indicator_id', 'id');
}
public function expertRules()
{
return $this->hasMany(RuleExpert::class, 'indicator_id', 'id');
}
public function evaluationDetails()
{
return $this->hasMany(EvaluationDetail::class, 'indicator_id', 'id');

View File

@ -9,6 +9,6 @@ class RuleExpert extends Model
{
use HasFactory;
protected $guarded = [];
protected $table = 'rule_expert_cf';
protected $guarded = [];
}

View File

@ -1,28 +1,20 @@
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) {
function updateData(data) {
var form = document.getElementById("edit-form");
var indicator = form.querySelector("#indicator-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;
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;
form.action = "/data-aturan-pakar/" + data.id;
indicator.value = data.indicator_id;
categoryEditField.value = data.parameter_type;
description.value = data.description;
cf.value = data.cf;
}
function deleteData(id) {
var form = document.getElementById("delete-form");
form.action = "/data-aturan/" + id;
form.action = "/data-aturan-pakar/" + id;
}
function validateCfInput(input) {
@ -59,12 +51,23 @@ function validateCfInput(input) {
let numValue = parseFloat(input.value);
// **Batasi nilai antara -1.0 dan 1.0**
if (!isNaN(numValue)) {
if (numValue > 1) {
input.value = "1.0";
} else if (numValue < -1) {
input.value = "-1.0";
let decimal = Math.abs(numValue * 10);
let lastDigit = decimal % 10;
if (lastDigit % 2 === 1) {
input.value = "";
alert("Nilai CF Tidak Sesuai");
return;
}
// **Batasi nilai antara -1.0 dan 1.0**
if (!isNaN(numValue)) {
if (numValue > 1) {
input.value = "1.0";
} else if (numValue < -1) {
input.value = "-1.0";
}
}
}
}

View File

@ -20,9 +20,78 @@ function updateData(rule) {
cf.value = rule.cf;
}
function updateData(data) {
var form = document.getElementById("edit-form");
var indicator = form.querySelector("#indicator-edit-field");
var category = form.querySelector("#category-edit-field");
var description = form.querySelector("#description-edit-field");
var cf = form.querySelector("#cf-edit-field");
form.action = "/data-aturan-pengguna/" + data.id;
indicator.value = data.indicator_id;
category.value = data.parameter_type;
description.value = data.description;
cf.value = data.cf;
}
function deleteData(id) {
var form = document.getElementById("delete-form");
form.action = "/data-aturan/" + id;
form.action = "/data-aturan-pengguna/" + id;
}
function validateCfInput(input) {
input.value = input.value.replace(",", ".");
input.value = input.value.replace(/[^0-9.\-]/g, "");
if (input.value.includes("-") && !input.value.startsWith("-")) {
input.value = input.value.replace("-", "");
}
input.value = input.value.replace(/-+/g, "-");
if (input.value === "-") {
return;
}
if (input.value.startsWith(".")) {
input.value = "0" + input.value;
}
if (input.value.startsWith("-.")) {
input.value = "-0.";
}
// **PERBAIKAN**: Hilangkan nol berlebih di depan angka, kecuali nol sebelum titik
input.value = input.value.replace(/^(-?)0+(\d)/, "$1$2");
// **BATASI INPUT**: Hanya satu titik desimal, dan maksimal 1 angka setelah titik
let match = input.value.match(/^-?\d*(\.\d{0,1})?/);
if (match) {
input.value = match[0];
}
let numValue = parseFloat(input.value);
if (!isNaN(numValue)) {
let decimal = Math.abs(numValue * 10);
let lastDigit = decimal % 10;
if (lastDigit % 2 === 1) {
input.value = "";
alert("Nilai CF Tidak Sesuai");
return;
}
// **Batasi nilai antara -1.0 dan 1.0**
if (!isNaN(numValue)) {
if (numValue > 1) {
input.value = "1.0";
} else if (numValue < -1) {
input.value = "-1.0";
}
}
}
}
function validateCfInput(input) {
@ -182,7 +251,7 @@ refreshCallbacks(),
.addEventListener("show.bs.modal", function (e) {
e.relatedTarget.classList.contains("edit-item-btn")
? ((document.getElementById("exampleModalLabel").innerHTML =
"Edit Customer"),
"Edit Data Aturan"),
(document
.getElementById("showModal")
.querySelector(".modal-footer").style.display = "block"),

View File

@ -1,40 +1,47 @@
var mapEdit, drawnItems, drawControl, googleHybrid, iconMarker;
var currentMarkerEdit = null;
var formEdit = document.getElementById("edit-form");
var provinceEditField = formEdit.querySelector("#province-edit-field");
var provinceEditVal = new Choices(provinceEditField);
var regencyEditContainer = formEdit.querySelector("#regency-edit-container");
let regencyCode = formEdit.querySelector("#regency-code").dataset.regency;
var regencyEditField = formEdit.querySelector("#regency-edit-field");
var regencyEditVal = new Choices(regencyEditField, {
shouldSort: false,
});
var districtEditContainer = formEdit.querySelector("#district-edit-container");
let districtCode = formEdit.querySelector("#district-code").dataset.district;
var districtEditField = formEdit.querySelector("#district-edit-field");
var districtEditVal = new Choices(districtEditField, {
shouldSort: false,
});
var addressEditContainer = formEdit.querySelector("#address-edit-container");
var addressEditField = formEdit.querySelector("#address-edit-field");
var mapEditConatiner = formEdit.querySelector("#map-edit-container");
var latEditField = formEdit.querySelector("#lat-edit");
var lngEditField = formEdit.querySelector("#lng-edit");
var polygonField = formEdit.querySelector("#polygon-edit");
let latDb = formEdit.querySelector("#lat-db").dataset.lat;
let lngDb = formEdit.querySelector("#lng-db").dataset.lng;
let polygonDb = formEdit.querySelector("#polygon-db");
let polygonData = polygonDb.getAttribute("data-polygon");
var loadingEdit = formEdit.querySelector("#loading-edit");
var btnEditContainer = formEdit.querySelector("#edit-footer");
document.addEventListener("DOMContentLoaded", function () {
initMapEdit();
setMapEdit();
});
function fetchWithTimeout(url, options = {}, timeout = 10000) {
return Promise.race([
fetch(url, options),
new Promise((_, reject) =>
setTimeout(
() =>
reject(new Error("Request timeout, periksa koneksi Anda")),
timeout
)
),
]);
}
async function reverseGeocode(lat, lng) {
try {
const response = await fetchWithTimeout(
`https://nominatim.openstreetmap.org/reverse?lat=${lat}&lon=${lng}&format=json&accept-language=id`
);
const data = await response.json();
return data.display_name;
} catch (error) {
return alert(`Error ` + error.message);
}
}
function initMapEdit() {
mapEdit = L.map("map-edit", {
attributionControl: false,
@ -89,246 +96,43 @@ function initMapEdit() {
mapEdit.invalidateSize();
}
document.addEventListener("DOMContentLoaded", function () {
initMapEdit();
getRegencies(provinceEditField.value);
getDistricts(regencyCode);
setMapEdit();
});
function getProvinces(provinceId) {
return new Promise(function (resolve, reject) {
$.ajax({
url: "/location/get-province",
type: "GET",
success: function (response) {
if (response.success) {
const province = response.data.find(
(province) => province.id == provinceId
);
resolve(province);
} else {
reject(new Error("Terjadi kesalahan saat mengambil data"));
}
},
error: function (xhr, status, error) {
reject(new Error("Terjadi kesalahan saat mengambil data"));
},
});
});
}
function getRegencies(provinceId) {
regencyEditContainer.style.display = "none";
districtEditContainer.style.display = "none";
addressEditContainer.style.display = "none";
loadingEdit.style.display = "block";
mapEditConatiner.style.display = "none";
const url = "/location/get-regency/" + provinceId;
$.ajax({
url: url,
type: "GET",
success: function (response) {
if (response.success) {
loadingEdit.style.display = "none";
const data = response.data;
regencyEditVal.clearStore();
regencyEditVal.clearChoices();
regencyEditVal.value = "";
regencyEditVal.setChoices([
{
value: "",
label: "Pilih Kabupaten",
selected: false,
disabled: true,
},
]);
if (Array.isArray(data)) {
regencyEditVal.setChoices(
data.map((regency) => ({
value: regency.id,
label: regency.name,
selected: regency.id == regencyCode,
disabled: false,
}))
);
regencyEditContainer.style.display = "block";
} else {
mapEditConatiner.style.display = "block";
mapEditConatiner.innerHTML =
"<p class='text-center text-muted'>Terjadi kesalaahan saat mengambil data, silahkan coba beberapa saat lagi</p>";
}
}
},
error: function (xhr, status, error) {
mapEditConatiner.style.display = "block";
mapEditConatiner.innerHTML =
"<p class='text-center text-muted'>Terjadi kesalaahan saat mengambil data, silahkan coba beberapa saat lagi</p>";
},
});
}
function getDistricts(regencyId) {
districtEditContainer.style.display = "none";
addressEditContainer.style.display = "none";
loadingEdit.style.display = "block";
mapEditConatiner.style.display = "none";
handleDrawDeleted();
const url = "/location/get-district/" + regencyId;
$.ajax({
url: url,
type: "GET",
success: function (response) {
if (response.success) {
loadingEdit.style.display = "none";
const data = response.data;
console.log(data);
districtEditVal.clearStore();
districtEditVal.clearChoices();
districtEditVal.value = "";
districtEditVal.setChoices([
{
value: "",
label: "Pilih Kecamatan",
selected: false,
disabled: true,
},
]);
if (Array.isArray(data)) {
districtEditVal.setChoices(
data.map((district) => ({
value: district.id,
label: district.name,
selected: district.id == districtCode,
disabled: false,
}))
);
districtEditContainer.style.display = "block";
} else {
mapEditConatiner.style.display = "block";
mapEditConatiner.innerHTML =
"<p class='text-center text-muted'>Terjadi kesalaahan saat mengambil data, silahkan coba beberapa saat lagi</p>";
}
}
},
error: function (xhr, status, error) {
mapEditConatiner.style.display = "block";
mapEditConatiner.innerHTML =
"<p class='text-center text-muted'>Terjadi kesalaahan saat mengambil data, silahkan coba beberapa saat lagi</p>";
},
});
}
function showmap(districtId) {
loadingEdit.style.display = "block";
if (!navigator.geolocation) {
alert("Geolocation tidak didukung oleh browser ini.");
return;
}
navigator.geolocation.getCurrentPosition(
function (position) {
loadingEdit.style.display = "none";
mapEditConatiner.style.display = "block";
mapEdit.invalidateSize();
addressEditContainer.style.display = "block";
btnEditContainer.style.display = "block";
var lat = position.coords.latitude;
var lng = position.coords.longitude;
console.log(lat, lng);
mapEdit.setView([lat, lng], 16);
if (currentMarkerEdit) {
mapEdit.removeLayer(currentMarkerEdit);
}
var iconMarker = L.icon({
iconUrl: "/assets/images/marker.png",
iconSize: [50, 50],
iconAnchor: [25, 50],
popupAnchor: [0, -50],
});
currentMarkerEdit = L.marker([lat, lng], {
icon: iconMarker,
draggable: true,
}).addTo(mapEdit);
currentMarkerEdit.on("dragend", onPointerDragend);
currentMarkerEdit
.bindPopup(
`<div class="text-center"><b>Anda berada di sini</b><br />Silahkan tentukan petak lahan.<br />Pastikan lokasi anda sudah benar.</div>`
)
.openPopup();
latEditField.value = lat;
lngEditField.value = lng;
},
function (error) {
alert("Error: " + error.message);
}
);
}
function setMapEdit() {
loadingEdit.style.display = "block";
mapEditConatiner.style.display = "block";
mapEdit.invalidateSize();
addressEditContainer.style.display = "block";
btnEditContainer.style.display = "block";
mapEdit.setView([latDb, lngDb], 16);
if (polygonData) {
let coordinates = JSON.parse(polygonData);
console.log("Polygon Data:", coordinates);
let latlngs = coordinates.map((point) => [point.lat, point.lng]);
let polygon = L.polygon(latlngs, { color: "blue" }).addTo(mapEdit);
drawnItems.addLayer(polygon);
mapEdit.fitBounds(polygon.getBounds());
polygonField.value = JSON.stringify(coordinates);
}
if (currentMarkerEdit) {
mapEdit.removeLayer(currentMarkerEdit);
}
var iconMarker = L.icon({
iconUrl: "/assets/images/marker.png",
iconSize: [50, 50],
iconAnchor: [25, 50],
popupAnchor: [0, -50],
});
currentMarkerEdit = L.marker([latDb, lngDb], {
icon: iconMarker,
draggable: true,
}).addTo(mapEdit);
currentMarkerEdit.on("dragend", onPointerDragend);
currentMarkerEdit
.bindPopup(
`<div class="text-center"><b>Anda berada di sini</b><br />Silahkan tentukan petak lahan.<br />Pastikan lokasi anda sudah benar.</div>`
)
.openPopup();
loadingEdit.style.display = "none";
}
function handleDrawCreated(e) {
@ -358,16 +162,28 @@ function handleDrawDeleted(e) {
polygonField.value = "";
}
function onPointerDragend() {
async function onPointerDragend() {
if (!currentMarkerEdit) return;
var coordinates = currentMarkerEdit.getLatLng();
loadingEdit.style.display = "block";
addressEditContainer.style.display = "none";
btnEditContainer.style.display = "none";
try {
const address = await reverseGeocode(coordinates.lat, coordinates.lng);
loadingEdit.style.display = "none";
addressEditContainer.style.display = "block";
addressEditField.value = address;
} catch (error) {
alert(`Error ` + error.message);
} finally {
loadingEdit.style.display = "none";
btnEditContainer.style.display = "block";
}
currentMarkerEdit
.setLatLng(coordinates)
.bindPopup(
`<div class="text-center"><b>Anda berada di sini</b><br />Silahkan tentukan petak lahan.<br />Pastikan lokasi anda sudah benar.</div>`
)
.openPopup();
latEditField.value = coordinates.lat;
lngEditField.value = coordinates.lng;
}

View File

@ -0,0 +1,326 @@
@extends('layouts.app')
@push('title', 'Data Aturan Pakar')
@section('content')
<div class="page-content">
<div class="container-fluid">
<!-- start page title -->
<div class="row">
<div class="col-12">
<div class="page-title-box d-sm-flex align-items-center justify-content-between">
<h4 class="mb-sm-0">Data Aturan Pakar</h4>
</div>
</div>
</div>
<!-- end page title -->
<div class="row">
<div class="col-lg-12">
<div class="card">
<div class="card-header">
<h4 class="card-title mb-0">Data Aturan Pakar</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...">
<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="customerTable">
<thead class="table-light">
<tr class="text-center">
<th scope="col" data-sort="no">
No
</th>
<th class="sort" data-sort="customer_name">Indikator</th>
<th class="sort" data-sort="email">Kategori</th>
<th class="sort" data-sort="phone">Deskripsi</th>
<th class="sort" data-sort="status">CF(h)</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->expertRules as $index => $rule)
<tr class="text-center">
<th scope="row" 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="customer_name">{{ $indicator->name }}</td>
<td class="email">{{ $rule->parameter_type }}</td>
<td class="phone">{{ $rule->description }}</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="#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"
onclick="deleteData({{ $rule->id }})">Hapus</button>
</div>
</div>
</td>
</tr>
@endforeach
@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="#">
Sebelumnya
</a>
<ul class="pagination listjs-pagination mb-0"></ul>
<a class="page-item pagination-next" href="#">
Selanjutnya
</a>
</div>
</div>
</div>
</div><!-- end card -->
</div>
<!-- end col -->
</div>
<!-- end col -->
</div>
<!-- end row -->
<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"></h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"
id="close-modal"></button>
</div>
<form action="{{ route('master_data.aturan.expert_store') }}" class="needs-validation"
method="POST" novalidate id="add-form">
@csrf
<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 />
</div>
<div class="mb-3">
<label for="indicatorname-field" class="form-label">Indikator</label>
<select name="indicator" class="form-control" id="indicator-field" required>
<option value="" selected disabled>Pilih Indikator</option>
@foreach ($parameters as $parameter)
<option value="{{ $parameter->id }}">{{ $parameter->name }}</option>
@endforeach
</select>
<div class="invalid-feedback">
Pilih Indikator
</div>
</div>
<div class="mb-3">
<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 kategori
</div>
</div>
<div class="mb-3">
<label for="description-field" class="form-label">Deskripsi</label>
<textarea class="form-control" name="description" id="description-field" rows="5"
placeholder="Masukan Deskripsi" required></textarea>
<div class="invalid-feedback">
Masukan Nilai Ideal Max
</div>
</div>
<div>
<label for="cf-field" class="form-label">CF(h)</label>
<input type="text" id="cf-field" class="form-control" name="cf"
placeholder="Masukan nilai CF pakar" required oninput="validateCfInput(this)" />
<div class="invalid-feedback">
Masukan Nilai CF
</div>
</div>
</div>
<div class="modal-footer">
<div class="hstack gap-2 justify-content-end">
<button type="button" class="btn btn-light" data-bs-dismiss="modal">Tutup</button>
<button type="submit" class="btn btn-success" id="add-btn">Simpan</button>
<button type="button" class="btn btn-primary" id="edit-btn">Ubah</button>
</div>
</div>
</form>
</div>
</div>
</div>
<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 Aturan Pakar</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"
id="close-modal"></button>
</div>
<form class="needs-validation" method="POST" novalidate id="edit-form">
@csrf
@method('PUT')
<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 />
</div>
<div class="mb-3">
<label for="indicator-edit-field" class="form-label">Indikator</label>
<select name="indicator" class="form-control" id="indicator-edit-field" required
disabled>
<option value="" selected disabled>Pilih Indikator</option>
@foreach ($indicators as $indicator)
<option value="{{ $indicator->id }}">{{ $indicator->name }}</option>
@endforeach
</select>
<div class="invalid-feedback">
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>
<div class="mb-3">
<label for="description-edit-field" class="form-label">Deskirpsi</label>
<textarea class="form-control" name="description" id="description-edit-field" rows="5"
placeholder="Masukan Deskripsi" required></textarea>
<div class="invalid-feedback">
Masukan Deskirpsi
</div>
</div>
<div>
<label for="cf-edit-field" class="form-label">CF(h)</label>
<input type="text" id="cf-edit-field" class="form-control" name="cf"
placeholder="Masukan Nilai CF(e)" required oninput="validateCfInput(this)" />
<div class="invalid-feedback">
Masukan CF(h)
</div>
</div>
<div class="d-none">
<label for="status-field" class="form-label">Status</label>
<select class="form-control" data-trigger name="status-field" id="status-field">
<option value="">Status</option>
<option value="Active">Active</option>
<option value="Block">Block</option>
</select>
</div>
</div>
<div class="modal-footer">
<div class="hstack gap-2 justify-content-end">
<button type="button" class="btn btn-light" data-bs-dismiss="modal">Tutup</button>
<button type="submit" class="btn btn-success" id="edit-btn">Ubah</button>
</div>
</div>
</form>
</div>
</div>
</div>
<!-- Modal -->
<div class="modal fade zoomIn" id="deleteRecordModal" tabindex="-1" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"
id="btn-close"></button>
</div>
<div class="modal-body">
<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>
<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>
</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">
@csrf
@method('DELETE')
<button type="submit" class="btn w-sm btn-danger" id="delete-record">Ya
Hapus!</button>
</form>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- container-fluid -->
</div>
<!-- End Page-content -->
@push('other-js')
<!-- prismjs plugin -->
<script src="assets/libs/prismjs/prism.js"></script>
<script src="assets/libs/list.js/list.min.js"></script>
<script src="assets/libs/list.pagination.js/list.pagination.min.js"></script>
<!-- listjs init -->
<script src="assets/js/pages/customJs/master-data/aturan/pakar.js"></script>
<script src="assets/js/pages/form-validation.init.js"></script>
@endpush
@endsection

View File

@ -1,5 +1,5 @@
@extends('layouts.app')
@push('title', 'Data Aturan')
@push('title', 'Data Aturan Petugas')
@section('content')
<div class="page-content">
<div class="container-fluid">
@ -7,7 +7,7 @@
<div class="row">
<div class="col-12">
<div class="page-title-box d-sm-flex align-items-center justify-content-between">
<h4 class="mb-sm-0">Data Aturan</h4>
<h4 class="mb-sm-0">Data Aturan Petugas</h4>
</div>
</div>
</div>
@ -17,7 +17,7 @@
<div class="col-lg-12">
<div class="card">
<div class="card-header">
<h4 class="card-title mb-0">Data Aturan</h4>
<h4 class="card-title mb-0">Data Aturan Petugas</h4>
</div><!-- end card header -->
<div class="card-body">
@ -128,12 +128,12 @@ class="fw-medium link-primary">#VZ2101</a></td>
<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"></h5>
<h5 class="modal-title" id="exampleModalLabel">Tambah Data Aturan</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"
id="close-modal"></button>
</div>
<form action="{{ route('master_data.aturan.store') }}" class="needs-validation" method="POST"
novalidate id="add-form">
<form action="{{ route('master_data.aturan.user_store') }}" class="needs-validation"
method="POST" novalidate id="add-form">
@csrf
<div class="modal-body">
<div class="mb-3" id="modal-id" style="display: none">
@ -318,7 +318,7 @@ class="fw-medium link-primary">#VZ2101</a></td>
<script src="assets/libs/list.pagination.js/list.pagination.min.js"></script>
<!-- listjs init -->
<script src="assets/js/pages/customJs/master-data/aturan/index1.js"></script>
<script src="assets/js/pages/customJs/master-data/aturan/petugas.js"></script>
<script src="assets/js/pages/form-validation.init.js"></script>
@endpush

View File

@ -60,50 +60,6 @@
onclick="getLocation()">Dapatkan Lokasi Lahan!</button>
</div>
{{-- <div class="mb-3">
<label for="province-field" class="form-label">Provinsi</label>
<select name="province_id" id="province-field" class="form-control" required
onchange="getRegencies(this.value)">
<option value="" selected disabled>Pilih Provinsi</option>
@foreach ($provinces as $province)
<option value="{{ $province->id }}"
{{ old('province_id') == $province->id ? 'selected' : '' }}>
{{ $province->name }}</option>
@endforeach
</select>
<div class="invalid-feedback">
Harap Pilih Provinsi
</div>
</div>
<div class="mb-3" id="regency-container" style="display: none">
<label for="regency-field" class="form-label">Kabupaten atau Kota</label>
<select name="regency_id" id="regency-field" class="form-control" required
onchange="getDistricts(this.value)">
<option value="" selected disabled>Pilih Kabupaten atau Kota</option>
</select>
<div class="invalid-feedback">
Harap Pilih Kabupaten atau Kota
</div>
</div>
<div class="mb-3" id="district-container" style="display: none">
<label for="district-field" class="form-label">Kecamatan</label>
<select name="district_id" id="district-field" class="form-control" required
onchange="showmap(this.value)">
<option value="" selected disabled>Pilih Kecamatan</option>
</select>
<div class="invalid-feedback">
Harap Pilih Kecamatan
</div>
</div>
<div id="loading" class="text-center" style="display: none">
<div class="spinner-border text-primary" role="status">
<span class="visually-hidden">Loading...</span>
</div>
</div> --}}
<div id="loading" class="text-center" style="display: none">
<div class="spinner-border text-primary" role="status">
<span class="visually-hidden">Loading...</span>

View File

@ -59,55 +59,6 @@
</div>
</div>
{{-- <div class="mb-3">
<label for="landname-edit-field" class="form-label">Nama Lahan</label>
<input type="text" id="landname-edit-field" class="form-control" name="land_name"
value="{{ old('land_name') }}" placeholder="Masukan Nama Lahan" required />
<div class="invalid-feedback">
Masukan Nama Lahan
</div>
</div> --}}
<div class="mb-3">
<label for="province-edit-field" class="form-label">Provinsi</label>
<select name="province_id" id="province-edit-field" class="form-control" required
onchange="getRegencies(this.value)">
<option value="" selected disabled>Pilih Provinsi</option>
@foreach ($provinces as $province)
<option value="{{ $province->id }}"
{{ old('province_id', $land->province_code) == $province->id ? 'selected' : '' }}>
{{ $province->name }}</option>
@endforeach
</select>
<div class="invalid-feedback">
Harap Pilih Provinsi
</div>
</div>
<div class="mb-3" id="regency-edit-container">
<label for="regency-edit-field" class="form-label">Kabupaten atau Kota</label>
<input type="hidden" id="regency-code" data-regency="{{ $land->regency_code }}">
<select name="regency_id" id="regency-edit-field" class="form-control" required
onchange="getDistricts(this.value)">
<option value="" selected disabled>Pilih Kabupaten atau Kota</option>
</select>
<div class="invalid-feedback">
Harap Pilih Kabupaten atau Kota
</div>
</div>
<div class="mb-3" id="district-edit-container">
<label for="district-edit-field" class="form-label">Kecamatan</label>
<input type="hidden" id="district-code" data-district="{{ $land->district_code }}">
<select name="district_id" id="district-edit-field" class="form-control" required
onchange="showmap(this.value)">
<option value="" selected disabled>Pilih Kecamatan</option>
</select>
<div class="invalid-feedback">
Harap Pilih Kecamatan
</div>
</div>
<div id="loading-edit" class="text-center" style="display: none">
<div class="spinner-border text-primary" role="status">
<span class="visually-hidden">Loading...</span>
@ -116,7 +67,7 @@
<div class="mb-3" id="address-edit-container">
<label for="address-edit-field" class="form-label">Alamat</label>
<textarea name="address" id="address-edit-field" rows="3" class="form-control"
<textarea name="address" id="address-edit-field" rows="3" class="form-control" readonly
placeholder="Masukan Alamat, cnth: Jl. Jend. Sudirman No. 12" required>{{ old('address', $land->address) }}</textarea>
<div class="invalid-feedback">
Masukan Alamat
@ -128,16 +79,11 @@
<div id="map-edit"></div>
<div class="mt-3">
<input type="hidden" name="lat" id="lat-edit" class="form-control"
value="{{ $land->latitude }}" readonly>
<input type="hidden" name="lng" id="lng-edit" class="form-control"
value="{{ $land->longitude }}" readonly>
<input type="hidden" name="polygon" id="polygon-edit" class="form-control"
readonly>
<input type="hidden" id="lat-db" data-lat={{ $land->latitude }}>
<input type="hidden" id="lng-db" data-lng={{ $land->longitude }}>
<input type="hidden" id="lat-db" data-lat={{ $landDetails[0]['lat'] }}>
<input type="hidden" id="lng-db" data-lng={{ $landDetails[0]['lng'] }}>
<input type="hidden" id="polygon-db"
data-polygon="{{ json_encode($landDetails) }}">

View File

@ -70,10 +70,35 @@ class="nav-link {{ request()->routeIs('master_data.indikator.*') ? 'active' : ''
</a>
</li>
<li class="nav-item">
<a href="{{ route('master_data.aturan.index') }}"
{{-- <a href="{{ route('master_data.aturan.index') }}"
class="nav-link {{ request()->routeIs('master_data.aturan.*') ? 'active' : '' }}"
data-key="t-calendar"> Aturan
</a> --}}
<a href="#rules"
class="nav-link {{ request()->routeIs('master_data.aturan.*') ? 'collapsed active' : '' }}"
data-bs-toggle="collapse" role="button"
aria-expanded="{{ request()->routeIs('master_data.aturan.*') ? 'true' : 'false' }}"
aria-controls="rules" data-key="t-level-2.2"> Aturan
</a>
<div class="collapse menu-dropdown {{ request()->routeIs('master_data.aturan.*') ? 'show' : '' }}"
id="rules">
<ul class="nav nav-sm flex-column">
<li class="nav-item">
<a href="{{ route('master_data.aturan.expert') }}"
class="nav-link {{ request()->routeIs('master_data.aturan.expert') ? 'active' : '' }}"
data-key="t-level-3.1"> Keyakinan
Pakar
</a>
</li>
<li class="nav-item">
<a href="{{ route('master_data.aturan.user') }}"
class="nav-link {{ request()->routeIs('master_data.aturan.user') ? 'active' : '' }}"
data-key="t-level-3.2"> Keyakikan
Pengguna
</a>
</li>
</ul>
</div>
</li>
</ul>
</div>

View File

@ -13,6 +13,7 @@
use App\Http\Controllers\MasterData\IndicatorController;
use App\Http\Controllers\MasterData\LandController;
use App\Http\Controllers\MasterData\RuleController;
use App\Http\Controllers\MasterData\RuleExpertController;
use App\Http\Controllers\MasterData\UserController;
use Illuminate\Support\Facades\Route;
@ -100,11 +101,20 @@
Route::delete('/{id}', 'destroy')->name('destroy');
});
Route::prefix('data-aturan')->controller(RuleController::class)->name('aturan.')->group(function () {
Route::get('/', 'index')->name('index');
Route::post('/', 'store')->name('store');
Route::put('/{id}', 'update')->name('update');
Route::delete('/{id}', 'destroy')->name('destroy');
Route::name('aturan.')->group(function () {
Route::prefix('data-aturan-pakar')->controller(RuleExpertController::class)->group(function () {
Route::get('/', 'index')->name('expert');
Route::post('/', 'store')->name('expert_store');
Route::put('/{id}', 'update')->name('expert_update');
Route::delete('/{id}', 'destroy')->name('expert_destroy');
});
Route::prefix('data-aturan-pengguna')->controller(RuleController::class)->group(function () {
Route::get('/', 'index')->name('user');
Route::post('/', 'store')->name('user_store');
Route::put('/{id}', 'update')->name('user_update');
Route::delete('/{id}', 'destroy')->name('user_destroy');
});
});
});