qcast3/onsitesurvey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: qcast3:c769d9b53328bf67710080953385d3b56577a40e
Branches Tags
qcast3:main
qcast3:dev
qcast3:feature/submition-target
qcast3:feature/pdf-tracking
qcast3:backup
qcast3:release
..
compare: qcast3:8be8831fc4d642082ced351ddf81c09462f4333c
Branches Tags
qcast3:dev
qcast3:feature/submition-target
qcast3:feature/pdf-tracking
qcast3:backup
qcast3:main
qcast3:release

No commits in common. "c769d9b53328bf67710080953385d3b56577a40e" and "8be8831fc4d642082ced351ddf81c09462f4333c" have entirely different histories.
c769d9b533 ... 8be8831fc4

2 changed files with 43 additions and 38 deletions
Show Stats Expand all files Collapse all files

26
src/components/pdf/SurveySalePdf.tsx
View File

@ -137,7 +137,7 @@ export default function SurveySalePdf({ survey }: { survey: SurveyBasicInfo }) {
<Text style={styles.title}>HWJ 現地調査シート</Text> <Text style={styles.title}>HWJ 現地調査シート</Text>
<View style={styles.headerRight}> <View style={styles.headerRight}>
<View style={styles.headerLeft}> <View style={styles.headerLeft}>
<Text style={styles.headerLabel}>現地調査会社名</Text> <Text style={styles.headerLabel}>現地調査販賣店名</Text>
<Text style={styles.headerValue}>{survey?.store ?? '-'}</Text> <Text style={styles.headerValue}>{survey?.store ?? '-'}</Text>
</View> </View>
{survey?.constructionPoint && ( {survey?.constructionPoint && (
@ -147,7 +147,7 @@ export default function SurveySalePdf({ survey }: { survey: SurveyBasicInfo }) {
</View> </View>
)} )}
<View> <View>
<Text style={styles.headerLabel}>現地調査日</Text> <Text style={styles.headerLabel}>現地阴買日</Text>
<Text style={styles.headerValue}>{survey?.investigationDate ?? '-'}</Text> <Text style={styles.headerValue}>{survey?.investigationDate ?? '-'}</Text>
</View> </View>
</View> </View>
@ -171,16 +171,16 @@ export default function SurveySalePdf({ survey }: { survey: SurveyBasicInfo }) {
{/* Electric Info */} {/* Electric Info */}
<View style={styles.section}> <View style={styles.section}>
<Text style={styles.sectionTitle}>電気関係</Text> <Text style={styles.sectionTitle}>も気開係</Text>
<View style={styles.table}> <View style={styles.table}>
<View style={styles.tableRow}> <View style={styles.tableRow}>
<Text style={[styles.tableHeader, styles.tableHeaderMedium]}>電気契約容量</Text> <Text style={[styles.tableHeader, styles.tableHeaderMedium]}>雨気契约容国</Text>
<Text style={[styles.tableCell, styles.tableCellFlex1, styles.marginL]}>{survey?.detailInfo?.contractCapacity ?? '-'}</Text> <Text style={[styles.tableCell, styles.tableCellFlex1, styles.marginL]}>{survey?.detailInfo?.contractCapacity ?? '-'}</Text>
<Text style={[styles.tableHeader, styles.tableHeaderMedium, styles.marginL]}>電気契約会社</Text> <Text style={[styles.tableHeader, styles.tableHeaderMedium, styles.marginL]}>電気契約会社</Text>
<Text style={[styles.tableCell, styles.tableCellFlex1, styles.marginL]}>{survey?.detailInfo?.retailCompany ?? '-'}</Text> <Text style={[styles.tableCell, styles.tableCellFlex1, styles.marginL]}>{survey?.detailInfo?.retailCompany ?? '-'}</Text>
</View> </View>
<View style={styles.tableRow}> <View style={styles.tableRow}>
<Text style={[styles.tableHeader, styles.tableHeaderMedium, styles.marginT]}>電気付帯設備</Text> <Text style={[styles.tableHeader, styles.tableHeaderMedium, styles.marginT]}>電気付带設備</Text>
<Text style={[styles.tableCell, styles.tableCellFlex1, styles.marginL, styles.marginT]}> <Text style={[styles.tableCell, styles.tableCellFlex1, styles.marginL, styles.marginT]}>
{survey?.detailInfo?.supplementaryFacilities {survey?.detailInfo?.supplementaryFacilities
? supplementaryFacilities ? supplementaryFacilities
@ -207,7 +207,7 @@ export default function SurveySalePdf({ survey }: { survey: SurveyBasicInfo }) {
{/* Roof Info */} {/* Roof Info */}
<View style={styles.section}> <View style={styles.section}>
<Text style={styles.sectionTitle}>屋根関連</Text> <Text style={styles.sectionTitle}>屋根眀係</Text>
<View style={styles.table}> <View style={styles.table}>
<View style={styles.tableRow}> <View style={styles.tableRow}>
<Text style={[styles.tableHeader, styles.tableHeaderMedium]}>築年数</Text> <Text style={[styles.tableHeader, styles.tableHeaderMedium]}>築年数</Text>
@ -218,7 +218,7 @@ export default function SurveySalePdf({ survey }: { survey: SurveyBasicInfo }) {
? `既築 (${survey?.detailInfo?.constructionYear}年)` ? `既築 (${survey?.detailInfo?.constructionYear}年)`
: '-'} : '-'}
</Text> </Text>
<Text style={[styles.tableHeader, styles.tableHeaderMedium, styles.marginL]}>屋根材</Text> <Text style={[styles.tableHeader, styles.tableHeaderMedium, styles.marginL]}>至根材</Text>
<Text style={[styles.tableCell, styles.tableCellFlex07, styles.marginL, styles.marginL]}> <Text style={[styles.tableCell, styles.tableCellFlex07, styles.marginL, styles.marginL]}>
{survey?.detailInfo?.roofMaterial === null && survey?.detailInfo?.roofMaterialEtc === null {survey?.detailInfo?.roofMaterial === null && survey?.detailInfo?.roofMaterialEtc === null
? '-' ? '-'
@ -228,25 +228,25 @@ export default function SurveySalePdf({ survey }: { survey: SurveyBasicInfo }) {
.join(', ')} .join(', ')}
{survey?.detailInfo?.roofMaterialEtc ? `, ${survey?.detailInfo?.roofMaterialEtc}` : ''} {survey?.detailInfo?.roofMaterialEtc ? `, ${survey?.detailInfo?.roofMaterialEtc}` : ''}
</Text> </Text>
<Text style={[styles.tableHeader, styles.tableHeaderMedium, styles.marginL]}>屋根形状</Text> <Text style={[styles.tableHeader, styles.tableHeaderMedium, styles.marginL]}>座根形状</Text>
<Text style={[styles.tableCell, styles.tableCellFlex07, styles.marginL]}> <Text style={[styles.tableCell, styles.tableCellFlex07, styles.marginL]}>
{selectBoxOptions.roofShape.find((shape) => shape.id.toString() === survey?.detailInfo?.roofShape)?.name ?? {selectBoxOptions.roofShape.find((shape) => shape.id.toString() === survey?.detailInfo?.roofShape)?.name ??
(survey?.detailInfo?.roofShapeEtc ? ` ${survey?.detailInfo?.roofShapeEtc}` : '-')} (survey?.detailInfo?.roofShapeEtc ? ` ${survey?.detailInfo?.roofShapeEtc}` : '-')}
</Text> </Text>
</View> </View>
<View style={styles.tableRow}> <View style={styles.tableRow}>
<Text style={[styles.tableHeader, styles.tableHeaderMedium, styles.marginT]}>屋根勾配</Text> <Text style={[styles.tableHeader, styles.tableHeaderMedium, styles.marginT]}>座根勾配</Text>
<Text style={[styles.tableCell, styles.tableCellFlex1, styles.marginL, styles.marginT, styles.marginL]}> <Text style={[styles.tableCell, styles.tableCellFlex1, styles.marginL, styles.marginT, styles.marginL]}>
{survey?.detailInfo?.roofSlope ? `${survey?.detailInfo?.roofSlope} 寸` : '-'} {survey?.detailInfo?.roofSlope ? `${survey?.detailInfo?.roofSlope} 寸` : '-'}
</Text> </Text>
<Text style={[styles.tableHeader, styles.tableHeaderMedium, styles.marginL, styles.marginT]}>住宅構造</Text> <Text style={[styles.tableHeader, styles.tableHeaderMedium, styles.marginL, styles.marginT]}>住宅樠造</Text>
<Text style={[styles.tableCell, styles.tableCellFlex2, styles.marginL, styles.marginL, styles.marginT]}> <Text style={[styles.tableCell, styles.tableCellFlex2, styles.marginL, styles.marginL, styles.marginT]}>
{radioEtcData.houseStructure.find((structure) => structure.id.toString() === survey?.detailInfo?.houseStructure)?.label ?? {radioEtcData.houseStructure.find((structure) => structure.id.toString() === survey?.detailInfo?.houseStructure)?.label ??
(survey?.detailInfo?.houseStructureEtc ? ` ${survey?.detailInfo?.houseStructureEtc}` : '-')} (survey?.detailInfo?.houseStructureEtc ? ` ${survey?.detailInfo?.houseStructureEtc}` : '-')}
</Text> </Text>
</View> </View>
<View style={styles.tableRow}> <View style={styles.tableRow}>
<Text style={[styles.tableHeader, styles.tableHeaderMedium, styles.marginT]}>垂木材質</Text> <Text style={[styles.tableHeader, styles.tableHeaderMedium, styles.marginT]}>並木材質</Text>
<Text style={[styles.tableCell, styles.tableCellFlex1, styles.marginL, styles.marginT]}> <Text style={[styles.tableCell, styles.tableCellFlex1, styles.marginL, styles.marginT]}>
{radioEtcData.rafterMaterial.find((material) => material.id.toString() === survey?.detailInfo?.rafterMaterial)?.label ?? {radioEtcData.rafterMaterial.find((material) => material.id.toString() === survey?.detailInfo?.rafterMaterial)?.label ??
(survey?.detailInfo?.rafterMaterialEtc ? ` ${survey?.detailInfo?.rafterMaterialEtc}` : '-')} (survey?.detailInfo?.rafterMaterialEtc ? ` ${survey?.detailInfo?.rafterMaterialEtc}` : '-')}
@ -280,7 +280,7 @@ export default function SurveySalePdf({ survey }: { survey: SurveyBasicInfo }) {
</Text> </Text>
</View> </View>
<View style={styles.tableRow}> <View style={styles.tableRow}>
<Text style={[styles.tableHeader, styles.tableHeaderMedium, styles.marginT]}>雨漏りの形跡</Text> <Text style={[styles.tableHeader, styles.tableHeaderMedium, styles.marginT]}>兩漏の形跡</Text>
<Text style={[styles.tableCell, styles.tableCellFlex1, styles.marginL, styles.marginT]}> <Text style={[styles.tableCell, styles.tableCellFlex1, styles.marginL, styles.marginT]}>
{survey?.detailInfo?.leakTrace ? 'あり' : 'なし'} {survey?.detailInfo?.leakTrace ? 'あり' : 'なし'}
</Text> </Text>
@ -313,7 +313,7 @@ export default function SurveySalePdf({ survey }: { survey: SurveyBasicInfo }) {
<View style={styles.sectionNoPadding}> <View style={styles.sectionNoPadding}>
<View style={styles.table}> <View style={styles.table}>
<View style={styles.tableRow}> <View style={styles.tableRow}>
<Text style={[styles.tableHeader, styles.tableHeaderLarge]}>屋根製品名設置可否</Text> <Text style={[styles.tableHeader, styles.tableHeaderLarge]}>区根製品名設置可否確認</Text>
<Text style={[styles.tableCell, styles.tableCellFlex1, styles.marginL]}> <Text style={[styles.tableCell, styles.tableCellFlex1, styles.marginL]}>
{survey?.detailInfo?.installationAvailability === null && survey.detailInfo?.installationAvailabilityEtc === null {survey?.detailInfo?.installationAvailability === null && survey.detailInfo?.installationAvailabilityEtc === null
? '-' ? '-'

55
src/components/survey-sale/detail/RoofForm.tsx
View File

@ -309,6 +309,7 @@ const SelectedBox = ({
const handleSelectChange = (e: React.ChangeEvent<HTMLSelectElement>) => { const handleSelectChange = (e: React.ChangeEvent<HTMLSelectElement>) => {
const value = e.target.value const value = e.target.value
const isEtc = value === 'etc' const isEtc = value === 'etc'
const isSpecialEtc = isSpecialCase && value === 'O'
const updatedData = { const updatedData = {
...detailInfoData, ...detailInfoData,
@ -316,7 +317,11 @@ const SelectedBox = ({
[`${column}Etc`]: isEtc ? '' : null, [`${column}Etc`]: isEtc ? '' : null,
} }
setIsEtcSelected(isEtc) if (isSpecialEtc) {
updatedData[column] = value
}
setIsEtcSelected(isEtc || isSpecialEtc)
setRoofInfo(updatedData) setRoofInfo(updatedData)
} }
@ -328,13 +333,13 @@ const SelectedBox = ({
/** Input box 비활성화 처리 /** Input box 비활성화 처리
* - 읽기 모드 : 비활성화 * - 읽기 모드 : 비활성화
* - 설치 가능 여부 : 기타 입력 창 항상 활성화 * - 설치 가능 여부 : 기타 입력 창 항상 활성화
* - 건축 연수 : 新築 신축 (N) 체크 시 비활성화 * - 건축 연수 : 신축(1) 체크 시 비활성화
* */ * */
const isInputDisabled = () => { const isInputDisabled = () => {
if (mode === 'READ') return true if (mode === 'READ') return true
if (column === 'installationAvailability') return false if (column === 'installationAvailability') return false
if (column === 'constructionYear') { if (column === 'constructionYear') {
return detailInfoData.constructionYear === selectBoxOptions.constructionYear[0].code || detailInfoData.constructionYear === null return detailInfoData.constructionYear === 'N' || detailInfoData.constructionYear === null
} }
return !isEtcSelected && !etcValue return !isEtcSelected && !etcValue
} }
@ -396,10 +401,8 @@ const RadioSelected = ({
const [etcChecked, setEtcChecked] = useState<boolean>(Boolean(etcValue)) const [etcChecked, setEtcChecked] = useState<boolean>(Boolean(etcValue))
const selectedId = const selectedId =
/** 누수 흔적 boolean 타입이므로 number 타입으로 변환 - 값이 없을 경우 2(없음) 으로 초기화*/ /** 누수 흔적 boolean 타입이므로 number 타입으로 변환 - 값이 없을 경우 2(없음) 으로 초기화*/
column === 'leakTrace' column === 'leakTrace' ? Number(detailInfoData?.[column as keyof SurveyDetailInfo]) || 2 : detailInfoData?.[column as keyof SurveyDetailInfo]
? Number(detailInfoData?.[column as keyof SurveyDetailInfo]) || radioEtcData.leakTrace[1].id
: detailInfoData?.[column as keyof SurveyDetailInfo]
const isSpecialColumn = column === 'rafterDirection' || column === 'leakTrace' || column === 'insulationPresence' const isSpecialColumn = column === 'rafterDirection' || column === 'leakTrace' || column === 'insulationPresence'
const showEtcOption = !isSpecialColumn const showEtcOption = !isSpecialColumn
@ -410,7 +413,7 @@ const RadioSelected = ({
/** 누수 흔적 처리 - boolean 타입이므로 별도 처리 */ /** 누수 흔적 처리 - boolean 타입이므로 별도 처리 */
if (column === 'leakTrace') { if (column === 'leakTrace') {
setRoofInfo({ ...detailInfoData, leakTrace: value === String(radioEtcData.leakTrace[0].id) }) setRoofInfo({ ...detailInfoData, leakTrace: value === '1' })
return return
} }
@ -427,7 +430,7 @@ const RadioSelected = ({
const isInsulationPresence = column === 'insulationPresence' const isInsulationPresence = column === 'insulationPresence'
const isRafterDirection = column === 'rafterDirection' const isRafterDirection = column === 'rafterDirection'
setEtcChecked(isInsulationPresence && value === String(radioEtcData.insulationPresence[1].id)) setEtcChecked(isInsulationPresence && value === '2')
setRoofInfo({ setRoofInfo({
...detailInfoData, ...detailInfoData,
@ -448,7 +451,7 @@ const RadioSelected = ({
const isInputDisabled = () => { const isInputDisabled = () => {
if (mode === 'READ') return true if (mode === 'READ') return true
if (column === 'insulationPresence') { if (column === 'insulationPresence') {
return detailInfoData.insulationPresence === String(radioEtcData.insulationPresence[0].id) return detailInfoData.insulationPresence !== '2'
} }
return !etcChecked && !etcValue return !etcChecked && !etcValue
} }
@ -515,11 +518,8 @@ const MultiCheck = ({
const { showErrorAlert } = useAlertMsg() const { showErrorAlert } = useAlertMsg()
const { roofMaterial, initialized, loading, loadOptions } = useSurveyOptionStore() const { roofMaterial, initialized, loading, loadOptions } = useSurveyOptionStore()
const multiCheckData = column === 'supplementaryFacilities' ? supplementaryFacilities : roofMaterial const multiCheckData = column === 'supplementaryFacilities' ? supplementaryFacilities : roofMaterial
const [etcValue, setEtcValue] = useState<string | null>(roofInfo?.[`${column}Etc` as keyof SurveyDetailInfo]?.toString() ?? null) const etcValue = roofInfo?.[`${column}Etc` as keyof SurveyDetailInfo]
useEffect(() => { const [isOtherCheck, setIsOtherCheck] = useState<boolean>(Boolean(etcValue))
const newValue = roofInfo?.[`${column}Etc` as keyof SurveyDetailInfo]?.toString() ?? null
setEtcValue(newValue)
}, [roofInfo, column])
useEffect(() => { useEffect(() => {
if (!initialized && !loading) loadOptions() if (!initialized && !loading) loadOptions()
@ -538,7 +538,7 @@ const MultiCheck = ({
} else { } else {
/** 지붕 재료 처리 - 최대 2개 선택 처리 */ /** 지붕 재료 처리 - 최대 2개 선택 처리 */
if (isRoofMaterial) { if (isRoofMaterial) {
const totalSelected = selectedValues.length + (isOtherSelected ? 1 : 0) const totalSelected = selectedValues.length + (isOtherSelected || isOtherCheck ? 1 : 0)
if (totalSelected >= 2) { if (totalSelected >= 2) {
showErrorAlert(WARNING_MESSAGE.ROOF_MATERIAL_MAX_SELECT) showErrorAlert(WARNING_MESSAGE.ROOF_MATERIAL_MAX_SELECT)
return return
@ -551,22 +551,21 @@ const MultiCheck = ({
/** 기타 선택 처리 */ /** 기타 선택 처리 */
const handleOtherCheckbox = () => { const handleOtherCheckbox = () => {
setEtcValue(etcValue !== null ? null : '')
const isOtherSelected = etcValue !== null
if (isRoofMaterial) { if (isRoofMaterial) {
/** 지붕 재료 기타 선택 포함 최대 2개 선택 처리 */ const currentSelected = selectedValues.length
if (selectedValues.length >= 2) { if (!isOtherCheck && currentSelected >= 2) {
showErrorAlert(WARNING_MESSAGE.ROOF_MATERIAL_MAX_SELECT) showErrorAlert(WARNING_MESSAGE.ROOF_MATERIAL_MAX_SELECT)
setEtcValue(null)
return return
} }
} }
const newIsOtherCheck = !isOtherCheck
setIsOtherCheck(newIsOtherCheck)
/** 기타 선택 해제 시 값도 null로 설정 */ /** 기타 선택 해제 시 값도 null로 설정 */
setRoofInfo({ setRoofInfo({
...roofInfo, ...roofInfo,
[`${column}Etc`]: isOtherSelected ? null : '', [`${column}Etc`]: newIsOtherCheck ? '' : null,
}) })
} }
@ -577,7 +576,7 @@ const MultiCheck = ({
/** Input box 비활성화 처리 */ /** Input box 비활성화 처리 */
const isInputDisabled = () => { const isInputDisabled = () => {
return mode === 'READ' || etcValue === null return mode === 'READ' || (!isOtherCheck && !etcValue)
} }
return ( return (
@ -596,7 +595,13 @@ const MultiCheck = ({
</div> </div>
))} ))}
<div className="check-form-box"> <div className="check-form-box">
<input type="checkbox" id={`${column}Etc`} checked={etcValue !== null} disabled={mode === 'READ'} onChange={handleOtherCheckbox} /> <input
type="checkbox"
id={`${column}Etc`}
checked={isOtherCheck || Boolean(etcValue)}
disabled={mode === 'READ'}
onChange={handleOtherCheckbox}
/>
<label htmlFor={`${column}Etc`}>その他 (直接入力)</label> <label htmlFor={`${column}Etc`}>その他 (直接入力)</label>
</div> </div>
</div> </div>