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

Url fix

Browse Source
This commit is contained in:
Pusdatin BPKD Jkt
2022-08-08 16:07:59 +07:00
parent 2733073239
commit 82a5869d1c
7 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/RealisasiBelanjaController.php
+10 -10
View File
@@ -131,13 +131,13 @@ class RealisasiBelanjaController extends Controller
DB::beginTransaction(); DB::beginTransaction();
$realisasi_belanja->delete(); $realisasi_belanja->delete();
DB::commit(); DB::commit();
return redirect('/realisasi-belanja') return redirect(URL::to("/realisasi-belanja"))
->with('success','Data Realisasi Belanja berhasil dihapus!'); ->with('success','Data Realisasi Belanja berhasil dihapus!');
}catch(Throwable $e){ }catch(Throwable $e){
DB::rollBack(); DB::rollBack();
return redirect('/realisasi-belanja') return redirect(URL::to("/realisasi-belanja"))
->with('error','Data Realisasi Belanja gagal dihapus.'); ->with('error','Data Realisasi Belanja gagal dihapus.');
} }
} }
@@ -178,11 +178,11 @@ class RealisasiBelanjaController extends Controller
TempRealisasiBelanja::where("userid",Auth::user()->id)->truncate(); TempRealisasiBelanja::where("userid",Auth::user()->id)->truncate();
Excel::import(new RealisasiBelanjaImport(strtoupper($typeDana),$subJenisDana), $tujuan_upload."/".$file->getClientOriginalName()); Excel::import(new RealisasiBelanjaImport(strtoupper($typeDana),$subJenisDana), $tujuan_upload."/".$file->getClientOriginalName());
DB::commit(); DB::commit();
return redirect('/upload-realisasi-belanja/'.$typeDana)->with('success','Data Rencana belanja berhasil diupload, Silahkan validasi data!'); return redirect(URL::to("/upload-realisasi-belanja/".$typeDana))->with('success','Data Rencana belanja berhasil diupload, Silahkan validasi data!');
}catch(\Exception $e){ }catch(\Exception $e){
throw new \Exception($e->getMessage()); throw new \Exception($e->getMessage());
DB::rollBack(); DB::rollBack();
return redirect('/upload-realisasi-belanja/'.$typeDana)->with('error',$e->getMessage()); return redirect(URL::to("/upload-realisasi-belanja/".$typeDana))->with('error',$e->getMessage());
} }
} }
$this->siteTitle = "Rencana Belanja"; $this->siteTitle = "Rencana Belanja";
@@ -259,11 +259,11 @@ class RealisasiBelanjaController extends Controller
} }
TempRealisasiBelanja::where("userid",Auth::user()->id)->truncate(); TempRealisasiBelanja::where("userid",Auth::user()->id)->truncate();
DB::commit(); DB::commit();
return redirect('/upload-realisasi-belanja/'.$typeDana)->with('success','Data Realisasi belanja berhasil diupload.'); return redirect(URL::to("/upload-realisasi-belanja/".$typeDana))->with('success','Data Realisasi belanja berhasil diupload.');
}catch(\Exception $e){ }catch(\Exception $e){
throw new \Exception($e->getMessage()); throw new \Exception($e->getMessage());
DB::rollBack(); DB::rollBack();
return redirect('/upload-realisasi-belanja/'.$typeDana)->with('error',$e->getMessage()); return redirect(URL::to("/upload-realisasi-belanja/".$typeDana))->with('error',$e->getMessage());
} }
return view('realisasi_belanja.upload'); return view('realisasi_belanja.upload');
} }
@@ -330,12 +330,12 @@ class RealisasiBelanjaController extends Controller
DB::beginTransaction(); DB::beginTransaction();
$data->delete(); $data->delete();
DB::commit(); DB::commit();
return redirect('/realisasi-belanja/'.$data->dbh_belanja_realisasi_id."/submit")->with('success','Data detail Realisasi belanja berhasil dihapus!'); return redirect(URL::to("/realisasi-belanja/".$data->dbh_belanja_realisasi_id."/submit"))->with('success','Data detail Realisasi belanja berhasil dihapus!');
}catch(Throwable $e){ }catch(Throwable $e){
DB::rollBack(); DB::rollBack();
return redirect('/realisasi-belanja/'.$data->dbh_belanja_realisasi_id."/submit")->with('error','Data detail Realisasi belanja gagal dihapus.'); return redirect(URL::to("/realisasi-belanja/".$data->dbh_belanja_realisasi_id."/submit"))->with('error','Data detail Realisasi belanja gagal dihapus.');
} }
} }
@@ -427,13 +427,13 @@ class RealisasiBelanjaController extends Controller
unlink("uploadFiles/kontrak/".$BelanjaRealisasiKontrak->file_kontrak); unlink("uploadFiles/kontrak/".$BelanjaRealisasiKontrak->file_kontrak);
BelanjaRealisasiKontrak::where("id",$id)->delete(); BelanjaRealisasiKontrak::where("id",$id)->delete();
DB::commit(); DB::commit();
return redirect('/realisasi-belanja/'.$BelanjaRealisasiKontrak->belanja_realisasi_id.'/submit') return redirect(URL::to("/realisasi-belanja/".$BelanjaRealisasiKontrak->belanja_realisasi_id."/submit"))
->with('success','Data Kontrak Realisasi Belanja berhasil dihapus!'); ->with('success','Data Kontrak Realisasi Belanja berhasil dihapus!');
}catch(Throwable $e){ }catch(Throwable $e){
DB::rollBack(); DB::rollBack();
return redirect('/realisasi-belanja/'.$BelanjaRealisasiKontrak->belanja_realisasi_id.'/submit') return redirect(URL::to("/realisasi-belanja/".$BelanjaRealisasiKontrak->belanja_realisasi_id."/submit"))
->with('error','Data Kontrak Realisasi Belanja gagal dihapus.'); ->with('error','Data Kontrak Realisasi Belanja gagal dihapus.');
} }
} }
app/Http/Controllers/RealisasiPendapatanController.php
+9 -15
View File
@@ -72,12 +72,10 @@ class RealisasiPendapatanController extends Controller
$this->sendNotif("anggaran", "bendahara", $userBendahara, $message, $url, "Realisasi Pendapatan", $PendapatanRealisasi->id); $this->sendNotif("anggaran", "bendahara", $userBendahara, $message, $url, "Realisasi Pendapatan", $PendapatanRealisasi->id);
DB::commit(); DB::commit();
return redirect('/realisasi-pendapatan') return redirect(URL::to("/realisasi-pendapatan"))->with('success','Realisasi Pendapatan berhasil dibuat.');
->with('success','Realisasi Pendapatan berhasil dibuat.');
}catch(\Exception $e){ }catch(\Exception $e){
DB::rollBack(); DB::rollBack();
return redirect('/realisasi-pendapatan') return redirect(URL::to("/realisasi-pendapatan"))->with('error',$e->getMessage());
->with('error',$e->getMessage());
} }
} }
@@ -100,13 +98,11 @@ class RealisasiPendapatanController extends Controller
DB::commit(); DB::commit();
return redirect('/realisasi-pendapatan') return redirect(URL::to("/realisasi-pendapatan"))->with('success','Realisasi Pendapatan berhasil diubah.');
->with('success','Realisasi Pendapatan berhasil diubah.');
}catch(Throwable $e){ }catch(Throwable $e){
DB::rollBack(); DB::rollBack();
return redirect('/realisasi-pendapatan') return redirect(URL::to("/realisasi-pendapatan"))->with('error','Realisasi Pendapatan gagal diubah!');
->with('error','Realisasi Pendapatan gagal diubah!');
} }
} }
@@ -148,14 +144,12 @@ class RealisasiPendapatanController extends Controller
DB::beginTransaction(); DB::beginTransaction();
$realisasi_pendapatan->delete(); $realisasi_pendapatan->delete();
DB::commit(); DB::commit();
return redirect('/realisasi-pendapatan.index') return redirect(URL::to("/realisasi-pendapatan.index"))->with('success','Data Realisasi Pendapatan berhasil dihapus!');
->with('success','Data Realisasi Pendapatan berhasil dihapus!');
}catch(Throwable $e){ }catch(Throwable $e){
DB::rollBack(); DB::rollBack();
return redirect('/realisasi-pendapatan.index') return redirect(URL::to("/realisasi-pendapatan.index"))->with('error','Data Realisasi Pendapatan gagal dihapus.');
->with('error','Data Realisasi Pendapatan gagal dihapus.');
} }
} }
@@ -187,7 +181,7 @@ class RealisasiPendapatanController extends Controller
$data = PendapatanRealisasi::firstOrNew(array('id' => $realisasiId)); $data = PendapatanRealisasi::firstOrNew(array('id' => $realisasiId));
if ($data["simtrad4_bersih"]<>replaceMoney($req["rkud_jumlah"])){ if ($data["simtrad4_bersih"]<>replaceMoney($req["rkud_jumlah"])){
return redirect(url("/realisasi-pendapatan/".$realisasiId))->with('error', "Jumlah STS harus sama dengan Rencana !"); return redirect(URL::to("/realisasi-pendapatan/".$realisasiId))->with('error', "Jumlah STS harus sama dengan Rencana !");
} }
$data["rkud_tgl"] = $req["rkud_tgl"]; $data["rkud_tgl"] = $req["rkud_tgl"];
$data["rkud_no_sts"] = $req["rkud_no_sts"]; $data["rkud_no_sts"] = $req["rkud_no_sts"];
@@ -198,11 +192,11 @@ class RealisasiPendapatanController extends Controller
DB::commit(); DB::commit();
return redirect('/realisasi-pendapatan')->with('success','STS berhasil diinput.'); return redirect(URL::to("/realisasi-pendapatan"))->with('success','STS berhasil diinput.');
}catch(\Exception $e){ }catch(\Exception $e){
DB::rollBack(); DB::rollBack();
return redirect(url("/realisasi-pendapatan/".$realisasiId))->with('error',$e->getMessage()); return redirect(URL::to("/realisasi-pendapatan/".$realisasiId))->with('error',$e->getMessage());
} }
} }
public/js/app.js
Vendored
+1 -1
View File
@@ -380,7 +380,7 @@ refreshNotif = ()=>{
</a> </a>
<div class="dropdown-divider"></div>`; <div class="dropdown-divider"></div>`;
}); });
$listElm += `<a href="/notif" class="dropdown-item dropdown-footer">Lihat semua Notifikasi</a>`; $listElm += `<a href="`+Url+`/notif" class="dropdown-item dropdown-footer">Lihat semua Notifikasi</a>`;
$("#list_notif").html($listElm); $("#list_notif").html($listElm);
} }
} }
resources/views/notifikasi/index.blade.php
+1 -1
View File
@@ -117,7 +117,7 @@
$("td:eq(0)", nRow).html(index); $("td:eq(0)", nRow).html(index);
$("td:eq(5)", nRow).html(aData["is_read"]==0?"<strong>Belum dibaca</strong>":"<span class='text-success'>Sudah dibaca</span>"); $("td:eq(5)", nRow).html(aData["is_read"]==0?"<strong>Belum dibaca</strong>":"<span class='text-success'>Sudah dibaca</span>");
$("td:eq(6)", nRow).html( $("td:eq(6)", nRow).html(
"<form class='form-delete' action='/realisasi-pendapatan/"+aData['id']+"' method='POST'>"+ "<form class='form-delete' action='{{ $baseUrl }}/realisasi-pendapatan/"+aData['id']+"' method='POST'>"+
"<input type='hidden' name='_token' id='csrf-token' value='{{ Session::token() }}' /><input type='hidden' name='_method' value='DELETE'>"+ "<input type='hidden' name='_token' id='csrf-token' value='{{ Session::token() }}' /><input type='hidden' name='_method' value='DELETE'>"+
"<a class='btn btn-default btn-sm' href='"+aData['url']+"' title='Lihat'><i class='fa fa-bullseye'></i></a></form>"); "<a class='btn btn-default btn-sm' href='"+aData['url']+"' title='Lihat'><i class='fa fa-bullseye'></i></a></form>");
resources/views/realisasi_belanja/index.blade.php
+1 -1
View File
@@ -192,7 +192,7 @@
$("td:eq(0)", nRow).html(index); $("td:eq(0)", nRow).html(index);
$("td:eq(5)", nRow).html(separateNumberIndo(aData["jumlah_anggaran"])); $("td:eq(5)", nRow).html(separateNumberIndo(aData["jumlah_anggaran"]));
$("td:eq(8)", nRow).html(separateNumberIndo(aData["jml_realisasi_sp2d"])); $("td:eq(8)", nRow).html(separateNumberIndo(aData["jml_realisasi_sp2d"]));
$("td:eq(11)", nRow).html('<a href="/realisasi-belanja/' + aData["id"] +'/submit" class="btn btn-sm btn-default mr-2"><i class="fa fa-eye"></i></a>'+btnInput); $("td:eq(11)", nRow).html('<a href="{{ $baseUrl }}/realisasi-belanja/' + aData["id"] +'/submit" class="btn btn-sm btn-default mr-2"><i class="fa fa-eye"></i></a>'+btnInput);
return nRow; return nRow;
}, },
resources/views/realisasi_belanja/submit.blade.php
+2 -2
View File
@@ -150,10 +150,10 @@
<td class="text-center"><?= empty($kontrak->file_kontrak)?"-":"<a href='".url("/realisasi-belanja/".$BelanjaRealisasi->id.'__'.$kontrak->id ."/download-kontrak")."'>".$kontrak->file_kontrak."</a>" ?></td> <td class="text-center"><?= empty($kontrak->file_kontrak)?"-":"<a href='".url("/realisasi-belanja/".$BelanjaRealisasi->id.'__'.$kontrak->id ."/download-kontrak")."'>".$kontrak->file_kontrak."</a>" ?></td>
<?php if (Auth::user()->can("Create Kontrak")){ ?> <?php if (Auth::user()->can("Create Kontrak")){ ?>
<td class="text-center"> <td class="text-center">
<form class='form-delete' action='/realisasi-belanja/{{ $kontrak->id }}/kontrak' method='POST'> <form class='form-delete' action='{{ $baseUrl }}/realisasi-belanja/{{ $kontrak->id }}/kontrak' method='POST'>
<input type='hidden' name='_token' id='csrf-token' value='{{ Session::token() }}' /> <input type='hidden' name='_token' id='csrf-token' value='{{ Session::token() }}' />
<input type='hidden' name='_method' value='DELETE'> <input type='hidden' name='_method' value='DELETE'>
<a class='btn btn-default btn-sm modalButton' href='/realisasi-belanja/{{ $kontrak->id }}/kontrak/update' title='Ubah Kontrak'><i class='fa fa-edit'></i></a> <a class='btn btn-default btn-sm modalButton' href='{{ $baseUrl }}/realisasi-belanja/{{ $kontrak->id }}/kontrak/update' title='Ubah Kontrak'><i class='fa fa-edit'></i></a>
<button type="submit" class="btn btn-default btn-sm" name="btnSubmit"><i class="fa fa-trash"></i></button> <button type="submit" class="btn btn-default btn-sm" name="btnSubmit"><i class="fa fa-trash"></i></button>
</form> </form>
</td> </td>
resources/views/realisasi_pendapatan/index.blade.php
+3 -3
View File
@@ -168,7 +168,7 @@
let info = dtTable.page.info(); let info = dtTable.page.info();
let numStart = info.page; let numStart = info.page;
let index = (numStart * dtTable.page.len()) + iDisplayIndex + 1; let index = (numStart * dtTable.page.len()) + iDisplayIndex + 1;
let btnEdit = {{ !empty(auth()->user()->can('Update DBH Realisasi Pendapatan'))?auth()->user()->can('Update DBH Realisasi Pendapatan'):"false" }} ?"<a class='btn btn-default btn-sm ml-1' href='/realisasi-pendapatan/" + aData["id"] + "/edit' title='Ubah'><i class='fa fa-edit'></i></a>":""; let btnEdit = {{ !empty(auth()->user()->can('Update DBH Realisasi Pendapatan'))?auth()->user()->can('Update DBH Realisasi Pendapatan'):"false" }} ?"<a class='btn btn-default btn-sm ml-1' href='{{ $baseUrl }}/realisasi-pendapatan/" + aData["id"] + "/edit' title='Ubah'><i class='fa fa-edit'></i></a>":"";
let btnDelete = {{ !empty(auth()->user()->can('Delete DBH Realisasi Pendapatan'))?auth()->user()->can('Delete DBH Realisasi Pendapatan'):"false" }} ?"<button type='submit' class='btn btn-default btn-sm ml-1' title='Hapus'><i class='fa fa-trash'></i></button>":""; let btnDelete = {{ !empty(auth()->user()->can('Delete DBH Realisasi Pendapatan'))?auth()->user()->can('Delete DBH Realisasi Pendapatan'):"false" }} ?"<button type='submit' class='btn btn-default btn-sm ml-1' title='Hapus'><i class='fa fa-trash'></i></button>":"";
$("td:eq(0)", nRow).html(index); $("td:eq(0)", nRow).html(index);
$("td:eq(2)", nRow).html(separateNumberIndo(aData["simtrad4_kotor"])); $("td:eq(2)", nRow).html(separateNumberIndo(aData["simtrad4_kotor"]));
@@ -177,9 +177,9 @@
$("td:eq(6)", nRow).html(setIndoDateOracle(aData["simtrad4_tgl_sp2d_bun"])); $("td:eq(6)", nRow).html(setIndoDateOracle(aData["simtrad4_tgl_sp2d_bun"]));
$("td:eq(8)", nRow).html(setIndoDateOracle(aData["rkud_tgl"])); $("td:eq(8)", nRow).html(setIndoDateOracle(aData["rkud_tgl"]));
$("td:eq(9)", nRow).html( $("td:eq(9)", nRow).html(
"<form class='form-delete' action='/realisasi-pendapatan/"+aData['id']+"' method='POST'>"+ "<form class='form-delete' action='{{ $baseUrl }}/realisasi-pendapatan/"+aData['id']+"' method='POST'>"+
"<input type='hidden' name='_token' id='csrf-token' value='{{ Session::token() }}' /><input type='hidden' name='_method' value='DELETE'>"+ "<input type='hidden' name='_token' id='csrf-token' value='{{ Session::token() }}' /><input type='hidden' name='_method' value='DELETE'>"+
"<a class='btn btn-default btn-sm' href='/realisasi-pendapatan/"+aData['id']+"' title='Lihat'><i class='fa fa-eye'></i></a>"+ "<a class='btn btn-default btn-sm' href='{{ $baseUrl }}/realisasi-pendapatan/"+aData['id']+"' title='Lihat'><i class='fa fa-eye'></i></a>"+
btnEdit + btnDelete + "</form>"); btnEdit + btnDelete + "</form>");
return nRow; return nRow;