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

fix(penilai): perbaiki logika penilaian dan tampilan

Browse Source 
- Memperbaiki logika penilaian untuk akurasi yang lebih baik.
- Menyempurnakan tampilan antarmuka agar lebih responsif.
- Menghilangkan elemen yang tidak diperlukan untuk meningkatkan pengalaman pengguna.
This commit is contained in:
Daeng Deni Mardaeni
2025-03-10 14:08:13 +07:00
parent b79b65ea6c
commit 900de88ddd
1 changed files with 222 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

435
app/Http/Controllers/RegistrasiController.php
View File

@@ -1,256 +1,265 @@
<?php <?php
namespace Modules\Lpj\Http\Controllers; namespace Modules\Lpj\Http\Controllers;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use Exception; use Exception;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Validator; use Illuminate\Support\Facades\Validator;
use Maatwebsite\Excel\Facades\Excel; use Maatwebsite\Excel\Facades\Excel;
use Modules\Lpj\Models\JenisPenilaian; use Modules\Lpj\Models\Debiture;
use Modules\Lpj\Models\Penilai; use Modules\Lpj\Models\DokumenJaminan;
use Modules\Lpj\Models\Permohonan; use Modules\Lpj\Models\JenisPenilaian;
use Modules\Lpj\Models\Regions; use Modules\Lpj\Models\Penilai;
use Modules\Lpj\Models\DokumenJaminan; use Modules\Lpj\Models\Permohonan;
use Modules\Lpj\Models\Debiture; use Modules\Lpj\Models\Regions;
class RegistrasiController extends Controller class RegistrasiController extends Controller
{
public $user;
public function index()
{ {
return view('lpj::registrasi.index'); public $user;
}
public function dataForDatatables(Request $request) public function index()
{ {
if (is_null($this->user) || !$this->user->can('debitur.view')) { return view('lpj::registrasi.index');
//abort(403, 'Sorry! You are not allowed to view users.');
} }
// Retrieve data from the database public function dataForDatatables(Request $request)
$query = Permohonan::query() {
->whereIn('status', ['preregister', 'revisi']); if (is_null($this->user) || !$this->user->can('debitur.view')) {
//abort(403, 'Sorry! You are not allowed to view users.');
}
// Retrieve data from the database
$query = Permohonan::query()
->whereIn('status', ['preregister', 'revisi']);
// Apply search filter if provided // Apply search filter if provided
if ($request->has('search') && !empty($request->get('search'))) { if ($request->has('search') && !empty($request->get('search'))) {
$search = $request->get('search'); $search = $request->get('search');
$query->where(function ($q) use ($search) { $query->where(function ($q) use ($search) {
$q->where('nomor_registrasi', 'LIKE', '%' . $search . '%'); $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
$q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%'); $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
$q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%'); $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
$q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%'); $q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%');
$q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%'); $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
$q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%'); $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
$q->orWhere('status', 'LIKE', '%' . $search . '%'); $q->orWhere('status', 'LIKE', '%' . $search . '%');
}); });
}
// Apply sorting if provided
if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
$order = $request->get('sortOrder');
$column = $request->get('sortField');
$query->orderBy($column, $order);
}
// Get the total count of records
$totalRecords = $query->count();
// Apply pagination if provided
if ($request->has('page') && $request->has('size')) {
$page = $request->get('page');
$size = $request->get('size');
$offset = ($page - 1) * $size; // Calculate the offset
$query->skip($offset)->take($size);
}
// Get the filtered count of records
$filteredRecords = $query->count();
// Get the data for the current page
$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
// Calculate the page count
$pageCount = ceil($totalRecords / $request->get('size'));
// Calculate the current page number
$currentPage = 0 + 1;
// Return the response data as a JSON object
return response()->json([
'draw' => $request->get('draw'),
'recordsTotal' => $totalRecords,
'recordsFiltered' => $filteredRecords,
'pageCount' => $pageCount,
'page' => $currentPage,
'totalCount' => $totalRecords,
'data' => $data,
]);
} }
// Apply sorting if provided public function edit($id)
if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) { {
$order = $request->get('sortOrder'); return view('lpj::registrasi.edit', compact('id'));
$column = $request->get('sortField');
$query->orderBy($column, $order);
} }
// Get the total count of records public function setData(Request $request)
$totalRecords = $query->count(); : JsonResponse
{
$data = [];
$datas = [];
// Apply pagination if provided if (request()->ajax()) {
if ($request->has('page') && $request->has('size')) { $id = $request->id;
$page = $request->get('page'); $datas = Permohonan::find($id);
$size = $request->get('size');
$offset = ($page - 1) * $size; // Calculate the offset
$query->skip($offset)->take($size); if ($datas) {
$jenisPenilaians = null;
$regions = null;
$regions = Regions::pluck('name', 'id');
$jenisPenilaians = JenisPenilaian::pluck('name', 'id');
$data['status'] = 'success';
$data['regions'] = $regions;
$data['jenisPenilaians'] = $jenisPenilaians;
$data['datas'] = $datas;
$data['message'] ['message_success'] = ["data successfully found"];
} else {
$data['status'] = 'error';
$data['datas'] = null;
$data['message'] ['message_data'] = ["data not found"];
}
} else {
$data['status'] = 'error';
$data['message']['message_ajax'] = ["no ajax request"];
}
return response()->json($data);
} }
// Get the filtered count of records public function show($id)
$filteredRecords = $query->count(); {
$permohonan = Permohonan::find($id);
$debitur = Debiture::find($permohonan->debiture_id);
$documents = DokumenJaminan::with('pemilik', 'detail')->where('permohonan_id', $id)->get();
return view('lpj::registrasi.show', compact('id', 'permohonan', 'documents', 'debitur'));
}
// Get the data for the current page public function storeRevisi(Request $request, $id)
$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get(); {
try {
$permohonan = Permohonan::find($id);
// Calculate the page count $permohonan->update([
$pageCount = ceil($totalRecords / $request->get('size')); 'status' => 'registered'
]);
// Calculate the current page number return redirect()->route('registrasi.index')->with('success', 'Submit Revision successfully');
$currentPage = 0 + 1; } catch (Exception $e) {
return redirect()
->route('registrasi.index')
->with('error', 'Failed to create permohonan' . $e->getMessage());
// Return the response data as a JSON object }
return response()->json([ }
'draw' => $request->get('draw'),
'recordsTotal' => $totalRecords,
'recordsFiltered' => $filteredRecords,
'pageCount' => $pageCount,
'page' => $currentPage,
'totalCount' => $totalRecords,
'data' => $data,
]);
}
public function edit($id) public function update(Request $request, $id)
{ : JsonResponse
return view('lpj::registrasi.edit', compact('id')); {
} // init
$data = [];
$dataku = [];
$tindakan = null;
if (request()->ajax()) {
$validator = RegistrasiController::rulesEditnya($request, $id);
public function setData(Request $request): JsonResponse if ($validator['fails']) {
{ $data['message'] = $validator['errors'];
$data = []; $data['status'] = 'error';
$datas = []; } else {
try {
$tindakan = $request->tindakan;
$dataku = [
'registrasi_by' => Auth::id(),
'registrasi_at' => now(),
];
if (request()->ajax()) { if ($tindakan == 0) {
$id = $request->id; $dataku['jenis_penilaian_id'] = $request->jenis_penilaian;
$datas = Permohonan::find($id); $dataku['region_id'] = $request->region;
$dataku['status'] = 'registered';
if ($request->catatan2) {
$dataku['registrasi_catatan'] = $request->catatan2;
}
} else {
$dataku['registrasi_catatan'] = $request->catatan;
$dataku['status'] = 'revisi';
}
if ($datas) { $data['dataku'] = $dataku;
$jenisPenilaians = null;
$regions = null;
$regions = Regions::pluck('name', 'id');
$jenisPenilaians = JenisPenilaian::pluck('name', 'id');
$data['status'] = 'success'; $modal = Permohonan::find($id);
$data['regions'] = $regions;
$data['jenisPenilaians'] = $jenisPenilaians; $modal->update($dataku);
$data['datas'] = $datas;
$data['message'] ['message_success'] = ["data successfully found"]; if ($modal && $request->jenis_laporan) {
foreach ($modal->documents as $document) {
Penilai::updateOrCreate(
[
'permohonan_id' => $id,
'dokument_id' => $document->id
],
['type' => $request->jenis_laporan]
);
}
}
//
$data['status'] = 'success';
$data['message'] ['message_success'] = ['Regitrasi ' . $modal->nomor_registrasi . ' successfully'];
} catch (Exception $e) {
$data['status'] = 'error';
$data['message'] ['message_try_catch'] = ['Regitrasi updated failed.'];
}
}
} else { } else {
$data['status'] = 'error'; $data['status'] = 'error';
$data['datas'] = null; $data['message'] ['message_ajax'] = ["no ajax request"];
$data['message'] ['message_data'] = ["data not found"];
} }
} else {
$data['status'] = 'error'; return response()->json($data);
$data['message']['message_ajax'] = ["no ajax request"];
} }
return response()->json($data); public function rulesEditnya($request, $id)
} {
$tindakan = null;
$jenis_penilaian = null;
$validate_catatan = '';
$tindakan = $request->tindakan;
$jenis_penilaian = $request->jenis_penilaian;
public function update(Request $request, $id): JsonResponse $validateIt = [
{ // 'name' diambil dari definisi parameter yang di kirim pada POST Data
// init 'tindakan' => 'required',
$data = []; ];
$dataku = [];
$tindakan = null;
if (request()->ajax()) {
$validator = RegistrasiController::rulesEditnya($request, $id);
if ($validator['fails']) { $messageIt = [
$data['message'] = $validator['errors']; 'tindakan.required' => 'Silahkan pilih Tindakan',
$data['status'] = 'error'; ];
} else {
try {
$tindakan = $request->tindakan;
$dataku = [
'registrasi_by' => Auth::id(),
'registrasi_at' => now(),
];
if ($tindakan == 0) { if ($tindakan == 0) {
$dataku['jenis_penilaian_id'] = $request->jenis_penilaian; $validateIt['jenis_penilaian'] = ['required'];
$dataku['region_id'] = $request->region; $messageIt ['jenis_penilaian.required'] = 'Silahkan pilih Jenis Penilaian';
$dataku['status'] = 'registered';
if ($request->catatan2) {
$dataku['registrasi_catatan'] = $request->catatan2;
}
} else {
$dataku['registrasi_catatan'] = $request->catatan;
$dataku['status'] = 'revisi';
}
$data['dataku'] = $dataku; // INTERNAL
if (1 == $jenis_penilaian) {
$modal = Permohonan::find($id); $validateIt['region'] = ['required'];
$messageIt ['region.required'] = 'Silahkan pilih Region';
$modal->update($dataku);
if($modal && $request->jenis_laporan){
Penilai::updateOrCreate(
['permohonan_id' => $id],
['type' => $request->jenis_laporan]
);
}
//
$data['status'] = 'success';
$data['message'] ['message_success'] = ['Regitrasi ' . $modal->nomor_registrasi . ' successfully'];
} catch (Exception $e) {
$data['status'] = 'error';
$data['message'] ['message_try_catch'] = ['Regitrasi updated failed.'];
} }
} else if ($tindakan == 1) {
$validateIt['catatan'] = ['required'];
$messageIt ['catatan.required'] = 'Silahkan isi Catatan';
} }
} else {
$data['status'] = 'error';
$data['message'] ['message_ajax'] = ["no ajax request"];
}
return response()->json($data); $validator = Validator::make($request->all(), $validateIt, $messageIt);
}
public function rulesEditnya($request, $id) $data['fails'] = $validator->fails();
{ $data['errors'] = $validator->errors();
$tindakan = null;
$jenis_penilaian = null;
$validate_catatan = '';
$tindakan = $request->tindakan;
$jenis_penilaian = $request->jenis_penilaian;
$validateIt = [
// 'name' diambil dari definisi parameter yang di kirim pada POST Data
'tindakan' => 'required',
];
$messageIt = [
'tindakan.required' => 'Silahkan pilih Tindakan',
];
if ($tindakan == 0) {
$validateIt['jenis_penilaian'] = ['required'];
$messageIt ['jenis_penilaian.required'] = 'Silahkan pilih Jenis Penilaian';
// INTERNAL
if (1 == $jenis_penilaian) {
$validateIt['region'] = ['required'];
$messageIt ['region.required'] = 'Silahkan pilih Region';
}
} elseif ($tindakan == 1) {
$validateIt['catatan'] = ['required'];
$messageIt ['catatan.required'] = 'Silahkan isi Catatan';
}
$validator = Validator::make($request->all(), $validateIt, $messageIt);
$data['fails'] = $validator->fails();
$data['errors'] = $validator->errors();
return $data;
}
public function show($id)
{
$permohonan = Permohonan::find($id);
$debitur = Debiture::find($permohonan->debiture_id);
$documents = DokumenJaminan::with('pemilik', 'detail')->where('permohonan_id', $id)->get();
return view('lpj::registrasi.show', compact('id', 'permohonan', 'documents', 'debitur'));
}
public function storeRevisi(Request $request, $id)
{
try {
$permohonan = Permohonan::find($id);
$permohonan->update([
'status' => 'registered'
]);
return redirect()->route('registrasi.index')->with('success', 'Submit Revision successfully');
} catch (Exception $e) {
return redirect()->route('registrasi.index')->with('error', 'Failed to create permohonan' . $e->getMessage());
return $data;
} }
} }
}