diff --git a/ipi-survey-platform/src/components/survey/EstablishmentInfo/EstablishmentInfo.jsx b/ipi-survey-platform/src/components/survey/EstablishmentInfo/EstablishmentInfo.jsx index 8609531..a89a538 100644 --- a/ipi-survey-platform/src/components/survey/EstablishmentInfo/EstablishmentInfo.jsx +++ b/ipi-survey-platform/src/components/survey/EstablishmentInfo/EstablishmentInfo.jsx @@ -202,6 +202,7 @@ const EstablishmentInfo = ({ industryCode: establishmentData.industry_code, licenseNumber: establishmentData.license_number, isicCode: establishmentData.isic_code, + ern: establishmentData.ERN || establishmentData.ern, emirate: establishmentData.establishment_emirate_id, establishment_contact_email: establishmentData.establishment_contact_email, employeeInfo: { @@ -356,6 +357,7 @@ React.useEffect(() => { industryCode: establishmentData.industry_code, licenseNumber: establishmentData.license_number, isicCode: establishmentData.isic_code, + ern: establishmentData.ERN || establishmentData.ern, emirate: establishmentData.establishment_emirate_id, establishment_contact_email: establishmentData.establishment_contact_email, employeeInfo: { @@ -382,6 +384,7 @@ React.useEffect(() => { industryCode: data.industryCode || '', licenseNumber: data.licenseNumber || '', isicCode: data.isicCode || '', + ern: data.ERN || data.ern || '', emirate: emirateName || '', establishment_contact_email: data.establishment_contact_email || '', employeeInfo: { @@ -638,6 +641,13 @@ React.useEffect(() => { value={emirateName} disabled={true} /> + diff --git a/ipi-survey-platform/src/pages/Survey/Survey.jsx b/ipi-survey-platform/src/pages/Survey/Survey.jsx index bde3054..2c54ca2 100644 --- a/ipi-survey-platform/src/pages/Survey/Survey.jsx +++ b/ipi-survey-platform/src/pages/Survey/Survey.jsx @@ -49,6 +49,7 @@ const Survey = () => { industryCode: '', licenseNumber: '', isicCode: '', + ern: '', emirate: '', employeeInfo: { emiratiMale: '', @@ -105,6 +106,7 @@ const Survey = () => { industryCode: establishment.industryCode || prev.industryCode, licenseNumber: establishment.licenseNumber || prev.licenseNumber, isicCode: establishment.isicCode || prev.isicCode, + ern: establishment.ern || prev.ern, emirate: establishment.emirate || prev.emirate, employeeInfo: { emiratiMale: establishment.employeeInfo?.emiratiMale ?? prev.employeeInfo.emiratiMale, @@ -153,6 +155,7 @@ const Survey = () => { industryCode: establishment.industryCode || prev.industryCode, licenseNumber: establishment.licenseNumber || prev.licenseNumber, isicCode: establishment.isicCode || prev.isicCode, + ern: establishment.ern || prev.ern, emirate: establishment.emirate || prev.emirate, employeeInfo: { emiratiMale: establishment.employeeInfo?.emiratiMale ?? prev.employeeInfo.emiratiMale, @@ -213,6 +216,7 @@ const Survey = () => { industryCode: submission.industry_code || prev.industryCode, licenseNumber: submission.license_number || prev.licenseNumber, isicCode: submission.isic_code || prev.isicCode, + ern: submission.ern || prev.ern, emirate: submission.emirate || prev.emirate, employeeInfo: { emiratiMale: submission.emirati_male || prev.employeeInfo.emiratiMale, @@ -283,6 +287,7 @@ const Survey = () => { industryCode: ensureString(detail?.industry_code) || prev.industryCode, licenseNumber: ensureString(detail?.license_number) || prev.licenseNumber, isicCode: ensureString(detail?.isic_code) || prev.isicCode, + ern: ensureString(detail?.ERN) || ensureString(detail?.ern) || prev.ern, emirate: ensureString(detail?.establishment_emirate?.name) || ensureString(detail?.emirate) || prev.emirate, establishment_contact_email: ensureString(detail?.establishment_contact_email) || prev.establishment_contact_email || '', employeeInfo: { @@ -352,6 +357,11 @@ const Survey = () => { isicCode: ensureString(establishment.isic_code) || ensureString(summary.isic_code) || establishmentData.isicCode || '', + ern: ensureString(establishment.ERN) || + ensureString(establishment.ern) || + ensureString(summary.ERN) || + ensureString(summary.ern) || + establishmentData.ern || '', emirate: ensureString(establishment.establishment_emirate_id) || ensureString(establishment.emirate) || ensureString(summary.emirate) || @@ -591,6 +601,7 @@ const Survey = () => { quarter: quarter, year: year, status: 'Submitted', + ern: establishmentData.ERN || establishmentData.ern || '', emirati_male: parseNumber(info.emiratiMale), emirati_female: parseNumber(info.emiratiFemale), non_emirati_male: parseNumber(info.nonEmiratiMale),