- added better amount field validation;

- removed field PEC;

src/pages/DomandaEditInstructorManager/index.js

@@ -5,7 +5,7 @@ import { is, isEmpty, isNil, sum, pathOr, head, pluck } from 'ramda';
 import { klona } from 'klona';
 import { wrap } from 'object-path-immutable';
 import { useForm } from 'react-hook-form';
-import { evaluate } from 'mathjs';
+import { evaluate, isNaN } from 'mathjs';
 import equal from 'fast-deep-equal';
 
 // store
@@ -81,7 +81,6 @@ const DomandaEditInstructorManager = () => {
     const [isVisiblePreTecEvalDialog, setIsVisiblePreTecEvalDialog] = useState(false);
     const [preTecEvalData, setPreTecEvalData] = useState({
         amendmentDocumentType: '',
-        pec: '',
         amount: 0
     });
     const [allFilesRated, setAllFilesRated] = useState(false);
@@ -780,18 +779,22 @@ const DomandaEditInstructorManager = () => {
 
     const hidePreTecEvalDialog = () => {
         setIsVisiblePreTecEvalDialog(false);
-        setPreTecEvalData({});
+        setPreTecEvalData({
+            amendmentDocumentType: '',
+            amount: 0
+        });
     }
 
-    const footerPreTecEvalDialog = () => {
+    const footerPreTecEvalDialog = useCallback(() => {
+        const amount = pathOr(null, ['amount'], preTecEvalData);
         return <div>
             <Button type="button" label={__('Annulla', 'gepafin')} onClick={hidePreTecEvalDialog} outlined/>
             <Button
                 type="button"
-                disabled={loading}
+                disabled={loading || isNil(amount) || isNaN(parseFloat(amount)) || parseFloat(amount) <= 0}
-                label={__('Invia', 'gepafin')} onClick={doCreateSpecialAmendment}/>
+                label={__('Invia', 'gepafin')} onClick={startCreatingSpecialAmendment}/>
         </div>
-    }
+    }, [preTecEvalData]);
 
     const doCreateAppointmentRequest = () => {
         if (
@@ -845,9 +848,14 @@ const DomandaEditInstructorManager = () => {
         storeSet('unsetAsyncRequest');
     }
 
+    const startCreatingSpecialAmendment = () => {
+        doSaveDraft(doCreateSpecialAmendment);
+    }
+
     const doCreateSpecialAmendment = useCallback(() => {
         if (
-            !isEmpty(preTecEvalData.amount) && !isEmpty(preTecEvalData.pec) && !isEmpty(preTecEvalData.amendmentDocumentType)
+            !isEmpty(preTecEvalData.amount) && !isNil(preTecEvalData.amount)
+            && !isNaN(parseInt(preTecEvalData.amount)) && parseFloat(preTecEvalData.amount) >= 0 && !isEmpty(preTecEvalData.amendmentDocumentType)
         ) {
             storeSet('setAsyncRequest');
 
@@ -869,7 +877,10 @@ const DomandaEditInstructorManager = () => {
             }
         }
         setIsVisiblePreTecEvalDialog(false);
-        setPreTecEvalData({});
+        setPreTecEvalData({
+            amendmentDocumentType: '',
+            amount: 0
+        });
         storeSet('unsetAsyncRequest');
     }
 
@@ -882,7 +893,10 @@ const DomandaEditInstructorManager = () => {
             });
         }
         setIsVisiblePreTecEvalDialog(false);
-        setPreTecEvalData({});
+        setPreTecEvalData({
+            amendmentDocumentType: '',
+            amount: 0
+        });
         set404FromErrorResponse(data);
         storeSet('unsetAsyncRequest');
     }
@@ -1015,11 +1029,16 @@ const DomandaEditInstructorManager = () => {
                 : APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE'
                     ? <SplitButton
                         ref={tecFinBtnRef}
-                        disabled={!data.id || !['ADMISSIBLE'].includes(data.applicationStatus) || evaluationBlockedForUser(data) || connectedSoccorsoId !== 0}
+                        disabled={!data.id || !['ADMISSIBLE'].includes(data.applicationStatus)
+                            || evaluationBlockedForUser(data) || connectedSoccorsoId !== 0 || !isAdmissible}
                         label={__('Valutazione tecnico-finanziaria', 'gepafin')}
                         onClick={(e) => {
                             tecFinBtnRef.current.show(e);
                         }}
+                        tooltip={isAdmissible
+                            ? __('Punteggio sufficiente per passaggio alla valutazione tecnica ed economico finanziaria', 'gepafin')
+                            : __('Punteggio non sufficiente per passaggio alla valutazione tecnica ed economico finanziaria', 'gepafin')}
+                        severity={isAdmissible ? 'success' : 'warning'}
                         model={technicalEvalItems}/> : null}
             <Button
                 type="button"
@@ -1571,72 +1590,17 @@ const DomandaEditInstructorManager = () => {
                         onHide={hidePreTecEvalDialog}>
                         <div className="appForm__field">
                             <label
-                                className={classNames({ 'p-error': isEmpty(preTecEvalData.amount) || preTecEvalData.amount === 0 })}>
+                                className={classNames({ 'p-error': isEmpty(preTecEvalData.amount)
+                                        || isNaN(parseFloat(preTecEvalData.amount)) || parseFloat(preTecEvalData.amount) <= 0 })}>
                                 {__('Importo', 'gepafin')}
                             </label>
                             <InputNumber
                                 value={preTecEvalData.amount}
                                 locale="it-IT"
                                 minFractionDigits={2}
-                                invalid={isEmpty(preTecEvalData.amount) || preTecEvalData.amount === 0}
+                                invalid={isEmpty(preTecEvalData.amount) || isNaN(parseFloat(preTecEvalData.amount)) || parseFloat(preTecEvalData.amount) <= 0}
                                 onChange={(e) => setPreTecEvalFieldValue('amount', e.value)}/>
                         </div>
-                        <div className="appForm__field">
-                            <label className={classNames({ 'p-error': isEmpty(preTecEvalData.pec) })}>
-                                {__('PEC', 'gepafin')}
-                            </label>
-                            <InputText
-                                value={preTecEvalData.title}
-                                invalid={isEmpty(preTecEvalData.title)}
-                                onChange={(e) => setPreTecEvalFieldValue('pec', e.target.value)}/>
-                        </div>
-                        {/*<div className="appForm__field">
-                            <label>
-                                {__('Files', 'gepafin')}
-                            </label>
-                            <div className="file-upload-container">
-                                {(preTecEvalData.files || []).map((file, index) => (
-                                    <div key={index} className="file-upload-item">
-                                        <span className="file-name">
-                                            <i className="pi pi-file"></i>
-                                            {file.name}
-                                        </span>
-                                        <button
-                                            type="button"
-                                            className="p-button p-button-sm p-button-danger p-button-text"
-                                            onClick={() => {
-                                                const newFiles = [...(preTecEvalData.files || [])];
-                                                newFiles.splice(index, 1);
-                                                setPreTecEvalFieldValue('files', newFiles);
-                                            }}
-                                        >
-                                            <i className="pi pi-times"></i>
-                                        </button>
-                                    </div>
-                                ))}
-                                <div>
-                                    <input
-                                        type="file"
-                                        id="file-upload"
-                                        style={{ display: 'none' }}
-                                        multiple
-                                        onChange={(e) => {
-                                            const newFiles = Array.from(e.target.files);
-                                            const existingFiles = preTecEvalData.files || [];
-                                            setPreTecEvalFieldValue('files', [...existingFiles, ...newFiles]);
-                                            e.target.value = '';
-                                        }}
-                                    />
-                                    <label
-                                        htmlFor="file-upload"
-                                        className="file-upload-button"
-                                    >
-                                        <i className="pi pi-upload"></i>
-                                        {__('Add Files', 'gepafin')}
-                                    </label>
-                                </div>
-                            </div>
-                        </div>*/}
                     </Dialog>
 
                 </div>

src/pages/DomandaEditPreInstructor/index.js

@@ -5,7 +5,7 @@ import { is, isEmpty, isNil, sum, pathOr, head, pluck } from 'ramda';
 import { klona } from 'klona';
 import { wrap } from 'object-path-immutable';
 import { useForm } from 'react-hook-form';
-import { evaluate } from 'mathjs';
+import { evaluate, isNaN } from 'mathjs';
 import equal from 'fast-deep-equal';
 
 // store
@@ -81,7 +81,6 @@ const DomandaEditPreInstructor = () => {
     const [isVisiblePreTecEvalDialog, setIsVisiblePreTecEvalDialog] = useState(false);
     const [preTecEvalData, setPreTecEvalData] = useState({
         amendmentDocumentType: '',
-        pec: '',
         amount: 0
     });
     const [allFilesRated, setAllFilesRated] = useState(false);
@@ -780,18 +779,22 @@ const DomandaEditPreInstructor = () => {
 
     const hidePreTecEvalDialog = () => {
         setIsVisiblePreTecEvalDialog(false);
-        setPreTecEvalData({});
+        setPreTecEvalData({
+            amendmentDocumentType: '',
+            amount: 0
+        });
     }
 
-    const footerPreTecEvalDialog = () => {
+    const footerPreTecEvalDialog = useCallback(() => {
+        const amount = pathOr(null, ['amount'], preTecEvalData);
         return <div>
             <Button type="button" label={__('Annulla', 'gepafin')} onClick={hidePreTecEvalDialog} outlined/>
             <Button
                 type="button"
-                disabled={loading}
+                disabled={loading || isNil(amount) || isNaN(parseFloat(amount)) || parseFloat(amount) <= 0}
-                label={__('Invia', 'gepafin')} onClick={doCreateSpecialAmendment}/>
+                label={__('Invia', 'gepafin')} onClick={startCreatingSpecialAmendment}/>
         </div>
-    }
+    }, [preTecEvalData]);
 
     const doCreateAppointmentRequest = () => {
         if (
@@ -845,9 +848,14 @@ const DomandaEditPreInstructor = () => {
         storeSet('unsetAsyncRequest');
     }
 
+    const startCreatingSpecialAmendment = () => {
+        doSaveDraft(doCreateSpecialAmendment);
+    }
+
     const doCreateSpecialAmendment = useCallback(() => {
         if (
-            !isEmpty(preTecEvalData.amount) && !isEmpty(preTecEvalData.pec) && !isEmpty(preTecEvalData.amendmentDocumentType)
+            !isEmpty(preTecEvalData.amount) && !isNil(preTecEvalData.amount)
+            && !isNaN(parseInt(preTecEvalData.amount)) && parseFloat(preTecEvalData.amount) >= 0 && !isEmpty(preTecEvalData.amendmentDocumentType)
         ) {
             storeSet('setAsyncRequest');
 
@@ -869,7 +877,10 @@ const DomandaEditPreInstructor = () => {
             }
         }
         setIsVisiblePreTecEvalDialog(false);
-        setPreTecEvalData({});
+        setPreTecEvalData({
+            amendmentDocumentType: '',
+            amount: 0
+        });
         storeSet('unsetAsyncRequest');
     }
 
@@ -882,7 +893,10 @@ const DomandaEditPreInstructor = () => {
             });
         }
         setIsVisiblePreTecEvalDialog(false);
-        setPreTecEvalData({});
+        setPreTecEvalData({
+            amendmentDocumentType: '',
+            amount: 0
+        });
         set404FromErrorResponse(data);
         storeSet('unsetAsyncRequest');
     }
@@ -1015,11 +1029,16 @@ const DomandaEditPreInstructor = () => {
                 : APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE'
                     ? <SplitButton
                         ref={tecFinBtnRef}
-                        disabled={!data.id || !['ADMISSIBLE'].includes(data.applicationStatus) || evaluationBlockedForUser(data) || connectedSoccorsoId !== 0}
+                        disabled={!data.id || !['ADMISSIBLE'].includes(data.applicationStatus)
+                            || evaluationBlockedForUser(data) || connectedSoccorsoId !== 0 || !isAdmissible}
                         label={__('Valutazione tecnico-finanziaria', 'gepafin')}
                         onClick={(e) => {
                             tecFinBtnRef.current.show(e);
                         }}
+                        tooltip={isAdmissible
+                            ? __('Punteggio sufficiente per passaggio alla valutazione tecnica ed economico finanziaria', 'gepafin')
+                            : __('Punteggio non sufficiente per passaggio alla valutazione tecnica ed economico finanziaria', 'gepafin')}
+                        severity={isAdmissible ? 'success' : 'warning'}
                         model={technicalEvalItems}/> : null}
             <Button
                 type="button"
@@ -1571,72 +1590,17 @@ const DomandaEditPreInstructor = () => {
                         onHide={hidePreTecEvalDialog}>
                         <div className="appForm__field">
                             <label
-                                className={classNames({ 'p-error': isEmpty(preTecEvalData.amount) || preTecEvalData.amount === 0 })}>
+                                className={classNames({ 'p-error': isEmpty(preTecEvalData.amount)
+                                        || isNaN(parseFloat(preTecEvalData.amount)) || parseFloat(preTecEvalData.amount) <= 0 })}>
                                 {__('Importo', 'gepafin')}
                             </label>
                             <InputNumber
                                 value={preTecEvalData.amount}
                                 locale="it-IT"
                                 minFractionDigits={2}
-                                invalid={isEmpty(preTecEvalData.amount) || preTecEvalData.amount === 0}
+                                invalid={isEmpty(preTecEvalData.amount) || isNaN(parseFloat(preTecEvalData.amount)) || parseFloat(preTecEvalData.amount) <= 0}
                                 onChange={(e) => setPreTecEvalFieldValue('amount', e.value)}/>
                         </div>
-                        <div className="appForm__field">
-                            <label className={classNames({ 'p-error': isEmpty(preTecEvalData.pec) })}>
-                                {__('PEC', 'gepafin')}
-                            </label>
-                            <InputText
-                                value={preTecEvalData.title}
-                                invalid={isEmpty(preTecEvalData.title)}
-                                onChange={(e) => setPreTecEvalFieldValue('pec', e.target.value)}/>
-                        </div>
-                        {/*<div className="appForm__field">
-                            <label>
-                                {__('Files', 'gepafin')}
-                            </label>
-                            <div className="file-upload-container">
-                                {(preTecEvalData.files || []).map((file, index) => (
-                                    <div key={index} className="file-upload-item">
-                                        <span className="file-name">
-                                            <i className="pi pi-file"></i>
-                                            {file.name}
-                                        </span>
-                                        <button
-                                            type="button"
-                                            className="p-button p-button-sm p-button-danger p-button-text"
-                                            onClick={() => {
-                                                const newFiles = [...(preTecEvalData.files || [])];
-                                                newFiles.splice(index, 1);
-                                                setPreTecEvalFieldValue('files', newFiles);
-                                            }}
-                                        >
-                                            <i className="pi pi-times"></i>
-                                        </button>
-                                    </div>
-                                ))}
-                                <div>
-                                    <input
-                                        type="file"
-                                        id="file-upload"
-                                        style={{ display: 'none' }}
-                                        multiple
-                                        onChange={(e) => {
-                                            const newFiles = Array.from(e.target.files);
-                                            const existingFiles = preTecEvalData.files || [];
-                                            setPreTecEvalFieldValue('files', [...existingFiles, ...newFiles]);
-                                            e.target.value = '';
-                                        }}
-                                    />
-                                    <label
-                                        htmlFor="file-upload"
-                                        className="file-upload-button"
-                                    >
-                                        <i className="pi pi-upload"></i>
-                                        {__('Add Files', 'gepafin')}
-                                    </label>
-                                </div>
-                            </div>
-                        </div>*/}
                     </Dialog>
 
                 </div>