gitea/sidata
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Update and Bugs Fix

Browse Source
This commit is contained in:
Izuddin
2022-09-15 21:47:46 +07:00
parent 21d9ce5975
commit 187f80eb2a
13 changed files with 85 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/MstJenisBelanjaController.php
+9 -50
View File
@@ -30,21 +30,17 @@ class MstJenisBelanjaController extends Controller
return view('admin.mst_jenis_belanja.create'); return view('admin.mst_jenis_belanja.create');
} }
// public function create_sub(MstJenisBelanja $MstJenisBelanja)
// {
// $this->setSubtitle("Tambah Data Sub Jenis Belanja [<strong>".$MstJenisBelanja->name."</strong>] ");
// return view('admin.mst_jenis_belanja.create_sub',compact("MstJenisBelanja"));
// }
public function store(Request $request) public function store(Request $request)
{ {
$request->validate([ $request->validate([
'kode' => 'required', 'grup' => 'required',
//'kode' => 'required',
'name' => 'required', 'name' => 'required',
]); ]);
$req = $request->all(); $req = $request->all();
MstJenisBelanja::where("name", $req["name"])->delete(); MstJenisBelanja::where("name", $req["name"])->where("grup", $req["grup"])->delete();
$data["grup"] = $req["grup"];
$data["kode"] = $req["kode"]; $data["kode"] = $req["kode"];
$data["name"] = $req["name"]; $data["name"] = $req["name"];
$data["description"] = $req["description"]; $data["description"] = $req["description"];
@@ -53,23 +49,6 @@ class MstJenisBelanjaController extends Controller
return redirect("/admin/MstJenisBelanja")->with('success','Jenis Belanja berhasil dibuat.'); return redirect("/admin/MstJenisBelanja")->with('success','Jenis Belanja berhasil dibuat.');
} }
// public function store_sub(Request $request)
// {
// $request->validate([
// 'name' => 'required',
// 'id_jenis_belanja' => 'required'
// ]);
// $req = $request->all();
// MstSubJenisBelanja::where("name", $req["name"])->where("id_jenis_belanja", $req["id_jenis_belanja"])->delete();
// $data["id_jenis_belanja"] = $req["id_jenis_belanja"];
// $data["name"] = $req["name"];
// $data["description"] = $req["description"];
// MstSubJenisBelanja::create($data);
// return redirect("/admin/MstJenisBelanja/".$data["id_jenis_belanja"])->with('success','Sub Jenis Belanja berhasil dibuat.');
// }
public function show(MstJenisBelanja $MstJenisBelanja) public function show(MstJenisBelanja $MstJenisBelanja)
{ {
$SubJenisBelanja = MstSubJenisBelanja::where("id_jenis_belanja",$MstJenisBelanja->id)->get(); $SubJenisBelanja = MstSubJenisBelanja::where("id_jenis_belanja",$MstJenisBelanja->id)->get();
@@ -86,12 +65,14 @@ class MstJenisBelanjaController extends Controller
public function update(Request $request, MstJenisBelanja $MstJenisBelanja) public function update(Request $request, MstJenisBelanja $MstJenisBelanja)
{ {
$request->validate([ $request->validate([
'kode' => 'required', 'grup' => 'required',
//'kode' => 'required',
'name' => 'required', 'name' => 'required',
]); ]);
$req = $request->all(); $req = $request->all();
$data["kode"] = $req["kdde"]; $data["grup"] = $req["grup"];
$data["kode"] = $req["kode"];
$data["name"] = $req["name"]; $data["name"] = $req["name"];
$data["description"] = $req["description"]; $data["description"] = $req["description"];
$MstJenisBelanja->update($req); $MstJenisBelanja->update($req);
@@ -114,7 +95,7 @@ class MstJenisBelanjaController extends Controller
$offset = $post["start"]; $offset = $post["start"];
$limit = $post["length"]; $limit = $post["length"];
$src = isset($post["search"]["value"]) ? strtolower($post["search"]["value"]):""; $src = isset($post["search"]["value"]) ? strtolower($post["search"]["value"]):"";
$select = DB::raw("ID,KODE,NAME,DESCRIPTION"); $select = DB::raw("ID,GRUP,KODE,NAME,DESCRIPTION");
$sqlstr = MstJenisBelanja::select($select); $sqlstr = MstJenisBelanja::select($select);
$dataTotal = $sqlstr->count(); $dataTotal = $sqlstr->count();
$data = $sqlstr->orderBy("ID"); $data = $sqlstr->orderBy("ID");
@@ -130,26 +111,4 @@ class MstJenisBelanjaController extends Controller
]); ]);
} }
// public function datatableSubJenisBelanja(Request $request, $id)
// {
// $post = $request->all();
// $offset = $post["start"];
// $limit = $post["length"];
// $src = isset($post["search"]["value"]) ? strtolower($post["search"]["value"]):"";
// $select = DB::raw("ID,NAME,DESCRIPTION");
// $sqlstr = MstSubJenisBelanja::select($select)->where("id_jenis_belanja", $id);
// $dataTotal = $sqlstr->count();
// $data = $sqlstr->orderBy("ID");
// if (!empty($src)){
// $data->whereRaw(" ( lower(NAME) like '%$src%' OR lower(DESCRIPTION) like '%$src%' ) ");
// }
// $dataFilter = $data->count();
// return response()->json([
// "recordsTotal" => $dataTotal,
// "recordsFiltered" => $dataFilter,
// "data"=> $data->skip($offset)->take($limit)->get()
// ]);
// }
} }
app/Http/Controllers/ItemSearchController.php
+3 -1
View File
@@ -192,13 +192,15 @@ class ItemSearchController extends Controller
{ {
$sk = []; $sk = [];
$select = DB::raw("ID, NAME"); $select = DB::raw("ID, NAME");
$grup = $request->grup;
if($request->has('q')){ if($request->has('q')){
$search = $request->q; $search = $request->q;
$sk = MstJenisBelanja::select($select) $sk = MstJenisBelanja::select($select)
->where('GRUP',$grup)
->where('NAME', 'LIKE', "%$search%") ->where('NAME', 'LIKE', "%$search%")
->get(); ->get();
}else{ }else{
$sk = MstJenisBelanja::select($select)->get(); $sk = MstJenisBelanja::select($select)->where('GRUP',$grup)->get();
} }
return response()->json($sk); return response()->json($sk);
} }
app/Http/Controllers/RealisasiBelanjaController.php
+2 -6
View File
@@ -102,11 +102,9 @@ class RealisasiBelanjaController extends Controller
"jenis_dana"=>"required", "jenis_dana"=>"required",
"sub_jenis_dana"=>"required", "sub_jenis_dana"=>"required",
"jenis"=>"required", "jenis"=>"required",
"sub_jenis"=>"required",
"rsk"=>"required", "rsk"=>"required",
"vol"=>"required", "vol"=>"required",
"unit"=>"required", "unit"=>"required",
"jml_rencana_kontrak"=>"required",
"id_sps"=>"required", "id_sps"=>"required",
]); ]);
@@ -118,7 +116,7 @@ class RealisasiBelanjaController extends Controller
$input = [ $input = [
"tahun_anggaran"=>getTA(), "tahun_anggaran"=>getTA(),
"jenis_belanja"=>$req["jenis"], "jenis_belanja"=>$req["jenis"],
"sub_jenis_belanja"=>$req["sub_jenis"], "sub_jenis_belanja"=>isset($req["sub_jenis"])?$req["sub_jenis"]:0,
"kode_program"=>$VwDpaRsk["c_program"], "kode_program"=>$VwDpaRsk["c_program"],
"nama_program"=>$VwDpaRsk["n_program"], "nama_program"=>$VwDpaRsk["n_program"],
"kode_skpd"=>$VwDpaRsk["c_opd"], "kode_skpd"=>$VwDpaRsk["c_opd"],
@@ -132,7 +130,7 @@ class RealisasiBelanjaController extends Controller
"jumlah_anggaran"=>$VwDpaRsk["v_angg_tapd"], "jumlah_anggaran"=>$VwDpaRsk["v_angg_tapd"],
"volume_satuan"=>$req["vol"], "volume_satuan"=>$req["vol"],
"unit_satuan"=>$req["unit"], "unit_satuan"=>$req["unit"],
"jml_rencana_kontrak"=>$req["jml_rencana_kontrak"], "jml_rencana_kontrak"=>isset($req["jml_rencana_kontrak"])?$req["jml_rencana_kontrak"]:0,
"jenis_dana"=>$req["jenis_dana"], "jenis_dana"=>$req["jenis_dana"],
"sub_jenis_dana"=>$req["sub_jenis_dana"], "sub_jenis_dana"=>$req["sub_jenis_dana"],
"id_sps"=>$req["id_sps"], "id_sps"=>$req["id_sps"],
@@ -167,11 +165,9 @@ class RealisasiBelanjaController extends Controller
"jenis_dana"=>"required", "jenis_dana"=>"required",
"sub_jenis_dana"=>"required", "sub_jenis_dana"=>"required",
"jenis"=>"required", "jenis"=>"required",
"sub_jenis"=>"required",
"rsk"=>"required", "rsk"=>"required",
"vol"=>"required", "vol"=>"required",
"unit"=>"required", "unit"=>"required",
"jml_rencana_kontrak"=>"required",
"id_sps"=>"required", "id_sps"=>"required",
]); ]);
app/Models/MstJenisBelanja.php
+1
View File
@@ -15,5 +15,6 @@ class MstJenisBelanja extends Eloquent
"kode", "kode",
"name", "name",
"description", "description",
"grup"
]; ];
} }
database/migrations/2022_08_24_143252_create_mst_jenis_belanja_table.php
+1
View File
@@ -18,6 +18,7 @@ class CreateMstJenisbelanjaTable extends Migration
$table->string('kode', 20); $table->string('kode', 20);
$table->string('name', 300); $table->string('name', 300);
$table->string('description'); $table->string('description');
$table->enum('grup',["DBH","DAK"])->default("DBH");
$table->timestamps(); $table->timestamps();
}); });
} }
public/js/app.js
Vendored
+21 -19
View File
@@ -295,25 +295,27 @@ $('.rsk_search').select2({
} }
}); });
$('.jenis_belanja_search').select2({ let jenisBelanja = (grup)=>{
placeholder: 'Pilih Jenis Belanja', $('.jenis_belanja_search').select2({
ajax: { placeholder: 'Pilih Jenis Belanja',
url: Url+'/item-search-jenisbelanja', ajax: {
dataType: 'json', url: Url+'/item-search-jenisbelanja?grup='+grup,
delay: 250, dataType: 'json',
processResults: function (data) { delay: 250,
return { processResults: function (data) {
results: $.map(data, function (item) { return {
return { results: $.map(data, function (item) {
text: item.name, return {
id: item.id text: item.name,
} id: item.id
}) }
}; })
}, };
cache: true },
} cache: true
}); }
});
}
let subJenisBelanja = (idJenisBelanja)=>{ let subJenisBelanja = (idJenisBelanja)=>{
$('.sub_jenis_belanja_search').select2({ $('.sub_jenis_belanja_search').select2({
resources/views/admin/mst_jenis_belanja/create.blade.php
+10 -1
View File
@@ -23,10 +23,19 @@
@csrf @csrf
<div class="row"> <div class="row">
<div class="col-xs-12 col-sm-12 col-md-12">
<div class="form-group">
<strong>Grup</strong>
<select class="form-control" name="grup">
<option value="DBH">DBH</option>
<option value="DAK">DAK</option>
</select>
</div>
</div>
<div class="col-xs-12 col-sm-12 col-md-12"> <div class="col-xs-12 col-sm-12 col-md-12">
<div class="form-group"> <div class="form-group">
<strong>Kode</strong> <strong>Kode</strong>
<input type="text" class="form-control" name="kode" required placeholder="Input Kode"> <input type="text" class="form-control" name="kode" placeholder="Input Kode">
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-12 col-md-12"> <div class="col-xs-12 col-sm-12 col-md-12">
resources/views/admin/mst_jenis_belanja/edit.blade.php
+10 -1
View File
@@ -23,10 +23,19 @@
@csrf @csrf
@method('PUT') @method('PUT')
<div class="row"> <div class="row">
<div class="col-xs-12 col-sm-12 col-md-12">
<div class="form-group">
<strong>Grup</strong>
<select class="form-control" name="grup">
<option value="DBH">DBH</option>
<option value="DAK">DAK</option>
</select>
</div>
</div>
<div class="col-xs-12 col-sm-12 col-md-12"> <div class="col-xs-12 col-sm-12 col-md-12">
<div class="form-group"> <div class="form-group">
<strong>Kode</strong> <strong>Kode</strong>
<input type="text" class="form-control" name="kode" required placeholder="Input Kode" value="{{ $MstJenisBelanja->kode }}"> <input type="text" class="form-control" name="kode" placeholder="Input Kode" value="{{ $MstJenisBelanja->kode }}">
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-12 col-md-12"> <div class="col-xs-12 col-sm-12 col-md-12">
resources/views/admin/mst_jenis_belanja/index.blade.php
+3 -1
View File
@@ -28,6 +28,7 @@
<tr> <tr>
<thead> <thead>
<th width="50">No</th> <th width="50">No</th>
<th>Grup</th>
<th>Kode</th> <th>Kode</th>
<th>Nama</th> <th>Nama</th>
<th>Deskripsi</th> <th>Deskripsi</th>
@@ -79,6 +80,7 @@
"paging": true, // Table pagination "paging": true, // Table pagination
"columns": [ "columns": [
{ "data": null}, { "data": null},
{ "data": "grup", "className":"text-center" },
{ "data": "kode", "className":"text-center" }, { "data": "kode", "className":"text-center" },
{ "data": "name", "className":"text-left" }, { "data": "name", "className":"text-left" },
{ "data": "description", "className":"text-left" }, { "data": "description", "className":"text-left" },
@@ -91,7 +93,7 @@
let checked = aData["is_lock_upload"] == 1 ? "checked":""; let checked = aData["is_lock_upload"] == 1 ? "checked":"";
$("td:eq(0)", nRow).html(index); $("td:eq(0)", nRow).html(index);
$("td:eq(4)", nRow).html(` $("td:eq(5)", nRow).html(`
<form class="form-delete" action="{{ URL::to("/admin/MstJenisBelanja") }}/`+ aData["id"] +`" method="POST"> <form class="form-delete" action="{{ URL::to("/admin/MstJenisBelanja") }}/`+ aData["id"] +`" method="POST">
@csrf @csrf
@method('DELETE') @method('DELETE')
resources/views/layouts/app.blade.php
+1 -1
View File
@@ -24,7 +24,7 @@
<section class="content pt-1"> <section class="content pt-1">
@if ($errors->any()) @if ($errors->any())
<div class="alert alert-danger"> <div class="alert alert-danger">
<strong>Whoops!</strong> There were some problems with your input.<br><br> <strong>Error: </strong> Terjadi beberapa kesalahan!<br><br>
<ul> <ul>
@foreach ($errors->all() as $error) @foreach ($errors->all() as $error)
<li>{{ $error }}</li> <li>{{ $error }}</li>
resources/views/realisasi_belanja/create.blade.php
+1 -1
View File
@@ -85,7 +85,7 @@
$("input[name=anggaran]").val("{{ separateNumberIndo($VwDpaRsk->v_angg_tapd) }}"); $("input[name=anggaran]").val("{{ separateNumberIndo($VwDpaRsk->v_angg_tapd) }}");
$("input[name=anggaran]").attr("readonly", true); $("input[name=anggaran]").attr("readonly", true);
subJenisDana($("#jenis_dana").val()); $('select[name=jenis_dana]').change();
$(document).on("submit","#frmRealBelanja",function (e){ $(document).on("submit","#frmRealBelanja",function (e){
e.preventDefault(); e.preventDefault();
resources/views/realisasi_belanja/edit.blade.php
+3 -2
View File
@@ -34,7 +34,8 @@
var srcDate1 = null, srcDate2 = null; var srcDate1 = null, srcDate2 = null;
$("select[name=jenis_dana]").val("{{ $realisasi_belanja->jenis_dana }}"); $("select[name=jenis_dana]").val("{{ $realisasi_belanja->jenis_dana }}");
$('select[name=jenis_dana]').change();
let $newOptionSubJenisDana = $("<option selected='selected'></option>").val("{{ $realisasi_belanja->sub_jenis_dana }}").text("{{ $realisasi_belanja->nama_jenis_dana }}") let $newOptionSubJenisDana = $("<option selected='selected'></option>").val("{{ $realisasi_belanja->sub_jenis_dana }}").text("{{ $realisasi_belanja->nama_jenis_dana }}")
$("select[name=sub_jenis_dana]").val("{{ $realisasi_belanja->sub_jenis_dana }}"); $("select[name=sub_jenis_dana]").val("{{ $realisasi_belanja->sub_jenis_dana }}");
$("select[name=sub_jenis_dana]").append($newOptionSubJenisDana).trigger('change'); $("select[name=sub_jenis_dana]").append($newOptionSubJenisDana).trigger('change');
@@ -82,7 +83,7 @@
$("input[name=vol]").val("{{ isset($realisasi_belanja->volume_satuan)?separateNumberIndo($realisasi_belanja->volume_satuan):0 }}"); $("input[name=vol]").val("{{ isset($realisasi_belanja->volume_satuan)?separateNumberIndo($realisasi_belanja->volume_satuan):0 }}");
$("select[name=unit]").val("{{ $realisasi_belanja->unit_satuan }}"); $("select[name=unit]").val("{{ $realisasi_belanja->unit_satuan }}");
$("input[name=jml_rencana_kontrak]").val("{{ isset($realisasi_belanja->jml_rencana_kontrak)?$realisasi_belanja->jml_rencana_kontrak:0 }}"); $("input[name=jml_rencana_kontrak]").val("{{ isset($realisasi_belanja->jml_rencana_kontrak)?$realisasi_belanja->jml_rencana_kontrak:0 }}");
subJenisDana($("#jenis_dana").val()); subJenisDana($("#jenis_dana").val());
subJenisBelanja($("select[name=jenis]").val()); subJenisBelanja($("select[name=jenis]").val());
resources/views/realisasi_belanja/form.blade.php
+20 -3
View File
@@ -17,11 +17,11 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-form-label label-align" for="jenis">Jenis Belanja</label> <label class="col-form-label label-align" for="jenis">Jenis Belanja</label>
<select name="jenis" class="form-control jenis_belanja_search" required></select> <select id="jenis" name="jenis" class="form-control jenis_belanja_search" required></select>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-form-label label-align" for="sub_jenis">Sub Jenis Belanja</label> <label class="col-form-label label-align" for="sub_jenis">Sub Jenis Belanja</label>
<select name="sub_jenis" class="form-control sub_jenis_belanja_search" required></select> <select id="sub_jenis" name="sub_jenis" class="form-control sub_jenis_belanja_search"></select>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-form-label label-align" for="prog">Program</label> <label class="col-form-label label-align" for="prog">Program</label>
@@ -61,7 +61,7 @@
<?php } ?> <?php } ?>
</select> </select>
</div> </div>
<div class="form-group"> <div id="div_jml_rencana_kontrak" class="form-group" style="display: none;">
<label class="col-form-label label-align" for="sk">Jumlah Rencana Kontrak</label> <label class="col-form-label label-align" for="sk">Jumlah Rencana Kontrak</label>
<input type="number" class="form-control form-control-sm" name="jml_rencana_kontrak" required> <input type="number" class="form-control form-control-sm" name="jml_rencana_kontrak" required>
</div> </div>
@@ -79,7 +79,24 @@
}) })
$('select[name=jenis_dana]').on('change', function (e) { $('select[name=jenis_dana]').on('change', function (e) {
$("#sub_jenis_dana").val('').trigger('change');
$("#jenis").val('').trigger('change');
$("#sub_jenis").val('').trigger('change');
subJenisDana($(this).val()); subJenisDana($(this).val());
jenisBelanja($(this).val());
})
$('select[name=sub_jenis_dana]').on('select2:select', function (e) {
var data = e.params.data;
if (data.text == "Fisik")
{
$("#div_jml_rencana_kontrak").show();
$("input[name=jml_rencana_kontrak]").prop("required", true);
}else{
$("#div_jml_rencana_kontrak").hide();
$("input[name=jml_rencana_kontrak]").val(0);
$("input[name=jml_rencana_kontrak]").prop("required", false);
}
}) })
}); });