diff --git a/src/pages/DocumentsBeneficiary/components/DocumentsTable/index.js b/src/pages/DocumentsBeneficiary/components/DocumentsTable/index.js
index 52ed254..5c132ce 100644
--- a/src/pages/DocumentsBeneficiary/components/DocumentsTable/index.js
+++ b/src/pages/DocumentsBeneficiary/components/DocumentsTable/index.js
@@ -24,8 +24,9 @@ import { Tag } from 'primereact/tag';
 import ProperBandoLabel from '../../../../components/ProperBandoLabel';
 import { confirmPopup, ConfirmPopup } from 'primereact/confirmpopup';
 
-const DocumentsTable = ({ type, reload = 0 }) => {
-    const chosenCompanyId = useStoreValue('chosenCompanyId');
+const DocumentsTable = ({ type, reload = 0, companyId: companyIdProp }) => {
+    const storedCompanyId = useStoreValue('chosenCompanyId');
+    const effectiveCompanyId = companyIdProp || storedCompanyId;
     const companies = useStoreValue('companies');
     const [docs, setDocs] = useState([]);
     const [filters, setFilters] = useState(null);
@@ -33,22 +34,26 @@ const DocumentsTable = ({ type, reload = 0 }) => {
     const [statuses, setStatuses] = useState([]);
 
     useEffect(() => {
-        const existingCompany = head(companies.filter(o => o.id === chosenCompanyId));
+        const shouldFetch = companyIdProp
+            ? !!effectiveCompanyId
+            : !!head(companies.filter(o => o.id === effectiveCompanyId));
 
-        if (!loading && existingCompany && reload !== 0) {
+        if (!loading && shouldFetch && reload !== 0) {
             setLoading(true);
-            CompanyDocumentsService.getCompanyDocuments(chosenCompanyId, getCallback, errGetCallbacks, [
+            CompanyDocumentsService.getCompanyDocuments(effectiveCompanyId, getCallback, errGetCallbacks, [
                 ['documentType', type]
             ]);
         }
-    }, [chosenCompanyId, reload, companies]);
+    }, [effectiveCompanyId, reload, companies]);
 
     useEffect(() => {
-        const existingCompany = head(companies.filter(o => o.id === chosenCompanyId));
+        const shouldFetch = companyIdProp
+            ? !!effectiveCompanyId
+            : !!head(companies.filter(o => o.id === effectiveCompanyId));
 
-        if (existingCompany) {
+        if (shouldFetch) {
             setLoading(true);
-            CompanyDocumentsService.getCompanyDocuments(chosenCompanyId, getCallback, errGetCallbacks, [
+            CompanyDocumentsService.getCompanyDocuments(effectiveCompanyId, getCallback, errGetCallbacks, [
                 ['documentType', type]
             ]);
         }
diff --git a/src/pages/DomandaEditPreInstructor/components/EvaluationExtraFiles/index.js b/src/pages/DomandaEditPreInstructor/components/EvaluationExtraFiles/index.js
index 78a63b1..43fd573 100644
--- a/src/pages/DomandaEditPreInstructor/components/EvaluationExtraFiles/index.js
+++ b/src/pages/DomandaEditPreInstructor/components/EvaluationExtraFiles/index.js
@@ -1,22 +1,30 @@
 import React, { useMemo, useState, useCallback, useEffect, useRef } from 'react';
 import { useForm, useFieldArray } from 'react-hook-form';
-import { isEmpty, head, pluck } from 'ramda';
+import { isEmpty, head, isNil } from 'ramda';
 import { __ } from '@wordpress/i18n';
 import { klona } from 'klona';
+import { wrap } from 'object-path-immutable';
+import { classNames } from 'primereact/utils';
 
 // tools
 import uniqid from '../../../../helpers/uniqid';
+import formatDateString from '../../../../helpers/formatDateString';
 
 // components
 import FormField from '../../../../components/FormField';
 import { Button } from 'primereact/button';
 import { Dialog } from 'primereact/dialog';
 import { Toast } from 'primereact/toast';
-import CompanyService from '../../../../service/company-service';
-import FileSelect from '../../../../components/FormField/components/FileSelect';
-import ApplicationService from '../../../../service/application-service';
+import { Dropdown } from 'primereact/dropdown';
+import { InputText } from 'primereact/inputtext';
+import { Calendar } from 'primereact/calendar';
+import { FileUpload } from 'primereact/fileupload';
+import DocumentsTable from '../../../DocumentsBeneficiary/components/DocumentsTable';
+
+// services
+import CompanyDocumentsService from '../../../../service/company-documents-service';
+import DocumentCategoryService from '../../../../service/document-category-service';
 import set404FromErrorResponse from '../../../../helpers/set404FromErrorResponse';
-import { storeSet } from '../../../../store';
 
 const EvaluationExtraFiles = ({
                                   sourceId,
@@ -32,9 +40,16 @@ const EvaluationExtraFiles = ({
                               }) => {
     const [chosen, setChosen] = useState('');
     const [isVisibleCompanyDocsDialog, setIsVisibleCompanyDocsDialog] = useState(false);
-    const [companyDocs, setCompanyDocs] = useState([]);
-    const [companyDocsSelected, setCompanyDocsSelected] = useState([]);
+    const [isVisibleAddDocDialog, setIsVisibleAddDocDialog] = useState(false);
+    const [newDocData, setNewDocData] = useState({});
+    const [docFileAttached, setDocFileAttached] = useState([]);
+    const [documentCategories, setDocumentCategories] = useState([]);
+    const [addDocLoading, setAddDocLoading] = useState(false);
+    const [reloadHash, setReloadHash] = useState(0);
     const toast = useRef(null);
+    const today = new Date();
+    const tomorrow = new Date(today);
+    tomorrow.setDate(today.getDate() + 1);
     const {
         control,
         handleSubmit,
@@ -107,74 +122,113 @@ const EvaluationExtraFiles = ({
 
     const hideCompanyDocsDialog = () => {
         setIsVisibleCompanyDocsDialog(false);
-        setCompanyDocsSelected([]);
     }
 
-    const footerPreTecEvalDialog = useCallback(() => {
+    const footerCompanyDocsDialog = () => {
         return <div>
-            <Button type="button" label={__('Annulla', 'gepafin')} onClick={hideCompanyDocsDialog} outlined/>
+            <Button type="button" label={__('Chiudi', 'gepafin')} onClick={hideCompanyDocsDialog} outlined/>
+        </div>
+    }
+
+    const openAddDocDialog = () => {
+        setNewDocData({
+            name: '',
+            documentCategoryId: 0,
+            expirationDate: ''
+        });
+        setDocFileAttached([]);
+        setIsVisibleAddDocDialog(true);
+    }
+
+    const hideAddDocDialog = () => {
+        setIsVisibleAddDocDialog(false);
+        setNewDocData({});
+        setDocFileAttached([]);
+    }
+
+    const headerAddDocDialog = () => {
+        return <span>{__('Aggiungi documento aziendale', 'gepafin')}</span>;
+    }
+
+    const isDocFormValid = useCallback(() => {
+        return !isEmpty(docFileAttached)
+            && !isEmpty(newDocData.name) && !isNil(newDocData.name)
+            && newDocData.documentCategoryId !== 0 && !isNil(newDocData.documentCategoryId)
+            && !isEmpty(newDocData.expirationDate) && !isNil(newDocData.expirationDate);
+    }, [docFileAttached, newDocData]);
+
+    const footerAddDocDialog = () => {
+        return <div>
+            <Button type="button" label={__('Annulla', 'gepafin')} onClick={hideAddDocDialog} outlined/>
             <Button
                 type="button"
-                disabled={isEmpty(companyDocsSelected)}
-                label={__('Aggiungi', 'gepafin')} onClick={doImportCompanyDocs}/>
+                disabled={addDocLoading || !isDocFormValid()}
+                label={__('Salva', 'gepafin')}
+                onClick={doAddNewDoc}/>
         </div>
-    }, [companyDocsSelected]);
+    }
 
-    const doImportCompanyDocs = useCallback(() => {
-        if (!isEmpty(companyDocsSelected)) {
-            const ids = pluck('id', companyDocsSelected);
-            ApplicationService.setApplicationDocuments(applicationId, setDocsCallback, errSetDocsCallback, [
-                ['companyDocumentIds', ids]
-            ])
+    const onUpdateDocFieldValue = useCallback((value, name) => {
+        setNewDocData(prev => wrap(prev).set([name], value).value());
+    }, []);
+
+    const onDocFileSelect = (file) => {
+        setDocFileAttached(file.files);
+    }
+
+    const doAddNewDoc = useCallback(() => {
+        const submitData = {
+            ...newDocData,
+            expirationDate: formatDateString(newDocData.expirationDate),
+            documentType: 'COMPANY_DOCUMENT'
+        };
+        const queryParams = Object.keys(submitData).map(k => [k, submitData[k]]);
+
+        if (!isEmpty(docFileAttached)) {
+            const formData = new FormData();
+            for (const file of docFileAttached) {
+                formData.append('file', file);
+            }
+            setAddDocLoading(true);
+            CompanyDocumentsService.uploadCompanyDocument(companyId, formData, uploadDocCallback, errUploadDocCallback, queryParams);
         }
-    }, [companyDocsSelected]);
+    }, [docFileAttached, newDocData, companyId]);
 
-    const setDocsCallback = (resp) => {
+    const uploadDocCallback = (resp) => {
         if (resp.status === 'SUCCESS') {
+            hideAddDocDialog();
+            setReloadHash(new Date().getTime());
+        } else {
             if (toast.current && resp.message) {
                 toast.current.show({
-                    severity: 'success',
+                    severity: 'error',
                     summary: '',
                     detail: resp.message
                 });
             }
         }
-        setIsVisibleCompanyDocsDialog(false);
-        setCompanyDocsSelected([]);
-        storeSet('unsetAsyncRequest');
-
-        setTimeout(() => {
-            window.location.reload();
-        }, 2500);
+        setAddDocLoading(false);
     }
 
-    const errSetDocsCallback = (resp) => {
+    const errUploadDocCallback = (resp) => {
         if (toast.current && resp.message) {
             toast.current.show({
-                severity: resp.status === 'SUCCESS' ? 'info' : 'error',
+                severity: 'error',
                 summary: '',
                 detail: resp.message
             });
         }
-        setIsVisibleCompanyDocsDialog(false);
-        setCompanyDocsSelected([]);
         set404FromErrorResponse(resp);
-        storeSet('unsetAsyncRequest');
+        setAddDocLoading(false);
     }
 
-    const getDocsCallback = (resp) => {
-        if (resp.status === 'SUCCESS') {
-            setCompanyDocs(resp.data);
-        }
-    }
-
-    const errGetDocsCallback = () => {}
-
     useEffect(() => {
-        CompanyService.getCompanyDocuments(companyId, getDocsCallback, errGetDocsCallback, [
-            ['documentType', 'COMPANY_DOCUMENT']
-        ])
-    }, [companyId]);
+        DocumentCategoryService.getCategories((resp) => {
+            if (resp.status === 'SUCCESS') {
+                setDocumentCategories(resp.data.map(o => ({ value: o.id, label: o.description })));
+            }
+        }, () => {});
+    }, []);
 
     return (
         <>
@@ -240,7 +294,7 @@ const EvaluationExtraFiles = ({
                         className="fieldsRepeater__addNew"
                         outlined
                         type="button"
-                        disabled={(watchFields && watchFields.filter(o => isEmpty(o.nameValue) || isEmpty(o.fileValue)).length > 0) || shouldDisable}
+                        disabled={shouldDisable}
                         onClick={openCompanyArchive}
                         label={__('Documenti aziendale', 'gepafin')}
                     />
@@ -251,41 +305,79 @@ const EvaluationExtraFiles = ({
                 visible={isVisibleCompanyDocsDialog}
                 modal
                 header={headerCompanyDocsDialog}
-                footer={footerPreTecEvalDialog}
-                style={{ maxWidth: '600px', width: '100%' }}
+                footer={footerCompanyDocsDialog}
+                style={{ maxWidth: '900px', width: '100%' }}
                 onHide={hideCompanyDocsDialog}>
-                <div className="appForm__field">
-                    {/*<label
-                        className={classNames({
-                            'p-error': isEmpty(companyDocsSelected)
-                        })}>
-                        {__('Documenti', 'gepafin')}
-                    </label>*/}
-                    <FileSelect
-                        fieldName="companyDocsSelected"
-                        label={null}
-                        errors={{}}
-                        register={() => {}}
-                        key={companyDocsSelected}
-                        defaultValue={companyDocsSelected}
-                        options={companyDocs}
-                        sourceId="0"
-                        source="DOCUMENT"
-                        documentCategories={[]}
-                        attachFilesCallback={(o) => {
-                            setCompanyDocsSelected(prev => {
-                                const newSelected = [...prev];
-                                if (!newSelected.find(s => s.id === o.id)) {
-                                    newSelected.push(o);
-                                }
-                                return newSelected;
-                            })
-                        }}
-                    />
+                <div style={{ marginBottom: '1rem' }}>
+                    <Button
+                        type="button"
+                        label={__('Aggiungi nuovo documento', 'gepafin')}
+                        icon="pi pi-plus"
+                        iconPos="right"
+                        onClick={openAddDocDialog}/>
+                </div>
+                <DocumentsTable type="COMPANY_DOCUMENT" companyId={companyId} reload={reloadHash}/>
+            </Dialog>
+            <Dialog
+                visible={isVisibleAddDocDialog}
+                modal
+                header={headerAddDocDialog}
+                footer={footerAddDocDialog}
+                style={{ maxWidth: '600px', width: '100%' }}
+                onHide={hideAddDocDialog}>
+                <div className="appForm__cols">
+                    <div className="appForm__field">
+                        <label
+                            className={classNames({ 'p-error': isEmpty(newDocData.name) || isNil(newDocData.name) })}>
+                            {__('Nome', 'gepafin')}*
+                        </label>
+                        <InputText
+                            value={newDocData.name || ''}
+                            invalid={isEmpty(newDocData.name || '') || isNil(newDocData.name)}
+                            onChange={(e) => onUpdateDocFieldValue(e.target.value, 'name')}/>
+                    </div>
+                    <div className="appForm__field">
+                        <label
+                            className={classNames({ 'p-error': !newDocData.documentCategoryId || newDocData.documentCategoryId === 0 })}>
+                            {__('Categoria', 'gepafin')}*
+                        </label>
+                        <Dropdown
+                            value={newDocData.documentCategoryId}
+                            invalid={!newDocData.documentCategoryId || newDocData.documentCategoryId === 0}
+                            onChange={(e) => onUpdateDocFieldValue(e.value, 'documentCategoryId')}
+                            options={documentCategories}
+                            optionLabel="label"
+                            optionValue="value"/>
+                    </div>
+                </div>
+                <div className="appForm__cols">
+                    <div className="appForm__field">
+                        <label
+                            className={classNames({ 'p-error': isEmpty(newDocData.expirationDate || '') || isNil(newDocData.expirationDate) })}>
+                            {__('Scadenza', 'gepafin')}*
+                        </label>
+                        <Calendar
+                            value={newDocData.expirationDate}
+                            minDate={tomorrow}
+                            invalid={isEmpty(newDocData.expirationDate || '') || isNil(newDocData.expirationDate)}
+                            onChange={(e) => onUpdateDocFieldValue(e.value, 'expirationDate')}/>
+                    </div>
+                </div>
+                <div className="appForm__cols">
+                    <div className="appForm__field">
+                        <label
+                            className={classNames({ 'p-error': isEmpty(docFileAttached) })}>
+                            {__('File', 'gepafin')}*
+                        </label>
+                        <FileUpload
+                            mode="basic"
+                            name="file"
+                            onSelect={onDocFileSelect}/>
+                    </div>
                 </div>
             </Dialog>
         </>
     )
 }
 
-export default EvaluationExtraFiles;
\ No newline at end of file
+export default EvaluationExtraFiles;