From 975cd46f58c1c019920400b42e9f578a8db92eb5 Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Tue, 6 Feb 2024 10:27:06 +0700 Subject: [PATCH 1/5] Max size upload file --- .../Http/Controllers/Api/RequestLogController.php | 10 ++++++++-- .../src/sections/dashboard/TableListFinalLog.tsx | 2 +- .../src/sections/dashboard/TableListReqLog.tsx | 2 +- resources/lang/en/Message.php | 2 +- resources/lang/en/Validation.php | 4 +++- resources/lang/id/Validation.php | 4 +++- 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php index 39168e81..8d0aa211 100644 --- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php @@ -324,10 +324,16 @@ class RequestLogController extends Controller ]; $validator = Validator::make($request->all(), [ 'request_logs_id' => 'required', - 'discharge_date' => 'required' + 'discharge_date' => 'required', + 'result_files.*' => 'max:10000', + 'diagnosa_files.*' => 'max:10000', + 'kondisi_files.*' => 'max:10000', ], [ 'request_logs_id.required' => trans('Validation.required',['attribute' => 'Request Logs ID']), - 'discharge_date.required' => trans('Validation.required',['attribute' => 'Discharge Date']) + 'discharge_date.required' => trans('Validation.required',['attribute' => 'Discharge Date']), + 'result_files.*.max' => trans('Validation.max.file', ['attribute' => 'Result Files', 'max' => '10 MB' ]), + 'diagnosa_files.*.max' => trans('Validation.max.file', ['attribute' => 'Diagnosis Files', 'max' => '10 MB' ]), + 'kondisi_files.*.max' => trans('Validation.max.file', ['attribute' => 'Condition Files', 'max' => '10 MB' ]), ]); if ($validator->fails()) { diff --git a/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx b/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx index 63365102..010662dc 100644 --- a/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx +++ b/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx @@ -333,7 +333,7 @@ export default function TableListFinalLog() { const response = await axios.get(`/get-final-log`, { params: { ...parameters, search:searchText, order: order, - orderBy: orderBy, type: 'final-log' }, + orderBy: orderBy, status:statusValue, type: 'final-log' }, }); setData( response.data.data.map((obj: any) => ({ diff --git a/frontend/hospital-portal/src/sections/dashboard/TableListReqLog.tsx b/frontend/hospital-portal/src/sections/dashboard/TableListReqLog.tsx index 0b0c8729..17ce8ace 100644 --- a/frontend/hospital-portal/src/sections/dashboard/TableListReqLog.tsx +++ b/frontend/hospital-portal/src/sections/dashboard/TableListReqLog.tsx @@ -326,7 +326,7 @@ export default function TableList() { const response = await axios.get(`/get-request-log`, { params: { ...parameters, search:searchText, order: order, - orderBy: orderBy, type: 'request-log' }, + orderBy: orderBy, status:statusValue, type: 'request-log' }, }); setData( response.data.data.map((obj: any) => ({ diff --git a/resources/lang/en/Message.php b/resources/lang/en/Message.php index d0167b2b..7b8a6c6d 100644 --- a/resources/lang/en/Message.php +++ b/resources/lang/en/Message.php @@ -3,7 +3,7 @@ return [ 'success' => 'Request has been successfully processed.', 'server_error' => 'Internal server error.', - 'not_found' => 'Data not found', + 'not_found' => 'Data not found.', 'password' => 'Password wrong. Please try again.', 'read_notification' => 'Notification has been read.', 'already_exists' => 'Data already exists.', diff --git a/resources/lang/en/Validation.php b/resources/lang/en/Validation.php index c5c2b448..8f242065 100644 --- a/resources/lang/en/Validation.php +++ b/resources/lang/en/Validation.php @@ -3,6 +3,8 @@ return [ 'required' => 'The :attribute field is required.', 'invalid' => 'The :attribute field is invalid.', - 'max' => ':attribute cannot exceed :length characters.', + 'max' => [ + 'file' => ':attribute max size is :max.', + ], 'email' => 'Invalid email format.' ]; \ No newline at end of file diff --git a/resources/lang/id/Validation.php b/resources/lang/id/Validation.php index 2b2ffa07..5a8fdb02 100644 --- a/resources/lang/id/Validation.php +++ b/resources/lang/id/Validation.php @@ -3,6 +3,8 @@ return [ 'required' => 'Kolom :attribute harus diisi.', 'invalid' => 'Kolom :attribute tidak valid.', - 'max' => ':attribute tidak boleh melebihi :length karakter.', + 'max' => [ + 'file' => ':attribute tidak boleh melebihi :max.', + ], 'email' => 'Format email salah.' ]; \ No newline at end of file From dba3e9a542f378d23a4b26804f0f7fa5eb606fa1 Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Tue, 6 Feb 2024 10:40:26 +0700 Subject: [PATCH 2/5] Update setting PHP ini --- .../HospitalPortal/Http/Controllers/Api/RequestLogController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php index 8d0aa211..a50dad15 100644 --- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php @@ -318,6 +318,7 @@ class RequestLogController extends Controller public function requestFinalLog(Request $request) { + Helper::setCustomPHPIniSettings(); $data = [ 'request_logs_id' => $request->request_logs_id, 'discharge_date' => $request->discharge_date, From 9b96c38b6f874d3ea523ebb8ae912c72067db99f Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Tue, 6 Feb 2024 11:00:58 +0700 Subject: [PATCH 3/5] Update --- .../Http/Controllers/Api/RequestLogController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php index a50dad15..a46fca81 100644 --- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php @@ -318,7 +318,7 @@ class RequestLogController extends Controller public function requestFinalLog(Request $request) { - Helper::setCustomPHPIniSettings(); + // Helper::setCustomPHPIniSettings(); $data = [ 'request_logs_id' => $request->request_logs_id, 'discharge_date' => $request->discharge_date, From 1c52addf99a7abf24bcfd6d5000be360c88bfef6 Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Tue, 6 Feb 2024 11:04:25 +0700 Subject: [PATCH 4/5] Test Update --- .../Http/Controllers/Api/RequestLogController.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php index a46fca81..62264500 100644 --- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php @@ -326,15 +326,15 @@ class RequestLogController extends Controller $validator = Validator::make($request->all(), [ 'request_logs_id' => 'required', 'discharge_date' => 'required', - 'result_files.*' => 'max:10000', - 'diagnosa_files.*' => 'max:10000', - 'kondisi_files.*' => 'max:10000', + //'result_files.*' => 'max:10000', + //'diagnosa_files.*' => 'max:10000', + //'kondisi_files.*' => 'max:10000', ], [ 'request_logs_id.required' => trans('Validation.required',['attribute' => 'Request Logs ID']), 'discharge_date.required' => trans('Validation.required',['attribute' => 'Discharge Date']), - 'result_files.*.max' => trans('Validation.max.file', ['attribute' => 'Result Files', 'max' => '10 MB' ]), - 'diagnosa_files.*.max' => trans('Validation.max.file', ['attribute' => 'Diagnosis Files', 'max' => '10 MB' ]), - 'kondisi_files.*.max' => trans('Validation.max.file', ['attribute' => 'Condition Files', 'max' => '10 MB' ]), + //'result_files.*.max' => trans('Validation.max.file', ['attribute' => 'Result Files', 'max' => '10 MB' ]), + //'diagnosa_files.*.max' => trans('Validation.max.file', ['attribute' => 'Diagnosis Files', 'max' => '10 MB' ]), + //'kondisi_files.*.max' => trans('Validation.max.file', ['attribute' => 'Condition Files', 'max' => '10 MB' ]), ]); if ($validator->fails()) { From a0b0e47b4d3f9585a3a180a726823ddc7934eeac Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Tue, 6 Feb 2024 13:46:55 +0700 Subject: [PATCH 5/5] Upload file max size --- .../Http/Controllers/Api/RequestLogController.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php index 62264500..ca7a3e08 100644 --- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php @@ -318,7 +318,6 @@ class RequestLogController extends Controller public function requestFinalLog(Request $request) { - // Helper::setCustomPHPIniSettings(); $data = [ 'request_logs_id' => $request->request_logs_id, 'discharge_date' => $request->discharge_date, @@ -326,15 +325,15 @@ class RequestLogController extends Controller $validator = Validator::make($request->all(), [ 'request_logs_id' => 'required', 'discharge_date' => 'required', - //'result_files.*' => 'max:10000', - //'diagnosa_files.*' => 'max:10000', - //'kondisi_files.*' => 'max:10000', + 'result_files.*' => 'sometimes|file|max:10000', + 'diagnosa_files.*' => 'sometimes|file|max:10000', + 'kondisi_files.*' => 'sometimes|file|max:10000', ], [ 'request_logs_id.required' => trans('Validation.required',['attribute' => 'Request Logs ID']), 'discharge_date.required' => trans('Validation.required',['attribute' => 'Discharge Date']), - //'result_files.*.max' => trans('Validation.max.file', ['attribute' => 'Result Files', 'max' => '10 MB' ]), - //'diagnosa_files.*.max' => trans('Validation.max.file', ['attribute' => 'Diagnosis Files', 'max' => '10 MB' ]), - //'kondisi_files.*.max' => trans('Validation.max.file', ['attribute' => 'Condition Files', 'max' => '10 MB' ]), + 'result_files.*.max' => trans('Validation.max.file', ['attribute' => 'Result Files', 'max' => '10 MB' ]), + 'diagnosa_files.*.max' => trans('Validation.max.file', ['attribute' => 'Diagnosis Files', 'max' => '10 MB' ]), + 'kondisi_files.*.max' => trans('Validation.max.file', ['attribute' => 'Condition Files', 'max' => '10 MB' ]), ]); if ($validator->fails()) {