- merged with develop;

src/pages/DomandaEditPreInstructor/components/ArchiveDocument/index.js

@@ -1,8 +1,14 @@
 import React, { useEffect, useRef, useState } from 'react';
 import { __ } from '@wordpress/i18n';
-import { isEmpty } from 'ramda';
+import { isEmpty, pathOr, isNil } from 'ramda';
 import { wrap } from 'object-path-immutable';
 
+// store
+import AppointmentService from '../../../../service/appointment-service';
+
+// tools
+import set404FromErrorResponse from '../../../../helpers/set404FromErrorResponse';
+
 // components
 import { Button } from 'primereact/button';
 import { Dialog } from 'primereact/dialog';
@@ -11,14 +17,11 @@ import { Dropdown } from 'primereact/dropdown';
 import { classNames } from 'primereact/utils';
 import { InputSwitch } from 'primereact/inputswitch';
 import { InputText } from 'primereact/inputtext';
-
-import { classificationType, protocolType } from '../../../../configData';
-import AppointmentService from '../../../../service/appointment-service';
-import set404FromErrorResponse from '../../../../helpers/set404FromErrorResponse';
-import { storeSet } from '../../../../store';
 import { Toast } from 'primereact/toast';
 
-const ArchiveDocument = ({ applicationId, ndg = '', fileId = 0 }) => {
+import { classificationType, protocolType } from '../../../../configData';
+
+const ArchiveDocument = ({ applicationId, ndg = '', fileId = 0, docAttachmentId = null, updateFn = () => {} }) => {
     const [loading, setLoading] = useState(false);
     const [isVisibleDialog, setIsVisibleDialog] = useState(false);
     const [modalData, setModalData] = useState({});
@@ -87,19 +90,29 @@ const ArchiveDocument = ({ applicationId, ndg = '', fileId = 0 }) => {
 
     const submitCallback = (data) => {
         if (data.status === 'SUCCESS') {
-            console.log(data.data);
+            if (toast.current && data.message) {
+                toast.current.show({
+                    severity: 'success',
+                    summary: '',
+                    detail: data.message
+                });
+            }
+            const documentAttachmentId = pathOr('fake_id', ['documentAttachmentId'], data.data);
+            updateFn(documentAttachmentId);
         }
+        setIsVisibleDialog(false);
         setLoading(false);
     }
 
     const errSubmitCallback = (data) => {
         if (toast.current && data.message) {
             toast.current.show({
-                severity: 'error',
+                severity: data.status === 'SUCCESS' ? 'info' : 'error',
                 summary: '',
                 detail: data.message
             });
         }
+        setIsVisibleDialog(false);
         set404FromErrorResponse(data);
         setLoading(false);
     }
@@ -119,7 +132,7 @@ const ArchiveDocument = ({ applicationId, ndg = '', fileId = 0 }) => {
         setTypes(protocolType.map(o => ({ value: o.id, label: o.name })));
     }, []);
 
-    return (!isEmpty(ndg)
+    return (!isEmpty(ndg) && !isNil(ndg) && !docAttachmentId
             ? <>
                 <Toast ref={toast}/>
                 <Button icon="pi pi-file-export"

src/pages/DomandaEditPreInstructor/components/ListOfFiles/index.js

@@ -3,22 +3,35 @@ import { Button } from 'primereact/button';
 import { __ } from '@wordpress/i18n';
 import { isNil } from 'ramda';
 import ArchiveDocument from '../ArchiveDocument';
+import renderHtmlContent from '../../../../helpers/renderHtmlContent';
+import uniqid from '../../../../helpers/uniqid';
 
 const ListOfFiles = ({ files, updateFn, shouldDisableFieldFn, name, ndg, applicationId }) => {
 
     return (
         <ol className="appPageSection__list">
-            {files.map((o, i) => <li key={o.id} className="appPageSection__listItem">
+            {files.map((o, i) => <li key={`${o.id}_${uniqid('f')}`} className="appPageSection__listItem">
                 <div className="appPageSection__listItemRow">
-                    <span>{o.label}</span>
+                    <div>{renderHtmlContent(o.label)}</div>
                     <div className="appPageSection__iconActions">
                         {o.fileDetail && o.fileDetail.length === 1
-                            ? <Button icon="pi pi-eye" rounded
+                            ? <>
+                            <Button icon="pi pi-eye" rounded
                                       onClick={() => {
                                           window.open(o.fileDetail[0].filePath, '_blank').focus()
                                       }}
                                       outlined severity="info"
-                                      aria-label={__('Mostra', 'gepafin')}/> : null}
+                                      aria-label={__('Mostra', 'gepafin')}/>
+                                <ArchiveDocument
+                                    ndg={ndg}
+                                    applicationId={applicationId}
+                                    fileId={o.fileDetail[0].id}
+                                    updateFn={(val) => updateFn(
+                                        val,
+                                        [name, i, 'fileDetail', 0, 'documentAttachmentId']
+                                    )}
+                                    docAttachmentId={o.fileDetail[0].documentAttachmentId}/>
+                            </> : null}
                         <Button icon="pi pi-thumbs-up" rounded outlined
                                 disabled={shouldDisableFieldFn(name)}
                                 severity={!isNil(o.valid) && o.valid ? 'success' : 'secondary'}
@@ -45,7 +58,7 @@ const ListOfFiles = ({ files, updateFn, shouldDisableFieldFn, name, ndg, applica
                         flexDirection: 'column',
                         gap: '10px'
                     }}>
-                        {o.fileDetail.map((k) => <li key={k.id} style={{
+                        {o.fileDetail.map((k, ind) => <li key={k.id} style={{
                             display: 'flex',
                             flexDirection: 'row',
                             alignItems: 'center',
@@ -53,7 +66,15 @@ const ListOfFiles = ({ files, updateFn, shouldDisableFieldFn, name, ndg, applica
                         }}>
                             <span>{k.name}</span>
                             <div className="appPageSection__iconActions">
-                                <ArchiveDocument ndg={ndg} applicationId={applicationId} fileId={k.id}/>
+                                <ArchiveDocument
+                                    ndg={ndg}
+                                    applicationId={applicationId}
+                                    fileId={k.id}
+                                    updateFn={(val) => updateFn(
+                                        val,
+                                        [name, i, 'fileDetail', ind, 'documentAttachmentId']
+                                    )}
+                                    docAttachmentId={k.documentAttachmentId}/>
                                 <Button icon="pi pi-eye" rounded
                                         onClick={() => {
                                             window.open(k.filePath, '_blank').focus()

src/pages/DomandaEditPreInstructor/components/RepeaterFields/index.js

@@ -0,0 +1,149 @@
+import React, { useMemo, useState, useCallback } from 'react';
+import { useForm, useFieldArray } from 'react-hook-form';
+import { isEmpty, head } from 'ramda';
+import { __ } from '@wordpress/i18n';
+import { klona } from 'klona';
+
+// tools
+import uniqid from '../../../../helpers/uniqid';
+
+// components
+import FormField from '../../../../components/FormField';
+import { Button } from 'primereact/button';
+
+const RepeaterFields = ({
+                            sourceId,
+                            sourceName,
+                            updateFn = () => {
+                            },
+                            updateCallbackFn = () => {
+                            },
+                            defaultValue = [],
+                            shouldDisable = false
+                        }) => {
+    const [chosen, setChosen] = useState('');
+    const {
+        control,
+        handleSubmit,
+        formState: { errors },
+        setValue,
+        register,
+        trigger,
+        getValues,
+        watch
+    } = useForm({
+        defaultValues: useMemo(() => {
+            return {
+                items: defaultValue || []
+            };
+        }, [defaultValue]), mode: 'onChange'
+    });
+    const { fields, append, remove } = useFieldArray({
+        control,
+        name: 'items'
+    });
+
+    const watchFields = watch('items');
+
+    const onSubmit = () => {
+    }
+
+    const doUpdateAfterFileUploaded = () => {
+        const formData = getValues();
+        updateFn(formData.items);
+        updateCallbackFn(formData.items);
+    }
+
+    const addNew = () => {
+        const uid = uniqid('f');
+        const newItem = {
+            fieldId: uid,
+            nameValue: '',
+            fileValue: []
+        }
+        append(newItem);
+        setChosen(newItem.fieldId);
+        trigger();
+    };
+
+    const setNewChosen = useCallback((id) => {
+        const chosenObj = head(fields.filter(o => id === o.fieldId));
+        if (chosenObj) {
+            setChosen(chosen === id ? '' : id);
+        }
+    }, [fields, chosen]);
+
+    const removeItem = useCallback((index) => {
+        const chosenObj = klona(fields[index]);
+        remove(index);
+        if (chosen === chosenObj.fieldId) {
+            setChosen('');
+        }
+        const formData = getValues();
+        updateFn(formData.items);
+        updateCallbackFn(formData.items);
+    }, [fields, chosen]);
+
+    return (
+        <div className="fieldsRepeater">
+            <form className="appForm" onSubmit={handleSubmit(onSubmit)}>
+                {watchFields
+                    ? watchFields.map((o, index) => <div key={o.fieldId}
+                                                         className="fieldsRepeater__panel p-panel p-component">
+                            <div className="fieldsRepeater__heading p-panel p-panel-header">
+                                <span onClick={() => setNewChosen(o.fieldId)}>{o.nameValue}</span>
+                                <Button icon="pi pi-times"
+                                        disabled={shouldDisable}
+                                        outlined
+                                        severity="danger"
+                                        className="actionBtn"
+                                        type="button"
+                                        aria-label={__('Cancella', 'gepafin')}
+                                        onClick={() => removeItem(index)}/>
+                            </div>
+                            <div className="fieldsRepeater__fields p-panel-content" data-hide={chosen !== o.fieldId}>
+                                <FormField
+                                    type="textinput"
+                                    disabled={shouldDisable}
+                                    fieldName={`items.${index}.nameValue`}
+                                    label={__('Titolo del file', 'gepafin')}
+                                    control={control}
+                                    errors={errors}
+                                    defaultValue={o.nameValue}
+                                    config={{ required: __('È obbligatorio', 'gepafin') }}
+                                />
+                                <FormField
+                                    type="fileupload"
+                                    disabled={isEmpty(o.nameValue) || shouldDisable}
+                                    setDataFn={setValue}
+                                    saveFormCallback={doUpdateAfterFileUploaded}
+                                    fieldName={`items.${index}.fileValue`}
+                                    label={__('File', 'gepafin')}
+                                    control={control}
+                                    register={register}
+                                    errors={errors}
+                                    defaultValue={o.fileValue ? o.fileValue : []}
+                                    accept={[]}
+                                    source={sourceName}
+                                    sourceId={sourceId}
+                                    multiple={false}
+                                    deleteOnBackend={false}
+                                    config={{ required: __('È obbligatorio', 'gepafin') }}
+                                />
+                            </div>
+                        </div>
+                    ) : null}
+            </form>
+            <Button
+                className="fieldsRepeater__addNew"
+                outlined
+                type="button"
+                disabled={(watchFields && watchFields.filter(o => isEmpty(o.nameValue) || isEmpty(o.fileValue)).length > 0) || shouldDisable}
+                onClick={addNew}
+                label={__('Aggiungi nuovo file', 'gepafin')}
+            />
+        </div>
+    )
+}
+
+export default RepeaterFields;

src/pages/DomandaEditPreInstructor/index.js

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef } from 'react';
+import React, { useState, useEffect, useRef, useCallback } from 'react';
 import { __, sprintf } from '@wordpress/i18n';
 import { useNavigate, useParams } from 'react-router-dom';
 import { is, isEmpty, isNil, sum, pathOr, head } from 'ramda';
@@ -6,11 +6,12 @@ import { klona } from 'klona';
 import { wrap } from 'object-path-immutable';
 
 // store
-import { storeSet, useStore } from '../../store';
+import { storeGet, storeSet, useStore } from '../../store';
 
 // api
 import ApplicationEvaluationService from '../../service/application-evaluation-service';
 import AmendmentsService from '../../service/amendments-service';
+import AppointmentService from '../../service/appointment-service';
 
 // tools
 import set404FromErrorResponse from '../../helpers/set404FromErrorResponse';
@@ -24,19 +25,18 @@ import { Tag } from 'primereact/tag';
 import { Checkbox } from 'primereact/checkbox';
 import { Editor } from 'primereact/editor';
 import { InputNumber } from 'primereact/inputnumber';
-import BlockingOverlay from '../../components/BlockingOverlay';
 import { Toast } from 'primereact/toast';
-import HelpIcon from '../../icons/HelpIcon';
 import { Dialog } from 'primereact/dialog';
-import ArchiveDocument from './components/ArchiveDocument';
+import HelpIcon from '../../icons/HelpIcon';
+import BlockingOverlay from '../../components/BlockingOverlay';
 import { classNames } from 'primereact/utils';
 import { InputTextarea } from 'primereact/inputtextarea';
 import { InputText } from 'primereact/inputtext';
 import DownloadApplicationArchive from './components/DownloadApplicationArchive';
 import DownloadCompanyDelegation from './components/DownloadCompanyDelegation';
 import DownloadSignedApplication from './components/DownloadSignedApplication';
-import AppointmentService from '../../service/appointment-service';
 import ListOfFiles from './components/ListOfFiles';
+import RepeaterFields from './components/RepeaterFields';
 
 const APP_EVALUATION_FLOW_ID = process.env.REACT_APP_EVALUATION_FLOW_ID;
 
@@ -71,12 +71,24 @@ const DomandaEditPreInstructor = () => {
     }
 
     const updateFlagsForSoccorso = (data) => {
+        let nonRatedFilesLength = 0;
+
         if (data.files) {
             const nonRatedFiles = data.files
                 .map(el => el.valid)
                 .filter(v => isNil(v));
-            setAllFilesRated(nonRatedFiles.length === 0);
+            nonRatedFilesLength = nonRatedFiles.length;
         }
+
+        if (data.amendmentDetails) {
+            const nonRatedFiles = data.amendmentDetails
+                .map(el => el.valid)
+                .filter(v => isNil(v));
+            nonRatedFilesLength = nonRatedFiles.length;
+        }
+
+        setAllFilesRated(nonRatedFilesLength === 0);
+
         if (data.checklist) {
             const checkedChecklistItems = data.checklist
                 .map(el => el.valid)
@@ -88,7 +100,7 @@ const DomandaEditPreInstructor = () => {
 
     const doNewSoccorso = () => {
         if (connectedSoccorsoId !== 0) {
-            doSaveDraft(`/domande/${id}/soccorso/${connectedSoccorsoId}`)
+            navigate(`/domande/${id}/soccorso/${connectedSoccorsoId}`);
         } else {
             doSaveDraft(`/domande/${id}/aggiungi-soccorso/`)
         }
@@ -153,11 +165,17 @@ const DomandaEditPreInstructor = () => {
         updateFlagsForSoccorso(newData);
     }
 
-    const doSaveDraft = (doRedirect = '') => {
+    const doSaveDraft = useCallback((doRedirect = '') => {
         const formData = {
             criteria: klona(data.criteria),
             checklist: klona(data.checklist),
             files: klona(data.files),
+            evaluationDocument: klona(data.evaluationDocument.map(o => ({
+                    ...o,
+                    fileValue: o.fileValue[0] ? o.fileValue[0].id : ''
+                })
+            )),
+            amendmentDetails: klona(data.amendmentDetails),
             note: data.note
         }
 
@@ -167,7 +185,7 @@ const DomandaEditPreInstructor = () => {
             (data) => updateCallback(data, doRedirect),
             errUpdateCallback
         );
-    }
+    }, [data]);
 
     const updateCallback = (data, doRedirect = '') => {
         if (data.status === 'SUCCESS') {
@@ -208,7 +226,7 @@ const DomandaEditPreInstructor = () => {
             motivation
         }
 
-        setLoading(true);
+        setIsVisibleCompleteDialog(false);
         ApplicationEvaluationService.updateEvaluation(data.assignedApplicationId, formData, updateStatusCallback, errUpdateStatusCallback);
     }
 
@@ -222,12 +240,13 @@ const DomandaEditPreInstructor = () => {
             motivation
         }
 
-        setLoading(true);
+        setIsVisibleCompleteDialog(false);
         ApplicationEvaluationService.updateEvaluation(data.assignedApplicationId, formData, updateStatusCallback, errUpdateStatusCallback);
     }
 
     const updateStatusCallback = (data) => {
         if (data.status === 'SUCCESS') {
+            setData(getFormattedData(data.data));
             if (toast.current) {
                 toast.current.show({
                     severity: 'success',
@@ -236,7 +255,7 @@ const DomandaEditPreInstructor = () => {
                 });
             }
         }
-        setLoading(false);
+        storeSet.main.unsetAsyncRequest();
     }
 
     const errUpdateStatusCallback = (data) => {
@@ -248,7 +267,7 @@ const DomandaEditPreInstructor = () => {
             });
         }
         set404FromErrorResponse(data);
-        setLoading(false);
+        storeSet.main.unsetAsyncRequest();
     }
 
     const displayCriterionData = (id) => {
@@ -376,7 +395,13 @@ const DomandaEditPreInstructor = () => {
 
     const getNdgCallback = (data) => {
         if (data.status === 'SUCCESS') {
-            console.log('data', data.data);
+            if (toast.current && data.message) {
+                toast.current.show({
+                    severity: 'success',
+                    summary: '',
+                    detail: data.message
+                });
+            }
         }
         storeSet.main.unsetAsyncRequest();
     }
@@ -384,7 +409,7 @@ const DomandaEditPreInstructor = () => {
     const errGetNdgCallback = (data) => {
         if (toast.current && data.message) {
             toast.current.show({
-                severity: 'error',
+                severity: data.status === 'SUCCESS' ? 'info' : 'error',
                 summary: '',
                 detail: data.message
             });
@@ -432,15 +457,56 @@ const DomandaEditPreInstructor = () => {
             !isEmpty(appointmentData.title) && !isEmpty(appointmentData.text) && !isEmpty(appointmentData.amount)
             && !isEmpty(appointmentData.duration) && appointmentData.duration !== 0 && appointmentData.amount !== 0
         ) {
-            console.log(appointmentData);
-            //setLoading(true);
+            storeSet.main.setAsyncRequest();
+            const submitData = {
+                'importoBreveTermine': appointmentData.amount,
+                'durataMesiFinanziamento': appointmentData.duration,
+                'nota': {
+                    'titolo': appointmentData.title,
+                    'testo': appointmentData.text
+                }
+            }
+
+            AppointmentService.createAppointment(id, submitData, getAppointemntCallback, errGetAppointemntCallback);
         }
     }
 
+    const getAppointemntCallback = (data) => {
+        if (data.status === 'SUCCESS') {
+            if (toast.current && data.message) {
+                toast.current.show({
+                    severity: 'success',
+                    summary: '',
+                    detail: data.message
+                });
+            }
+        }
+        setIsVisibleAppointmentDialog(false);
+        storeSet.main.unsetAsyncRequest();
+    }
+
+    const errGetAppointemntCallback = (data) => {
+        if (toast.current && data.message) {
+            toast.current.show({
+                severity: data.status === 'SUCCESS' ? 'info' : 'error',
+                summary: '',
+                detail: data.message
+            });
+        }
+        setIsVisibleAppointmentDialog(false);
+        set404FromErrorResponse(data);
+        storeSet.main.unsetAsyncRequest();
+    }
+
     const doMakeAdmisible = () => {
         // TODO
     }
 
+    const evaluationShouldBeBlocked = (data = {}) => {
+        const userData = storeGet.main.userData()
+        return isAsyncRequest || userData.id !== data.assignedUserId;
+    }
+
     useEffect(() => {
         const maxScore = pathOr(0, ['minScore'], data);
         const criteria = pathOr([], ['criteria'], data);
@@ -507,11 +573,11 @@ const DomandaEditPreInstructor = () => {
                             <span>{data.callName}</span>
                         </p>
                         <p className="appPageSection__pMeta">
-                            <span>{__('Beneficiario', 'gepafin')}</span>
+                            <span>{__('Referente Aziendale', 'gepafin')}</span>
                             <span>{data.beneficiary}</span>
                         </p>
                         <p className="appPageSection__pMeta">
-                            <span>{__('Azienda', 'gepafin')}</span>
+                            <span>{__('Azienda Beneficiaria', 'gepafin')}</span>
                             <span>{data.companyName}</span>
                         </p>
                         <p className="appPageSection__pMeta">
@@ -541,17 +607,29 @@ const DomandaEditPreInstructor = () => {
                         </div>
                     </div>
 
+                    <div className="appPageSection">
+                        <h2>{__('Documenti aggiuntivi', 'gepafin')}</h2>
+                        <RepeaterFields
+                            defaultValue={data.evaluationDocument ?? []}
+                            updateFn={(data) => updateEvaluationValue(
+                                data,
+                                ['evaluationDocument']
+                            )}
+                            shouldDisable={['APPROVED', 'REJECTED'].includes(data.applicationStatus) || evaluationShouldBeBlocked(data)}
+                            sourceId={data.assignedApplicationId}
+                            sourceName="evaluation"/>
+                    </div>
+
                     <div className="appPageSection">
                         <h2>{__('Checklist Valutazione', 'gepafin')}</h2>
                         <div className="appPageSection columns">
                             <div>
-
                                 <h3>{__('Lista', 'gepafin')}</h3>
                                 <div className="appPageSection__withBorder grey" style={{ marginBottom: '20px' }}>
                                     <div className="appPageSection__checklist">
                                         {data.checklist.map((o, i) => <div key={o.id}>
                                             <Checkbox
-                                                disabled={shouldDisableField('checklist')}
+                                                disabled={shouldDisableField('checklist') || evaluationShouldBeBlocked(data)}
                                                 inputId={`checklist_${o.id}`}
                                                 onChange={(e) => updateEvaluationValue(
                                                     e.checked,
@@ -567,7 +645,7 @@ const DomandaEditPreInstructor = () => {
                                 <div>
                                     <Editor
                                         value={data.note}
-                                        readOnly={shouldDisableField('note')}
+                                        readOnly={shouldDisableField('note') || evaluationShouldBeBlocked(data)}
                                         placeholder={__('Digita qui il messagio', 'gepafin')}
                                         headerTemplate={header}
                                         onTextChange={(e) => updateEvaluationValue(
@@ -583,7 +661,7 @@ const DomandaEditPreInstructor = () => {
                                 <ListOfFiles
                                     files={data.files}
                                     updateFn={updateEvaluationValue}
-                                    shouldDisableFieldFn={shouldDisableField}
+                                    shouldDisableFieldFn={(name) => shouldDisableField(name) || evaluationShouldBeBlocked(data)}
                                     name="files"
                                     ndg={data.ndg}
                                     applicationId={id}/>
@@ -591,6 +669,18 @@ const DomandaEditPreInstructor = () => {
                         </div>
                     </div>
 
+                    {!isEmpty(data.amendmentDetails)
+                        ? <div className="appPageSection">
+                            <h2>{__('Documenti di soccorso', 'gepafin')}</h2>
+                            <ListOfFiles
+                                files={data.amendmentDetails}
+                                updateFn={updateEvaluationValue}
+                                shouldDisableFieldFn={(name) => shouldDisableField(name) || evaluationShouldBeBlocked(data)}
+                                name="amendmentDetails"
+                                ndg={data.ndg}
+                                applicationId={id}/>
+                        </div> : null}
+
                     <div className="appPageSection">
                         <h2>{__('Punteggi di valutazione', 'gepafin')}</h2>
                         {data.criteria
@@ -608,7 +698,7 @@ const DomandaEditPreInstructor = () => {
                                     <td>
                                         <div className="p-inputgroup">
                                             <InputNumber
-                                                disabled={shouldDisableField('criteria')}
+                                                disabled={shouldDisableField('criteria') || evaluationShouldBeBlocked(data)}
                                                 placeholder={__('Punteggio', 'gepafin')}
                                                 keyfilter="int"
                                                 value={o.score}
@@ -631,7 +721,7 @@ const DomandaEditPreInstructor = () => {
                                                           onClick={() => displayCriterionData(o.id)}
                                                           aria-label={__('Mostra', 'gepafin')}/> : null}
                                             <Button icon="pi pi-thumbs-up" rounded outlined
-                                                    disabled={shouldDisableField('criteria')}
+                                                    disabled={shouldDisableField('criteria') || evaluationShouldBeBlocked(data)}
                                                     severity={!isNil(o.valid) && o.valid ? 'success' : 'secondary'}
                                                     onClick={() => updateEvaluationValue(
                                                         true,
@@ -639,7 +729,7 @@ const DomandaEditPreInstructor = () => {
                                                     )}
                                                     aria-label={__('Su', 'gepafin')}/>
                                             <Button icon="pi pi-thumbs-down" rounded outlined
-                                                    disabled={shouldDisableField('criteria')}
+                                                    disabled={shouldDisableField('criteria') || evaluationShouldBeBlocked(data)}
                                                     severity={!isNil(o.valid) && !o.valid ? 'danger' : 'secondary'}
                                                     onClick={() => updateEvaluationValue(
                                                         false,
@@ -681,7 +771,8 @@ const DomandaEditPreInstructor = () => {
                             {['EVALUATION', 'SOCCORSO', 'CLOSE'].includes(data.applicationStatus)
                                 ? <Button
                                     type="button"
-                                    disabled={!data.id || data.status === 'CLOSE' || !allFilesRated || !atLeastOneChecked}
+                                    disabled={!data.id || data.status === 'CLOSE' || (data.applicationStatus === 'EVALUATION'
+                                        && (!allFilesRated || !atLeastOneChecked)) || evaluationShouldBeBlocked(data)}
                                     onClick={doNewSoccorso}
                                     outlined
                                     label={<>
@@ -696,7 +787,7 @@ const DomandaEditPreInstructor = () => {
                             {data.id
                                 ? <Button
                                     type="button"
-                                    disabled={data.status === 'CLOSE'}
+                                    disabled={data.status === 'CLOSE' || evaluationShouldBeBlocked(data)}
                                     onClick={() => doSaveDraft()}
                                     outlined
                                     label={__('Salva bozza valutazione', 'gepafin')}
@@ -706,41 +797,72 @@ const DomandaEditPreInstructor = () => {
                                     onClick={() => doSaveDraft()}
                                     label={__('Crea valutazione', 'gepafin')}
                                     icon="pi pi-save" iconPos="right"/>}
-                            {APP_EVALUATION_FLOW_ID === '1' && ['EVALUATION'].includes(data.applicationStatus)
+                            {/*{APP_EVALUATION_FLOW_ID === '1' && ['EVALUATION'].includes(data.applicationStatus)
                                 ? <Button
                                     type="button"
-                                    disabled={!data.id || !allFilesRated || !allChecksChecked}
+                                    disabled={!data.id || !allFilesRated || !allChecksChecked || evaluationShouldBeBlocked(data)}
                                     onClick={doCheckNDG}
                                     label={__('Controlla NDG', 'gepafin')}
-                                /> : null}
-                            {APP_EVALUATION_FLOW_ID === '1' && ['EVALUATION'].includes(data.applicationStatus) && data.ndg
+                                /> : null}*/}
+                            <Button
+                                type="button"
+                                disabled={true}
+                                onClick={() => {
+                                }}
+                                label={__('Controlla NDG', 'gepafin')}
+                            />
+                            {/*{APP_EVALUATION_FLOW_ID === '1' && ['NDG'].includes(data.applicationStatus) && data.ndg
                                 ? <Button
                                     type="button"
-                                    disabled={!data.id}
+                                    disabled={!data.id || evaluationShouldBeBlocked(data)}
                                     onClick={doCreateAppointment}
                                     label={__('Crea l\'appuntamento', 'gepafin')}
-                                /> : null}
-                            {APP_EVALUATION_FLOW_ID === '1' && ['APPOINTMENT'].includes(data.applicationStatus)
+                                /> : null}*/}
+                            <Button
+                                type="button"
+                                disabled={true}
+                                onClick={() => {
+                                }}
+                                label={__('Crea l\'appuntamento', 'gepafin')}
+                            />
+                            {/*{APP_EVALUATION_FLOW_ID === '1' && ['APPOINTMENT'].includes(data.applicationStatus)
                                 ? <Button
                                     type="button"
-                                    disabled={!data.id}
+                                    disabled={!data.id || evaluationShouldBeBlocked(data)}
                                     onClick={doMakeAdmisible}
                                     label={__('Ammissibile', 'gepafin')}
-                                /> : null}
+                                /> : null}*/}
+                            <Button
+                                type="button"
+                                disabled={true}
+                                onClick={() => {
+                                }}
+                                label={__('Ammissibile', 'gepafin')}
+                            />
                             {data.id
                                 ? <Button
                                     type="button"
-                                    disabled={!isAdmissible
-                                        || (APP_EVALUATION_FLOW_ID === '1' && !['ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus))}
+                                    disabled={!isAdmissible || ['APPROVED'].includes(data.applicationStatus) || evaluationShouldBeBlocked(data)}
+                                    /*disabled={!isAdmissible
+                                        || (APP_EVALUATION_FLOW_ID === '1' && !['ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus))}*/
                                     onClick={initiateApproving}
                                     label={__('Approva Domanda', 'gepafin')}
                                     icon="pi pi-check" iconPos="right"/> : null}
-                            {data.id
+                            {/*{data.id
                                 ? <Button
                                     type="button"
                                     disabled={APP_EVALUATION_FLOW_ID === '1' && !['ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus)}
                                     onClick={initiateRejecting}
                                     label={__('Respingi Domanda', 'gepafin')}
+                                    icon="pi pi-times" iconPos="right"/> : null}*/}
+                            {data.id
+                                ? <Button
+                                    type="button"
+                                    disabled={APP_EVALUATION_FLOW_ID === '1'
+                                        && !['EVALUATION', 'ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus)
+                                        || evaluationShouldBeBlocked(data)}
+                                    onClick={initiateRejecting}
+                                    label={__('Respingi Domanda', 'gepafin')}
                                     icon="pi pi-times" iconPos="right"/> : null}
                         </div>
                     </div>
@@ -840,4 +962,4 @@ const DomandaEditPreInstructor = () => {
 
 }
 
-export default DomandaEditPreInstructor;
+export default DomandaEditPreInstructor;