Merge remote-tracking branch 'composer/feature/senior-officer' into staging

This commit is contained in:
Daeng Deni Mardaeni
2024-12-27 15:59:14 +07:00
8 changed files with 149 additions and 41 deletions

View File

@@ -18,6 +18,7 @@ use Modules\Location\Models\City;
use Modules\Location\Models\District;
use Modules\Location\Models\Village;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\App;
use App\Helpers\Lpj;
class PenilaiController extends Controller
@@ -649,7 +650,7 @@ class PenilaiController extends Controller
try {
if ($statusLpj) {
return view('lpj::' . $viewLaporan, compact(
return view('lpj::' . $viewLaporan, compact(
'permohonan',
'forminspeksi',
'lpjData',
@@ -661,7 +662,8 @@ class PenilaiController extends Controller
'alamat',
'dataPembanding',
'nomorLaporan'
));
))->render();
} else {
$pdf = PDF::loadView('lpj::' . $viewLaporan, compact(
'permohonan',

View File

@@ -557,5 +557,12 @@
]);
}
public function view_laporan(Request $request){
$id = $request->permohonanId;
$permohonan = Permohonan::find($id);
return view('lpj::penilaian.laporan-so', compact('permohonan'));
}
}