diff --git a/app/Http/Controllers/Admin/MappingDbhSkpdController.php b/app/Http/Controllers/Admin/MappingDbhSkpdController.php index 09a2ed4..8840c24 100644 --- a/app/Http/Controllers/Admin/MappingDbhSkpdController.php +++ b/app/Http/Controllers/Admin/MappingDbhSkpdController.php @@ -33,31 +33,34 @@ class MappingDbhSkpdController extends Controller public function store(Request $request) { $request->validate([ - 'name' => 'required', - 'nrk' => 'required', - 'password' => 'required', - 'opt_role' => 'required' + 'id_sps' => 'required', + 'tahun' => 'required', + 'kode_rekening' => 'required', + 'txt_id_skpd'=>'required' ]); - $requestAll = $request->all(); - $requestAll["password"] = \Hash::make($requestAll["password"]); - $requestAll["role_name"] = $requestAll["opt_role"]; - $user=User::create($requestAll); + $req = $request->all(); + MappingDbhSkpd::where("id_sps", $req["id_sps"])->delete(); + foreach($req["txt_id_skpd"] as $row_req) + { + $data["id_sps"] = $req["id_sps"]; + $data["tahun"] = $req["tahun"]; + $data["kode_rekening"] = $req["kode_rekening"]; + $data["kode_skpd"] = $row_req; - $user->roles()->detach(); - //$user->removeRole($requestAll["opt_role"]); - $user->assignRole($requestAll["opt_role"]); + MappingDbhSkpd::create($data); + } - return redirect()->route('users.index') - ->with('success','Mapping berhasil dibuat.'); + return redirect("/admin/MappingDbhSkpd")->with('success','Mapping Rekening DBH/DAK ke SKPD berhasil dibuat.'); } public function show($MappingDbhSkpd) { $sps = sps_pendapatan::where("id",$MappingDbhSkpd)->firstorNew(); - // var_dump($sps); exit; - $mappingSKPD = MappingDbhSkpd::where("id_sps",$MappingDbhSkpd)->get(); - $this->setSubtitle("Detail Data"); + $mappingSKPD = DB::select(DB::raw("SELECT x.*,y.N_OPD FROM SAMASA.MAPPING_DBH_SKPD x + LEFT JOIN NEWSIPKD.TROPD y ON x.KODE_SKPD = y.C_OPD WHERE x.id_sps = $MappingDbhSkpd")); + // MappingDbhSkpd::where("id_sps",$MappingDbhSkpd)->get(); + $this->setSubtitle("Detail Data Mapping"); return view('admin.mapping_dbh_skpd.show',compact('mappingSKPD','sps')); } diff --git a/app/Http/Controllers/Admin/MstPenggunaController.php b/app/Http/Controllers/Admin/MstPenggunaController.php index da680f5..1b32a81 100644 --- a/app/Http/Controllers/Admin/MstPenggunaController.php +++ b/app/Http/Controllers/Admin/MstPenggunaController.php @@ -135,7 +135,7 @@ class MstPenggunaController extends Controller $dataTotal = $sqlstr->count(); $data = $sqlstr->orderBy("role_name"); if (!empty($src)){ - $data->whereRaw(" ( lower(name) like '%$src%' OR lower(role_name) like '%$src%' ) "); + $data->whereRaw(" ( lower(name) like '%$src%' OR lower(nrk) like '%$src%' ) "); } $dataFilter = $data->count(); diff --git a/app/Http/Controllers/ItemSearchController.php b/app/Http/Controllers/ItemSearchController.php index f08e015..4fb8c7f 100644 --- a/app/Http/Controllers/ItemSearchController.php +++ b/app/Http/Controllers/ItemSearchController.php @@ -13,6 +13,7 @@ use App\Models\Siesetpembayaran; use App\Models\Sp2d; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Auth; class ItemSearchController extends Controller { @@ -102,22 +103,30 @@ class ItemSearchController extends Controller $search = strtolower($request->q); $ta = $request->ta; $jenis = $request->jenis; - $select = DB::raw("ID,KODE_REKENING||' | '||NAMA_REKENING as name"); - $sps = Sps_pendapatan::select($select) - ->whereRaw("TAHUN=$ta AND SKPD_ID = 980"); - if (!empty($search)){ - $sps->whereRaw(" (LOWER(KODE_REKENING) LIKE '%$search%' OR LOWER(NAMA_REKENING) LIKE '%$search%') "); - } + if (getRole()=="skpd"){ + $sps = DB::select(DB::raw("SELECT x.ID_SPS as ID,x.KODE_REKENING||' | '||z.NAMA_REKENING as name + FROM SAMASA.MAPPING_DBH_SKPD x + LEFT JOIN PROKSI.SPS_PENDAPATAN z ON x.ID_SPS = z.ID + WHERE x.tahun = $ta AND x.kode_skpd='".Auth::user()->nrk."'")); + }else{ + $select = DB::raw("ID,KODE_REKENING||' | '||NAMA_REKENING as name"); + $sps = Sps_pendapatan::select($select)->whereRaw("TAHUN=$ta AND SKPD_ID = 980"); + + if (!empty($search)){ + $sps->whereRaw(" (LOWER(KODE_REKENING) LIKE '%$search%' OR LOWER(NAMA_REKENING) LIKE '%$search%') "); + } + + if ($jenis == "dbh"){ + $sps->whereRaw(" (SUBSTR(KODE_REKENING,1,12)='4.2.01.01.01') "); + }else if($jenis == "dak"){ + $sps->whereRaw(" (SUBSTR(KODE_REKENING,1,12)='4.2.01.01.03' OR SUBSTR(KODE_REKENING,1,12)='4.2.01.01.04') "); + } - if ($jenis == "dbh"){ - $sps->whereRaw(" (SUBSTR(KODE_REKENING,1,12)='4.2.01.01.01') "); - }else if($jenis == "dak"){ - $sps->whereRaw(" (SUBSTR(KODE_REKENING,1,12)='4.2.01.01.03' OR SUBSTR(KODE_REKENING,1,12)='4.2.01.01.04') "); + $sps->orderby("KODE_REKENING"); + $sps = $sps->get(); } - - $sps->orderby("KODE_REKENING"); - $sps = $sps->get(); + return response()->json($sps); } diff --git a/app/Http/Controllers/JadwalSalurdanaController.php b/app/Http/Controllers/JadwalSalurdanaController.php index 7727554..2cb638c 100644 --- a/app/Http/Controllers/JadwalSalurdanaController.php +++ b/app/Http/Controllers/JadwalSalurdanaController.php @@ -26,9 +26,9 @@ class JadwalSalurdanaController extends Controller protected function queryJadwalSalurDana($ta) { - $sqlstr = 'SELECT kode_rekening,nama_rekening,spsbulan1,spsbulan2,spsbulan3,spsbulan4, + $sqlstr = 'SELECT x.kode_rekening,x.nama_rekening,spsbulan1,spsbulan2,spsbulan3,spsbulan4, spsbulan5,spsbulan6,spsbulan7,spsbulan8,spsbulan9,spsbulan10,spsbulan11,spsbulan12, - SUBSTR(KODE_REKENING,1,12) AS kodegrup,SUBSTR(KODE_REKENING,1,9) AS groupall, + SUBSTR(x.KODE_REKENING,1,12) AS kodegrup,SUBSTR(x.KODE_REKENING,1,9) AS groupall, NVL("1",0) AS "REAL1",NVL("2",0) AS "REAL2",NVL("3",0) AS "REAL3", NVL("4",0) AS "REAL4",NVL("5",0) AS "REAL5",NVL("6",0) AS "REAL6", NVL("7",0) AS "REAL7",NVL("8",0) AS "REAL8",NVL("9",0) AS "REAL9", @@ -46,14 +46,16 @@ class JadwalSalurdanaController extends Controller SUM(RKUD_JUMLAH) FOR BULAN IN(1,2,3,4,5,6,7,8,9,10,11,12) ) - )y ON x.ID = y.ID_SPS - LEFT JOIN - NEWSIPKD.TROPD z ON x.SKPD_ID = z.I_ID - WHERE x.TAHUN = '.$ta.' AND x.SKPD_ID=980 AND SUBSTR(x.KODE_REKENING,1,3)=\'4.2\''; + )y ON x.ID = y.ID_SPS '; + - // if (getRole()=="skpd"){ - // $sqlstr.=" AND z.C_OPD='".Auth::user()->nrk."'"; - // } + if (getRole()=="skpd"){ + $sqlstr .= ' LEFT JOIN SAMASA.MAPPING_DBH_SKPD z ON x.id=z.id_sps WHERE z.KODE_SKPD=\''.Auth::user()->nrk.'\''; + }else{ + $sqlstr .= " WHERE 1=1 "; + } + + $sqlstr .= ' AND x.TAHUN = '.$ta.' AND x.SKPD_ID=980 AND SUBSTR(x.KODE_REKENING,1,3)=\'4.2\''; return $sqlstr; } @@ -78,12 +80,12 @@ class JadwalSalurdanaController extends Controller if (!empty($typeDana)){ if ($typeDana == "cht"){ - $sqlstr.=" AND kode_rekening='4.2.01.01.01.0004'"; + $sqlstr.=" AND x.kode_rekening='4.2.01.01.01.0004'"; }else{ - $sqlstr.=" AND SUBSTR(kode_rekening,1,12) IN ('4.2.01.01.03','4.2.01.01.04')"; + $sqlstr.=" AND SUBSTR(x.kode_rekening,1,12) IN ('4.2.01.01.03','4.2.01.01.04')"; } } - $data = DB::select(DB::raw($sqlstr.'ORDER BY kode_rekening OFFSET '.$offset.' ROWS FETCH NEXT '.$limit.' ROWS ONLY')); + $data = DB::select(DB::raw($sqlstr.'ORDER BY x.kode_rekening OFFSET '.$offset.' ROWS FETCH NEXT '.$limit.' ROWS ONLY')); $dataFilter = count(DB::select(DB::raw($sqlstr))); return response()->json([ diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php index 95d9656..e217ae3 100644 --- a/app/Http/Controllers/RealisasiBelanjaController.php +++ b/app/Http/Controllers/RealisasiBelanjaController.php @@ -255,6 +255,7 @@ class RealisasiBelanjaController extends Controller "jumlah_anggaran"=>$datas[$i]["jumlah_anggaran"], "volume_satuan"=>$datas[$i]["volume_satuan"], "unit_satuan"=>$datas[$i]["unit_satuan"], + "jml_rencana_kontrak"=>$datas[$i]["jml_rencana_kontrak"], "jenis_dana"=>$datas[$i]["jenis_dana"], "sub_jenis_dana"=>$datas[$i]["sub_jenis_dana"], "created_by"=>$datas[$i]["userid"] diff --git a/app/Imports/RealisasiBelanjaImport.php b/app/Imports/RealisasiBelanjaImport.php index 2fe6573..76b42cc 100644 --- a/app/Imports/RealisasiBelanjaImport.php +++ b/app/Imports/RealisasiBelanjaImport.php @@ -26,7 +26,7 @@ class RealisasiBelanjaImport implements ToModel, WithStartRow public function model(array $row) { - return new TempRealisasiBelanja([ + $data = [ "tahun_anggaran"=>$this->ta, "jenis_belanja"=>$row[0], "sub_jenis_belanja"=>$row[1], @@ -46,6 +46,12 @@ class RealisasiBelanjaImport implements ToModel, WithStartRow "jenis_dana"=>$this->jenisDana, "sub_jenis_dana"=>$this->subjenisDana, "userid"=>Auth::user()->id - ]); + ]; + + if ($this->subjenisDana == "Fisik"){ + $data["jml_rencana_kontrak"] = $row[15]; + } + + return new TempRealisasiBelanja($data); } } diff --git a/app/Models/BelanjaRealisasi.php b/app/Models/BelanjaRealisasi.php index c2f9f53..4c5fb6a 100644 --- a/app/Models/BelanjaRealisasi.php +++ b/app/Models/BelanjaRealisasi.php @@ -35,6 +35,7 @@ class BelanjaRealisasi extends Eloquent "volume_satuan_realisasi", "unit_satuan_realisasi", "no_sp2d", + "jml_rencana_kontrak", "realisasi_by", "created_by", "jenis_dana", diff --git a/app/Models/MappingDbhSkpd.php b/app/Models/MappingDbhSkpd.php index fbd0f1b..80eadf4 100644 --- a/app/Models/MappingDbhSkpd.php +++ b/app/Models/MappingDbhSkpd.php @@ -11,4 +11,10 @@ class MappingDbhSkpd extends Eloquent use HasFactory; protected $connection = 'Samasa'; protected $table = 'SAMASA.mapping_dbh_skpd'; -} + protected $fillable = [ + "id_sps", + "tahun", + "kode_rekening", + "kode_skpd" + ]; +} \ No newline at end of file diff --git a/app/Models/TempRealisasiBelanja.php b/app/Models/TempRealisasiBelanja.php index 450553a..dd7a0ad 100644 --- a/app/Models/TempRealisasiBelanja.php +++ b/app/Models/TempRealisasiBelanja.php @@ -30,6 +30,7 @@ class TempRealisasiBelanja extends Eloquent "jumlah_anggaran", "volume_satuan", "unit_satuan", + "jml_rencana_kontrak", "jenis_dana", "sub_jenis_dana", "userid" diff --git a/database/migrations/2022_07_15_094519_create_temp_realisasi_belanja_table.php b/database/migrations/2022_07_15_094519_create_temp_realisasi_belanja_table.php index bab3460..fb17a24 100644 --- a/database/migrations/2022_07_15_094519_create_temp_realisasi_belanja_table.php +++ b/database/migrations/2022_07_15_094519_create_temp_realisasi_belanja_table.php @@ -33,6 +33,7 @@ class CreateTempRealisasiBelanjaTable extends Migration $table->decimal('jumlah_anggaran', 19, 2); $table->integer('volume_satuan')->nullable(); $table->string('unit_satuan',30)->nullable(); + $table->smallInteger('jml_rencana_kontrak')->default(0); $table->enum('jenis_dana',["DBH","DAK"]); $table->enum('sub_jenis_dana',["All","CHT","Fisik","Non-Fisik"]); $table->uuid('userid'); diff --git a/database/migrations/2022_07_18_090432_create_belanja_realisasi_table.php b/database/migrations/2022_07_18_090432_create_belanja_realisasi_table.php index ba7ef0a..1ff8a2c 100644 --- a/database/migrations/2022_07_18_090432_create_belanja_realisasi_table.php +++ b/database/migrations/2022_07_18_090432_create_belanja_realisasi_table.php @@ -37,6 +37,7 @@ class CreateBelanjaRealisasiTable extends Migration $table->integer('volume_satuan_realisasi')->nullable(); $table->string('unit_satuan_realisasi',30)->nullable(); $table->string("no_sp2d",30)->nullable(); + $table->smallInteger('jml_rencana_kontrak')->default(0); $table->string("jenis_dana",50); $table->string("sub_jenis_dana",50); $table->uuid('realisasi_by')->nullable(); diff --git a/public/css/app.css b/public/css/app.css index c7acd55..90e12a8 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -336,4 +336,14 @@ hr{ width: -webkit-fill-available; width: fill-available; } -*/ \ No newline at end of file +*/ + +.select2-container--default .select2-selection--multiple .select2-selection__choice{ + background: #dfdfdf; + border-color:#dfdfdf; + color:#333; +} + +.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{ + color:#333; +} \ No newline at end of file diff --git a/resources/views/admin/mapping_dbh_skpd/index.blade.php b/resources/views/admin/mapping_dbh_skpd/index.blade.php index a339c74..fcc46e2 100644 --- a/resources/views/admin/mapping_dbh_skpd/index.blade.php +++ b/resources/views/admin/mapping_dbh_skpd/index.blade.php @@ -107,7 +107,7 @@ let checked = aData["is_lock_upload"] == 1 ? "checked":""; $("td:eq(0)", nRow).html(index); - $("td:eq(3)", nRow).html(``); + $("td:eq(3)", nRow).html(``); return nRow; }, diff --git a/resources/views/admin/mapping_dbh_skpd/show.blade.php b/resources/views/admin/mapping_dbh_skpd/show.blade.php index 0089ab9..232f193 100644 --- a/resources/views/admin/mapping_dbh_skpd/show.blade.php +++ b/resources/views/admin/mapping_dbh_skpd/show.blade.php @@ -5,52 +5,53 @@ ]; @endphp -@extends('layouts.app') +@extends('layouts.empty') @section('content') -
-
-
-
@php echo $sitesubTitle; @endphp
-
-
- Back +
+
+
@php echo $sitesubTitle; @endphp
+
+
+
+ @csrf +
+
+
+ Tahun: + + +
+
+ Kode Rekening: + +
+
+ Nama Rekening + +
+
+
+
+ + +
+
+
+ +
+
+
+
- -
id }}" method="POST"> - @csrf -
-
-
- Tahun: - -
-
- Kode Rekening: - -
-
- Nama Rekening - -
-
-
-
- - -
-
-
- -
-
-
@endsection @section('scripts') @endsection \ No newline at end of file diff --git a/resources/views/admin/mst_pengguna/index.blade.php b/resources/views/admin/mst_pengguna/index.blade.php index c157980..b4bfc46 100644 --- a/resources/views/admin/mst_pengguna/index.blade.php +++ b/resources/views/admin/mst_pengguna/index.blade.php @@ -117,7 +117,7 @@ $("td:eq(4)", nRow).html(""); $("td:eq(5)", nRow).html( `
- + @csrf @method("DELETE") diff --git a/resources/views/realisasi_belanja/form.blade.php b/resources/views/realisasi_belanja/form.blade.php index 79f5a8d..eecf533 100644 --- a/resources/views/realisasi_belanja/form.blade.php +++ b/resources/views/realisasi_belanja/form.blade.php @@ -49,6 +49,10 @@
+
+ + +
{{-- --}} diff --git a/resources/views/realisasi_belanja/submit.blade.php b/resources/views/realisasi_belanja/submit.blade.php index 05c0a6a..153bfd1 100644 --- a/resources/views/realisasi_belanja/submit.blade.php +++ b/resources/views/realisasi_belanja/submit.blade.php @@ -254,7 +254,8 @@ $("input[name=unit]").attr("readonly", true); $("input[name=vol_realisasi]").val("{{ isset($BelanjaRealisasi->volume_satuan_realisasi)?$BelanjaRealisasi->volume_satuan_realisasi:0 }}"); $("input[name=unit_realisasi]").val("{{ isset($BelanjaRealisasi->unit_satuan_realisasi)?$BelanjaRealisasi->unit_satuan_realisasi:0 }}"); - + $("input[name=jml_rencana_kontrak]").val("{{ isset($BelanjaRealisasi->jml_rencana_kontrak)?$BelanjaRealisasi->jml_rencana_kontrak:0 }}"); + $("input[name=jml_rencana_kontrak]").attr("readonly", true); }); @endsection \ No newline at end of file diff --git a/resources/views/realisasi_belanja/upload.blade.php b/resources/views/realisasi_belanja/upload.blade.php index b7cfd68..328b69d 100644 --- a/resources/views/realisasi_belanja/upload.blade.php +++ b/resources/views/realisasi_belanja/upload.blade.php @@ -57,7 +57,8 @@
-

Format:xlsx | Columns: +

+ Format:xlsx | Columns: "jenis_belanja", "sub_jenis_belanja", "kode_program", @@ -72,7 +73,9 @@ "nama_rsk", "jumlah_anggaran", "volume_satuan", - "unit_satuan"

+ "unit_satuan", + "jml_rencana_kontrak" +

@@ -95,7 +98,7 @@ "Nama Program", "Kode SKPD", "Nama SKPD", "Kode Kegiatan", "Nama Kegiatan", "Kode Sub Kegiatan", "Nama Sub Kegiatan", "Kode RSK", "Nama RSK", //"Kode Rek", "Nama Rek", - "Anggaran", "Volume", "Unit","Jenis Dana","Sub Jenis Dana"); + "Anggaran", "Volume", "Unit","Jml Rencana Kontrak","Jenis Dana","Sub Jenis Dana"); foreach($arrCol as $rowCol){ echo "$rowCol"; } @@ -188,6 +191,7 @@ { "data": "jumlah_anggaran", "className":"text-right", "defaultContent":"0" }, { "data": "volume_satuan", "className":"text-center", "defaultContent":"0" }, { "data": "unit_satuan", "className":"text-center", "defaultContent":"-" }, + { "data": "jml_rencana_kontrak", "className":"text-center", "defaultContent":"-" }, { "data": "jenis_dana", "className":"text-center", "defaultContent":"-" }, { "data": "sub_jenis_dana", "className":"text-center", "defaultContent":"-" }, ],