diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php index 6037e39..7f56a58 100644 --- a/app/Http/Controllers/RealisasiBelanjaController.php +++ b/app/Http/Controllers/RealisasiBelanjaController.php @@ -7,7 +7,7 @@ use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Auth; use Maatwebsite\Excel\Facades\Excel; -use App\Models\DbhPendapatanRealisasi; +use App\Models\DbhBelanjaRealisasi; use App\Models\TempRealisasiBelanja; use App\Imports\RealisasiBelanjaImport; @@ -26,81 +26,24 @@ class RealisasiBelanjaController extends Controller public function create() { - // if (!Auth::user()->can("Tambah SKPP")){ - // abort(403, 'Youre not allowed to visit this page!'); - // } - $this->setSubtitle("Tambah Data"); - return view('realisasi_belanja.create'); } public function store(Request $request) { - try{ - $date = date("Ymd"); - DB::beginTransaction(); - - $req = $request->all(); - $data["tahun"] = $req["txt_ta"]; - $data["id_sps"] = $req["txt_id_sps"]; - $txt_rek_sps = explode("|",$req["txt_rek_sps"]); - $data["kode_rekening_sps"] = $txt_rek_sps[0]; - $data["nama_rekening_sps"] = $txt_rek_sps[1]; - $data["simtrad4_uraian"] = $req["txt_simtrad4_uraian"]; - $data["simtrad4_kotor"] = replaceMoney($req["txt_simtrad4_kotor"]); - $data["simtrad4_potongan"] = replaceMoney($req["txt_simtrad4_potongan"]); - $data["simtrad4_bersih"] = replaceMoney($req["txt_simtrad4_bersih"]); - $data["simtrad4_sp2d_bun"] = $req["txt_simtrad4_sp2d_bun"]; - $data["created_by"] = Auth::user()->id; - //var_dump($data); exit; - DbhPendapatanRealisasi::create($data); - DB::commit(); - - return redirect()->route('realisasi-pendapatan.index') - ->with('success','Realisasi Pendapatan berhasil dibuat.'); - }catch(\Exception $e){ - - DB::rollBack(); - return redirect()->route('realisasi-pendapatan.create') - ->with('error',$e->getMessage()); - } } - public function edit(DbhPendapatanRealisasi $realisasi_belanja) + public function edit(DbhBelanjaRealisasi $realisasi_belanja) { - $this->setSubtitle("Ubah Data"); - return view('realisasi_belanja.edit',compact('realisasi_belanja')); } - public function update(Request $request, DbhPendapatanRealisasi $realisasi_belanja) + public function update(Request $request, DbhBelanjaRealisasi $realisasi_belanja) { - try{ + } - DB::beginTransaction(); - - $req = $request->all(); - $data["tahun"] = $req["txt_ta"]; - $data["id_sps"] = $req["txt_id_sps"]; - $txt_rek_sps = explode("|",$req["txt_rek_sps"]); - $data["kode_rekening_sps"] = $txt_rek_sps[0]; - $data["nama_rekening_sps"] = $txt_rek_sps[1]; - $data["simtrad4_uraian"] = $req["txt_simtrad4_uraian"]; - $data["simtrad4_kotor"] = replaceMoney($req["txt_simtrad4_kotor"]); - $data["simtrad4_potongan"] = replaceMoney($req["txt_simtrad4_potongan"]); - $data["simtrad4_bersih"] = replaceMoney($req["txt_simtrad4_bersih"]); - $data["simtrad4_sp2d_bun"] = $req["txt_simtrad4_sp2d_bun"]; - $data["updated_by"] = Auth::user()->id; - $realisasi_belanja->update($data); - - DB::commit(); - - return redirect()->route('realisasi-pendapatan.index') - ->with('success','Realisasi Pendapatan berhasil diubah.'); - }catch(Throwable $e){ - - DB::rollBack(); - return redirect()->route('tx-salurdana.index') - ->with('error','Realisasi Pendapatan gagal diubah!'); - } + public function submit(Request $request, DbhBelanjaRealisasi $realisasi_belanja) + { + $this->setSubtitle("Detail"); + return view('realisasi_belanja.submit'); } public function datatable(Request $request) @@ -108,16 +51,22 @@ class RealisasiBelanjaController extends Controller $post = $request->all(); $offset = $post["start"]; $limit = $post["length"]; - $src = $post["src"]; - $ta = $post["ta"]; + $src = isset($post["search"])?$post["search"]["value"]:""; $dataFilter=0; - $data = DbhPendapatanRealisasi::orderBy("created_at","ASC"); + $data = DbhBelanjaRealisasi::orderBy("id","ASC"); if (!empty($src)){ - $data->whereRaw("(LOWER(simtrad4_uraian) LIKE '%".strtolower($src)."%')"); + $data->whereRaw("(LOWER(jenis_belanja) LIKE '%".strtolower($src)."%' + OR LOWER(sub_jenis_belanja) LIKE '%".strtolower($src)."%' + OR LOWER(nama_program) LIKE '%".strtolower($src)."%' + OR LOWER(nama_skpd) LIKE '%".strtolower($src)."%' + OR LOWER(nama_kegiatan) LIKE '%".strtolower($src)."%' + OR LOWER(nama_sub_kegiatan) LIKE '%".strtolower($src)."%' + OR LOWER(nama_rsk) LIKE '%".strtolower($src)."%' + OR LOWER(nama_rekening) LIKE '%".strtolower($src)."%')"); } $dataFilter = $data->count(); - $dataTotal = DbhPendapatanRealisasi::count(); + $dataTotal = DbhBelanjaRealisasi::count(); return response()->json([ "recordsTotal" => $dataTotal, @@ -126,7 +75,7 @@ class RealisasiBelanjaController extends Controller ]); } - public function destroy(DbhPendapatanRealisasi $realisasi_belanja) + public function destroy(DbhBelanjaRealisasi $realisasi_belanja) { try{ DB::beginTransaction(); @@ -143,7 +92,7 @@ class RealisasiBelanjaController extends Controller } } - public function show(DbhPendapatanRealisasi $realisasi_belanja) + public function show(DbhBelanjaRealisasi $realisasi_belanja) { // if (!Auth::user()->can("Lihat SKPP")){ // abort(403, 'Youre not allowed to visit this page!'); @@ -155,7 +104,7 @@ class RealisasiBelanjaController extends Controller public function upload(Request $request) { $method = $request->method(); - $this->setSubtitle("Upload Data"); + $this->setSubtitle("Upload Data Rencana Belanja"); if ($request->isMethod('post')) { $req = $request->all(); try{ @@ -176,13 +125,14 @@ class RealisasiBelanjaController extends Controller TempRealisasiBelanja::truncate(); Excel::import(new RealisasiBelanjaImport, $tujuan_upload."/".$file->getClientOriginalName()); DB::commit(); - return redirect('upload-realisasi-belanja')->with('success','Data Realisasi belanja berhasil diupload.'); + return redirect('upload-realisasi-belanja')->with('success','Data Rencana belanja berhasil diupload, Silahkan validasi data!'); }catch(\Exception $e){ throw new \Exception($e->getMessage()); DB::rollBack(); return redirect('upload-realisasi-belanja')->with('error',$e->getMessage()); } } + $this->siteTitle = "Rencana Belanja"; return view('realisasi_belanja.upload'); } @@ -214,4 +164,48 @@ class RealisasiBelanjaController extends Controller "data"=> $data->skip($offset)->take($limit)->get() ]); } + + public function uploadValidate(Request $request) + { + try{ + DB::beginTransaction(); + $datas = TempRealisasiBelanja::orderBy("id","ASC")->get(); + for($i=0;$i<$datas->count();$i++){ + $cekData = DbhBelanjaRealisasi::where(["kode_rsk"=>$datas[$i]["kode_rsk"],"kode_rekening"=>$datas[$i]["kode_rekening"]])->firstOrNew(); + if (!$cekData==null){ + $cekData->delete(); + // DbhBelanjaRealisasi::where(["kode_rsk"=>$datas[$i]["kode_rsk"],"kode_rekening"=>$datas[$i]["kode_rekening"]])->delete(); + } + $input = [ + "tahun_anggaran"=>$datas[$i]["tahun_anggaran"], + "jenis_belanja"=>$datas[$i]["jenis_belanja"], + "sub_jenis_belanja"=>$datas[$i]["sub_jenis_belanja"], + "kode_program"=>$datas[$i]["kode_program"], + "nama_program"=>$datas[$i]["nama_program"], + "kode_skpd"=>$datas[$i]["kode_skpd"], + "nama_skpd"=>$datas[$i]["nama_skpd"], + "kode_kegiatan"=>$datas[$i]["kode_kegiatan"], + "nama_kegiatan"=>$datas[$i]["nama_kegiatan"], + "kode_sub_kegiatan"=>$datas[$i]["kode_sub_kegiatan"], + "nama_sub_kegiatan"=>$datas[$i]["nama_sub_kegiatan"], + "kode_rsk"=>$datas[$i]["kode_rsk"], + "nama_rsk"=>$datas[$i]["nama_rsk"], + "kode_rekening"=>$datas[$i]["kode_rekening"], + "nama_rekening"=>$datas[$i]["nama_rekening"], + "jumlah_anggaran"=>$datas[$i]["jumlah_anggaran"], + "volume_satuan"=>$datas[$i]["volume_satuan"], + "unit_satuan"=>$datas[$i]["unit_satuan"] + ]; + DbhBelanjaRealisasi::create($input); + } + TempRealisasiBelanja::truncate(); + DB::commit(); + return redirect('upload-realisasi-belanja')->with('success','Data Realisasi belanja berhasil diupload.'); + }catch(\Exception $e){ + throw new \Exception($e->getMessage()); + DB::rollBack(); + return redirect('upload-realisasi-belanja')->with('error',$e->getMessage()); + } + return view('realisasi_belanja.upload'); + } } diff --git a/app/Models/DbhBelanjaRealisasi.php b/app/Models/DbhBelanjaRealisasi.php new file mode 100644 index 0000000..27b8b7a --- /dev/null +++ b/app/Models/DbhBelanjaRealisasi.php @@ -0,0 +1,38 @@ +uuid('id')->primary(); + $table->string("tahun_anggaran",4); + $table->string("jenis_belanja",50); + $table->string("sub_jenis_belanja",50); + $table->string("kode_program",50); + $table->string("nama_program",150); + $table->string("kode_skpd",50); + $table->string("nama_skpd",150); + $table->string("kode_kegiatan",50); + $table->string("nama_kegiatan",150); + $table->string("kode_sub_kegiatan",50); + $table->string("nama_sub_kegiatan",150); + $table->string("kode_rsk",50); + $table->text("nama_rsk"); + $table->string("kode_rekening",50); + $table->string("nama_rekening",150); + $table->decimal('jumlah_anggaran', 19, 2); + $table->tinyInteger('volume_satuan'); + $table->string('unit_satuan',30); + $table->tinyInteger('volume_satuan_realisasi')->nullable(); + $table->string('unit_satuan_realisasi',30)->nullable(); + $table->uuid('realisasi_by')->nullable(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('dbh_belanja_realisasi'); + } +} diff --git a/public/bg.jpeg b/public/bg.jpeg new file mode 100644 index 0000000..ee44c77 Binary files /dev/null and b/public/bg.jpeg differ diff --git a/public/bg.jpg b/public/bg.jpg deleted file mode 100644 index 0d9cd34..0000000 Binary files a/public/bg.jpg and /dev/null differ diff --git a/public/css/app.css b/public/css/app.css index 8033cf2..e4cfbac 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -1,5 +1,14 @@ @import url('https://fonts.googleapis.com/css?family=Ubuntu'); +body{ + /* background: url("../bg.jpeg") no-repeat; + background-size: cover; */ + background: #d5dee7; + color:#333; + font-size: 12px; + font-family: "Ubuntu", "Helvetica Neue", Roboto, Arial, "Droid Sans", sans-serif; +} + .select2-container { width: 100% !important; padding: 0; @@ -150,7 +159,7 @@ hr{ white-space: nowrap; } -#tempUploadRealisasi td{ +#tblRealisasi td,#tempUploadRealisasi td{ white-space: nowrap; } @@ -273,3 +282,11 @@ hr{ } } + .content-wrapper{ + background: transparent; + } + + #tblRealisasi td:hover{ + cursor: pointer; + color: navy; + } \ No newline at end of file diff --git a/resources/views/layouts/auth.blade.php b/resources/views/layouts/auth.blade.php index 18ec974..ac5fc09 100644 --- a/resources/views/layouts/auth.blade.php +++ b/resources/views/layouts/auth.blade.php @@ -8,6 +8,7 @@ +
@yield('content') diff --git a/resources/views/login.blade.php b/resources/views/login.blade.php index 2e9657a..a0798c0 100644 --- a/resources/views/login.blade.php +++ b/resources/views/login.blade.php @@ -7,7 +7,7 @@ --}}diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php index c66f9f3..43d8a05 100644 --- a/resources/views/partials/menu.blade.php +++ b/resources/views/partials/menu.blade.php @@ -48,7 +48,7 @@
Upload Data
+Upload Rencana Belanja
Format:xlsx | Columns: "tahun_anggaran", "jenis_belanja", @@ -52,10 +52,10 @@