Merge pull request #57 from Kitzanos/master-sync-04-07-2025

Master sync 04 07 2025

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;
 }

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')))
                     ? <Button onClick={() => goToBandoPage(data.id)} severity="info">
-                        {__('Mostra', 'gepafin')}
+                        {data.allowMultipleApplications ? __('Partecipa', 'gepafin') : __('Mostra', 'gepafin')}
                     </Button> : null}
             </div>
         );

src/pages/BandoEdit/components/BandoEditFormStep1/index.js

@@ -274,7 +274,17 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, setInitialData, g
                 onLabel={__('Si', 'gepafin')}
                 offLabel={__('No', 'gepafin')}
             />
-
+            <FormField
+                type="switch"
+                disabled={shouldDisableField('confidi')}
+                fieldName="allowMultipleApplications"
+                label={__('Applicazione multipla', 'gepafin')}
+                control={control}
+                errors={errors}
+                defaultValue={values['confidi']}
+                onLabel={__('Si', 'gepafin')}
+                offLabel={__('No', 'gepafin')}
+            />
             <FormField
                 type="textinput"
                 disabled={shouldDisableField('name')}

src/pages/BandoViewBeneficiario/index.js

@@ -98,11 +98,16 @@ const BandoViewBeneficiario = () => {
         if (REACT_APP_HUB_ID === 't7jh5wfg9QXylNaTZkPoE') {
             return __('Presenta domanda', 'gepafin');
         } else {
-            if (applicationObj && applicationObj.id) {
+            if(data.allowMultipleApplications){
-                return __('Vai alla domanda', 'gepafin');
-            } else {
                 return __('Presenta domanda', 'gepafin');
+            } else {
+                if (applicationObj && applicationObj.id) {
+                    return __('Vai alla domanda', 'gepafin');
+                } else {
+                    return __('Presenta domanda', 'gepafin');
+                }
             }
+
         }
     }
 
@@ -110,10 +115,14 @@ const BandoViewBeneficiario = () => {
         if (REACT_APP_HUB_ID === 't7jh5wfg9QXylNaTZkPoE') {
             return 'pi pi-save';
         } else {
-            if (applicationObj && applicationObj.id) {
+            if(data.allowMultipleApplications){
-                return 'pi pi-arrow-right';
-            } else {
                 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) {
+                if(data.allowMultipleApplications){
-                    navigate(`/imieibandi/${applicationObj.id}`);
-                } else {
                     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,11 +163,16 @@ const BandoViewBeneficiario = () => {
                 const bandoId = getBandoId();
                 ApplicationService.createApplication(bandoId, {}, createApplCallback, errCreateApplCallback, [['companyId', chosenCompanyId]]);
             } else {
-                if (applicationObj && applicationObj.id) {
+                if(data.allowMultipleApplications){
-                    navigate(`/imieibandi/${applicationObj.id}`);
-                } else {
                     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]]);
+                    }
                 } 
             }
         }