SS-FCSC/fcsc_ipi_frontend
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added ern field in establishment flow

Browse Source
This commit is contained in:
Malini 2026-02-18 11:41:05 +05:30
parent d4e0a19b21
commit 6236ebdf2d
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ipi-survey-platform/src/components/survey/EstablishmentInfo/EstablishmentInfo.jsx
View File

@ -202,6 +202,7 @@ const EstablishmentInfo = ({
industryCode: establishmentData.industry_code, industryCode: establishmentData.industry_code,
licenseNumber: establishmentData.license_number, licenseNumber: establishmentData.license_number,
isicCode: establishmentData.isic_code, isicCode: establishmentData.isic_code,
ern: establishmentData.ERN || establishmentData.ern,
emirate: establishmentData.establishment_emirate_id, emirate: establishmentData.establishment_emirate_id,
establishment_contact_email: establishmentData.establishment_contact_email, establishment_contact_email: establishmentData.establishment_contact_email,
employeeInfo: { employeeInfo: {
@ -356,6 +357,7 @@ React.useEffect(() => {
industryCode: establishmentData.industry_code, industryCode: establishmentData.industry_code,
licenseNumber: establishmentData.license_number, licenseNumber: establishmentData.license_number,
isicCode: establishmentData.isic_code, isicCode: establishmentData.isic_code,
ern: establishmentData.ERN || establishmentData.ern,
emirate: establishmentData.establishment_emirate_id, emirate: establishmentData.establishment_emirate_id,
establishment_contact_email: establishmentData.establishment_contact_email, establishment_contact_email: establishmentData.establishment_contact_email,
employeeInfo: { employeeInfo: {
@ -382,6 +384,7 @@ React.useEffect(() => {
industryCode: data.industryCode || '', industryCode: data.industryCode || '',
licenseNumber: data.licenseNumber || '', licenseNumber: data.licenseNumber || '',
isicCode: data.isicCode || '', isicCode: data.isicCode || '',
ern: data.ERN || data.ern || '',
emirate: emirateName || '', emirate: emirateName || '',
establishment_contact_email: data.establishment_contact_email || '', establishment_contact_email: data.establishment_contact_email || '',
employeeInfo: { employeeInfo: {
@ -638,6 +641,13 @@ React.useEffect(() => {
value={emirateName} value={emirateName}
disabled={true} disabled={true}
/> />
<Field
label="ERN"
placeholder="Enter ERN"
value={info.ern}
onChange={handleFieldChange('ern')}
disabled={true}
/>
</div> </div>
</Card> </Card>

11
ipi-survey-platform/src/pages/Survey/Survey.jsx
View File

@ -49,6 +49,7 @@ const Survey = () => {
industryCode: '', industryCode: '',
licenseNumber: '', licenseNumber: '',
isicCode: '', isicCode: '',
ern: '',
emirate: '', emirate: '',
employeeInfo: { employeeInfo: {
emiratiMale: '', emiratiMale: '',
@ -105,6 +106,7 @@ const Survey = () => {
industryCode: establishment.industryCode || prev.industryCode, industryCode: establishment.industryCode || prev.industryCode,
licenseNumber: establishment.licenseNumber || prev.licenseNumber, licenseNumber: establishment.licenseNumber || prev.licenseNumber,
isicCode: establishment.isicCode || prev.isicCode, isicCode: establishment.isicCode || prev.isicCode,
ern: establishment.ern || prev.ern,
emirate: establishment.emirate || prev.emirate, emirate: establishment.emirate || prev.emirate,
employeeInfo: { employeeInfo: {
emiratiMale: establishment.employeeInfo?.emiratiMale ?? prev.employeeInfo.emiratiMale, emiratiMale: establishment.employeeInfo?.emiratiMale ?? prev.employeeInfo.emiratiMale,
@ -153,6 +155,7 @@ const Survey = () => {
industryCode: establishment.industryCode || prev.industryCode, industryCode: establishment.industryCode || prev.industryCode,
licenseNumber: establishment.licenseNumber || prev.licenseNumber, licenseNumber: establishment.licenseNumber || prev.licenseNumber,
isicCode: establishment.isicCode || prev.isicCode, isicCode: establishment.isicCode || prev.isicCode,
ern: establishment.ern || prev.ern,
emirate: establishment.emirate || prev.emirate, emirate: establishment.emirate || prev.emirate,
employeeInfo: { employeeInfo: {
emiratiMale: establishment.employeeInfo?.emiratiMale ?? prev.employeeInfo.emiratiMale, emiratiMale: establishment.employeeInfo?.emiratiMale ?? prev.employeeInfo.emiratiMale,
@ -213,6 +216,7 @@ const Survey = () => {
industryCode: submission.industry_code || prev.industryCode, industryCode: submission.industry_code || prev.industryCode,
licenseNumber: submission.license_number || prev.licenseNumber, licenseNumber: submission.license_number || prev.licenseNumber,
isicCode: submission.isic_code || prev.isicCode, isicCode: submission.isic_code || prev.isicCode,
ern: submission.ern || prev.ern,
emirate: submission.emirate || prev.emirate, emirate: submission.emirate || prev.emirate,
employeeInfo: { employeeInfo: {
emiratiMale: submission.emirati_male || prev.employeeInfo.emiratiMale, emiratiMale: submission.emirati_male || prev.employeeInfo.emiratiMale,
@ -283,6 +287,7 @@ const Survey = () => {
industryCode: ensureString(detail?.industry_code) || prev.industryCode, industryCode: ensureString(detail?.industry_code) || prev.industryCode,
licenseNumber: ensureString(detail?.license_number) || prev.licenseNumber, licenseNumber: ensureString(detail?.license_number) || prev.licenseNumber,
isicCode: ensureString(detail?.isic_code) || prev.isicCode, 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, emirate: ensureString(detail?.establishment_emirate?.name) || ensureString(detail?.emirate) || prev.emirate,
establishment_contact_email: ensureString(detail?.establishment_contact_email) || prev.establishment_contact_email || '', establishment_contact_email: ensureString(detail?.establishment_contact_email) || prev.establishment_contact_email || '',
employeeInfo: { employeeInfo: {
@ -352,6 +357,11 @@ const Survey = () => {
isicCode: ensureString(establishment.isic_code) || isicCode: ensureString(establishment.isic_code) ||
ensureString(summary.isic_code) || ensureString(summary.isic_code) ||
establishmentData.isicCode || '', establishmentData.isicCode || '',
ern: ensureString(establishment.ERN) ||
ensureString(establishment.ern) ||
ensureString(summary.ERN) ||
ensureString(summary.ern) ||
establishmentData.ern || '',
emirate: ensureString(establishment.establishment_emirate_id) || emirate: ensureString(establishment.establishment_emirate_id) ||
ensureString(establishment.emirate) || ensureString(establishment.emirate) ||
ensureString(summary.emirate) || ensureString(summary.emirate) ||
@ -591,6 +601,7 @@ const Survey = () => {
quarter: quarter, quarter: quarter,
year: year, year: year,
status: 'Submitted', status: 'Submitted',
ern: establishmentData.ERN || establishmentData.ern || '',
emirati_male: parseNumber(info.emiratiMale), emirati_male: parseNumber(info.emiratiMale),
emirati_female: parseNumber(info.emiratiFemale), emirati_female: parseNumber(info.emiratiFemale),
non_emirati_male: parseNumber(info.nonEmiratiMale), non_emirati_male: parseNumber(info.nonEmiratiMale),