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

Update, maintenance dan bugs fix

Browse Source
This commit is contained in:
Pusdatin BPKD Jkt
2022-08-11 16:15:36 +07:00
parent 872674ad93
commit 23300ce262
16 changed files with 237 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/MstPenggunaController.php
+36 -1
View File
@@ -8,6 +8,7 @@ use App\Models\Roless;
use App\Models\RoleUser;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
class MstPenggunaController extends Controller
{
@@ -18,7 +19,8 @@ class MstPenggunaController extends Controller
public function index()
{
$data = User::where('role_name', "<>", "superadmin")->latest()->paginate(10);
$data = null;
// $data = User::where('role_name', "<>", "superadmin")->latest()->paginate(10);
return view('admin.mst_pengguna.index',compact('data'))
->with('i', (request()->input('page', 1) - 1) * 10);
}
@@ -122,4 +124,37 @@ class MstPenggunaController extends Controller
}
}
public function datatable(Request $request)
{
$post = $request->all();
$offset = $post["start"];
$limit = $post["length"];
$src = isset($post["src"]) ? $post["src"]:"";
$sqlstr = User::where('role_name', "<>", "superadmin");
$dataTotal = $sqlstr->count();
$data = $sqlstr->orderBy("role_name");
if (!empty($src)){
$data->where("name","like","%$src%");
$data->orWhere("role_name","like","%$src%");
}
$dataFilter = $data->count();
return response()->json([
"recordsTotal" => $dataTotal,
"recordsFiltered" => $dataFilter,
"data"=> $data->skip($offset)->take($limit)->get()
]);
}
public function lockUploadData(Request $req)
{
$user = User::query()->update([
"is_lock_upload"=>1,
"lock_upload_time"=>date("Y-m-d H:i"),
"lock_upload_by"=>Auth::user()->id
]);
return redirect()->route('users.index')
->with('success','User berhasil dibuat.');
}
}
app/Http/Controllers/JadwalSalurdanaController.php
+19 -18
View File
@@ -109,7 +109,7 @@ class JadwalSalurdanaController extends Controller
$ta = $post["ta"];
$typeDanaFilter = $typeDana == "cht" ? " AND x.jenis_dana = 'DBH' AND x.sub_jenis_dana = 'CHT' ": " AND x.jenis_dana = 'DAK'";
$dataFilter=0;
$sqlstr = 'SELECT x.kode_rsk, x.nama_rsk, x.jumlah_anggaran, y.*
$sqlstr = 'SELECT x.kode_skpd, x.nama_skpd, x.kode_rsk, x.nama_rsk, x.jumlah_anggaran, y.*
FROM SAMASA.BELANJA_REALISASI x
LEFT JOIN
(
@@ -164,30 +164,31 @@ class JadwalSalurdanaController extends Controller
(
SELECT
RSK_BELANJARINCI_ID,
BULAN1 AS V_AKB_01,
BULAN2 AS V_AKB_02,
BULAN3 AS V_AKB_03,
BULAN4 AS V_AKB_04,
BULAN5 AS V_AKB_05,
BULAN6 AS V_AKB_06,
BULAN7 AS V_AKB_07,
BULAN8 AS V_AKB_08,
BULAN9 AS V_AKB_09,
BULAN10 AS V_AKB_10,
BULAN11 AS V_AKB_11,
BULAN12 AS V_AKB_12
sum(BULAN1) AS V_AKB_01,
sum(BULAN2) AS V_AKB_02,
sum(BULAN3) AS V_AKB_03,
sum(BULAN4) AS V_AKB_04,
sum(BULAN5) AS V_AKB_05,
sum(BULAN6) AS V_AKB_06,
sum(BULAN7) AS V_AKB_07,
sum(BULAN8) AS V_AKB_08,
sum(BULAN9) AS V_AKB_09,
sum(BULAN10) AS V_AKB_10,
sum(BULAN11) AS V_AKB_11,
sum(BULAN12) AS V_AKB_12
FROM BAPEDA_BUDGETING.P_SPB_BELANJARINCIAKB@EBUDGETING
WHERE TAHUN = \''.$ta.'\'
WHERE TAHUN = \''.$ta.'\'
GROUP BY RSK_BELANJARINCI_ID
) yy
ON xx.IDRSK = yy.RSK_BELANJARINCI_ID
) y
ON x.KODE_RSK = y.IDRSK
WHERE x.TAHUN_ANGGARAN = \''.$ta.'\''.$typeDanaFilter;
// if (getRole()=="skpd"){
// $sqlstr.=" AND KODE_SKPD='".Auth::user()->nrk."'";
// }
$data = DB::connection('oracle')->select(DB::raw($sqlstr.' ORDER BY x.id OFFSET '.$offset.' ROWS FETCH NEXT '.$limit.' ROWS ONLY'));
if (getRole()=="skpd"){
$sqlstr.=" AND KODE_SKPD='".Auth::user()->nrk."'";
}
$data = DB::connection('oracle')->select(DB::raw($sqlstr.' ORDER BY x.kode_skpd,x.kode_rsk OFFSET '.$offset.' ROWS FETCH NEXT '.$limit.' ROWS ONLY'));
$dataTotal = count(DB::connection('oracle')->select(DB::raw($sqlstr)));
// if (!empty($src)){
//$data->whereRaw("(LOWER(NAMA_REKENING) LIKE '%".strtolower($src)."%' OR LOWER(KODE_REKENING) LIKE '%".strtolower($src)."%')");
app/Http/Controllers/RealisasiBelanjaController.php
+10 -3
View File
@@ -231,10 +231,10 @@ class RealisasiBelanjaController extends Controller
// "kode_rekening"=>$datas[$i]["kode_rekening"]
])->firstOrNew();
if (!$cekData==null){
/* if (!$cekData==null){
$cekData->delete();
// BelanjaRealisasi::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"],
@@ -256,7 +256,12 @@ class RealisasiBelanjaController extends Controller
"sub_jenis_dana"=>$datas[$i]["sub_jenis_dana"],
"created_by"=>$datas[$i]["userid"]
];
BelanjaRealisasi::create($input);
if (!$cekData==null){
$cekData->update($input);
}else{
BelanjaRealisasi::create($input);
}
}
TempRealisasiBelanja::where("userid",Auth::user()->id)->delete();
DB::commit();
@@ -373,6 +378,7 @@ class RealisasiBelanjaController extends Controller
$data["tgl_kontrak"] = ConvertIndoDate($req["tgl_kontrak"]);
$data["nominal_kontrak"] = replaceMoney($req["nominal_kontrak"]);
$data["file_kontrak"] = $fileName;
$data["nomor_bast"] = $req["nomor_bast"];
$data["created_by"] = Auth::user()->id;
BelanjaRealisasiKontrak::create($data);
@@ -402,6 +408,7 @@ class RealisasiBelanjaController extends Controller
$data["nomor_kontrak"] = $req["nomor_kontrak"];
$data["tgl_kontrak"] = ConvertIndoDate($req["tgl_kontrak"]);
$data["nominal_kontrak"] = replaceMoney($req["nominal_kontrak"]);
$data["nomor_bast"] = $req["nomor_bast"];
$fileName = $this->uploadFileKontrak($request);
if ($fileName){
$data["file_kontrak"] = $fileName;
app/Models/BelanjaRealisasiKontrak.php
+1
View File
@@ -17,6 +17,7 @@ class BelanjaRealisasiKontrak extends Eloquent
"tgl_kontrak",
"nominal_kontrak",
"file_kontrak",
"nomor_bast",
"created_by"
];
}
app/Models/User.php
+4 -1
View File
@@ -24,7 +24,10 @@ class User extends Authenticatable
'name',
'nrk',
'password',
'role_name'
'role_name',
'is_lock_upload',
'lock_upload_time',
'lock_upload_by'
];
/**