Request untuk Tanggal Pengajuan LOG bisa dipilih

This commit is contained in:
ivan-sim
2024-01-22 09:46:06 +07:00
parent 3f1c620742
commit a54d9107f8
6 changed files with 46 additions and 9 deletions

View File

@@ -27,25 +27,30 @@ class RequestLogController extends Controller
'service_code' => $request->service_code, 'service_code' => $request->service_code,
'organization_id' => $request->organization_id, 'organization_id' => $request->organization_id,
'organization_name' => $request->organization_name, 'organization_name' => $request->organization_name,
'address_provider' => $request->address_provider 'address_provider' => $request->address_provider,
'submission_date' => $request->submission_date,
]; ];
$validator = Validator::make($request->all(), [ $validator = Validator::make($request->all(), [
'member_id' => 'required', 'member_id' => 'required',
'service_code' => 'required' 'service_code' => 'required',
'submission_date' => 'required'
], [ ], [
'member_id.required' => trans('Validation.required',['attribute' => 'Member ID']), 'member_id.required' => trans('Validation.required',['attribute' => 'Member ID']),
'service_code.required' => trans('Validation.required',['attribute' => 'Service Code']), 'service_code.required' => trans('Validation.required',['attribute' => 'Service Code']),
'submission_date.required' => trans('Validation.required',['attribute' => 'Submission Date']),
]); ]);
if($request->organization_id) if($request->organization_id)
{ {
$validator = Validator::make($request->all(), [ $validator = Validator::make($request->all(), [
'organization_id' => 'required', 'organization_id' => 'required',
'member_id' => 'required', 'member_id' => 'required',
'service_code' => 'required' 'service_code' => 'required',
'submission_date' => 'required'
], [ ], [
'organization_id.required' => trans('Validation.required',['attribute' => 'Provider ID']), 'organization_id.required' => trans('Validation.required',['attribute' => 'Provider ID']),
'member_id.required' => trans('Validation.required',['attribute' => 'Member ID']), 'member_id.required' => trans('Validation.required',['attribute' => 'Member ID']),
'service_code.required' => trans('Validation.required',['attribute' => 'Service Code']), 'service_code.required' => trans('Validation.required',['attribute' => 'Service Code']),
'submission_date.required' => trans('Validation.required',['attribute' => 'Submission Date']),
]); ]);
} }
if ($validator->fails()) if ($validator->fails())

View File

@@ -122,7 +122,7 @@ class RequestLogController extends Controller
member: $member, member: $member,
paymentType: 'cashless', paymentType: 'cashless',
serviceCode: $request->service_code, serviceCode: $request->service_code,
submissionDate: null, submissionDate: $request->submission_date,
// status: 'approved', // status: 'approved',
status: 'requested', // di nonaktifkan dulu auto approved status: 'requested', // di nonaktifkan dulu auto approved
organization_id: $request->organization_id, organization_id: $request->organization_id,
@@ -145,7 +145,7 @@ class RequestLogController extends Controller
member: $member, member: $member,
paymentType: 'cashless', paymentType: 'cashless',
serviceCode: $request->service_code, serviceCode: $request->service_code,
submissionDate: null, submissionDate: $request->submission_date,
status: 'requested', status: 'requested',
organization_id: $request->organization_id, organization_id: $request->organization_id,
source: $request->source source: $request->source

View File

