| @@ -223,6 +223,16 @@ const ClientForm = ({ refClientDetail, isNewRecord, getClientDetail }) => { | |||||
| data["caseManagerId"] = 1; | data["caseManagerId"] = 1; | ||||
| data["consultantId"] = values.consultantId ? values.consultantId.id : null; | data["consultantId"] = values.consultantId ? values.consultantId.id : null; | ||||
| data["dob"] = dob === null ? null : dayjs(dob).format('YYYY-MM-DD'); | data["dob"] = dob === null ? null : dayjs(dob).format('YYYY-MM-DD'); | ||||
| data["crAddressRoom"] = values.crAddressRoom; | |||||
| data["crAddressFloor"] = values.crAddressFloor; | |||||
| data["crAddressBlock"] = values.crAddressBlock; | |||||
| data["crAddressBuilding"] = values.crAddressBuilding; | |||||
| data["crAddressStreet"] = values.crAddressStreet; | |||||
| data["crAddressArea"] = values.crAddressArea; | |||||
| data["crAddressCity"] = values.crAddressCity; | |||||
| data["crAddressCountry"] = values.crAddressCountry; | |||||
| data["crAddressPostalCode"] = values.crAddressPostalCode; | |||||
| setClientDetail(data); | setClientDetail(data); | ||||
| } else if (isCollectData) { | } else if (isCollectData) { | ||||
| setUserConfirm(false); | setUserConfirm(false); | ||||
| @@ -320,7 +330,7 @@ const ClientForm = ({ refClientDetail, isNewRecord, getClientDetail }) => { | |||||
| <Grid container alignItems={"flex-start"}> | <Grid container alignItems={"flex-start"}> | ||||
| <Grid item xs={4} sm={4} md={4} lg={4} sx={{ ml: 3, mr: 3, mt: 1, display: 'flex', alignItems: 'flex-start' }}> | <Grid item xs={4} sm={4} md={4} lg={4} sx={{ ml: 3, mr: 3, mt: 1, display: 'flex', alignItems: 'flex-start' }}> | ||||
| <Typography variant="lionerSize" component="span"> | <Typography variant="lionerSize" component="span"> | ||||
| Last Name: <Typography sx={{ color: GENERAL_RED_COLOR }} component="span">*</Typography> | |||||
| Last Name(Surname/Family Name): <Typography sx={{ color: GENERAL_RED_COLOR }} component="span">*</Typography> | |||||
| </Typography> | </Typography> | ||||
| </Grid> | </Grid> | ||||
| <Grid item xs={7} sm={7} md={7} lg={6.5}> | <Grid item xs={7} sm={7} md={7} lg={6.5}> | ||||
| @@ -345,7 +355,7 @@ const ClientForm = ({ refClientDetail, isNewRecord, getClientDetail }) => { | |||||
| <Grid container alignItems={"flex-start"}> | <Grid container alignItems={"flex-start"}> | ||||
| <Grid item xs={4} sm={4} md={4} lg={4} sx={{ ml: 3, mr: 3, mt: 1, display: 'flex', alignItems: 'flex-start' }}> | <Grid item xs={4} sm={4} md={4} lg={4} sx={{ ml: 3, mr: 3, mt: 1, display: 'flex', alignItems: 'flex-start' }}> | ||||
| <Typography variant="lionerSize" component="span"> | <Typography variant="lionerSize" component="span"> | ||||
| First Name: | |||||
| First Name(Given Name/Forename): | |||||
| </Typography> | </Typography> | ||||
| </Grid> | </Grid> | ||||
| <Grid item xs={7} sm={7} md={7} lg={6.5}> | <Grid item xs={7} sm={7} md={7} lg={6.5}> | ||||
| @@ -486,6 +496,186 @@ const ClientForm = ({ refClientDetail, isNewRecord, getClientDetail }) => { | |||||
| </Grid> | </Grid> | ||||
| </Grid> | </Grid> | ||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} sm={12} md={12} lg={5.5} sx={{ ml: 3, mr: 3, mb: 3 }}> | |||||
| <Grid container alignItems={"center"}> | |||||
| <Grid item xs={4} sm={4} md={4} lg={4} sx={{ ml: 3, mr: 3, display: 'flex', alignItems: 'center' }}> | |||||
| <Typography variant="lionerSize" component="span"> | |||||
| Address(Room): | |||||
| </Typography> | |||||
| </Grid> | |||||
| <Grid item xs={7} sm={7} md={7} lg={6.5}> | |||||
| <TextField | |||||
| fullWidth | |||||
| inputProps={{ maxLength: 50 }} | |||||
| size="small" | |||||
| {...register("crAddressRoom", { value: refClient.crAddressRoom })} | |||||
| id='crAddressRoom' | |||||
| disabled={!isEditing} | |||||
| autoComplete="off" | |||||
| /> | |||||
| </Grid> | |||||
| </Grid> | |||||
| </Grid> | |||||
| <Grid item xs={12} sm={12} md={12} lg={5.5} sx={{ ml: 3, mr: 3, mb: 3 }}> | |||||
| <Grid container alignItems={"center"}> | |||||
| <Grid item xs={4} sm={4} md={4} lg={4} sx={{ ml: 3, mr: 3, display: 'flex', alignItems: 'center' }}> | |||||
| <Typography variant="lionerSize" component="span"> | |||||
| Address(Floor): | |||||
| </Typography> | |||||
| </Grid> | |||||
| <Grid item xs={7} sm={7} md={7} lg={6.5}> | |||||
| <TextField | |||||
| fullWidth | |||||
| inputProps={{ maxLength: 50 }} | |||||
| size="small" | |||||
| {...register("crAddressFloor", { value: refClient.crAddressFloor })} | |||||
| id='crAddressFloor' | |||||
| disabled={!isEditing} | |||||
| autoComplete="off" | |||||
| /> | |||||
| </Grid> | |||||
| </Grid> | |||||
| </Grid> | |||||
| <Grid item xs={12} sm={12} md={12} lg={5.5} sx={{ ml: 3, mr: 3, mb: 3 }}> | |||||
| <Grid container alignItems={"center"}> | |||||
| <Grid item xs={4} sm={4} md={4} lg={4} sx={{ ml: 3, mr: 3, display: 'flex', alignItems: 'center' }}> | |||||
| <Typography variant="lionerSize" component="span"> | |||||
| Address(Block): | |||||
| </Typography> | |||||
| </Grid> | |||||
| <Grid item xs={7} sm={7} md={7} lg={6.5}> | |||||
| <TextField | |||||
| fullWidth | |||||
| inputProps={{ maxLength: 50 }} | |||||
| size="small" | |||||
| {...register("crAddressBlock", { value: refClient.crAddressBlock })} | |||||
| id='crAddressBlock' | |||||
| disabled={!isEditing} | |||||
| autoComplete="off" | |||||
| /> | |||||
| </Grid> | |||||
| </Grid> | |||||
| </Grid> | |||||
| <Grid item xs={12} sm={12} md={12} lg={5.5} sx={{ ml: 3, mr: 3, mb: 3 }}> | |||||
| <Grid container alignItems={"center"}> | |||||
| <Grid item xs={4} sm={4} md={4} lg={4} sx={{ ml: 3, mr: 3, display: 'flex', alignItems: 'center' }}> | |||||
| <Typography variant="lionerSize" component="span"> | |||||
| Address(Buliding): | |||||
| </Typography> | |||||
| </Grid> | |||||
| <Grid item xs={7} sm={7} md={7} lg={6.5}> | |||||
| <TextField | |||||
| fullWidth | |||||
| inputProps={{ maxLength: 50 }} | |||||
| size="small" | |||||
| {...register("crAddressBuilding", { value: refClient.crAddressBuilding })} | |||||
| id='crAddressBuilding' | |||||
| disabled={!isEditing} | |||||
| autoComplete="off" | |||||
| /> | |||||
| </Grid> | |||||
| </Grid> | |||||
| </Grid> | |||||
| <Grid item xs={12} sm={12} md={12} lg={5.5} sx={{ ml: 3, mr: 3, mb: 3 }}> | |||||
| <Grid container alignItems={"center"}> | |||||
| <Grid item xs={4} sm={4} md={4} lg={4} sx={{ ml: 3, mr: 3, display: 'flex', alignItems: 'center' }}> | |||||
| <Typography variant="lionerSize" component="span"> | |||||
| Address(Street): | |||||
| </Typography> | |||||
| </Grid> | |||||
| <Grid item xs={7} sm={7} md={7} lg={6.5}> | |||||
| <TextField | |||||
| fullWidth | |||||
| inputProps={{ maxLength: 50 }} | |||||
| size="small" | |||||
| {...register("crAddressStreet", { value: refClient.crAddressStreet })} | |||||
| id='crAddressStreet' | |||||
| disabled={!isEditing} | |||||
| autoComplete="off" | |||||
| /> | |||||
| </Grid> | |||||
| </Grid> | |||||
| </Grid> | |||||
| <Grid item xs={12} sm={12} md={12} lg={5.5} sx={{ ml: 3, mr: 3, mb: 3 }}> | |||||
| <Grid container alignItems={"center"}> | |||||
| <Grid item xs={4} sm={4} md={4} lg={4} sx={{ ml: 3, mr: 3, display: 'flex', alignItems: 'center' }}> | |||||
| <Typography variant="lionerSize" component="span"> | |||||
| Address(Area): | |||||
| </Typography> | |||||
| </Grid> | |||||
| <Grid item xs={7} sm={7} md={7} lg={6.5}> | |||||
| <TextField | |||||
| fullWidth | |||||
| inputProps={{ maxLength: 50 }} | |||||
| size="small" | |||||
| {...register("crAddressArea", { value: refClient.crAddressArea })} | |||||
| id='crAddressArea' | |||||
| disabled={!isEditing} | |||||
| autoComplete="off" | |||||
| /> | |||||
| </Grid> | |||||
| </Grid> | |||||
| </Grid> | |||||
| <Grid item xs={12} sm={12} md={12} lg={5.5} sx={{ ml: 3, mr: 3, mb: 3 }}> | |||||
| <Grid container alignItems={"center"}> | |||||
| <Grid item xs={4} sm={4} md={4} lg={4} sx={{ ml: 3, mr: 3, display: 'flex', alignItems: 'center' }}> | |||||
| <Typography variant="lionerSize" component="span"> | |||||
| Address(City): | |||||
| </Typography> | |||||
| </Grid> | |||||
| <Grid item xs={7} sm={7} md={7} lg={6.5}> | |||||
| <TextField | |||||
| fullWidth | |||||
| inputProps={{ maxLength: 50 }} | |||||
| size="small" | |||||
| {...register("crAddressCity", { value: refClient.crAddressCity })} | |||||
| id='crAddressCity' | |||||
| disabled={!isEditing} | |||||
| autoComplete="off" | |||||
| /> | |||||
| </Grid> | |||||
| </Grid> | |||||
| </Grid> | |||||
| <Grid item xs={12} sm={12} md={12} lg={5.5} sx={{ ml: 3, mr: 3, mb: 3 }}> | |||||
| <Grid container alignItems={"center"}> | |||||
| <Grid item xs={4} sm={4} md={4} lg={4} sx={{ ml: 3, mr: 3, display: 'flex', alignItems: 'center' }}> | |||||
| <Typography variant="lionerSize" component="span"> | |||||
| Address(Country): | |||||
| </Typography> | |||||
| </Grid> | |||||
| <Grid item xs={7} sm={7} md={7} lg={6.5}> | |||||
| <TextField | |||||
| fullWidth | |||||
| inputProps={{ maxLength: 50 }} | |||||
| size="small" | |||||
| {...register("crAddressCountry", { value: refClient.crAddressCountry })} | |||||
| id='crAddressCountry' | |||||
| disabled={!isEditing} | |||||
| autoComplete="off" | |||||
| /> | |||||
| </Grid> | |||||
| </Grid> | |||||
| </Grid> | |||||
| <Grid item xs={12} sm={12} md={12} lg={5.5} sx={{ ml: 3, mr: 3, mb: 3 }}> | |||||
| <Grid container alignItems={"center"}> | |||||
| <Grid item xs={4} sm={4} md={4} lg={4} sx={{ ml: 3, mr: 3, display: 'flex', alignItems: 'center' }}> | |||||
| <Typography variant="lionerSize" component="span"> | |||||
| Address(Postal Code): | |||||
| </Typography> | |||||
| </Grid> | |||||
| <Grid item xs={7} sm={7} md={7} lg={6.5}> | |||||
| <TextField | |||||
| fullWidth | |||||
| inputProps={{ maxLength: 50 }} | |||||
| size="small" | |||||
| {...register("crAddressPostalCode", { value: refClient.crAddressPostalCode })} | |||||
| id='crAddressPostalCode' | |||||
| disabled={!isEditing} | |||||
| autoComplete="off" | |||||
| /> | |||||
| </Grid> | |||||
| </Grid> | |||||
| </Grid> | |||||
| <Grid item xs={12} sm={12} md={12} lg={5.5} sx={{ ml: 3, mr: 3, mb: 3, mt: 1 }}> | <Grid item xs={12} sm={12} md={12} lg={5.5} sx={{ ml: 3, mr: 3, mb: 3, mt: 1 }}> | ||||
| <Grid container alignItems={"flex-start"}> | <Grid container alignItems={"flex-start"}> | ||||
| <Grid item xs={4} sm={4} md={4} lg={4} sx={{ ml: 3, mr: 3, mt: 1, display: 'flex', alignItems: 'flex-start' }}> | <Grid item xs={4} sm={4} md={4} lg={4} sx={{ ml: 3, mr: 3, mt: 1, display: 'flex', alignItems: 'flex-start' }}> | ||||