Refactor and optimize RegistrasiController
Menghapus komentar yang tidak diperlukan, merapikan kode, dan menambahkan dependensi yang hilang. Perubahan ini juga mencakup optimalisasi pengambilan data serta perbaikan penanganan permintaan AJAX pada metode setData dan update.
This commit is contained in:
@@ -4,28 +4,14 @@
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use Exception;
|
||||
use Illuminate\Http\Request;
|
||||
use Maatwebsite\Excel\Facades\Excel;
|
||||
// use Modules\Location\Models\City;
|
||||
// use Modules\Location\Models\District;
|
||||
// use Modules\Location\Models\Province;
|
||||
// use Modules\Location\Models\Village;
|
||||
// use Modules\Lpj\Exports\DebitureExport;
|
||||
// use Modules\Lpj\Http\Requests\DebitureRequest;
|
||||
// use Modules\Lpj\Http\Requests\DokumenJaminanRequest;
|
||||
// use Modules\Lpj\Models\Branch;
|
||||
// use Modules\Lpj\Models\Debiture;
|
||||
// use Modules\Lpj\Models\DokumenJaminan;
|
||||
// use Modules\Lpj\Models\JenisJaminan;
|
||||
// use Modules\Lpj\Models\JenisLegalitasJaminan;
|
||||
// use Modules\Lpj\Models\PemilikJaminan;
|
||||
use Modules\Lpj\Models\Permohonan;
|
||||
use Modules\Lpj\Models\JenisPenilaian;
|
||||
use Modules\Lpj\Models\Regions;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Maatwebsite\Excel\Facades\Excel;
|
||||
use Modules\Lpj\Models\JenisPenilaian;
|
||||
use Modules\Lpj\Models\Permohonan;
|
||||
use Modules\Lpj\Models\Regions;
|
||||
|
||||
class RegistrasiController extends Controller
|
||||
{
|
||||
@@ -107,10 +93,10 @@
|
||||
return view('lpj::registrasi.edit', compact('id'));
|
||||
}
|
||||
|
||||
public function setData(Request $request): JsonResponse
|
||||
{
|
||||
$data = array();
|
||||
$datas = array();
|
||||
public function setData(Request $request)
|
||||
: JsonResponse {
|
||||
$data = [];
|
||||
$datas = [];
|
||||
|
||||
if (request()->ajax()) {
|
||||
$id = $request->id;
|
||||
@@ -126,25 +112,25 @@
|
||||
$data['regions'] = $regions;
|
||||
$data['jenisPenilaians'] = $jenisPenilaians;
|
||||
$data['datas'] = $datas;
|
||||
$data['message'] ['message_success'] = array("data successfully found");
|
||||
$data['message'] ['message_success'] = ["data successfully found"];
|
||||
} else {
|
||||
$data['status'] = 'error';
|
||||
$data['datas'] = null;
|
||||
$data['message'] ['message_data'] = array("data not found");
|
||||
$data['message'] ['message_data'] = ["data not found"];
|
||||
}
|
||||
} else {
|
||||
$data['status'] = 'error';
|
||||
$data['message'] ['message_ajax'] = array("no ajax request");
|
||||
$data['message'] ['message_ajax'] = ["no ajax request"];
|
||||
}
|
||||
|
||||
return response()->json($data);
|
||||
}
|
||||
|
||||
public function update(Request $request, $id): JsonResponse
|
||||
{
|
||||
public function update(Request $request, $id)
|
||||
: JsonResponse {
|
||||
// init
|
||||
$data = array();
|
||||
$dataku = array();
|
||||
$data = [];
|
||||
$dataku = [];
|
||||
$tindakan = null;
|
||||
if (request()->ajax()) {
|
||||
$validator = RegistrasiController::rulesEditnya($request, $id);
|
||||
@@ -152,26 +138,22 @@
|
||||
if ($validator['fails']) {
|
||||
$data['message'] = $validator['errors'];
|
||||
$data['status'] = 'error';
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
try {
|
||||
|
||||
$tindakan = $request->tindakan;
|
||||
$dataku = ['registrasi_by' => Auth::id(),
|
||||
'registrasi_at' => now()
|
||||
$dataku = [
|
||||
'registrasi_by' => Auth::id(),
|
||||
'registrasi_at' => now(),
|
||||
];
|
||||
|
||||
if($tindakan==0)
|
||||
{
|
||||
if ($tindakan == 0) {
|
||||
$dataku['jenis_penilaian_id'] = $request->jenis_penilaian;
|
||||
$dataku['region_id'] = $request->region;
|
||||
$dataku['status'] = 'registered';
|
||||
if($request->catatan2)
|
||||
if ($request->catatan2) {
|
||||
$dataku['registrasi_catatan'] = $request->catatan2;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$dataku['registrasi_catatan'] = $request->catatan;
|
||||
$dataku['status'] = 'revisi';
|
||||
}
|
||||
@@ -183,21 +165,18 @@
|
||||
$modal->update($dataku);
|
||||
//
|
||||
$data['status'] = 'success';
|
||||
$data['message'] ['message_success'] = array('Regitrasi '.$modal->nomor_registrasi.' successfully');
|
||||
$data['message'] ['message_success'] = ['Regitrasi ' . $modal->nomor_registrasi . ' successfully'];
|
||||
} catch (Exception $e) {
|
||||
|
||||
$data['status'] = 'error';
|
||||
$data['message'] ['message_try_catch'] = array('Regitrasi updated failed.');
|
||||
$data['message'] ['message_try_catch'] = ['Regitrasi updated failed.'];
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
$data['status'] = 'error';
|
||||
$data['message'] ['message_ajax'] = array("no ajax request");
|
||||
$data['message'] ['message_ajax'] = ["no ajax request"];
|
||||
}
|
||||
|
||||
return response()->json($data);
|
||||
|
||||
}
|
||||
|
||||
public function rulesEditnya($request, $id)
|
||||
@@ -214,23 +193,19 @@
|
||||
];
|
||||
|
||||
$messageIt = [
|
||||
'tindakan.required' => 'Silahkan pilih Tindakan'
|
||||
'tindakan.required' => 'Silahkan pilih Tindakan',
|
||||
];
|
||||
|
||||
if($tindakan==0)
|
||||
{
|
||||
if ($tindakan == 0) {
|
||||
$validateIt['jenis_penilaian'] = ['required'];
|
||||
$messageIt ['jenis_penilaian.required'] = 'Silahkan pilih Jenis Penilaian';
|
||||
|
||||
// INTERNAL
|
||||
if(1==$jenis_penilaian)
|
||||
{
|
||||
if (1 == $jenis_penilaian) {
|
||||
$validateIt['region'] = ['required'];
|
||||
$messageIt ['region.required'] = 'Silahkan pilih Region';
|
||||
}
|
||||
}
|
||||
elseif($tindakan==1)
|
||||
{
|
||||
} elseif ($tindakan == 1) {
|
||||
$validateIt['catatan'] = ['required'];
|
||||
$messageIt ['catatan.required'] = 'Silahkan isi Catatan';
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user