diff --git a/app/Http/Controllers/Admin/MstJenisBelanjaController.php b/app/Http/Controllers/Admin/MstJenisBelanjaController.php index e0417f8..6898537 100644 --- a/app/Http/Controllers/Admin/MstJenisBelanjaController.php +++ b/app/Http/Controllers/Admin/MstJenisBelanjaController.php @@ -30,11 +30,11 @@ class MstJenisBelanjaController extends Controller return view('admin.mst_jenis_belanja.create'); } - public function create_sub(MstJenisBelanja $MstJenisBelanja) - { - $this->setSubtitle("Tambah Data Sub Jenis Belanja [".$MstJenisBelanja->name."] "); - return view('admin.mst_jenis_belanja.create_sub',compact("MstJenisBelanja")); - } + // public function create_sub(MstJenisBelanja $MstJenisBelanja) + // { + // $this->setSubtitle("Tambah Data Sub Jenis Belanja [".$MstJenisBelanja->name."] "); + // return view('admin.mst_jenis_belanja.create_sub',compact("MstJenisBelanja")); + // } public function store(Request $request) { @@ -51,22 +51,22 @@ class MstJenisBelanjaController extends Controller return redirect("/admin/MstJenisBelanja")->with('success','Jenis Belanja berhasil dibuat.'); } - public function store_sub(Request $request) - { - $request->validate([ - 'name' => 'required', - 'id_jenis_belanja' => 'required' - ]); + // 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); + // $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.'); - } + // return redirect("/admin/MstJenisBelanja/".$data["id_jenis_belanja"])->with('success','Sub Jenis Belanja berhasil dibuat.'); + // } public function show(MstJenisBelanja $MstJenisBelanja) { @@ -126,26 +126,26 @@ 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(); + // 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() - ]); - } + // return response()->json([ + // "recordsTotal" => $dataTotal, + // "recordsFiltered" => $dataFilter, + // "data"=> $data->skip($offset)->take($limit)->get() + // ]); + // } } diff --git a/app/Http/Controllers/Admin/MstSubJenisBelanjaController.php b/app/Http/Controllers/Admin/MstSubJenisBelanjaController.php new file mode 100644 index 0000000..365dbd3 --- /dev/null +++ b/app/Http/Controllers/Admin/MstSubJenisBelanjaController.php @@ -0,0 +1,103 @@ +siteTitle = "Master Jenis Belanja"; + parent::__construct(); + } + + public function index() + { + $data = null; + return view('admin.mst_sub_jenis_belanja.index',compact('data')) + ->with('i', (request()->input('page', 1) - 1) * 10); + } + + public function create(MstJenisBelanja $MstJenisBelanja) + { + $this->setSubtitle("Tambah Data Sub Jenis Belanja [".$MstJenisBelanja->name."] "); + return view('admin.mst_sub_jenis_belanja.create',compact("MstJenisBelanja")); + } + + public function store(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(MstSubJenisBelanja $MstSubJenisBelanja) + { + } + + public function edit(MstSubJenisBelanja $MstSubJenisBelanja) + { + $this->setSubtitle("Ubah Data"); + return view('admin.mst_sub_jenis_belanja.edit',compact('MstSubJenisBelanja')); + } + + public function update(Request $request, MstSubJenisBelanja $MstSubJenisBelanja) + { + $request->validate([ + 'name' => 'required', + 'id_jenis_belanja' => 'required' + ]); + + $req = $request->all(); + $data["id_jenis_belanja"] = $req["id_jenis_belanja"]; + $data["name"] = $req["name"]; + $data["description"] = $req["description"]; + $MstSubJenisBelanja->update($req); + + return redirect("/admin/MstJenisBelanja/".$MstSubJenisBelanja->id_jenis_belanja)->with('success','Sub Jenis Belanja berhasil diubah'); + } + + public function destroy(MstSubJenisBelanja $MstSubJenisBelanja) + { + $MstSubJenisBelanja->delete(); + return redirect("/admin/MstJenisBelanja/".$MstSubJenisBelanja->id_jenis_belanja)->with('success','Sub Jenis Belanja berhasil dihapus'); + } + + public function datatable(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() + ]); + } + +} diff --git a/resources/views/admin/mst_jenis_belanja/create.blade.php b/resources/views/admin/mst_jenis_belanja/create.blade.php index 99ff372..a752c08 100644 --- a/resources/views/admin/mst_jenis_belanja/create.blade.php +++ b/resources/views/admin/mst_jenis_belanja/create.blade.php @@ -14,7 +14,7 @@
@php echo $sitesubTitle; @endphp
- Back + Kembali
diff --git a/resources/views/admin/mst_jenis_belanja/edit.blade.php b/resources/views/admin/mst_jenis_belanja/edit.blade.php index adff372..fcec524 100644 --- a/resources/views/admin/mst_jenis_belanja/edit.blade.php +++ b/resources/views/admin/mst_jenis_belanja/edit.blade.php @@ -14,7 +14,7 @@
@php echo $sitesubTitle; @endphp
- Back + Kembali
diff --git a/resources/views/admin/mst_jenis_belanja/show.blade.php b/resources/views/admin/mst_jenis_belanja/show.blade.php index 71155e4..b0c5fc7 100644 --- a/resources/views/admin/mst_jenis_belanja/show.blade.php +++ b/resources/views/admin/mst_jenis_belanja/show.blade.php @@ -114,7 +114,13 @@ let checked = aData["is_lock_upload"] == 1 ? "checked":""; $("td:eq(0)", nRow).html(index); - $("td:eq(3)", nRow).html(``); + $("td:eq(3)", nRow).html(` +
+ @csrf + @method('DELETE') + + +
`); return nRow; }, diff --git a/resources/views/admin/mst_jenis_belanja/create_sub.blade.php b/resources/views/admin/mst_sub_jenis_belanja/create.blade.php similarity index 95% rename from resources/views/admin/mst_jenis_belanja/create_sub.blade.php rename to resources/views/admin/mst_sub_jenis_belanja/create.blade.php index cf68745..fa80a49 100644 --- a/resources/views/admin/mst_jenis_belanja/create_sub.blade.php +++ b/resources/views/admin/mst_sub_jenis_belanja/create.blade.php @@ -14,7 +14,7 @@
@php echo $sitesubTitle; @endphp
- Back + Kembali
@@ -37,7 +37,7 @@
- +
diff --git a/resources/views/admin/mst_sub_jenis_belanja/edit.blade.php b/resources/views/admin/mst_sub_jenis_belanja/edit.blade.php new file mode 100644 index 0000000..33222b5 --- /dev/null +++ b/resources/views/admin/mst_sub_jenis_belanja/edit.blade.php @@ -0,0 +1,50 @@ +@php + $siteBreadcumb = [ + ["url"=>"/admin/mst-hak","label"=>$siteTitle], + ["url"=>"/admin/mst-hak","label"=>$sitesubTitle] + ]; +@endphp + +@extends('layouts.app') + +@section('content') +
+
+
+
@php echo $sitesubTitle; @endphp
+
+ +
+
+ +
+ @csrf + @method('PUT') +
+
+
+ Nama + + +
+
+
+
+ Deskripsi + +
+
+
+ +
+
+
+@endsection +@section('scripts') + +@endsection \ No newline at end of file diff --git a/resources/views/admin/mst_sub_jenis_belanja/show.blade.php b/resources/views/admin/mst_sub_jenis_belanja/show.blade.php new file mode 100644 index 0000000..ba06858 --- /dev/null +++ b/resources/views/admin/mst_sub_jenis_belanja/show.blade.php @@ -0,0 +1,142 @@ +@php + $siteBreadcumb = [ + ["url"=>"/admin/users","label"=>$siteTitle], + ["url"=>"/admin/users","label"=>$sitesubTitle] + ]; +@endphp + +@section('styles') + + + + + +@endsection + +@extends('layouts.empty') + +@section('content') +
+
+
@php echo $sitesubTitle; @endphp
+
+ Back +
+
+
+
+ @csrf +
+
+
+ Nama: + +
+
+ Deskripsi + +
+
+
+
+
+
+
+
+
DATA SUB JENIS BELANJA
+ +
+
+ + + + + + + + + +
NoNamaDeskripsiAction
+
+
+@endsection +@section('scripts') + + + + + + + + + + + + + + + + + +@endsection \ No newline at end of file diff --git a/resources/views/realisasi_belanja/submit.blade.php b/resources/views/realisasi_belanja/submit.blade.php index b65f7e3..55e1f18 100644 --- a/resources/views/realisasi_belanja/submit.blade.php +++ b/resources/views/realisasi_belanja/submit.blade.php @@ -56,9 +56,9 @@
- - - + + + - - - - -
BulanAKBRealisasiBulanAKBRealisasi
TOTAL{{ separateNumberIndo($totalAKB) }}{{ separateNumberIndo($totalBKU) }}
+
@@ -95,7 +97,7 @@ {{-- @endif --}}
-
+
@@ -114,13 +116,15 @@ jml); } ?> - - - -
No{{ separateNumberIndo($spd->jml) }}
TOTAL SPD{{ separateNumberIndo($totalSPD) }}
+
@@ -133,7 +137,7 @@ {{-- @endif --}}
-
+
@@ -152,13 +156,15 @@ v_spp); } ?> - - - -
No{{ separateNumberIndo($sp2d->v_spp) }}
TOTAL SP2D{{ separateNumberIndo($totalSP2D) }}
+
diff --git a/routes/web.php b/routes/web.php index e275986..6d9886f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -14,6 +14,7 @@ use App\Http\Controllers\Admin\MappingDbhSkpdController; use App\Http\Controllers\Admin\RolessController; use App\Http\Controllers\Admin\PermissionsController; use App\Http\Controllers\Admin\MstJenisBelanjaController; +use App\Http\Controllers\Admin\MstSubJenisBelanjaController; use App\Http\Controllers\NotifikasiController; Route::get('/', [AuthController::class, 'showFormLogin']); @@ -32,10 +33,11 @@ Route::group(['middleware' => 'auth'], function () { Route::resource('MappingDbhSkpd', MappingDbhSkpdController::class); Route::post('MstJenisBelanja/datatable', [MstJenisBelanjaController::class,'datatable']); - Route::post('MstJenisBelanja/{id}/datatable-sub', [MstJenisBelanjaController::class,'datatableSubJenisBelanja']); - Route::get('MstJenisBelanja/{MstJenisBelanja}/create-sub', [MstJenisBelanjaController::class,'create_sub']); - Route::post('MstJenisBelanja/{id}/store-sub', [MstJenisBelanjaController::class,'store_sub']); Route::resource('MstJenisBelanja', MstJenisBelanjaController::class); + Route::get('MstJenisBelanja/{MstJenisBelanja}/create-sub', [MstSubJenisBelanjaController::class,'create']); + Route::post('MstJenisBelanja/{id}/datatable-sub', [MstSubJenisBelanjaController::class,'datatable']); + Route::post('MstJenisBelanja/{id}/store-sub', [MstSubJenisBelanjaController::class,'store']); + Route::resource('MstSubJenisBelanja', MstSubJenisBelanjaController::class); }); Route::get('users/change-password/{userId}', [MstPenggunaController::class,'changePass'])->name("users.changepass");