@@ -26,7 +26,7 @@ class RequestLogService{
$member, $member,
$paymentType, $paymentType,
$serviceCode, $serviceCode,
$submissionDate = null, $submissionDate,
$status, $organization_id = null, $status, $organization_id = null,
$source $source
) )
@@ -48,7 +48,7 @@ class RequestLogService{
$requestLogData = [ $requestLogData = [
'code' => $code, 'code' => $code,
'member_id' => $member->id, 'member_id' => $member->id,
'submission_date' => $submissionDate ?? now(), 'submission_date' => $submissionDate ? $submissionDate : now(),
'status' => $status, 'status' => $status,
'payment_type' => $paymentType, 'payment_type' => $paymentType,
'service_code' => $serviceCode, 'service_code' => $serviceCode,

View File

@@ -14,6 +14,8 @@
"txtDialogMember3" : "Detail", "txtDialogMember3" : "Detail",
"txtDialogMember4" : "Please select services", "txtDialogMember4" : "Please select services",
"txtDialogMember5" : "Submission Date", "txtDialogMember5" : "Submission Date",
"txtDialogMember6" : "Please select submission date",
"txtCreateAt" : "Create at",
"txtDateBirth" : "Date of Birth", "txtDateBirth" : "Date of Birth",
"txtGender" : "Gender", "txtGender" : "Gender",
"txtMaritalStatus" : "Marital Status", "txtMaritalStatus" : "Marital Status",

View File

@@ -14,6 +14,8 @@
"txtDialogMember3" : "Detail", "txtDialogMember3" : "Detail",
"txtDialogMember4" : "Mohon pilih layanan", "txtDialogMember4" : "Mohon pilih layanan",
"txtDialogMember5" : "Tanggal Pengajuan", "txtDialogMember5" : "Tanggal Pengajuan",
"txtDialogMember6" : "Mohon pilih tanggal pengajuan",
"txtCreateAt" : "Tanggal Buat",
"txtDateBirth" : "Tanggal Lahir", "txtDateBirth" : "Tanggal Lahir",
"txtGender" : "Jenis Kelamin", "txtGender" : "Jenis Kelamin",
"txtMaritalStatus" : "Status Perkawinan", "txtMaritalStatus" : "Status Perkawinan",

View File

@@ -19,6 +19,9 @@ import { LanguageContext } from '@/contexts/LanguageContext';
import Autocomplete from '@mui/material/Autocomplete'; import Autocomplete from '@mui/material/Autocomplete';
import TextField from '@mui/material/TextField'; import TextField from '@mui/material/TextField';
import Button from '@mui/material/Button'; import Button from '@mui/material/Button';
import { DatePicker, LocalizationProvider, MobileDatePicker } from '@mui/x-date-pickers';
import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns';
import { fPostFormat } from '@/utils/formatTime';
interface MemberType { interface MemberType {
members: any; members: any;
@@ -33,6 +36,8 @@ export default function FormRequestClaim({ member, handleSubmitSuccess }: FormRe
const { localeData }: any = useContext(LanguageContext); const { localeData }: any = useContext(LanguageContext);
const [serviceCode, setServiceCode] = useState<string>(''); const [serviceCode, setServiceCode] = useState<string>('');
const [idProvider, setIdProvider] = useState<number>(0); const [idProvider, setIdProvider] = useState<number>(0);
//Submission date
const [submissionDate, setSubmissionDate] = useState<string>(format(new Date(), "yyyy MMM d"));
const [submitLoading, setSubmitLoading] = useState<boolean>(false); const [submitLoading, setSubmitLoading] = useState<boolean>(false);
function submitRequest() { function submitRequest() {
@@ -46,13 +51,19 @@ export default function FormRequestClaim({ member, handleSubmitSuccess }: FormRe
enqueueSnackbar(localeData.txtDialogMember4, { variant: 'warning' }); enqueueSnackbar(localeData.txtDialogMember4, { variant: 'warning' });
return false; return false;
} }
if(submissionDate == '')
{
enqueueSnackbar(localeData.txtDialogMember6, { variant: 'warning' });
return false;
}
setSubmitLoading(true); setSubmitLoading(true);
const formData = { const formData = {
member_id: member.members.id, member_id: member.members.id,
service_code: serviceCode, service_code: serviceCode,
organization_id: idProvider, organization_id: idProvider,
organization_name : name, organization_name : name,
address_provider: alamat address_provider: alamat,
submission_date: fPostFormat(submissionDate, 'yyyy-MM-dd')
}; };
axios axios
.post('/request-log', formData) .post('/request-log', formData)
@@ -103,7 +114,7 @@ export default function FormRequestClaim({ member, handleSubmitSuccess }: FormRe
<Stack direction="column" spacing={2}> <Stack direction="column" spacing={2}>
<Stack direction="row" justifyContent={'end'} sx={{ marginBottom: 2 }} spacing={2}> <Stack direction="row" justifyContent={'end'} sx={{ marginBottom: 2 }} spacing={2}>
<Typography variant='body2' sx={{color: '#757575'}}> <Typography variant='body2' sx={{color: '#757575'}}>
{localeData.txtDialogMember5} {localeData.txtCreateAt}
</Typography> </Typography>
<Typography variant='body2' sx={{fontWeight:'bold'}}>{format(new Date(), "d MMM yyyy")}</Typography> <Typography variant='body2' sx={{fontWeight:'bold'}}>{format(new Date(), "d MMM yyyy")}</Typography>
</Stack> </Stack>
@@ -177,6 +188,23 @@ export default function FormRequestClaim({ member, handleSubmitSuccess }: FormRe
</Stack> </Stack>
</Stack> </Stack>
<Stack direction="row" spacing={2}>
<Stack spacing={2} sx={{ width: '100%' }}>
<Typography variant='subtitle1'>{localeData.txtDialogMember5} *</Typography>
<LocalizationProvider dateAdapter={AdapterDateFns}>
<DatePicker
label={localeData.txtDialogMember5}
value={submissionDate}
onChange={(newValue:any) => {
setSubmissionDate( (newValue));
}}
inputFormat="dd-MM-yyyy"
renderInput={(params) => <TextField sx={{width:'40%'}} {...params} required/>}
/>
</LocalizationProvider>
</Stack>
</Stack>
<Card sx={{ p: 1, background: '#f4f6f8'}}> <Card sx={{ p: 1, background: '#f4f6f8'}}>
<Stack direction="row"> <Stack direction="row">
<Avatar <Avatar