diff --git a/src/assets/scss/components/appPage.scss b/src/assets/scss/components/appPage.scss
index 1076549..9157170 100644
--- a/src/assets/scss/components/appPage.scss
+++ b/src/assets/scss/components/appPage.scss
@@ -414,6 +414,10 @@
flex-wrap: wrap;
}
+.appPageSection__actions > *:first-child{
+ margin-bottom: 24px;
+}
+
.appPageSection .appPageSection__actions:last-of-type {
padding-bottom: 48px;
}
diff --git a/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js b/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js
index 7c9d167..cbe5aa9 100644
--- a/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js
+++ b/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js
@@ -216,7 +216,7 @@ const AllBandiAccordion = ({ showOnlyPreferred = false }) => {
{isCallExpired || isCallScheduled || (!isEmpty(chosenCompanyId) && chosenCompanyId !== 0 && data.confidi
&& (data.id !== 6 || (data.id === 6 && REACT_APP_HUB_ID !== 'p4lk3bcx1RStqTaIVVbXs')))
? : null}
);
diff --git a/src/pages/BandoEdit/components/BandoEditFormStep1/index.js b/src/pages/BandoEdit/components/BandoEditFormStep1/index.js
index cae2a6e..e8cbaa8 100644
--- a/src/pages/BandoEdit/components/BandoEditFormStep1/index.js
+++ b/src/pages/BandoEdit/components/BandoEditFormStep1/index.js
@@ -274,7 +274,17 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, setInitialData, g
onLabel={__('Si', 'gepafin')}
offLabel={__('No', 'gepafin')}
/>
-
+
{
if (REACT_APP_HUB_ID === 't7jh5wfg9QXylNaTZkPoE') {
return __('Presenta domanda', 'gepafin');
} else {
- if (applicationObj && applicationObj.id) {
- return __('Vai alla domanda', 'gepafin');
- } else {
+ if(data.allowMultipleApplications){
return __('Presenta domanda', 'gepafin');
+ } else {
+ if (applicationObj && applicationObj.id) {
+ return __('Vai alla domanda', 'gepafin');
+ } else {
+ return __('Presenta domanda', 'gepafin');
+ }
}
+
}
}
@@ -110,11 +115,15 @@ const BandoViewBeneficiario = () => {
if (REACT_APP_HUB_ID === 't7jh5wfg9QXylNaTZkPoE') {
return 'pi pi-save';
} else {
- if (applicationObj && applicationObj.id) {
- return 'pi pi-arrow-right';
- } else {
+ if(data.allowMultipleApplications){
return 'pi pi-save';
- }
+ } else {
+ if (applicationObj && applicationObj.id) {
+ return 'pi pi-arrow-right';
+ } else {
+ return 'pi pi-save';
+ }
+ }
}
}
@@ -123,12 +132,29 @@ const BandoViewBeneficiario = () => {
if (data.confidi) {
if ((data.id === 6 && REACT_APP_HUB_ID === 'p4lk3bcx1RStqTaIVVbXs') || role === 'ROLE_CONFIDI') {
- if (applicationObj && applicationObj.id) {
- navigate(`/imieibandi/${applicationObj.id}`);
- } else {
+ if(data.allowMultipleApplications){
const bandoId = getBandoId();
ApplicationService.createApplication(bandoId, {}, createApplCallback, errCreateApplCallback, [['companyId', chosenCompanyId]]);
+ } else {
+ if (applicationObj && applicationObj.id) {
+ navigate(`/imieibandi/${applicationObj.id}`);
+ } else {
+ const bandoId = getBandoId();
+ ApplicationService.createApplication(bandoId, {}, createApplCallback, errCreateApplCallback, [['companyId', chosenCompanyId]]);
+ }
}
+ if(data.allowMultipleApplications){
+ const bandoId = getBandoId();
+ ApplicationService.createApplication(bandoId, {}, createApplCallback, errCreateApplCallback, [['companyId', chosenCompanyId]]);
+ } else {
+ if (applicationObj && applicationObj.id) {
+ navigate(`/imieibandi/${applicationObj.id}`);
+ } else {
+ const bandoId = getBandoId();
+ ApplicationService.createApplication(bandoId, {}, createApplCallback, errCreateApplCallback, [['companyId', chosenCompanyId]]);
+ }
+ }
+
} else {
displayConfidiPopup();
}
@@ -137,12 +163,17 @@ const BandoViewBeneficiario = () => {
const bandoId = getBandoId();
ApplicationService.createApplication(bandoId, {}, createApplCallback, errCreateApplCallback, [['companyId', chosenCompanyId]]);
} else {
- if (applicationObj && applicationObj.id) {
- navigate(`/imieibandi/${applicationObj.id}`);
- } else {
+ if(data.allowMultipleApplications){
const bandoId = getBandoId();
ApplicationService.createApplication(bandoId, {}, createApplCallback, errCreateApplCallback, [['companyId', chosenCompanyId]]);
- }
+ } else {
+ if (applicationObj && applicationObj.id) {
+ navigate(`/imieibandi/${applicationObj.id}`);
+ } else {
+ const bandoId = getBandoId();
+ ApplicationService.createApplication(bandoId, {}, createApplCallback, errCreateApplCallback, [['companyId', chosenCompanyId]]);
+ }
+ }
}
}
}