daengdeni/lpj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(so): tampilan memo tidak tampil

Browse Source
This commit is contained in:
majid
2025-01-21 12:11:04 +07:00
parent 9cb50c4110
commit a60a8c7ec4
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/Http/Controllers/PenilaianController.php
View File

@@ -23,19 +23,19 @@ use Modules\Location\Models\District;
use Modules\Location\Models\Village; use Modules\Location\Models\Village;
use Modules\Usermanagement\Models\User; use Modules\Usermanagement\Models\User;
use Modules\Lpj\Http\Controllers\SurveyorController; use Modules\Lpj\Http\Controllers\SurveyorController;
// use Modules\Lpj\Http\Controllers\PenilaiController; use Modules\Lpj\Http\Controllers\PenilaiController;
use Modules\Lpj\Http\Requests\FormSurveyorRequest; use Modules\Lpj\Http\Requests\FormSurveyorRequest;
class PenilaianController extends Controller class PenilaianController extends Controller
{ {
public $user; public $user;
protected $surveyorController; protected $surveyorController;
// protected $penilaiController; protected $penilaiController;
public function __construct(SurveyorController $surveyorController) public function __construct(SurveyorController $surveyorController, PenilaiController $penilaiController)
{ {
$this->surveyorController = $surveyorController; $this->surveyorController = $surveyorController;
// $this->penilaiController = $penilaiController; $this->penilaiController = $penilaiController;
} }
@@ -677,11 +677,26 @@ class PenilaianController extends Controller
if ($inspeksi) { if ($inspeksi) {
$forminspeksi = json_decode($inspeksi->data_form, true); $forminspeksi = json_decode($inspeksi->data_form, true);
} }
$noLpmemo = $this->penilaiController->generateNoLaporan($permohonan, $documentId, 'memo');
$formFoto = $formPeta = $cities = $districts = $villages = $memo = null;
if ($lpj) { if ($lpj) {
$lpjData = json_decode($lpj->lpj, true); $lpjData = json_decode($lpj->lpj, true);
$resumeData = json_decode($lpj->resume, true); $resumeData = json_decode($lpj->resume, true);
$memo = json_decode($lpj->memo, true); if (isset($lpj->memo)) {
$memo = json_decode($lpj->memo);
}
if (isset($memo->lokasi->province_code)) {
$cities = City::where('province_code', $memo->lokasi->province_code)->get();
}
if (isset($memo->lokasi->city_code)) {
$districts = District::where('city_code', $memo->lokasi->city_code)->get();
}
if (isset($memo->lokasi->district_code)) {
$villages = Village::where('district_code', $memo->lokasi->district_code)->get();
}
$rap = json_decode($lpj->rap, true); $rap = json_decode($lpj->rap, true);
} }
@@ -695,7 +710,7 @@ class PenilaianController extends Controller
return redirect()->back()->with('error', 'Laporan belum dibuat'); return redirect()->back()->with('error', 'Laporan belum dibuat');
} }
return view('lpj::' . $viewLaporan, compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'resumeData', 'rap', 'memo')); return view('lpj::' . $viewLaporan, compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'resumeData', 'rap', 'memo', 'cities', 'districts', 'villages','formFoto', 'formPeta','noLpmemo'));
} }
private function getViewLaporan($tipe) private function getViewLaporan($tipe)

2
resources/views/surveyor/components/informasi.blade.php
View File

@@ -206,7 +206,7 @@
</div> </div>
<img id="foto_tempat-preview" <img id="foto_tempat-preview"
src="{{ isset($forminspeksi['foto_tempat']) ? asset('storage/' . (is_array($forminspeksi['foto_tempat']) ? $forminspeksi['foto_tempat']['path'] : $forminspeksi['foto_tempat'])) : '' }}" src="{{ isset($forminspeksi['foto_tempat']) ? asset('storage/' . (is_array($forminspeksi['foto_tempat']) ? $forminspeksi['foto_tempat'] : $forminspeksi['foto_tempat'])) : '' }}"
alt="Foto Argis Region" class="mt-2 max-w-full h-auto" alt="Foto Argis Region" class="mt-2 max-w-full h-auto"
style="{{ isset($forminspeksi['foto_tempat']) ? '' : 'display: none;' }} max-width: 30rem;"> style="{{ isset($forminspeksi['foto_tempat']) ? '' : 'display: none;' }} max-width: 30rem;">
</div> </div>