tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'staging' of https://dev.sismedika.online/febio/aso into staging

Browse Source
This commit is contained in:
Tb Fajri
2024-02-06 13:48:59 +07:00
parent af53a504da a0b0e47b4d
commit 062d70d3c2
6 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
View File

@@ -324,10 +324,16 @@ class RequestLogController extends Controller
]; ];
$validator = Validator::make($request->all(), [ $validator = Validator::make($request->all(), [
'request_logs_id' => 'required', 'request_logs_id' => 'required',
'discharge_date' => 'required' 'discharge_date' => 'required',
'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']), '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()) if ($validator->fails())
{ {

2
frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx
View File

@@ -333,7 +333,7 @@ export default function TableListFinalLog() {
const response = await axios.get(`/get-final-log`, { const response = await axios.get(`/get-final-log`, {
params: { ...parameters, search:searchText, order: order, params: { ...parameters, search:searchText, order: order,
orderBy: orderBy, type: 'final-log' }, orderBy: orderBy, status:statusValue, type: 'final-log' },
}); });
setData( setData(
response.data.data.map((obj: any) => ({ response.data.data.map((obj: any) => ({

2
frontend/hospital-portal/src/sections/dashboard/TableListReqLog.tsx
View File

@@ -326,7 +326,7 @@ export default function TableList() {
const response = await axios.get(`/get-request-log`, { const response = await axios.get(`/get-request-log`, {
params: { ...parameters, search:searchText, order: order, params: { ...parameters, search:searchText, order: order,
orderBy: orderBy, type: 'request-log' }, orderBy: orderBy, status:statusValue, type: 'request-log' },
}); });
setData( setData(
response.data.data.map((obj: any) => ({ response.data.data.map((obj: any) => ({

2
resources/lang/en/Message.php
View File

@@ -3,7 +3,7 @@
return [ return [
'success' => 'Request has been successfully processed.', 'success' => 'Request has been successfully processed.',
'server_error' => 'Internal server error.', 'server_error' => 'Internal server error.',
'not_found' => 'Data not found', 'not_found' => 'Data not found.',
'password' => 'Password wrong. Please try again.', 'password' => 'Password wrong. Please try again.',
'read_notification' => 'Notification has been read.', 'read_notification' => 'Notification has been read.',
'already_exists' => 'Data already exists.', 'already_exists' => 'Data already exists.',

4
resources/lang/en/Validation.php
View File

@@ -3,6 +3,8 @@
return [ return [
'required' => 'The :attribute field is required.', 'required' => 'The :attribute field is required.',
'invalid' => 'The :attribute field is invalid.', 'invalid' => 'The :attribute field is invalid.',
'max' => ':attribute cannot exceed :length characters.', 'max' => [
'file' => ':attribute max size is :max.',
],
'email' => 'Invalid email format.' 'email' => 'Invalid email format.'
]; ];

4
resources/lang/id/Validation.php
View File

@@ -3,6 +3,8 @@
return [ return [
'required' => 'Kolom :attribute harus diisi.', 'required' => 'Kolom :attribute harus diisi.',
'invalid' => 'Kolom :attribute tidak valid.', 'invalid' => 'Kolom :attribute tidak valid.',
'max' => ':attribute tidak boleh melebihi :length karakter.', 'max' => [
'file' => ':attribute tidak boleh melebihi :max.',
],
'email' => 'Format email salah.' 'email' => 'Format email salah.'
]; ];