diff --git a/app/Http/Controllers/Admin/MstGolonganController.php b/app/Http/Controllers/Admin/MstGolonganController.php deleted file mode 100644 index b76798f..0000000 --- a/app/Http/Controllers/Admin/MstGolonganController.php +++ /dev/null @@ -1,128 +0,0 @@ -siteTitle = "Data Golongan"; - parent::__construct(); - } - /** - * Display a listing of the resource. - * - * @return \Illuminate\Http\Response - */ - public function index() - { - $data = MstGolongan::latest()->paginate(10); - - return view('admin.mst_golongan.index',compact('data')) - ->with('i', (request()->input('page', 1) - 1) * 10); - } - - /** - * Show the form for creating a new resource. - * - * @return \Illuminate\Http\Response - */ - public function create() - { - $this->setSubtitle("Tambah Data"); - return view('admin.mst_golongan.create'); - } - - /** - * Store a newly created resource in storage. - * - * @param \Illuminate\Http\Request $request - * @return \Illuminate\Http\Response - */ - public function store(Request $request) - { - $request->validate([ - 'nama_golongan' => 'required', - 'nama_pangkat' => 'required', - 'golongan_besar' => 'required', - 'alias' => 'required', - ]); - - $requestAll = $request->all(); - MstGolongan::create($requestAll); - - return redirect()->route('mst-golongan.index') - ->with('success','Post created successfully.'); - } - - /** - * Display the specified resource. - * - * @param \App\Models\MstGolongan $MstGolongan - * @return \Illuminate\Http\Response - */ - public function show(MstGolongan $MstGolongan) - { - $this->setSubtitle("Detail Data"); - return view('admin.mst_golongan.show',compact('MstGolongan')); - } - - /** - * Show the form for editing the specified resource. - * - * @param \App\Models\MstGolongan $MstGolongan - * @return \Illuminate\Http\Response - */ - public function edit(MstGolongan $MstGolongan) - { - $this->setSubtitle("Ubah Data"); - return view('admin.mst_golongan.edit',compact('MstGolongan')); - } - - /** - * Update the specified resource in storage. - * - * @param \Illuminate\Http\Request $request - * @param \App\Models\MstGolongan $MstGolongan - * @return \Illuminate\Http\Response - */ - public function update(Request $request, MstGolongan $MstGolongan) - { - $request->validate([ - 'nama_golongan' => 'required', - 'nama_pangkat' => 'required', - 'golongan_besar' => 'required', - 'alias' => 'required', - ]); - - $requestAll = $request->all(); - $MstGolongan->update($requestAll); - - return redirect()->route('mst-golongan.index') - ->with('success','Golongan berhasil diubah!'); - } - - /** - * Remove the specified resource from storage. - * - * @param \App\Models\MstGolongan $MstGolongan - * @return \Illuminate\Http\Response - */ - public function destroy(MstGolongan $MstGolongan) - { - $MstGolongan->delete(); - - return redirect()->route('mst-golongan.index') - ->with('success','Golongan berhasil dihapus!'); - } - - public function golonganList() - { - $mstGolongan = MstGolongan::select(["id","nama_golongan","nama_pangkat","alias"])->get(); - return response()->json($mstGolongan); - } -} diff --git a/app/Http/Controllers/Admin/MstHakController.php b/app/Http/Controllers/Admin/MstHakController.php deleted file mode 100644 index c20aca0..0000000 --- a/app/Http/Controllers/Admin/MstHakController.php +++ /dev/null @@ -1,81 +0,0 @@ -siteTitle = "Data Hak"; - parent::__construct(); - } - - public function index() - { - $data = MstHak::latest()->paginate(10); - - return view('admin.mst_hak.index',compact('data')) - ->with('i', (request()->input('page', 1) - 1) * 10); - } - - public function create() - { - $this->setSubtitle("Tambah Data"); - return view('admin.mst_hak.create'); - } - - public function store(Request $request) - { - $request->validate([ - 'nama_hak' => 'required', - ]); - - $requestAll = $request->all(); - MstHak::create($requestAll); - - return redirect()->route('mst-hak.index') - ->with('success','Hak berhasil dibuat.'); - } - - public function show(MstHak $MstHak) - { - $this->setSubtitle("Detail Data"); - return view('admin.mst_hak.show',compact('MstHak')); - } - - public function edit(MstHak $MstHak) - { - $this->setSubtitle("Ubah Data"); - return view('admin.mst_hak.edit',compact('MstHak')); - } - - public function update(Request $request, MstHak $MstHak) - { - $request->validate([ - 'nama_hak' => 'required', - ]); - - $requestAll = $request->all(); - $MstHak->update($requestAll); - - return redirect()->route('mst-hak.index') - ->with('success','Hak berhasil diubah!'); - } - - public function destroy(MstHak $MstHak) - { - $MstHak->delete(); - - return redirect()->route('mst-hak.index') - ->with('success','Hak berhasil dihapus!'); - } - - public function hakList() - { - $mstKantor = MstHak::select(["id","nama_hak"])->get(); - return response()->json($mstKantor); - } -} diff --git a/app/Http/Controllers/Admin/MstKantorController.php b/app/Http/Controllers/Admin/MstKantorController.php deleted file mode 100644 index 266390f..0000000 --- a/app/Http/Controllers/Admin/MstKantorController.php +++ /dev/null @@ -1,123 +0,0 @@ -siteTitle = "Data Kantor"; - parent::__construct(); - } - /** - * Display a listing of the resource. - * - * @return \Illuminate\Http\Response - */ - public function index() - { - $data = MstKantor::latest()->paginate(10); - - return view('admin.mst_kantor.index',compact('data')) - ->with('i', (request()->input('page', 1) - 1) * 10); - } - - /** - * Show the form for creating a new resource. - * - * @return \Illuminate\Http\Response - */ - public function create() - { - $this->setSubtitle("Tambah Data"); - return view('admin.mst_kantor.create'); - } - - /** - * Store a newly created resource in storage. - * - * @param \Illuminate\Http\Request $request - * @return \Illuminate\Http\Response - */ - public function store(Request $request) - { - $request->validate([ - 'nama_kantor' => 'required', - 'wilayah' => 'required', - ]); - - $requestAll = $request->all(); - MstKantor::create($requestAll); - - return redirect()->route('mst-kantor.index') - ->with('success','Post created successfully.'); - } - - /** - * Display the specified resource. - * - * @param \App\Models\MstKantor $MstKantor - * @return \Illuminate\Http\Response - */ - public function show(MstKantor $MstKantor) - { - $this->setSubtitle("Detail Data"); - return view('admin.mst_kantor.show',compact('MstKantor')); - } - - /** - * Show the form for editing the specified resource. - * - * @param \App\Models\MstKantor $MstKantor - * @return \Illuminate\Http\Response - */ - public function edit(MstKantor $MstKantor) - { - $this->setSubtitle("Ubah Data"); - return view('admin.mst_kantor.edit',compact('MstKantor')); - } - - /** - * Update the specified resource in storage. - * - * @param \Illuminate\Http\Request $request - * @param \App\Models\MstKantor $MstKantor - * @return \Illuminate\Http\Response - */ - public function update(Request $request, MstKantor $MstKantor) - { - $request->validate([ - 'nama_kantor' => 'required', - 'wilayah' => 'required', - ]); - - $requestAll = $request->all(); - $MstKantor->update($requestAll); - - return redirect()->route('mst-kantor.index') - ->with('success','Tempat Kerja berhasil diubah!'); - } - - /** - * Remove the specified resource from storage. - * - * @param \App\Models\MstKantor $MstKantor - * @return \Illuminate\Http\Response - */ - public function destroy(MstKantor $MstKantor) - { - $MstKantor->delete(); - - return redirect()->route('mst-kantor.index') - ->with('success','Tempat Kerja berhasil dihapus!'); - } - - public function kantorList() - { - $mstKantor = MstKantor::select(["id","nama_kantor","wilayah"])->get(); - return response()->json($mstKantor); - } -} diff --git a/app/Http/Controllers/Admin/MstKeputusanController.php b/app/Http/Controllers/Admin/MstKeputusanController.php deleted file mode 100644 index 43d3da4..0000000 --- a/app/Http/Controllers/Admin/MstKeputusanController.php +++ /dev/null @@ -1,122 +0,0 @@ -siteTitle = "Data Keputusan"; - parent::__construct(); - } - /** - * Display a listing of the resource. - * - * @return \Illuminate\Http\Response - */ - public function index() - { - $data = MstKeputusan::latest()->paginate(10); - - return view('admin.mst_keputusan.index',compact('data')) - ->with('i', (request()->input('page', 1) - 1) * 10); - } - - /** - * Show the form for creating a new resource. - * - * @return \Illuminate\Http\Response - */ - public function create() - { - $this->setSubtitle("Tambah Data"); - return view('admin.mst_keputusan.create'); - } - - /** - * Store a newly created resource in storage. - * - * @param \Illuminate\Http\Request $request - * @return \Illuminate\Http\Response - */ - public function store(Request $request) - { - $request->validate([ - 'nama_keputusan' => 'required', - ]); - - $requestAll = $request->all(); - MstKeputusan::create($requestAll); - - return redirect()->route('mst-keputusan.index') - ->with('success','Post created successfully.'); - } - - /** - * Display the specified resource. - * - * @param \App\Models\MstKeputusan $mstKeputusan - * @return \Illuminate\Http\Response - */ - public function show(MstKeputusan $mstKeputusan) - { - // var_dump($mstKeputusan); exit; - $this->setSubtitle("Detail Data"); - return view('admin.mst_keputusan.show',compact('mstKeputusan')); - } - - /** - * Show the form for editing the specified resource. - * - * @param \App\Models\MstKeputusan $mstKeputusan - * @return \Illuminate\Http\Response - */ - public function edit(MstKeputusan $mstKeputusan) - { - $this->setSubtitle("Ubah Data"); - return view('admin.mst_keputusan.edit',compact('mstKeputusan')); - } - - /** - * Update the specified resource in storage. - * - * @param \Illuminate\Http\Request $request - * @param \App\Models\MstKeputusan $mstKeputusan - * @return \Illuminate\Http\Response - */ - public function update(Request $request, MstKeputusan $mstKeputusan) - { - $request->validate([ - 'nama_keputusan' => 'required', - ]); - - $requestAll = $request->all(); - $mstKeputusan->update($requestAll); - - return redirect()->route('mst-keputusan.index') - ->with('success','Keputusan berhasil diubah!'); - } - - /** - * Remove the specified resource from storage. - * - * @param \App\Models\MstKeputusan $mstKeputusan - * @return \Illuminate\Http\Response - */ - public function destroy(MstKeputusan $mstKeputusan) - { - $mstKeputusan->delete(); - - return redirect()->route('mst-keputusan.index') - ->with('success','Keputusan berhasil dihapus!'); - } - - public function keputusanList() - { - $mstKeputusan = MstKeputusan::select(["id","nama_keputusan"])->get(); - return response()->json($mstKeputusan); - } -} diff --git a/app/Http/Controllers/Admin/MstKpkdController.php b/app/Http/Controllers/Admin/MstKpkdController.php deleted file mode 100644 index 01228a6..0000000 --- a/app/Http/Controllers/Admin/MstKpkdController.php +++ /dev/null @@ -1,85 +0,0 @@ -siteTitle = "Data KPKD"; - parent::__construct(); - } - - public function index() - { - $data = MstKpkd::latest()->paginate(10); - - return view('admin.mst_kpkd.index',compact('data')) - ->with('i', (request()->input('page', 1) - 1) * 10); - } - - public function create() - { - $this->setSubtitle("Tambah Data"); - return view('admin.mst_kpkd.create'); - } - - public function store(Request $request) - { - $request->validate([ - 'nama' => 'required', - 'nip' => 'required', - 'nrk' => 'required', - ]); - - $requestAll = $request->all(); - MstKpkd::create($requestAll); - - return redirect()->route('mst-kpkd.index') - ->with('success','Data KPKD berhasil dibuat.'); - } - - public function show(MstKpkd $mstKpkd) - { - $this->setSubtitle("Detail Data"); - return view('admin.mst_kpkd.show',compact('mstKpkd')); - } - - public function edit(MstKpkd $mstKpkd) - { - $this->setSubtitle("Ubah Data"); - return view('admin.mst_kpkd.edit',compact('mstKpkd')); - } - - public function update(Request $request, MstKpkd $mstKpkd) - { - $request->validate([ - 'nama' => 'required', - 'nip' => 'required', - 'nrk' => 'required', - ]); - - $requestAll = $request->all(); - $mstKpkd->update($requestAll); - - return redirect()->route('mst-kpkd.index') - ->with('success','Data KPKD berhasil diubah!'); - } - - public function destroy(MstKpkd $mstKpkd) - { - $mstKpkd->delete(); - - return redirect()->route('mst-kpkd.index') - ->with('success','Data KPKD berhasil dihapus!'); - } - - public function kpkdList() - { - $mstKpkd = MstKpkd::where("status_aktif", 1)->select(["id","nama"])->get(); - return response()->json($mstKpkd); - } -} diff --git a/app/Http/Controllers/Admin/MstTempatKerjaController.php b/app/Http/Controllers/Admin/MstTempatKerjaController.php deleted file mode 100644 index 2d78383..0000000 --- a/app/Http/Controllers/Admin/MstTempatKerjaController.php +++ /dev/null @@ -1,94 +0,0 @@ -siteTitle = "Data Tempat Kerja"; - parent::__construct(); - } - - public function index() - { - $data = MstTempatKerja::latest()->paginate(10); - - return view('admin.mst_tempatkerja.index',compact('data')) - ->with('i', (request()->input('page', 1) - 1) * 10); - } - - public function create() - { - $this->setSubtitle("Tambah Data"); - return view('admin.mst_tempatkerja.create'); - } - - public function store(Request $request) - { - $request->validate([ - 'skpd_id' => 'required', - 'tempat_kerja' => 'required', - ]); - - $skpd = Tropd::where('I_ID', $request->skpd_id)->first(); - $requestAll = $request->all(); - $requestAll["skpd_name"] = $skpd->n_opd; - - MstTempatKerja::create($requestAll); - - return redirect()->route('mst-tempat_kerja.index') - ->with('success','Post created successfully.'); - } - - public function show(MstTempatKerja $MstTempatKerja) - { - $this->setSubtitle("Detail Data"); - return view('admin.mst_tempatkerja.show',compact('MstTempatKerja')); - } - - public function edit(MstTempatKerja $MstTempatKerja) - { - $this->setSubtitle("Ubah Data"); - return view('admin.mst_tempatkerja.edit',compact('MstTempatKerja')); - } - - public function update(Request $request, MstTempatKerja $MstTempatKerja) - { - $request->validate([ - 'skpd_id' => 'required', - 'tempat_kerja' => 'required', - ]); - - $skpd = Tropd::where('I_ID', $request->skpd_id)->first(); - $requestAll = $request->all(); - $requestAll["skpd_name"] = $skpd->n_opd; - - $MstTempatKerja->update($requestAll); - - return redirect()->route('mst-tempat_kerja.index') - ->with('success','Tempat Kerja berhasil diubah!'); - } - - public function destroy(MstTempatKerja $MstTempatKerja) - { - $MstTempatKerja->delete(); - - return redirect()->route('mst-tempat_kerja.index') - ->with('success','Tempat Kerja berhasil dihapus!'); - } - - public function tempatKerjaList($idUnit){ - $tempatKerja = MstTempatKerja::select("tempat_kerja") - ->distinct() - ->where("id_unit",$idUnit) - ->get()->toArray(); - - $arrColumn = array_column($tempatKerja,"tempat_kerja"); - return response()->json($arrColumn); - } -} \ No newline at end of file diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 9eb0ea4..f21d71a 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -50,6 +50,11 @@ class AuthController extends Controller if (Auth::check()) { // true sekalian session field di users nanti bisa dipanggil via Auth //Login Success + $taValue = []; + for($i=2022;$i<=date("Y");$i++){ + $taValue[] = $i; + } + Session::put('listTA', $taValue); return redirect()->route('home'); } else { // false diff --git a/app/Http/Controllers/JadwalSalurdanaController.php b/app/Http/Controllers/JadwalSalurdanaController.php index 285476a..6da512f 100644 --- a/app/Http/Controllers/JadwalSalurdanaController.php +++ b/app/Http/Controllers/JadwalSalurdanaController.php @@ -34,7 +34,11 @@ class JadwalSalurdanaController extends Controller $data = Sps_pendapatan::where("SKPD_ID",980) ->where("TAHUN",$ta) ->whereRaw("SUBSTR(KODE_REKENING,1,3)='4.2'"); + if (!empty($src)){ + $data->whereRaw("(LOWER(NAMA_REKENING) LIKE '%".strtolower($src)."%' OR LOWER(KODE_REKENING) LIKE '%".strtolower($src)."%')"); + } $dataFilter = $data->count(); + $dataTotal = Sps_pendapatan::where("SKPD_ID",980) ->where("TAHUN",$ta) ->whereRaw("SUBSTR(KODE_REKENING,1,3)='4.2'") diff --git a/app/Http/Controllers/RealisasiPendapatanController.php b/app/Http/Controllers/RealisasiPendapatanController.php index c330865..6e3f825 100644 --- a/app/Http/Controllers/RealisasiPendapatanController.php +++ b/app/Http/Controllers/RealisasiPendapatanController.php @@ -8,6 +8,7 @@ use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Auth; use Maatwebsite\Excel\Facades\Excel; use App\Models\DbhPendapatanRealisasi; +use App\Models\Sps_pendapatan; class RealisasiPendapatanController extends Controller { @@ -38,6 +39,7 @@ class RealisasiPendapatanController extends Controller 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]; @@ -53,7 +55,7 @@ class RealisasiPendapatanController extends Controller DB::commit(); return redirect()->route('realisasi-pendapatan.index') - ->with('success','SKPP berhasil dibuat.'); + ->with('success','Realisasi Pendapatan berhasil dibuat.'); }catch(\Exception $e){ DB::rollBack(); @@ -68,6 +70,47 @@ class RealisasiPendapatanController extends Controller return view('realisasi_pendapatan.edit',compact('realisasi_pendapatan')); } + public function update(Request $request, DbhPendapatanRealisasi $realisasi_pendapatan) + { + 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_pendapatan->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 rinciDBH(Request $request) + { + $idSPS = $request->idSPS; + $select = DB::raw("spsbulan1,spsbulan2,spsbulan3,spsbulan4,spsbulan5,spsbulan6,spsbulan7,spsbulan8,spsbulan9,spsbulan10,spsbulan11,spsbulan12"); + $sps = Sps_pendapatan::select($select)->where("ID",$idSPS)->firstOrNew(); + + return response()->json($sps); + } + public function datatable(Request $request) { $post = $request->all(); @@ -78,6 +121,9 @@ class RealisasiPendapatanController extends Controller $dataFilter=0; $data = DbhPendapatanRealisasi::orderBy("created_at","ASC"); + if (!empty($src)){ + $data->whereRaw("(LOWER(simtrad4_uraian) LIKE '%".strtolower($src)."%')"); + } $dataFilter = $data->count(); $dataTotal = DbhPendapatanRealisasi::count(); diff --git a/app/Models/DbhPendapatanRealisasi.php b/app/Models/DbhPendapatanRealisasi.php index fa3cadc..90cdc0c 100644 --- a/app/Models/DbhPendapatanRealisasi.php +++ b/app/Models/DbhPendapatanRealisasi.php @@ -13,7 +13,7 @@ class DbhPendapatanRealisasi extends Eloquent protected $connection = 'mysql'; protected $table = 'dbh_pendapatan_realisasi'; protected $fillable = [ - 'simtrad4_uraian','simtrad4_kotor','simtrad4_potongan','simtrad4_bersih','simtrad4_sp2d_bun', + 'tahun','simtrad4_uraian','simtrad4_kotor','simtrad4_potongan','simtrad4_bersih','simtrad4_sp2d_bun', 'rkud_tgl','rkud_no_sts','rkud_kode_akun','rkud_nama_akun','rkud_jumlah','id_sps','kode_rekening_sps','nama_rekening_sps' ]; diff --git a/app/helpers.php b/app/helpers.php index a8a197a..295eca3 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -28,6 +28,10 @@ function SetToIndoDate($val,$monthYear=false, $full=false){ } } +function cekData($data, $default){ + return isset($data)?$data:$default; +} + function replaceMoney($val){ return doubleval(preg_replace("/\D/","",$val)); } diff --git a/database/migrations/2022_07_11_093130_create_dbh_pendapatan_realisasi_table.php b/database/migrations/2022_07_11_093130_create_dbh_pendapatan_realisasi_table.php index 155e1ad..5065a83 100644 --- a/database/migrations/2022_07_11_093130_create_dbh_pendapatan_realisasi_table.php +++ b/database/migrations/2022_07_11_093130_create_dbh_pendapatan_realisasi_table.php @@ -15,6 +15,7 @@ class CreateDbhPendapatanRealisasiTable extends Migration { Schema::create('dbh_pendapatan_realisasi', function (Blueprint $table) { $table->uuid('id')->primary(); + $table->string('tahun',4); $table->integer('id_sps')->nullable(); $table->string('kode_rekening_sps',50)->nullable(); $table->string('nama_rekening_sps',150)->nullable(); diff --git a/public/css/app.css b/public/css/app.css index 2e1e174..d5c1e4a 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -73,7 +73,7 @@ hr{ } .tblClickRow tr > td{ - cursor:pointer + cursor:default; } #loader-wrapper { diff --git a/public/js/custom.js b/public/js/custom.js index 8a86822..dda233e 100644 --- a/public/js/custom.js +++ b/public/js/custom.js @@ -2483,7 +2483,7 @@ function init_DataTables() { // console.log('run_datatables'); if (typeof ($.fn.DataTable) === 'undefined') { return; } - console.log('init_DataTables'); + //console.log('init_DataTables'); var handleDataTableButtons = function () { if ($("#datatable-buttons").length) { diff --git a/resources/views/jadwal_salurdana/index.blade.php b/resources/views/jadwal_salurdana/index.blade.php index d8c68eb..7cf6c8e 100644 --- a/resources/views/jadwal_salurdana/index.blade.php +++ b/resources/views/jadwal_salurdana/index.blade.php @@ -27,18 +27,27 @@ @stop @section('content') -
-
-
Periode
- +
+
+
+ + +
-
-
Berdasarkan Kata
- +
+
+ + +
- +
@@ -81,18 +90,14 @@ $(document).ready(function(){ var srcDate1 = null, srcDate2 = null; - $('#dtTableSKPP tbody').on('click', 'tr', function () { - var data = dtTable.row( this ).data(); - location.href = "/jadwal-salurdana/" + data["id"]; - }); - $("#src").keyup(function(e){ if (e.keyCode == 13){ + e.preventDefault(); dtTable.draw(); } }); - $("#srcTA").on("change",function(){ + $("#srcTA").on("change",function(e){ dtTable.draw(); }); @@ -164,8 +169,8 @@ "infoEmpty": "Data tidak tersedia", "infoFiltered": "(Disaring dari _MAX_ Data)", "paginate": { - "previous": "< Sebelumnya", - "next": "Selanjutnya >", + "previous": "", + "next": "", } }, scrollX:true, diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 8a24e9a..0d40288 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -15,7 +15,7 @@ @yield('styles') - +
@include('partials.top_menu') @@ -154,8 +154,48 @@ } e.preventDefault(); }); + + $(document).on("submit",".form-delete",function (e){ + e.preventDefault(); + let test = Swal.fire({ + title: 'Data akan dihapus?', + showDenyButton: true, + showCancelButton: false, + confirmButtonText: 'Ya', + denyButtonText: "Tidak", + icon: "warning", + }).then((result) => { + /* Read more about isConfirmed, isDenied below */ + if (result.isConfirmed) { + e.currentTarget.submit(); + } + }) + }); + + var url = window.location; + url = url + ""; + const allLinks = document.querySelectorAll('.nav-item a'); + // const currentLink = [...allLinks].filter(e => { + // return url.indexOf(e.href) > -1) { + // return e.href == url; + // } + // }); + let currentLink = ""; + allLinks.forEach((val, idx) => { + if (url.indexOf(val.href) > -1){ + currentLink = val; + } + }) + + $(currentLink).addClass("active") + $(".has-treeview").removeClass("menu-open active"); + $(currentLink).closest(".has-treeview").addClass("menu-open active"); + $($(currentLink).closest(".has-treeview")).children("a.nav-link").addClass("active"); + $($(currentLink).closest(".nav-treeview")).closest("li.nav-item").addClass("menu-open"); + $($(currentLink).closest(".nav-treeview")).parentsUntil(".nav-sidebar > .nav-treeview").addClass('menu-open'); }); @yield('scripts') + @yield('scripts2') diff --git a/resources/views/layouts/empty.blade.php b/resources/views/layouts/empty.blade.php index 45e41a6..3c818f9 100644 --- a/resources/views/layouts/empty.blade.php +++ b/resources/views/layouts/empty.blade.php @@ -15,7 +15,7 @@ @yield('styles') - +
@include('partials.top_menu') @@ -152,5 +152,6 @@ }); @yield('scripts') + @yield('scripts2') diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php index 8a35b22..6937ced 100644 --- a/resources/views/partials/menu.blade.php +++ b/resources/views/partials/menu.blade.php @@ -3,49 +3,51 @@ $role = $role[0]; @endphp
@@ -74,13 +83,9 @@ $(document).ready(function(){ var srcDate1 = null, srcDate2 = null; - $('#dtTableSKPP tbody').on('click', 'tr', function () { - var data = dtTable.row( this ).data(); - location.href = "/realisasi-pendapatan/" + data["id"]; - }); - $("#src").keyup(function(e){ if (e.keyCode == 13){ + e.preventDefault(); dtTable.draw(); } }); @@ -149,8 +154,8 @@ "infoEmpty": "Data tidak tersedia", "infoFiltered": "(Disaring dari _MAX_ Data)", "paginate": { - "previous": "< Sebelumnya", - "next": "Selanjutnya >", + "previous": "", + "next": "", } }, scrollX:true, diff --git a/resources/views/realisasi_pendapatan/show.blade.php b/resources/views/realisasi_pendapatan/show.blade.php index 75845aa..0b53664 100644 --- a/resources/views/realisasi_pendapatan/show.blade.php +++ b/resources/views/realisasi_pendapatan/show.blade.php @@ -16,56 +16,11 @@

{{ $sitesubTitle }}

- {{-- @if(auth()->user()->can('Tambah SKPP')) --}} - {{-- @endif --}}
-
-
- -
- -
-
-
- -
- nama_rekening_sps }}"> -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
+
+ @include('realisasi_pendapatan.form')
@@ -78,7 +33,7 @@
- +
@@ -113,15 +68,21 @@
@stop -@section('scripts') +@section('scripts2') @endsection \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 17d47f2..9f38609 100644 --- a/routes/web.php +++ b/routes/web.php @@ -43,6 +43,7 @@ Route::group(['middleware' => 'auth'], function () { Route::group(['prefix' => 'realisasi-pendapatan'], function () { Route::post('/datatable', [RealisasiPendapatanController::class,'datatable']); Route::post('/{realisasiId}/sts', [RealisasiPendapatanController::class,'sts']); + Route::get('/rinci-dbh', [RealisasiPendapatanController::class,'rinciDBH']); }); Route::resource('realisasi-pendapatan', RealisasiPendapatanController::class);