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

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

Browse Source
This commit is contained in:
Daeng Deni Mardaeni
2025-02-04 09:01:15 +07:00
parent d6e1586b4b a200c1ec52
commit c17541dbc8
15 changed files with 1181 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
app/Http/Controllers/PenilaiController.php
View File

@@ -385,6 +385,77 @@ class PenilaiController extends Controller
}
public function call_report(Request $request)
{
$permohonanId = $request->query('permohonanId');
$documentId = $request->query('documentId');
$inspeksiId = $request->query('inspeksiId');
$jaminanId = $request->query('jaminanId');
$provinces = Province::all();
$permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId);
// $nomorLaporan = $this->generateNoLaporan($permohonan, $documentId, 'rap');
// $basicData = $this->surveyorController->getCommonData();
// $inspeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first();
// Penilai::updateOrCreate(
// [
// 'permohonan_id' => $permohonanId,
// 'dokument_id' => $documentId,
// 'inspeksi_id' => $inspeksiId,
// ],
// [
// 'type_penilai' => 'call-report',
// ]
// );
// $resume = Penilai::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first();
// $lpjData = null;
// $rap = null;
// $forminspeksi = null;
// if ($resume) {
// $forminspeksi = json_decode($inspeksi->data_form, true);
// $rap = json_decode($resume->rap, true);
// }
// Default: gunakan data dari debitur
// $debitur = Debiture::find($permohonan->debiture_id);
// $provinceCode = $debitur->province_code;
// $cityCode = $debitur->city_code;
// $districtCode = $debitur->district_code;
// $cekAlamat = $forminspeksi['asset']['alamat']['tidak sesuai'] ?? null;
// if ($cekAlamat) {
// $provinceCode = $cekAlamat['province_code'] ?? $provinceCode;
// $cityCode = $cekAlamat['city_code'] ?? $cityCode;
// $districtCode = $cekAlamat['district_code'] ?? $districtCode;
// }
// $cities = City::where('province_code', $provinceCode)->get();
// $districts = District::where('city_code', $cityCode)->get();
// $villages = Village::where('district_code', $districtCode)->get();
// if ($forminspeksi) {
// if (isset($forminspeksi['alamat']['sesuai']['province_code'])) {
// $cities = City::where('province_code', $forminspeksi['alamat']['sesuai']['province_code'])->get();
// }
// if (isset($forminspeksi['alamat']['sesuai']['city_code'])) {
// $districts = District::where('city_code', $forminspeksi['alamat']['sesuai']['city_code'])->get();
// }
// if (isset($forminspeksi['alamat']['sesuai']['district_code'])) {
// $villages = Village::where('district_code', $forminspeksi['alamat']['sesuai']['district_code'])->get();
// }
// }
// return view('lpj::penilai.components.call-report', compact('permohonan', 'rap', 'provinces', 'cities',
// 'districts',
// 'villages','forminspeksi', 'noLpRAP', 'basicData','cekAlamat'));
return view('lpj::penilai.components.call-report', compact('permohonan'));
}
/**
* Remove the specified resource from storage.
*/
@@ -1022,7 +1093,8 @@ class PenilaiController extends Controller
'standard' => 'penilai.components.print-out-standard',
'resume' => 'penilai.components.print-resume',
'memo' => 'penilai.components.print-memo',
'rap' => 'penilai.components.print-out-rap'
'rap' => 'penilai.components.print-out-rap',
'call-report' => 'penilai.components.print-out-call-report'
];
return $viewMap[$tipe] ?? 'penilai.components.print-resume';
}

33
app/Http/Controllers/SurveyorController.php
View File

@@ -14,6 +14,8 @@ use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Str;
use Barryvdh\DomPDF\Facade\Pdf;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Mail;
use Illuminate\Http\Response;
use Modules\Lpj\Models\Debiture;
use Modules\Lpj\Models\Permohonan;
@@ -77,16 +79,15 @@ use Modules\Lpj\Models\LaluLintasLokasi;
use Modules\Lpj\Models\SpekBagunanAnalisaDetail;
use Modules\Lpj\Http\Requests\SurveyorRequest;
use Modules\Lpj\Http\Requests\FormSurveyorRequest;
use Modules\Lpj\Emails\SendEmail;
use Illuminate\Support\Facades\Mail;
use Modules\Lpj\Emails\SendJadwalKunjunganEmail;
class SurveyorController extends Controller
{
public $user;
/**
* Display a listing of the resource.
*/
public function index()
{
return view('lpj::surveyor.index');
@@ -899,8 +900,6 @@ class SurveyorController extends Controller
}
public function checkButtonStatus($id)
{
try {
@@ -969,24 +968,24 @@ class SurveyorController extends Controller
'deskripsi_penilaian' => 'required'
]);
// $user = ['user' => 'rustammajid76@gmail.com'];
$penilaian = Penilaian::findOrFail($validate['id']);
// $emailData = [
// 'email' => 'rustammajid76@gmail.com',
// 'subject' => 'Test',
// 'emailData' => '<h2>Hello, World!</h2><h2>This is the email content. Waktu Penilaian:</h2>'
// ];
$emailData = [
'email' => $penilaian->permohonan->user->email,
'subject' => 'Jadwal Kunjungan',
'emailData' => $validate,
// $this->sendMessage($emailData, $user);
];
$id = $request->input('id');
$penilaian = Penilaian::findOrFail($id);
Mail::to($emailData['email'])->send(new SendJadwalKunjunganEmail($emailData, $penilaian->permohonan->nomor_resitrasi, $penilaian->permohonan->debiture));
if ($validate['waktu_penilaian'] <= $penilaian->tanggal_kunjungan) {
if (Carbon::parse($validate['waktu_penilaian']) <= Carbon::parse($penilaian->tanggal_kunjungan)) {
return redirect()
->route('surveyor.index')
->with('error', 'Waktu penilaian harus lebih besar dari tanggal assign.');
}
$penilaian->update([
'waktu_penilaian' => $validate['waktu_penilaian'],
'deskripsi_penilaian' => $validate['deskripsi_penilaian'],