diff --git a/src/pages/BandoApplication/index.js b/src/pages/BandoApplication/index.js index 0690ba2..6f5cf0f 100644 --- a/src/pages/BandoApplication/index.js +++ b/src/pages/BandoApplication/index.js @@ -263,6 +263,7 @@ const BandoApplication = () => { storeSet.main.setAsyncRequest(); ApplicationService.getApplicationForm(data.data.id, getApplFormCallback, errGetApplFormCallbacks, [ ['formId', formId], + ['companyId', chosenCompanyId], ['action', saveAndMove] ]); } else if (['VALIDATE'].includes(saveAndMove)) { @@ -273,7 +274,9 @@ const BandoApplication = () => { ApplicationService.validateApplication(applId, {}, validateApplicationCallback, errValidateApplicationCallback); } } else { - ApplicationService.getApplicationForm(data.data.id, getStatusCheckCallback, errGetStatusCheckCallbacks); + ApplicationService.getApplicationForm(data.data.id, getStatusCheckCallback, errGetStatusCheckCallbacks, [ + ['companyId', chosenCompanyId] + ]); } } } @@ -580,7 +583,9 @@ const BandoApplication = () => { if (applId) { storeSet.main.setAsyncRequest(); - ApplicationService.getApplicationForm(applId, getApplFormCallback, errGetApplFormCallbacks); + ApplicationService.getApplicationForm(applId, getApplFormCallback, errGetApplFormCallbacks, [ + ['companyId', chosenCompanyId] + ]); } } @@ -612,7 +617,9 @@ const BandoApplication = () => { if (applId) { storeSet.main.setAsyncRequest(); setIsRequestForApplData(true); - ApplicationService.getApplicationForm(applId, getApplFormCallback, errGetApplFormCallbacks); + ApplicationService.getApplicationForm(applId, getApplFormCallback, errGetApplFormCallbacks, [ + ['companyId', chosenCompanyId] + ]); } }, [id, chosenCompanyId]); diff --git a/src/pages/BandoApplicationPreview/index.js b/src/pages/BandoApplicationPreview/index.js index a21913e..84c64e8 100644 --- a/src/pages/BandoApplicationPreview/index.js +++ b/src/pages/BandoApplicationPreview/index.js @@ -50,6 +50,8 @@ const BandoApplicationPreview = () => { const [totalSteps, setTotalSteps] = useState(0); const [applicationStatus, setApplicationStatus] = useState(''); const [activeStep, setActiveStep] = useState(1); + const chosenCompanyId = useStore().main.chosenCompanyId(); + const role = useStore().main.getRole(); const isAsyncRequest = useStore().main.isAsyncRequest(); const toast = useRef(null); const formMsgs = useRef(null); @@ -130,18 +132,34 @@ const BandoApplicationPreview = () => { const goBackward = () => { storeSet.main.setAsyncRequest(); - ApplicationService.getApplicationForm(id, getApplFormCallback, errGetApplFormCallbacks, [ - ['formId', formId], - ['action', 'PREVIOUS'] - ]); + const queryParams = 'ROLE_BENEFICIARY' === role + ? [ + ['formId', formId], + ['companyId', chosenCompanyId], + ['action', 'PREVIOUS'] + ] + : [ + ['formId', formId], + ['action', 'PREVIOUS'] + ]; + + ApplicationService.getApplicationForm(id, getApplFormCallback, errGetApplFormCallbacks, queryParams); } const goForward = () => { storeSet.main.setAsyncRequest(); - ApplicationService.getApplicationForm(id, getApplFormCallback, errGetApplFormCallbacks, [ - ['formId', formId], - ['action', 'NEXT'] - ]); + const queryParams = 'ROLE_BENEFICIARY' === role + ? [ + ['formId', formId], + ['companyId', chosenCompanyId], + ['action', 'NEXT'] + ] + : [ + ['formId', formId], + ['action', 'NEXT'] + ]; + + ApplicationService.getApplicationForm(id, getApplFormCallback, errGetApplFormCallbacks, queryParams); } const getApplFormCallback = (data) => { @@ -310,7 +328,12 @@ const BandoApplicationPreview = () => { if (applId) { storeSet.main.setAsyncRequest(); - ApplicationService.getApplicationForm(applId, getApplFormCallback, errGetApplFormCallbacks); + const queryParams = 'ROLE_BENEFICIARY' === role + ? [ + ['companyId', chosenCompanyId] + ] + : []; + ApplicationService.getApplicationForm(applId, getApplFormCallback, errGetApplFormCallbacks, queryParams); } }, [id]);