- task/53;

- task/54;

src/components/FormField/components/Switch/index.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { classNames } from 'primereact/utils';
 import { Controller } from 'react-hook-form';
-import { isNil, isEmpty } from 'ramda';
+import { isNil, isEmpty, is } from 'ramda';
 
 // components
 import { InputSwitch } from 'primereact/inputswitch';
@@ -28,7 +28,7 @@ const Switch = ({
         render={({ field, fieldState }) => (
             <InputSwitch
                 inputId={fieldName}
-                checked={field.value}
+                checked={is(String, field.value) ? 'true' === field.value : field.value}
                 disabled={disabled}
                 onChange={(e) => field.onChange(e.value)}
                 className={classNames({ 'p-invalid': fieldState.invalid })}/>

src/pages/BandoApplication/index.js

@@ -153,7 +153,6 @@ const BandoApplication = () => {
         trigger();
 
         const formValues = getValues();
-        console.log('formValues', formValues);
         const usedFieldsIds = pluck('id', formData);
         const newFormValues = Object.keys(formValues)
             .filter(v => usedFieldsIds.includes(v))
@@ -398,7 +397,8 @@ const BandoApplication = () => {
     useEffect(() => {
         if (formInitialData) {
             //reset();
-            Object.keys(formInitialData).map(k => setValue(k, formInitialData[k]))
+            Object.keys(formInitialData).map(k => setValue(k, formInitialData[k]));
+            trigger();
         }
     }, [formInitialData]);
 

src/pages/BandoViewBeneficiario/index.js

@@ -26,6 +26,7 @@ import { Messages } from 'primereact/messages';
 import { Message } from 'primereact/message';
 import { Toast } from 'primereact/toast';
 import { Editor } from 'primereact/editor';
+import { Dialog } from 'primereact/dialog';
 
 const BandoViewBeneficiario = () => {
     const isAsyncRequest = useStore().main.isAsyncRequest();
@@ -35,16 +36,25 @@ const BandoViewBeneficiario = () => {
     const [data, setData] = useState({});
     const [newQuestion, setNewQuestion] = useState('');
     const [applicationObj, setApplicationObj] = useState(true);
+    const [isVisibleConfidiPopup, setIsVisibleConfidiPopup] = useState(false);
     const bandoMsgs = useRef(null);
     const toast = useRef(null);
 
-    /*const scaricaBando = () => {
+    const displayConfidiPopup = () => {
+        setIsVisibleConfidiPopup(true);
+    }
 
-    }*/
+    const hideConfidiPopup = () => {
+        setIsVisibleConfidiPopup(false)
+    }
 
     const scaricaModulistica = () => {
-        const bandoId = getBandoId();
+        if (data.confidi) {
-        BandoService.getBandoPdf(bandoId, getCallPdfCallback, errCallPdfCallback);
+            displayConfidiPopup();
+        } else {
+            const bandoId = getBandoId();
+            BandoService.getBandoPdf(bandoId, getCallPdfCallback, errCallPdfCallback);
+        }
     }
 
     const getCallPdfCallback = (data) => {
@@ -77,11 +87,15 @@ const BandoViewBeneficiario = () => {
     }
 
     const submitApplication = () => {
-        if (applicationObj && applicationObj.id) {
+        if (data.confidi) {
-            navigate(`/imieibandi/${applicationObj.id}`);
+            displayConfidiPopup();
         } else {
-            const bandoId = getBandoId();
+            if (applicationObj && applicationObj.id) {
-            ApplicationService.createApplication(bandoId, {}, createApplCallback, errCreateApplCallback, [['companyId', chosenCompanyId]]);
+                navigate(`/imieibandi/${applicationObj.id}`);
+            } else {
+                const bandoId = getBandoId();
+                ApplicationService.createApplication(bandoId, {}, createApplCallback, errCreateApplCallback, [['companyId', chosenCompanyId]]);
+            }
         }
     }
 
@@ -380,10 +394,14 @@ const BandoViewBeneficiario = () => {
                         : null}
 
                     {data.confidi
-                        ? <>
+                        ? <Dialog header={data.name}
-                            <Message severity="error"
+                                  visible={isVisibleConfidiPopup}
-                                     text={__('Non sei abilitato a partecipare a questo Bando', 'gepafin')}/>
+                                  style={{ width: '50vw' }}
-                        </>
+                                  onHide={hideConfidiPopup}>
+                            <p>
+                                {__('Non risultano convenzioni attive', 'gepafin')}
+                            </p>
+                        </Dialog>
                         : null}
 
                     <div className="appPageSection">
@@ -398,14 +416,13 @@ const BandoViewBeneficiario = () => {
                                 icon="pi pi-download" iconPos="right"/>*/}
                             <Button
                                 type="button"
-                                disabled={data.confidi}
                                 outlined
                                 onClick={scaricaModulistica}
                                 label={__('Scarica Bando Completo e Modulistica', 'gepafin')}
                                 icon="pi pi-download" iconPos="right"/>
                             <Button
                                 type="button"
-                                disabled={isAsyncRequest || chosenCompanyId === 0 || data.confidi}
+                                disabled={isAsyncRequest || chosenCompanyId === 0}
                                 onClick={submitApplication}
                                 label={__('Presenta Domanda', 'gepafin')}
                                 icon="pi pi-save" iconPos="right"/>