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

Fix Conflict

Browse Source
This commit is contained in:
updi
2023-01-06 00:24:24 +07:00
parent 6f0dfa2276 1b94baf5a7
commit 733ea100ef
20 changed files with 115 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/MappingDbhSkpdController.php
+15 -13
View File
@@ -4,6 +4,8 @@ namespace App\Http\Controllers\Admin;
use App\Models\MappingDbhSkpd;
use App\Models\Sps_pendapatan;
use App\Models\AkbPendapatan;
use App\Models\VwRekeningPendapatan;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
@@ -33,32 +35,33 @@ class MappingDbhSkpdController extends Controller
public function store(Request $request)
{
$request->validate([
'id_sps' => 'required',
'tahun' => 'required',
'id_rekening' => 'required',
// 'tahun' => 'required',
'kode_rekening' => 'required',
'txt_id_skpd'=>'required'
//'txt_id_skpd'=>'required'
]);
$req = $request->all();
MappingDbhSkpd::where("id_sps", $req["id_sps"])->delete();
MappingDbhSkpd::where("kode_rekening", $req["kode_rekening"])->delete();
if (isset($req["txt_id_skpd"])){
foreach($req["txt_id_skpd"] as $row_req)
{
$data["id_sps"] = $req["id_sps"];
$data["tahun"] = $req["tahun"];
$data["id_rekening"] = $req["id_rekening"];
// $data["tahun"] = $req["tahun"];
$data["kode_rekening"] = $req["kode_rekening"];
$data["kode_skpd"] = $row_req;
MappingDbhSkpd::create($data);
}
return redirect("/admin/MappingDbhSkpd")->with('success','Mapping Rekening DBH/DAK ke SKPD 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();
$sps = VwRekeningPendapatan::where("id",$MappingDbhSkpd)->firstorNew();
$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"));
LEFT JOIN NEWSIPKD.TROPD y ON x.KODE_SKPD = y.C_OPD WHERE x.id_rekening = $MappingDbhSkpd"));
// MappingDbhSkpd::where("id_sps",$MappingDbhSkpd)->get();
$this->setSubtitle("Detail Data Mapping");
return view('admin.mapping_dbh_skpd.show',compact('mappingSKPD','sps'));
@@ -105,10 +108,9 @@ class MappingDbhSkpdController extends Controller
$src = isset($post["search"]["value"]) ? strtolower($post["search"]["value"]):"";
$srcTA = $post["srcTA"];
$select = DB::raw("ID, KODE_REKENING, NAMA_REKENING");
$sqlstr = Sps_pendapatan::select($select)
->whereRaw("TAHUN=$srcTA AND SKPD_ID = 980 AND KODE_REKENING LIKE '4.2%'");
$sqlstr = VwRekeningPendapatan::select($select);
$dataTotal = $sqlstr->count();
$data = $sqlstr->orderBy("ID");
$data = $sqlstr->orderBy("KODE_REKENING");
if (!empty($src)){
$data->whereRaw(" ( lower(KODE_REKENING) like '%$src%' OR lower(NAMA_REKENING) like '%$src%' ) ");
}
app/Http/Controllers/ItemSearchController.php
+6 -5
View File
@@ -16,6 +16,7 @@ use App\Models\BelanjaRealisasi;
use App\Models\MstJenisDana;
use App\Models\MstJenisBelanja;
use App\Models\MstSubJenisBelanja;
use App\Models\VwRekeningPendapatan;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Auth;
@@ -140,13 +141,13 @@ class ItemSearchController extends Controller
$jenis = $request->jenis;
if (getRole()=="skpd"){
$sps = DB::select(DB::raw("SELECT x.ID_SPS as ID,x.KODE_REKENING||' | '||z.NAMA_REKENING as name
$sps = DB::select(DB::raw("SELECT x.KODE_REKENING as IDX,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."'"));
LEFT JOIN SAMASA.VW_REKENING_PENDAPATAN z ON x.ID_REKENING = z.ID
WHERE 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");
$select = DB::raw("KODE_REKENING AS IDX,KODE_REKENING||' | '||NAMA_REKENING as name");
$sps = VwRekeningPendapatan::select($select);
if (!empty($search)){
$sps->whereRaw(" (LOWER(KODE_REKENING) LIKE '%$search%' OR LOWER(NAMA_REKENING) LIKE '%$search%') ");
app/Http/Controllers/JadwalSalurdanaController.php
+4 -3
View File
@@ -37,7 +37,7 @@ class JadwalSalurdanaController extends Controller
$sqlstr = Sps_pendapatan::queryJadwalSalurDana($ta);
if (!empty($idSPS)){
$sqlstr.=" AND x.ID=$idSPS";
$sqlstr.=" AND x.KODE_REKENING='$idSPS'";
}
$dataTotal = count(DB::select(DB::raw($sqlstr)));
@@ -49,7 +49,8 @@ class JadwalSalurdanaController extends Controller
$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 x.kode_rekening OFFSET '.$offset.' ROWS FETCH NEXT '.$limit.' ROWS ONLY'));
$offsetLimit = $limit > 0 ?'OFFSET '.$offset.' ROWS FETCH NEXT '.$limit.' ROWS ONLY':'';
$data = DB::select(DB::raw($sqlstr.'ORDER BY x.kode_rekening '.$offsetLimit));
$dataFilter = count(DB::select(DB::raw($sqlstr)));
return response()->json([
@@ -72,7 +73,7 @@ class JadwalSalurdanaController extends Controller
{
if ($request->id_sps > 0)
{
$filter.=" AND x.id_sps=".$request->id_sps;
$filter.=" AND x.kode_rekening='".$request->id_sps."'";
$idSPS = $request->id_sps;
}
}
app/Http/Controllers/RealisasiBelanjaController.php
+9 -6
View File
@@ -20,6 +20,7 @@ use App\Models\VwDpaRsk;
use App\Models\VwBelanjaRealisasi;
use App\Models\UnitSatuan;
use App\Models\Sp2d;
use App\Models\Trbas;
use App\Models\Sps_pendapatan;
use App\Imports\RealisasiBelanjaImport;
use App\Imports\RealisasiBelanjaImportDak;
@@ -126,16 +127,17 @@ class RealisasiBelanjaController extends Controller
"jml_rencana_kontrak"=>isset($req["jml_rencana_kontrak"])?$req["jml_rencana_kontrak"]:0,
"jenis_dana"=>$req["jenis_dana"],
"sub_jenis_dana"=>$req["sub_jenis_dana"],
"id_sps"=>isset($req["id_sps"])?$req["id_sps"]:0,
// "id_sps"=>isset($req["id_sps"])?$req["id_sps"]:0,
"created_by"=>Auth::user()->id
];
if (isset($req["id_sps"]))
{
$sps = Sps_pendapatan::where("ID", $req["id_sps"])->firstorNew();
$sps = Trbas::where("C_AKUN", $req["id_sps"])->firstorNew();
if ($sps){
$input["kode_rekening"] = $sps["kode_rekening"];
$input["nama_rekening"] = $sps["nama_rekening"];
$input["kode_rekening"] = $sps["c_akun"];
$input["nama_rekening"] = $sps["n_akun"];
}
}
@@ -246,6 +248,7 @@ class RealisasiBelanjaController extends Controller
public function submit_akb_spd(VwBelanjaRealisasi $BelanjaRealisasi)
{
$vwAKB = DB::select(DB::raw(
"SELECT I_IDRSK,SUM(V_AKB_01) AS V_AKB_01,SUM(V_AKB_02) AS V_AKB_02,SUM(V_AKB_03) AS V_AKB_03,SUM(V_AKB_04) AS V_AKB_04,SUM(V_AKB_05) AS V_AKB_05,
SUM(V_AKB_06) AS V_AKB_06,SUM(V_AKB_07) AS V_AKB_07,SUM(V_AKB_08) AS V_AKB_08,SUM(V_AKB_09) AS V_AKB_09,SUM(V_AKB_10) AS V_AKB_10,
@@ -253,7 +256,7 @@ class RealisasiBelanjaController extends Controller
SUM(V_BKU_01) AS V_BKU_01,SUM(V_BKU_02) AS V_BKU_02,SUM(V_BKU_03) AS V_BKU_03,SUM(V_BKU_04) AS V_BKU_04,SUM(V_BKU_05) AS V_BKU_05,
SUM(V_BKU_06) AS V_BKU_06,SUM(V_BKU_07) AS V_BKU_07,SUM(V_BKU_08) AS V_BKU_08,SUM(V_BKU_09) AS V_BKU_09,SUM(V_BKU_10) AS V_BKU_10,
SUM(V_BKU_11) AS V_BKU_11,SUM(V_BKU_12) AS V_BKU_12
FROM NEWSIPKD.VW_AKB_SPD_REALISASI_RSK WHERE I_IDRSK = ".$BelanjaRealisasi->kode_rsk."
FROM MV_ASYNC_AKB_REALISASI WHERE I_IDRSK = ".$BelanjaRealisasi->kode_rsk."
GROUP BY I_IDRSK "
));
$vwAKB = json_decode(json_encode($vwAKB[0]), true);
@@ -333,7 +336,7 @@ class RealisasiBelanjaController extends Controller
}
if (!empty($idSPS)){
$filter.= " AND id_sps = ".$idSPS;
$filter.= " AND KODE_REKENING = '".$idSPS."'";
}
if (!empty($fReview)){
app/Http/Controllers/RealisasiPendapatanController.php
+5 -4
View File
@@ -9,6 +9,7 @@ use Illuminate\Support\Facades\Auth;
use Maatwebsite\Excel\Facades\Excel;
use App\Models\PendapatanRealisasi;
use App\Models\Sps_pendapatan;
use App\Models\VwJadwalSalur;
use App\Models\User;
use PhpOffice\PhpSpreadsheet\Spreadsheet;
use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
@@ -41,7 +42,7 @@ class RealisasiPendapatanController extends Controller
protected function dataPendapatan($req= [])
{
$data["tahun"] = $req["txt_ta"];
$data["id_sps"] = $req["txt_id_sps"];
// $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];
@@ -66,7 +67,7 @@ class RealisasiPendapatanController extends Controller
$req = $request->all();
$data = $this->dataPendapatan($req);
$data["created_by"] = Auth::user()->id;
// var_dump($data); exit;
$PendapatanRealisasi = PendapatanRealisasi::create($data);
// SEND NOTIF
@@ -115,7 +116,7 @@ class RealisasiPendapatanController extends Controller
{
$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();
$sps = VwJadwalSalur::select($select)->where("TAHUN",getTA())->where("KODE_REKENING",$idSPS)->firstOrNew();
return response()->json($sps);
}
@@ -133,7 +134,7 @@ class RealisasiPendapatanController extends Controller
$data = PendapatanRealisasi::where("tahun",$ta)->orderBy("created_at","ASC");
if (!empty($sps))
{
$data->where("id_sps",$sps);
$data->where("kode_rekening_sps",$sps);
}
if (!empty($src))
app/Models/AkbPendapatan.php
+16
View File
@@ -0,0 +1,16 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Yajra\Oci8\Eloquent\OracleEloquent as Eloquent;
use Illuminate\Support\Facades\Auth;
class AkbPendapatan extends Eloquent
{
use HasFactory;
protected $connection = 'oracle';
protected $table = 'SAMASA.AKB_PENDAPATAN';
}
app/Models/BelanjaRealisasi.php
+2 -2
View File
@@ -73,8 +73,8 @@ class BelanjaRealisasi extends Eloquent
THEN NVL(d.jml_spd, 0) ELSE NVL(c.jml_spd, 0) END AS jml_spd
FROM VW_BELANJA_REALISASI a
LEFT JOIN (
SELECT I_IDRSK,SUM(REALISASI_1) AS jml
FROM MV_REALISASI_BELANJA_PERBULAN
SELECT I_IDRSK,SUM(REALISASI) AS jml
FROM MV_ANGGARAN_REALISASI_RSK
WHERE C_ANGG_TAHUN = $ta
GROUP BY I_IDRSK
) b ON a.kode_rsk = b.I_IDRSK
app/Models/MappingDbhSkpd.php
+2 -1
View File
@@ -15,6 +15,7 @@ class MappingDbhSkpd extends Eloquent
"id_sps",
"tahun",
"kode_rekening",
"kode_skpd"
"kode_skpd",
"id_rekening"
];
}
app/Models/Sps_pendapatan.php
+2 -2
View File
@@ -18,12 +18,12 @@ class Sps_pendapatan extends Eloquent
$sqlstr = 'SELECT * FROM VW_JADWAL_SALUR x ';
if (getRole()=="skpd"){
$sqlstr .= ' WHERE x.id IN (SELECT id_sps FROM SAMASA.MAPPING_DBH_SKPD WHERE KODE_SKPD=\''.Auth::user()->nrk.'\') ';
$sqlstr .= ' WHERE x.kode_rekening IN (SELECT kode_rekening FROM SAMASA.MAPPING_DBH_SKPD WHERE 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\'';
$sqlstr .= ' AND x.TAHUN = '.$ta.' AND SUBSTR(x.KODE_REKENING,1,3)=\'4.2\'';
return $sqlstr;
}
app/Models/VwJadwalSalur.php
+14
View File
@@ -0,0 +1,14 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Yajra\Oci8\Eloquent\OracleEloquent as Eloquent;
class VwJadwalSalur extends Eloquent
{
use HasFactory;
protected $connection = 'Samasa';
protected $table = 'Samasa.VW_JADWAL_SALUR';
}
app/Models/VwRekeningPendapatan.php
+16
View File
@@ -0,0 +1,16 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Yajra\Oci8\Eloquent\OracleEloquent as Eloquent;
use Illuminate\Support\Facades\Auth;
class VwRekeningPendapatan extends Eloquent
{
use HasFactory;
protected $connection = 'oracle';
protected $table = 'SAMASA.VW_REKENING_PENDAPATAN';
}
public/js/app.js
Vendored
+1 -1
View File
@@ -375,7 +375,7 @@ $('.sps_search').select2({
results: $.map(data, function (item) {
return {
text: item.name,
id: item.id
id: item.idx
}
})
};
resources/views/admin/mapping_dbh_skpd/index.blade.php
+1 -9
View File
@@ -21,14 +21,6 @@
<h5 class="card-title"><i class="fa fa-th-list"></i> @php echo $sitesubTitle; @endphp</h5>
</div>
<div class="card-body">
<div class="row">
<div class="col-1">
<div class="form-group">
<label>Tahun</label>
<input class="form-control form-control-sm" id="srcTA" name="ta" value="{{ getTA() }}" readonly>
</div>
</div>
</div>
<table id="dtTableUser" class="table table-striped jambo_table">
<tr>
<thead>
@@ -73,7 +65,7 @@
'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
},
data: function (d) {
d.srcTA = $("#srcTA").val()
d.srcTA = null
}
},
"dom": "<\"top\" <\"row\"<\"col-md-6\"l><\"col-md-6 text-right\"f>>>rt<\"bottom\" <\"row\"<\"col-md-6\"i><\"col-md-6\"p>> ><\"clear\">",
resources/views/admin/mapping_dbh_skpd/show.blade.php
+2 -6
View File
@@ -21,11 +21,7 @@
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-12">
<div class="form-group">
<strong>Tahun:</strong>
<input type="hidden" name="id_sps" value="{{ $sps->id }}">
<input type="text" name="tahun" class="form-control-plaintext" value="{{ $sps->tahun }}" readonly>
</div>
<div class="form-group">
<input type="hidden" name="id_rekening" value="{{ $sps->id }}">
<strong>Kode Rekening:</strong>
<input type="text" name="kode_rekening" class="form-control-plaintext" value="{{ $sps->kode_rekening }}" readonly>
</div>
@@ -37,7 +33,7 @@
<div class="col-12">
<div class="form-group">
<label for="txt_id_skpd">SKPD</label>
<select id="txt_id_skpd" name="txt_id_skpd[]" class="form-control" required multiple></select>
<select id="txt_id_skpd" name="txt_id_skpd[]" class="form-control" multiple></select>
</div>
</div>
<div class="col-12">
resources/views/jadwal_salurdana/index.blade.php
+1 -1
View File
@@ -133,7 +133,7 @@
results: $.map(data, function (item) {
return {
text: item.name,
id: item.id
id: item.idx
}
})
};
resources/views/jadwal_salurdana/index_dak.blade.php
+4 -4
View File
@@ -238,7 +238,7 @@
$('#txt_id_sps').append($('<option>',{value:"",text:""}));
$.map(data, function (item) {
$('#txt_id_sps').append($('<option>', {
value: item.id,
value: item.idx,
text : item.name
}));
})
@@ -247,7 +247,7 @@
}
optionDAK();
$('#txt_id_sps').val({{ $idSPS }});
$('#txt_id_sps').val("{{ $idSPS }}");
$("#src").keyup(function(e){
if (e.keyCode == 13){
@@ -341,8 +341,8 @@
],
"dom": "<\"top\" <\"row\"<\"col-md-6\"l><\"col-md-6 text-right\"B>>>rt<\"bottom\" <\"row\"<\"col-md-6\"i><\"col-md-6\"p>> ><\"clear\">",
"lengthMenu": [
[ 10, 20, 50 ],
[ "10", "20", "50" ]
[ 10, 20, 50, -1 ],
[ "10", "20", "50", "All" ]
],
"paging": true, // Table pagination
"columns": [
resources/views/realisasi_belanja/edit.blade.php
+3 -3
View File
@@ -41,9 +41,9 @@
$("select[name=sub_jenis_dana]").append($newOptionSubJenisDana).trigger('change');
cekInputKontrak("{{ $realisasi_belanja->nama_subjenis_dana }}");
<?php if (!empty($realisasi_belanja->id_sps)) { ?>
let $newOptionSps = $("<option selected='selected'></option>").val("{{ $realisasi_belanja->id_sps }}").text("{{ $sps->name }}")
$("select[name=id_sps]").val("{{ $realisasi_belanja->id_sps }}");
<?php if (!empty($realisasi_belanja->kode_rekening)) { ?>
let $newOptionSps = $("<option selected='selected'></option>").val("{{ $realisasi_belanja->kode_rekening }}").text("{{ $realisasi_belanja->nama_rekening }}")
$("select[name=id_sps]").val("{{ $realisasi_belanja->kode_rekening }}");
$("select[name=id_sps]").append($newOptionSps).trigger('change');
<?php } ?>
resources/views/realisasi_belanja/submit.blade.php
+3 -3
View File
@@ -70,9 +70,9 @@
cekInputKontrak("{{ $BelanjaRealisasi->nama_subjenis_dana }}");
<?php if (!empty($BelanjaRealisasi->id_sps)) { ?>
let $newOptionSps = $("<option selected='selected'></option>").val("{{ $BelanjaRealisasi->id_sps }}").text("{{ $sps->name }}")
$("select[name=id_sps]").val("{{ $BelanjaRealisasi->id_sps }}");
<?php if (!empty($BelanjaRealisasi->kode_rekening)) { ?>
let $newOptionSps = $("<option selected='selected'></option>").val("{{ $BelanjaRealisasi->kode_rekening }}").text("{{ $BelanjaRealisasi->nama_rekening }}")
$("select[name=id_sps]").val("{{ $BelanjaRealisasi->kode_rekening }}");
$("select[name=id_sps]").append($newOptionSps).trigger('change');
$("select[name=id_sps]").attr("disabled", true);
<?php } ?>
resources/views/realisasi_pendapatan/form.blade.php
+1 -1
View File
@@ -171,7 +171,7 @@
results: $.map(data, function (item) {
return {
text: item.name,
id: item.id
id: item.idx
}
})
};
resources/views/realisasi_pendapatan/index.blade.php
+1 -1
View File
@@ -105,7 +105,7 @@
results: $.map(data, function (item) {
return {
text: item.name,
id: item.id
id: item.idx
}
})
};