diff --git a/app/Http/Controllers/RegistrasiController.php b/app/Http/Controllers/RegistrasiController.php
index 6efb5a4..adc0f3e 100644
--- a/app/Http/Controllers/RegistrasiController.php
+++ b/app/Http/Controllers/RegistrasiController.php
@@ -114,25 +114,27 @@
if (request()->ajax()) {
$id = $request->id;
- $datas = Permohonan::findOrFail($id);
- $data['status'] = 'success';
+ $datas = Permohonan::find($id);
+
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'] = 'data successfully found';
+ $data['message'] ['message_success'] = array("data successfully found");
} else {
+ $data['status'] = 'error';
$data['datas'] = null;
- $data['message'] = 'data not found';
+ $data['message'] ['message_data'] = array("data not found");
}
} else {
$data['status'] = 'error';
- $data['message'] = 'no ajax request';
+ $data['message'] ['message_ajax'] = array("no ajax request");
}
return response()->json($data);
@@ -179,17 +181,17 @@
$modal->update($dataku);
//
$data['status'] = 'success';
- $data['message'] = 'Regitrasi '.$modal->nomor_registrasi.' successfully';
+ $data['message'] ['message_success'] = array('Regitrasi '.$modal->nomor_registrasi.' successfully');
} catch (Exception $e) {
$data['status'] = 'error';
- $data['message'] = 'Jenis Fasilitas Kredit updated failed.';
+ $data['message'] ['message_try_catch'] = array('Regitrasi updated failed.');
}
}
} else {
$data['status'] = 'error';
- $data['message'] = 'no ajax request';
+ $data['message'] ['message_ajax'] = array("no ajax request");
}
return response()->json($data);
@@ -245,27 +247,4 @@
return view('lpj::registrasi.show', compact('id','permohonan'));
}
- public function showData(Request $request): JsonResponse
- {
- $data = array();
- $datas = array();
-
- if (request()->ajax()) {
- $id = $request->id;
- $datas = Permohonan::findOrFail($id);
- $data['status'] = 'success';
- if ($datas) {
- $data['datas'] = $datas;
- $data['message'] = 'data successfully found';
- } else {
- $data['datas'] = null;
- $data['message'] = 'data not found';
- }
- } else {
- $data['status'] = 'error';
- $data['message'] = 'no ajax request';
- }
-
- return response()->json($data);
- }
}
diff --git a/module.json b/module.json
index 0687930..de218f6 100644
--- a/module.json
+++ b/module.json
@@ -325,7 +325,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": ["Administrator", "admin"]
+ "roles": ["administrator", "admin"]
},
{
"title": "Tujuan Penilaian KJPP",
diff --git a/resources/views/assetsku/includenya.blade.php b/resources/views/assetsku/includenya.blade.php
index f646e05..e386f39 100644
--- a/resources/views/assetsku/includenya.blade.php
+++ b/resources/views/assetsku/includenya.blade.php
@@ -1,4 +1,45 @@
-
diff --git a/resources/views/registrasi/js/editjs.blade.php b/resources/views/registrasi/js/editjs.blade.php
index b6b31e8..1863f78 100644
--- a/resources/views/registrasi/js/editjs.blade.php
+++ b/resources/views/registrasi/js/editjs.blade.php
@@ -38,11 +38,23 @@
// }
},
success: function(response) {
- console.log(response);
+
+ if ('success' == response.status)
+ {
+ $("#textReg").text(response.datas.nomor_registrasi);
+ setJenisPenilaianList(response.jenisPenilaians,0);
+ setRegionList(response.regions,0);
- $("#textReg").text(response.datas.nomor_registrasi);
- setJenisPenilaianList(response.jenisPenilaians,0);
- setRegionList(response.regions,0);
+ // success
+ // var message = response.message;
+ // toastrku("success", message);
+
+ }
+ else if('error' == response.status)
+ {
+ var message = response.message;
+ toastrku("error", message);
+ }
},
error: function(xhr) {
},
@@ -152,8 +164,14 @@
else
{
//toastr.success(response.message);
- var url = "{{ route('registrasi.index') }}";
- $(location).attr('href',url);
+ var message = response.message;
+ toastrku("success", message);
+
+ setTimeout(function () {
+ var url = "{{ route('registrasi.index') }}";
+ $(location).attr('href',url);
+ // window.location.href = "https://www.newurl.com";
+ }, 2000);
}
},
@@ -189,10 +207,5 @@
}
});
- /*
- $('#{{$route[0]}}_jenis_penilaian').on('change', function() {
- console.log( this.value );
- });
- */
@endpush
diff --git a/resources/views/registrasi/js/showjs.blade.php b/resources/views/registrasi/js/showjs.blade.php
deleted file mode 100644
index 5309d38..0000000
--- a/resources/views/registrasi/js/showjs.blade.php
+++ /dev/null
@@ -1,148 +0,0 @@
-@push('scripts')
-
-@endpush
diff --git a/resources/views/registrasi/show.blade.php b/resources/views/registrasi/show.blade.php
index d599468..0b92b7e 100644
--- a/resources/views/registrasi/show.blade.php
+++ b/resources/views/registrasi/show.blade.php
@@ -312,5 +312,4 @@
@endsection
-@include('lpj::registrasi.js.showjs')
@include('lpj::registrasi.js.editjs')