From a5b817e999cdf404779eaebabd1376ae28c8a3e2 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Tue, 15 Oct 2024 12:42:10 +0200
Subject: [PATCH 1/5] - updated form element settings;

---
 .../BuilderElementSettings/index.js           | 72 +++++++++++++++++--
 1 file changed, 67 insertions(+), 5 deletions(-)

diff --git a/src/pages/BandoFormsEdit/components/BuilderElementSettings/index.js b/src/pages/BandoFormsEdit/components/BuilderElementSettings/index.js
index 9ade547..2e91fd9 100644
--- a/src/pages/BandoFormsEdit/components/BuilderElementSettings/index.js
+++ b/src/pages/BandoFormsEdit/components/BuilderElementSettings/index.js
@@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { head, isEmpty, isNil } from 'ramda';
 import { __, sprintf } from '@wordpress/i18n';
 import { klona } from 'klona';
+import { wrap } from 'object-path-immutable';
 
 // store
 import { storeSet, useStore } from '../../../../store';
@@ -21,6 +22,7 @@ const BuilderElementSettings = ({ closeSettings }) => {
     const [activeElementData, setActiveElementData] = useState({});
     const [settings, setSettings] = useState([]);
     const [validators, setValidators] = useState({});
+    const [dynamicData, setDynamicData] = useState({});
     const textBasedValidatorFields = ['min', 'max', 'minLength', 'maxLength', 'pattern'];
     const customValidationOptions = [
         { value: 'isPIVA', label: 'isPIVA' },
@@ -63,9 +65,11 @@ const BuilderElementSettings = ({ closeSettings }) => {
     }
 
     const saveSettings = () => {
-        activeElementData.settings = settings;
-        activeElementData.validators = validators;
-        const newElements = elements.map(o => o.id === activeElementData.id ? activeElementData : o);
+        let newActiveElementData = klona(activeElementData);
+        newActiveElementData = wrap(newActiveElementData).set(['settings'], settings).value();
+        newActiveElementData = wrap(newActiveElementData).set(['validators'], validators).value();
+        newActiveElementData = wrap(newActiveElementData).set(['dynamicData'], dynamicData).value();
+        const newElements = elements.map(o => o.id === newActiveElementData.id ? newActiveElementData : o);
         storeSet.main.formElements(newElements);
         closeSettings();
     }
@@ -92,17 +96,49 @@ const BuilderElementSettings = ({ closeSettings }) => {
         setValidators(newValidators);
     }
 
+    const dynamicDataOptions = (type) => {
+        switch (type) {
+            case 'datepicker' :
+                return [
+                    {label: 'user dateOfBirth', value: 'user.dateOfBirth'}
+                ]
+            default :
+                return [
+                    {label: 'company name', value: 'company.companyName'},
+                    {label: 'company vatNumber', value: 'company.vatNumber'},
+                    {label: 'company codiceFiscale', value: 'company.codiceFiscale'},
+                    {label: 'company address', value: 'company.address'},
+                    {label: 'company phoneNumber', value: 'company.phoneNumber'},
+                    {label: 'company city', value: 'company.city'},
+                    {label: 'company province', value: 'company.province'},
+                    {label: 'company cap', value: 'company.cap'},
+                    {label: 'company country', value: 'company.country'},
+                    {label: 'company pec', value: 'company.pec'},
+                    {label: 'company email', value: 'company.email'},
+                    {label: 'company contactName', value: 'company.contactName'},
+                    {label: 'company contactEmail', value: 'company.contactEmail'},
+                    {label: 'user email', value: 'user.email'},
+                    {label: 'user firstName', value: 'user.firstName'},
+                    {label: 'user lastName', value: 'user.lastName'},
+                    {label: 'user phoneNumber', value: 'user.phoneNumber'},
+                    {label: 'user codiceFiscale', value: 'user.codiceFiscale'}
+                ]
+        }
+    }
+
     useEffect(() => {
         const chosen = head(elements.filter(o => o.id === activeElement));
 
         if (chosen) {
             setActiveElementData(klona(chosen));
             setSettings(klona(chosen.settings));
-            setValidators(klona(chosen.validators))
+            setValidators(klona(chosen.validators));
+            setDynamicData(chosen.dynamicData ? chosen.dynamicData : '');
         } else {
             setActiveElementData({});
             setSettings([]);
-            setValidators({})
+            setValidators({});
+            setDynamicData('');
         }
     }, [activeElement]);
 
@@ -118,6 +154,18 @@ const BuilderElementSettings = ({ closeSettings }) => {
                                 changeFn={onChange}
                                 updateDataFn={onUpdateOptions}/>)
                             : null}
+                        {['textinput', 'datepicker'].includes(activeElementData.name)
+                            ? <div className="formElementSettings__field">
+                            <label htmlFor="dynamicData">{__('Dati dinamici', 'gepafin')}</label>
+                            <Dropdown
+                                id="dynamicData"
+                                value={dynamicData}
+                                onChange={(e) => setDynamicData(e.value)}
+                                options={dynamicDataOptions(activeElementData.name)}
+                                optionLabel="label"
+                                optionValue="value"
+                                placeholder={__('Scegli', 'gepafin')}/>
+                        </div> : null}
                     </TabPanel>
                     {!isEmpty(validators)
                         ? <TabPanel header={__('Validation', 'gepafin')}>
@@ -162,6 +210,20 @@ const BuilderElementSettings = ({ closeSettings }) => {
                                         </div> : null}
                                 </div>) : null}
                         </TabPanel> : null}
+                    {/*{['textinput', 'datepicker'].includes(activeElementData.name)
+                        ? <TabPanel header={__('Dati', 'gepafin')}>
+                            <div className="formElementSettings__field">
+                                <label htmlFor="dynamicData">{__('Dati dinamici', 'gepafin')}</label>
+                                <Dropdown
+                                    id="dynamicData"
+                                    value={[]}
+                                    onChange={(e) => onChangeDynamicData(e.value, 'dynamicData')}
+                                    options={customValidationOptions}
+                                    optionLabel="label"
+                                    optionValue="value"
+                                    placeholder={__('Scegli', 'gepafin')}/>
+                            </div>
+                    </TabPanel> : null}*/}
                 </TabView>
 
                 <Button label={__('Salva', 'gepafin')} onClick={saveSettings}/>

From 782ec5fda789abdb40e04d3d499d7f224004ff88 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Tue, 15 Oct 2024 15:20:27 +0200
Subject: [PATCH 2/5] - added criteria setting for form fields; - added dynamic
 data setitng for form fields;

---
 .../BuilderElementSettings/index.js           | 105 ++++++++++--------
 .../components/FormBuilder/index.js           |   2 +-
 src/pages/BandoFormsEdit/index.js             |  18 ++-
 src/store/initial.js                          |   1 +
 4 files changed, 77 insertions(+), 49 deletions(-)

diff --git a/src/pages/BandoFormsEdit/components/BuilderElementSettings/index.js b/src/pages/BandoFormsEdit/components/BuilderElementSettings/index.js
index 2e91fd9..6d0edf0 100644
--- a/src/pages/BandoFormsEdit/components/BuilderElementSettings/index.js
+++ b/src/pages/BandoFormsEdit/components/BuilderElementSettings/index.js
@@ -15,14 +15,17 @@ import { TabView, TabPanel } from 'primereact/tabview';
 import { InputSwitch } from 'primereact/inputswitch';
 import ElementSetting from './components/ElementSetting';
 import { Dropdown } from 'primereact/dropdown';
+import { MultiSelect } from 'primereact/multiselect';
 
-const BuilderElementSettings = ({ closeSettings }) => {
+const BuilderElementSettings = ({ closeSettingsFn }) => {
     const elements = useStore().main.formElements();
     const activeElement = useStore().main.activeElement();
+    const criteriaOptions = useStore().main.bandoCriteria();
     const [activeElementData, setActiveElementData] = useState({});
     const [settings, setSettings] = useState([]);
     const [validators, setValidators] = useState({});
-    const [dynamicData, setDynamicData] = useState({});
+    const [dynamicData, setDynamicData] = useState('');
+    const [criteria, setCriteria] = useState([]);
     const textBasedValidatorFields = ['min', 'max', 'minLength', 'maxLength', 'pattern'];
     const customValidationOptions = [
         { value: 'isPIVA', label: 'isPIVA' },
@@ -69,9 +72,10 @@ const BuilderElementSettings = ({ closeSettings }) => {
         newActiveElementData = wrap(newActiveElementData).set(['settings'], settings).value();
         newActiveElementData = wrap(newActiveElementData).set(['validators'], validators).value();
         newActiveElementData = wrap(newActiveElementData).set(['dynamicData'], dynamicData).value();
+        newActiveElementData = wrap(newActiveElementData).set(['criteria'], criteria).value();
         const newElements = elements.map(o => o.id === newActiveElementData.id ? newActiveElementData : o);
         storeSet.main.formElements(newElements);
-        closeSettings();
+        closeSettingsFn();
     }
 
     const showField = (value, key) => {
@@ -95,33 +99,38 @@ const BuilderElementSettings = ({ closeSettings }) => {
         newValidators[name] = value;
         setValidators(newValidators);
     }
+    
+    const onChangeCriteriaData = (value) => {
+        setCriteria(value);
+    }
 
-    const dynamicDataOptions = (type) => {
+
+    const getDynamicDataOptions = (type) => {
         switch (type) {
             case 'datepicker' :
                 return [
-                    {label: 'user dateOfBirth', value: 'user.dateOfBirth'}
+                    { label: 'user dateOfBirth', value: 'user.dateOfBirth' }
                 ]
             default :
                 return [
-                    {label: 'company name', value: 'company.companyName'},
-                    {label: 'company vatNumber', value: 'company.vatNumber'},
-                    {label: 'company codiceFiscale', value: 'company.codiceFiscale'},
-                    {label: 'company address', value: 'company.address'},
-                    {label: 'company phoneNumber', value: 'company.phoneNumber'},
-                    {label: 'company city', value: 'company.city'},
-                    {label: 'company province', value: 'company.province'},
-                    {label: 'company cap', value: 'company.cap'},
-                    {label: 'company country', value: 'company.country'},
-                    {label: 'company pec', value: 'company.pec'},
-                    {label: 'company email', value: 'company.email'},
-                    {label: 'company contactName', value: 'company.contactName'},
-                    {label: 'company contactEmail', value: 'company.contactEmail'},
-                    {label: 'user email', value: 'user.email'},
-                    {label: 'user firstName', value: 'user.firstName'},
-                    {label: 'user lastName', value: 'user.lastName'},
-                    {label: 'user phoneNumber', value: 'user.phoneNumber'},
-                    {label: 'user codiceFiscale', value: 'user.codiceFiscale'}
+                    { label: 'company name', value: 'company.companyName' },
+                    { label: 'company vatNumber', value: 'company.vatNumber' },
+                    { label: 'company codiceFiscale', value: 'company.codiceFiscale' },
+                    { label: 'company address', value: 'company.address' },
+                    { label: 'company phoneNumber', value: 'company.phoneNumber' },
+                    { label: 'company city', value: 'company.city' },
+                    { label: 'company province', value: 'company.province' },
+                    { label: 'company cap', value: 'company.cap' },
+                    { label: 'company country', value: 'company.country' },
+                    { label: 'company pec', value: 'company.pec' },
+                    { label: 'company email', value: 'company.email' },
+                    { label: 'company contactName', value: 'company.contactName' },
+                    { label: 'company contactEmail', value: 'company.contactEmail' },
+                    { label: 'user email', value: 'user.email' },
+                    { label: 'user firstName', value: 'user.firstName' },
+                    { label: 'user lastName', value: 'user.lastName' },
+                    { label: 'user phoneNumber', value: 'user.phoneNumber' },
+                    { label: 'user codiceFiscale', value: 'user.codiceFiscale' }
                 ]
         }
     }
@@ -134,11 +143,13 @@ const BuilderElementSettings = ({ closeSettings }) => {
             setSettings(klona(chosen.settings));
             setValidators(klona(chosen.validators));
             setDynamicData(chosen.dynamicData ? chosen.dynamicData : '');
+            setCriteria(chosen.criteria ? chosen.criteria : []);
         } else {
             setActiveElementData({});
             setSettings([]);
             setValidators({});
             setDynamicData('');
+            setCriteria([]);
         }
     }, [activeElement]);
 
@@ -156,16 +167,16 @@ const BuilderElementSettings = ({ closeSettings }) => {
                             : null}
                         {['textinput', 'datepicker'].includes(activeElementData.name)
                             ? <div className="formElementSettings__field">
-                            <label htmlFor="dynamicData">{__('Dati dinamici', 'gepafin')}</label>
-                            <Dropdown
-                                id="dynamicData"
-                                value={dynamicData}
-                                onChange={(e) => setDynamicData(e.value)}
-                                options={dynamicDataOptions(activeElementData.name)}
-                                optionLabel="label"
-                                optionValue="value"
-                                placeholder={__('Scegli', 'gepafin')}/>
-                        </div> : null}
+                                <label htmlFor="dynamicData">{__('Dati dinamici', 'gepafin')}</label>
+                                <Dropdown
+                                    id="dynamicData"
+                                    value={dynamicData}
+                                    onChange={(e) => setDynamicData(e.value)}
+                                    options={getDynamicDataOptions(activeElementData.name)}
+                                    optionLabel="label"
+                                    optionValue="value"
+                                    placeholder={__('Scegli', 'gepafin')}/>
+                            </div> : null}
                     </TabPanel>
                     {!isEmpty(validators)
                         ? <TabPanel header={__('Validation', 'gepafin')}>
@@ -210,20 +221,20 @@ const BuilderElementSettings = ({ closeSettings }) => {
                                         </div> : null}
                                 </div>) : null}
                         </TabPanel> : null}
-                    {/*{['textinput', 'datepicker'].includes(activeElementData.name)
-                        ? <TabPanel header={__('Dati', 'gepafin')}>
-                            <div className="formElementSettings__field">
-                                <label htmlFor="dynamicData">{__('Dati dinamici', 'gepafin')}</label>
-                                <Dropdown
-                                    id="dynamicData"
-                                    value={[]}
-                                    onChange={(e) => onChangeDynamicData(e.value, 'dynamicData')}
-                                    options={customValidationOptions}
-                                    optionLabel="label"
-                                    optionValue="value"
-                                    placeholder={__('Scegli', 'gepafin')}/>
-                            </div>
-                    </TabPanel> : null}*/}
+                    <TabPanel header={__('Criteri', 'gepafin')}>
+                        <div className="formElementSettings__field">
+                            <label htmlFor="criteria">{__('Criteri di valutazione', 'gepafin')}</label>
+                            <MultiSelect
+                                id="criteria"
+                                value={criteria}
+                                onChange={(e) => onChangeCriteriaData(e.value)}
+                                options={criteriaOptions}
+                                optionLabel="label"
+                                optionValue="value"
+                                display="chip"
+                                placeholder={__('Scegli', 'gepafin')}/>
+                        </div>
+                    </TabPanel>
                 </TabView>
 
                 <Button label={__('Salva', 'gepafin')} onClick={saveSettings}/>
diff --git a/src/pages/BandoFormsEdit/components/FormBuilder/index.js b/src/pages/BandoFormsEdit/components/FormBuilder/index.js
index cacf84e..95a8122 100644
--- a/src/pages/BandoFormsEdit/components/FormBuilder/index.js
+++ b/src/pages/BandoFormsEdit/components/FormBuilder/index.js
@@ -57,7 +57,7 @@ const FormBuilder = () => {
         <>
             <Sidebar visible={!isEmpty(activeElement)} onHide={closeSettings} className="formBuilder__elementSettings">
                 <h2>{__('Impostazioni del campo modulo', 'gepafin')}</h2>
-                {!isEmpty(activeElement) ? <BuilderElementSettings closeSettings={closeSettings}/> : null}
+                {!isEmpty(activeElement) ? <BuilderElementSettings closeSettingsFn={closeSettings}/> : null}
             </Sidebar>
             <div className="formBuilder">
                 <div className="formBuilder__main">
diff --git a/src/pages/BandoFormsEdit/index.js b/src/pages/BandoFormsEdit/index.js
index 1233076..2519744 100644
--- a/src/pages/BandoFormsEdit/index.js
+++ b/src/pages/BandoFormsEdit/index.js
@@ -4,7 +4,7 @@ import { useNavigate, useParams } from 'react-router-dom';
 import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import { klona } from 'klona';
-import { isEmpty } from 'ramda';
+import { isEmpty, pathOr } from 'ramda';
 
 // store
 import { storeSet, storeGet, useStore } from '../../store';
@@ -21,6 +21,7 @@ import { Messages } from 'primereact/messages';
 // api
 import FormsService from '../../service/forms-service';
 import set404FromErrorResponse from '../../helpers/set404FromErrorResponse';
+import BandoService from '../../service/bando-service';
 
 // TODO temp data
 //import { elementItems } from '../../tempData';
@@ -243,7 +244,20 @@ const BandoFormsEdit = () => {
         storeSet.main.unsetAsyncRequest();
     }
 
+    const getBandoCallback = (data) => {
+        if (data.status === 'SUCCESS') {
+            const criteria = pathOr([], ['data', 'criteria'], data);
+            const criteriaOptions = criteria.map(o => ({value: o.lookUpDataId, label: o.value}));
+            storeSet.main.bandoCriteria(criteriaOptions);
+        }
+    }
+
+    const errGetBandoCallback = (data) => {
+        set404FromErrorResponse(data);
+    }
+
     useEffect(() => {
+        const bandoId = getBandoId();
         const parsedFormId = parseInt(formId)
         const bandoFormId = !isNaN(parsedFormId) ? parsedFormId : 0;
 
@@ -253,12 +267,14 @@ const BandoFormsEdit = () => {
         if (bandoFormId) {
             storeSet.main.setAsyncRequest();
             FormsService.getFormById(bandoFormId, getFormCallback, errGetFormCallbacks);
+            BandoService.getBando(bandoId, getBandoCallback, errGetBandoCallback);
         }
 
         return () => {
             storeSet.main.formId(0);
             storeSet.main.formLabel('');
             storeSet.main.formElements([]);
+            storeSet.main.bandoCriteria([]);
         }
     }, [id, formId]);
 
diff --git a/src/store/initial.js b/src/store/initial.js
index c5aa75e..5cc368f 100644
--- a/src/store/initial.js
+++ b/src/store/initial.js
@@ -17,6 +17,7 @@ const initialStore = {
     elementItems: [],
     activeElement: '',
     draggingElementId: 0,
+    bandoCriteria: [],
     // flow
     flowData: [],
     flowForms: [],

From 487c6d071515a722f42e2b1c08318a3e48f2fbbc Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Wed, 16 Oct 2024 11:48:05 +0200
Subject: [PATCH 3/5] - added instructor dashboard page;

---
 package.json                                  |   1 +
 src/components/TopBarProfileMenu/index.js     |   4 +-
 src/helpers/getBandoLabel.js                  |   3 +
 src/helpers/getBandoSeverity.js               |   3 +
 .../components/AppSidebar/index.js            |   7 +
 .../Bandi/components/AllBandiTable/index.js   |  11 +-
 .../components/LatestBandiTable/index.js      |  45 +--
 src/pages/Dashboard/index.js                  |  48 ++-
 .../components/LatestBandiTable/index.js      |  16 +-
 .../MyLatestSubmissionsTable/index.js         |  13 +-
 src/pages/DashboardBeneficiario/index.js      |  16 +-
 .../components/MyEvaluationsTable/index.js    | 189 ++++++++++++
 src/pages/DashboardInstructor/index.js        |  76 +++++
 src/pages/Evaluations/index.js                |  23 ++
 src/pages/Profile/index.js                    |  83 +----
 src/pages/ProfileBeneficiario/index.js        | 288 ++++++++++++++++++
 .../Users/components/AllUsersTable/index.js   |   2 +-
 src/routes.js                                 |  25 +-
 18 files changed, 693 insertions(+), 160 deletions(-)
 create mode 100644 src/pages/DashboardInstructor/components/MyEvaluationsTable/index.js
 create mode 100644 src/pages/DashboardInstructor/index.js
 create mode 100644 src/pages/Evaluations/index.js
 create mode 100644 src/pages/ProfileBeneficiario/index.js

diff --git a/package.json b/package.json
index 9b1eeda..1fc4577 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
     "@babel/preset-react": "7.24.7",
     "@date-fns/tz": "1.1.2",
     "@emotion/styled": "11.13.0",
+    "@number-flow/react": "^0.2.0",
     "@tanstack/react-table": "^8.20.5",
     "@wordpress/i18n": "5.8.0",
     "@wordpress/react-i18n": "4.8.0",
diff --git a/src/components/TopBarProfileMenu/index.js b/src/components/TopBarProfileMenu/index.js
index 32bfac6..548f56a 100644
--- a/src/components/TopBarProfileMenu/index.js
+++ b/src/components/TopBarProfileMenu/index.js
@@ -55,7 +55,7 @@ const TopBarProfileMenu = ({ menuLeftRef }) => {
             command: () => {
                 navigate('/profilo-aziendale')
             },
-            enable: !intersection(permissions, ['MANAGE_TENDERS']).length && companies.length > 0
+            enable: intersection(permissions, ['APPLY_CALLS']).length && companies.length > 0
         },
         {
             label: __('Seleziona azienda', 'gepafin'),
@@ -67,7 +67,7 @@ const TopBarProfileMenu = ({ menuLeftRef }) => {
             command: () => {
                 navigate('/agguingi-azienda')
             },
-            enable: !intersection(permissions, ['MANAGE_TENDERS']).length
+            enable: intersection(permissions, ['APPLY_CALLS']).length
         },
         {
             separator: true,
diff --git a/src/helpers/getBandoLabel.js b/src/helpers/getBandoLabel.js
index 55c0c08..585def9 100644
--- a/src/helpers/getBandoLabel.js
+++ b/src/helpers/getBandoLabel.js
@@ -14,6 +14,9 @@ const getBandoLabel = (status) => {
         case 'DRAFT':
             return __('Bozza', 'gepafin');
 
+        case 'AWAITING':
+            return __('In attesa', 'gepafin');
+
         case 'EXPIRED':
             return __('Scaduto', 'gepafin');
 
diff --git a/src/helpers/getBandoSeverity.js b/src/helpers/getBandoSeverity.js
index 89263be..f0b2dad 100644
--- a/src/helpers/getBandoSeverity.js
+++ b/src/helpers/getBandoSeverity.js
@@ -14,6 +14,9 @@ const getBandoSeverity = (status) => {
         case 'DRAFT':
             return 'warning';
 
+        case 'AWAITING':
+            return 'warning';
+
         case 'EXPIRED':
             return 'closed';
 
diff --git a/src/layouts/DefaultLayout/components/AppSidebar/index.js b/src/layouts/DefaultLayout/components/AppSidebar/index.js
index 61a4484..c7672cf 100644
--- a/src/layouts/DefaultLayout/components/AppSidebar/index.js
+++ b/src/layouts/DefaultLayout/components/AppSidebar/index.js
@@ -40,6 +40,13 @@ const AppSidebar = () => {
             id: 4,
             enable: intersection(permissions, ['VIEW_CALLS']).length
         },
+        {
+            label: __('Domande da valutare', 'gepafin'),
+            icon: 'pi pi-calendar-clock',
+            href: '/valutazioni',
+            id: 4,
+            enable: intersection(permissions, ['EVALUATE_APPLICATIONS']).length
+        },
         {
             label: __('Gestione Utenti', 'gepafin'),
             icon: 'pi pi-users',
diff --git a/src/pages/Bandi/components/AllBandiTable/index.js b/src/pages/Bandi/components/AllBandiTable/index.js
index cc4191b..a636cd9 100644
--- a/src/pages/Bandi/components/AllBandiTable/index.js
+++ b/src/pages/Bandi/components/AllBandiTable/index.js
@@ -31,12 +31,12 @@ import { Link } from 'react-router-dom';
 const AllBandiTable = () => {
     const [items, setItems] = useState(null);
     const [filters, setFilters] = useState(null);
-    const [loading, setLoading] = useState(false);
+    const [localAsyncRequest, setLocalAsyncRequest] = useState(false);
     const [globalFilterValue, setGlobalFilterValue] = useState('');
     const [statuses, setStatuses] = useState([]);
 
     useEffect(() => {
-        storeSet.main.setAsyncRequest();
+        setLocalAsyncRequest(true);
         BandoService.getBandi(getCallback, errGetCallbacks);
     }, []);
 
@@ -46,12 +46,11 @@ const AllBandiTable = () => {
             setStatuses(uniq(data.data.map(o => o.status)))
             initFilters();
         }
-        storeSet.main.unsetAsyncRequest();
+        setLocalAsyncRequest(false);
     }
 
     const errGetCallbacks = (data) => {
-        console.log('errGetCallbacks', data)
-        storeSet.main.unsetAsyncRequest();
+        setLocalAsyncRequest(false);
     }
 
     const getFormattedBandiData = (data) => {
@@ -136,7 +135,7 @@ const AllBandiTable = () => {
 
     return(
         <div className="appPageSection__table">
-            <DataTable value={items} paginator showGridlines rows={10} loading={loading} dataKey="id"
+            <DataTable value={items} paginator showGridlines rows={10} loading={localAsyncRequest} dataKey="id"
                        filters={filters}
                        globalFilterFields={['name', 'status']}
                        header={header}
diff --git a/src/pages/Dashboard/components/LatestBandiTable/index.js b/src/pages/Dashboard/components/LatestBandiTable/index.js
index 94b45b5..52b646f 100644
--- a/src/pages/Dashboard/components/LatestBandiTable/index.js
+++ b/src/pages/Dashboard/components/LatestBandiTable/index.js
@@ -31,44 +31,12 @@ import { Link } from 'react-router-dom';
 const LatestBandiTable = () => {
     const [items, setItems] = useState(null);
     const [filters, setFilters] = useState(null);
-    const [loading, setLoading] = useState(false);
+    const [localAsyncRequest, setLocalAsyncRequest] = useState(false);
     const [globalFilterValue, setGlobalFilterValue] = useState('');
     const [statuses, setStatuses] = useState([]);
 
     useEffect(() => {
-        // TODO
-        /*const items = [
-            {
-                name: 'Bando Innovazione 2024',
-                start_date: '2024-08-08T00:00:00+00:00',
-                end_date: '2024-08-30T00:00:00+00:00',
-                submissions: 24,
-                status: 'PUBLISH',
-                id: 11
-            },
-            {
-                name: 'Bando Sostenibilità 2024',
-                start_date: '2024-07-28T00:00:00+00:00',
-                end_date: '2024-08-15T00:00:00+00:00',
-                submissions: 35,
-                status: 'PUBLISH',
-                id: 9
-            },
-            {
-                name: 'Bando A',
-                start_date: '2024-06-28T00:00:00+00:00',
-                end_date: '2024-06-15T00:00:00+00:00',
-                submissions: 2,
-                status: 'EXPIRED',
-                id: 2
-            }
-        ]
-        setItems(getFormattedBandiData(items));
-        setStatuses(uniq(items.map(o => o.status)))
-        setLoading(false);
-        initFilters();*/
-
-        storeSet.main.setAsyncRequest();
+        setLocalAsyncRequest(true);
         BandoService.getBandi(getCallback, errGetCallbacks);
     }, []);
 
@@ -79,12 +47,11 @@ const LatestBandiTable = () => {
             setStatuses(uniq(data.data.map(o => o.status)))
             initFilters();
         }
-        storeSet.main.unsetAsyncRequest();
+        setLocalAsyncRequest(false);
     }
 
     const errGetCallbacks = (data) => {
-        console.log('errGetCallbacks', data)
-        storeSet.main.unsetAsyncRequest();
+        setLocalAsyncRequest(false);
     }
 
     const getFormattedBandiData = (data) => {
@@ -179,13 +146,13 @@ const LatestBandiTable = () => {
 
     return(
         <div className="appPageSection__table">
-            <DataTable value={items} paginator showGridlines rows={10} loading={loading} dataKey="id"
+            <DataTable value={items} paginator showGridlines rows={10} loading={localAsyncRequest} dataKey="id"
                        filters={filters}
                        globalFilterFields={['name', 'status']}
                        header={header}
                        emptyMessage={__('Nessun dato disponibile', 'gepafin')}
                        onFilter={(e) => setFilters(e.filters)}>
-                <Column field="name" header={__('Nome Bando', 'gepafin')} filter filterPlaceholder="Search by name"
+                <Column field="name" header={__('Nome Bando', 'gepafin')} filter filterPlaceholder={__('Cerca il nome', 'gepafin')}
                         style={{ minWidth: '12rem' }}/>
                 <Column header={__('Data Pubblicazione', 'gepafin')} filterField="start_date" dataType="date"
                         style={{ minWidth: '10rem' }}
diff --git a/src/pages/Dashboard/index.js b/src/pages/Dashboard/index.js
index c56c89c..6ff37f6 100644
--- a/src/pages/Dashboard/index.js
+++ b/src/pages/Dashboard/index.js
@@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { __ } from '@wordpress/i18n';
 import { useNavigate } from 'react-router-dom';
 import { pathOr } from 'ramda';
+import NumberFlow from '@number-flow/react';
 
 // store
 //import { storeSet } from '../../store';
@@ -13,6 +14,7 @@ import DashboardService from '../../service/dashboard-service';
 import LatestBandiTable from './components/LatestBandiTable';
 //import LatestUsersActivityTable from './components/LatestUsersActivityTable';
 import { Button } from 'primereact/button';
+import MyEvaluationsTable from '../DashboardInstructor/components/MyEvaluationsTable';
 
 const Dashboard = () => {
     const navigate = useNavigate();
@@ -67,27 +69,52 @@ const Dashboard = () => {
                 <div className="statsBigBadges__grid">
                     <div className="statsBigBadges__gridItem">
                         <span>{__('Bandi attivi', 'gepafin')}</span>
-                        <span>{getStatValue('numberOfActiveCalls', 0)}</span>
+                        <span><NumberFlow
+                            value={getStatValue('numberOfActiveCalls', 0)}
+                            format={{ notation: 'compact' }}
+                            locales="it-IT" /></span>
                     </div>
                     <div className="statsBigBadges__gridItem">
                         <span>{__('Utenti registrati', 'gepafin')}</span>
-                        <span>{getStatValue('numberOfResgisteredUsers', 0)}</span>
+                        <span><NumberFlow
+                            value={getStatValue('numberOfResgisteredUsers', 0)}
+                            format={{ notation: 'compact' }}
+                            locales="it-IT" /></span>
                     </div>
                     <div className="statsBigBadges__gridItem">
                         <span>{__('Domande in pre-istruttoria', 'gepafin')}</span>
-                        <span>{getStatValue('numberOfSubmittedApplications', 0)}</span>
+                        <span><NumberFlow
+                            value={getStatValue('numberOfSubmittedApplications', 0)}
+                            format={{ notation: 'compact' }}
+                            locales="it-IT" /></span>
                     </div>
                     <div className="statsBigBadges__gridItem">
                         <span>{__('Domande in bozza', 'gepafin')}</span>
-                        <span>{getStatValue('numberOfDraftApplications', 0)}</span>
+                        <span><NumberFlow
+                            value={getStatValue('numberOfDraftApplications', 0)}
+                            format={{ notation: 'compact' }}
+                            locales="it-IT" /></span>
                     </div>
                     <div className="statsBigBadges__gridItem">
                         <span>{__('Aziende', 'gepafin')}</span>
-                        <span>{getStatValue('numberOfCompany', 0)}</span>
+                        <span><NumberFlow
+                            value={getStatValue('numberOfCompany', 0)}
+                            format={{ notation: 'compact' }}
+                            locales="it-IT" /></span>
                     </div>
                     <div className="statsBigBadges__gridItem">
                         <span>{__('Totale finanziamenti attivi', 'gepafin')}</span>
-                        <span>€{formatToMillions(getStatValue('totalActiveFinancing', 0))}</span>
+                        <span><NumberFlow
+                            value={getStatValue('totalActiveFinancing', 0)}
+                            format={{
+                                notation: 'compact',
+                                compactDisplay: 'short',
+                                roundingMode: 'trunc',
+                                style: 'currency',
+                                currency: 'EUR',
+                                currencyDisplay: 'symbol'
+                        }}
+                            locales="en-US" /></span>
                     </div>
                 </div>
             </div>
@@ -95,10 +122,17 @@ const Dashboard = () => {
             <div className="appPage__spacer"></div>
 
             <div className="appPageSection">
-                <h2>{__('Ultimi Bandi Pubblicati', 'gepafin')}</h2>
+                <h2>{__('Ultimi bandi pubblicati', 'gepafin')}</h2>
                 <LatestBandiTable/>
             </div>
 
+            <div className="appPage__spacer"></div>
+
+            <div className="appPageSection">
+                <h2>{__('Ultime domande pubblicate', 'gepafin')}</h2>
+                <MyEvaluationsTable/>
+            </div>
+
             {/*<div className="appPage__spacer"></div>
 
             <div className="appPageSection">
diff --git a/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js b/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js
index b852369..f48b208 100644
--- a/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js
+++ b/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js
@@ -1,6 +1,7 @@
 import React, { useState, useEffect} from 'react';
 import { __ } from '@wordpress/i18n';
 import { uniq } from 'ramda';
+import { Link } from 'react-router-dom';
 
 // tools
 import getBandoLabel from '../../../../helpers/getBandoLabel';
@@ -25,7 +26,6 @@ import { Button } from 'primereact/button';
 import { Calendar } from 'primereact/calendar';
 import { Tag } from 'primereact/tag';
 import ProperBandoLabel from '../../../../components/ProperBandoLabel';
-import { Link } from 'react-router-dom';
 
 
 const LatestBandiTable = () => {
@@ -43,7 +43,7 @@ const LatestBandiTable = () => {
     const getCallback = (data) => {
         if (data.status === 'SUCCESS') {
             const newItems = data.data.filter(o => o.status === 'PUBLISH');
-            setItems(getFormattedBandiData(newItems));
+            setItems(getFormattedData(newItems));
             setStatuses(uniq(data.data.map(o => o.status)))
             initFilters();
         }
@@ -55,7 +55,7 @@ const LatestBandiTable = () => {
         storeSet.main.unsetAsyncRequest();
     }
 
-    const getFormattedBandiData = (data) => {
+    const getFormattedData = (data) => {
         return [...(data || [])].map((d) => {
             d.start_date = new Date(d.dates[0]);
             d.end_date = new Date(d.dates[1]);
@@ -121,18 +121,10 @@ const LatestBandiTable = () => {
         return <Calendar value={options.value} onChange={(e) => options.filterCallback(e.value, options.index)} dateFormat="mm/dd/yy" placeholder="mm/dd/yyyy" mask="99/99/9999" />;
     };
 
-    const balanceFilterTemplate = (options) => {
-        return <InputNumber value={options.value} onChange={(e) => options.filterCallback(e.value, options.index)} />;
-    };
-
     const statusBodyTemplate = (rowData) => {
         return <ProperBandoLabel status={rowData.status}/>;
     };
 
-    const statusFilterTemplate = (options) => {
-        return <Dropdown value={options.value} options={statuses} onChange={(e) => options.filterCallback(e.value, options.index)} itemTemplate={statusItemTemplate} placeholder="Select One" className="p-column-filter" showClear />;
-    };
-
     const statusItemTemplate = (option) => {
         return <Tag value={getBandoLabel(option)} severity={getBandoSeverity(option)} />;
     };
@@ -153,7 +145,7 @@ const LatestBandiTable = () => {
                        header={header}
                        emptyMessage={__('Nessun dato disponibile', 'gepafin')}
                        onFilter={(e) => setFilters(e.filters)}>
-                <Column field="name" header={__('Nome Bando', 'gepafin')} filter filterPlaceholder="Search by name"
+                <Column field="name" header={__('Nome Bando', 'gepafin')} filter filterPlaceholder={__('Cerca il nome', 'gepafin')}
                         style={{ minWidth: '12rem' }}/>
                 <Column header={__('Data Pubblicazione', 'gepafin')} filterField="start_date" dataType="date"
                         style={{ minWidth: '10rem' }}
diff --git a/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js b/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js
index 0fda671..4835b30 100644
--- a/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js
+++ b/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js
@@ -26,14 +26,14 @@ import set404FromErrorResponse from '../../../../helpers/set404FromErrorResponse
 
 
 const MyLatestSubmissionsTable = () => {
-    const isAsyncRequest = useStore().main.isAsyncRequest();
+    const [localAsyncRequest, setLocalAsyncRequest] = useState(false);
     const [items, setItems] = useState(null);
     const [filters, setFilters] = useState(null);
     const [globalFilterValue, setGlobalFilterValue] = useState('');
     const [statuses, setStatuses] = useState([]);
 
     useEffect(() => {
-        storeSet.main.setAsyncRequest();
+        setLocalAsyncRequest(true);
         ApplicationService.getApplications(getApplCallback, errGetApplCallback)
     }, []);
 
@@ -45,12 +45,11 @@ const MyLatestSubmissionsTable = () => {
                 initFilters();
             }
         }
-        storeSet.main.unsetAsyncRequest();
+        setLocalAsyncRequest(false);
     }
 
     const errGetApplCallback = (data) => {
-        set404FromErrorResponse(data);
-        storeSet.main.unsetAsyncRequest();
+        setLocalAsyncRequest(false);
     }
 
     const getFormattedBandiData = (data) => {
@@ -164,13 +163,13 @@ const MyLatestSubmissionsTable = () => {
 
     return (
         <div className="appPageSection__table">
-            <DataTable value={items} paginator showGridlines rows={10} loading={isAsyncRequest} dataKey="id"
+            <DataTable value={items} paginator showGridlines rows={10} loading={localAsyncRequest} dataKey="id"
                        filters={filters}
                        globalFilterFields={['name', 'status']}
                        header={header}
                        emptyMessage={__('Nessun dato disponibile', 'gepafin')}
                        onFilter={(e) => setFilters(e.filters)}>
-                <Column field="callTitle" header={__('Bando', 'gepafin')} filter filterPlaceholder="Search by name"
+                <Column field="callTitle" header={__('Bando', 'gepafin')} filter filterPlaceholder={__('Cerca il nome', 'gepafin')}
                         style={{ minWidth: '12rem' }}/>
                 <Column header={__('Scadenza', 'gepafin')} filterField="callEndDate" dataType="date"
                         style={{ minWidth: '10rem' }}
diff --git a/src/pages/DashboardBeneficiario/index.js b/src/pages/DashboardBeneficiario/index.js
index 7f1c7c8..4500f0c 100644
--- a/src/pages/DashboardBeneficiario/index.js
+++ b/src/pages/DashboardBeneficiario/index.js
@@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { __ } from '@wordpress/i18n';
 import { useNavigate } from 'react-router-dom';
 import { head, pathOr } from 'ramda';
+import NumberFlow from '@number-flow/react';
 
 // store
 import { useStore } from '../../store';
@@ -57,15 +58,24 @@ const DashboardBeneficiario = () => {
                 <div className="statsBigBadges__grid">
                     <div className="statsBigBadges__gridItem">
                         <span>{__('Domande attive', 'gepafin')}</span>
-                        <span>{getStatValue('numberOfApplications', 0)}</span>
+                        <span><NumberFlow
+                            value={getStatValue('numberOfApplications', 0)}
+                            format={{ notation: 'compact' }}
+                            locales="it-IT" /></span>
                     </div>
                     <div className="statsBigBadges__gridItem">
                         <span>{__('Bandi osservati', 'gepafin')}</span>
-                        <span>{getStatValue('numberOfCalls', 0)}</span>
+                        <span><NumberFlow
+                            value={getStatValue('numberOfCalls', 0)}
+                            format={{ notation: 'compact' }}
+                            locales="it-IT" /></span>
                     </div>
                     <div className="statsBigBadges__gridItem">
                         <span>{__('Documenti da integrare', 'gepafin')}</span>
-                        <span>{getStatValue('numberOfIntegratedDocuments', 0)}</span>
+                        <span><NumberFlow
+                            value={getStatValue('numberOfIntegratedDocuments', 0)}
+                            format={{ notation: 'compact' }}
+                            locales="it-IT" /></span>
                     </div>
                 </div>
             </div>
diff --git a/src/pages/DashboardInstructor/components/MyEvaluationsTable/index.js b/src/pages/DashboardInstructor/components/MyEvaluationsTable/index.js
new file mode 100644
index 0000000..413b41c
--- /dev/null
+++ b/src/pages/DashboardInstructor/components/MyEvaluationsTable/index.js
@@ -0,0 +1,189 @@
+import React, { useState, useEffect } from 'react';
+import { __ } from '@wordpress/i18n';
+import { Link } from 'react-router-dom';
+
+// store
+import { useStore } from '../../../../store';
+
+// tools
+//import set404FromErrorResponse from '../../../../helpers/set404FromErrorResponse';
+import ProperBandoLabel from '../../../../components/ProperBandoLabel';
+
+// api
+//import ApplicationService from '../../../../service/application-service';
+
+// components
+import { FilterMatchMode, FilterOperator } from 'primereact/api';
+import { DataTable } from 'primereact/datatable';
+import { Column } from 'primereact/column';
+import { InputText } from 'primereact/inputtext';
+import { IconField } from 'primereact/iconfield';
+import { InputIcon } from 'primereact/inputicon';
+import { Button } from 'primereact/button';
+import { Calendar } from 'primereact/calendar';
+
+
+const MyEvaluationsTable = () => {
+    const isAsyncRequest = useStore().main.isAsyncRequest();
+    const [items, setItems] = useState(null);
+    const [filters, setFilters] = useState(null);
+    const [globalFilterValue, setGlobalFilterValue] = useState('');
+
+    useEffect(() => {
+        const demoItems = [
+            {
+                id: 1,
+                callTitle: 'Bando 1',
+                appliedDate: '2024-10-01',
+                callEndDate: '2025-11-25',
+                status: 'AWAITING'
+            },
+            {
+                id: 2,
+                callTitle: 'Bando 2',
+                appliedDate: '2024-08-11',
+                callEndDate: '2027-09-23',
+                status: 'AWAITING'
+            }
+        ];
+        setItems(getFormattedData(demoItems));
+        /*storeSet.main.setAsyncRequest();
+        ApplicationService.getApplications(getApplCallback, errGetApplCallback)*/
+    }, []);
+
+    /*const getApplCallback = (data) => {
+        if (data.status === 'SUCCESS') {
+            if (data.data.length) {
+                setItems(getFormattedBandiData(data.data));
+                setStatuses(uniq(items.map(o => o.status)))
+                initFilters();
+            }
+        }
+        storeSet.main.unsetAsyncRequest();
+    }
+
+    const errGetApplCallback = (data) => {
+        set404FromErrorResponse(data);
+        storeSet.main.unsetAsyncRequest();
+    }*/
+
+    const getFormattedData = (data) => {
+        return [...(data || [])].map((d) => {
+            d.appliedDate = new Date(d.appliedDate);
+            d.callEndDate = new Date(d.callEndDate);
+
+            return d;
+        });
+    };
+
+    const formatDate = (value) => {
+        return value.toLocaleDateString('it-IT', {
+            day: '2-digit',
+            month: '2-digit',
+            year: 'numeric'
+        });
+    };
+
+    const clearFilter = () => {
+        initFilters();
+    };
+
+    const onGlobalFilterChange = (e) => {
+        const value = e.target.value;
+        let _filters = { ...filters };
+
+        _filters['global'].value = value;
+
+        setFilters(_filters);
+        setGlobalFilterValue(value);
+    };
+
+    const initFilters = () => {
+        setFilters({
+            global: { value: null, matchMode: FilterMatchMode.CONTAINS },
+            callTitle: {
+                operator: FilterOperator.AND,
+                constraints: [{ value: null, matchMode: FilterMatchMode.STARTS_WITH }]
+            },
+            appliedDate: {
+                operator: FilterOperator.AND,
+                constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }]
+            },
+            callEndDate: {
+                operator: FilterOperator.AND,
+                constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }]
+            }
+        });
+        setGlobalFilterValue('');
+    };
+
+    const renderHeader = () => {
+        return (
+            <div className="appTableHeader">
+                <Button type="button" icon="pi pi-filter-slash" label={__('Pulisci', 'gepafin')} outlined
+                        onClick={clearFilter}/>
+                <IconField iconPosition="left">
+                    <InputIcon className="pi pi-search"/>
+                    <InputText value={globalFilterValue} onChange={onGlobalFilterChange}
+                               placeholder={__('Cerca', 'gepafin')}/>
+                </IconField>
+            </div>
+        );
+    };
+
+    const dateAppliedBodyTemplate = (rowData) => {
+        return formatDate(rowData.appliedDate);
+    };
+
+    const dateEndBodyTemplate = (rowData) => {
+        return formatDate(rowData.callEndDate);
+    };
+
+    const dateFilterTemplate = (options) => {
+        return <Calendar value={options.value} onChange={(e) => options.filterCallback(e.value, options.index)}
+                         dateFormat="mm/dd/yy" placeholder="mm/dd/yyyy" mask="99/99/9999"/>;
+    };
+
+    const statusBodyTemplate = (rowData) => {
+        return <ProperBandoLabel status={rowData.status}/>;
+    };
+
+    const actionsBodyTemplate = (rowData) => {
+        return <Link to={`/valutazioni/${rowData.id}`}>
+            <Button type="button"
+                    severity="info"
+                    label={__('Valuta', 'gepafin')}
+                    size="small"/>
+        </Link>
+    }
+
+    const header = renderHeader();
+
+    return (
+        <div className="appPageSection__table">
+            <DataTable value={items} paginator showGridlines rows={10} loading={isAsyncRequest} dataKey="id"
+                       filters={filters}
+                       globalFilterFields={['name', 'status']}
+                       header={header}
+                       emptyMessage={__('Nessun dato disponibile', 'gepafin')}
+                       onFilter={(e) => setFilters(e.filters)}>
+                <Column field="id" header={__('ID domanda', 'gepafin')}
+                        style={{ minWidth: '2rem' }}/>
+                <Column field="callTitle" header={__('Bando', 'gepafin')} filter filterPlaceholder={__('Cerca il nome', 'gepafin')}
+                        style={{ minWidth: '12rem' }}/>
+                <Column header={__('Data Ricezione', 'gepafin')} filterField="modifiedDate" dataType="date"
+                        style={{ minWidth: '10rem' }}
+                        body={dateAppliedBodyTemplate} filter filterElement={dateFilterTemplate}/>
+                <Column header={__('Scadenza', 'gepafin')} filterField="callEndDate" dataType="date"
+                        style={{ minWidth: '10rem' }}
+                        body={dateEndBodyTemplate} filter filterElement={dateFilterTemplate}/>
+                <Column field="status" header={__('Stato', 'gepafin')}
+                        style={{ width: '120px' }} body={statusBodyTemplate} />
+                <Column header={__('Azioni', 'gepafin')}
+                        body={actionsBodyTemplate}/>
+            </DataTable>
+        </div>
+    )
+}
+
+export default MyEvaluationsTable;
\ No newline at end of file
diff --git a/src/pages/DashboardInstructor/index.js b/src/pages/DashboardInstructor/index.js
new file mode 100644
index 0000000..641b24a
--- /dev/null
+++ b/src/pages/DashboardInstructor/index.js
@@ -0,0 +1,76 @@
+import React, { useEffect, useState } from 'react';
+import { __ } from '@wordpress/i18n';
+import { useNavigate } from 'react-router-dom';
+import { head, pathOr } from 'ramda';
+
+// store
+import { useStore } from '../../store';
+
+// api
+//import DashboardService from '../../service/dashboard-service';
+
+// components
+//import LatestBandiTable from './components/LatestBandiTable';
+//import MyLatestSubmissionsTable from './components/MyLatestSubmissionsTable';
+import { Button } from 'primereact/button';
+import MyEvaluationsTable from './components/MyEvaluationsTable';
+
+const DashboardInstructor = () => {
+    const navigate = useNavigate();
+    //const [mainStats, setMainStats] = useState({});
+
+    const goToAllEvaluations = () => {
+        navigate('/valutazioni');
+    }
+
+    return(
+        <div className="appPage">
+            <div className="appPage__pageHeader">
+                <h1>{__('Dashboard', 'gepafin')}</h1>
+            </div>
+
+            {/*<div className="appPage__spacer"></div>
+
+            <div className="appPageSection statsBigBadges">
+                <h2>{__('Panoramica di Sistema', 'gepafin')}</h2>
+                <div className="statsBigBadges__grid">
+                    <div className="statsBigBadges__gridItem">
+                        <span>{__('Domande attive', 'gepafin')}</span>
+                        <span>{getStatValue('numberOfApplications', 0)}</span>
+                    </div>
+                    <div className="statsBigBadges__gridItem">
+                        <span>{__('Bandi osservati', 'gepafin')}</span>
+                        <span>{getStatValue('numberOfCalls', 0)}</span>
+                    </div>
+                    <div className="statsBigBadges__gridItem">
+                        <span>{__('Documenti da integrare', 'gepafin')}</span>
+                        <span>{getStatValue('numberOfIntegratedDocuments', 0)}</span>
+                    </div>
+                </div>
+            </div>*/}
+
+            <div className="appPage__spacer"></div>
+
+            <div className="appPageSection">
+                <h2>{__('Coda di lavoro', 'gepafin')}</h2>
+                <MyEvaluationsTable/>
+            </div>
+
+            <div className="appPage__spacer"></div>
+
+            <div className="appPageSection__hr">
+                <span>{__('Azioni rapide', 'gepafin')}</span>
+            </div>
+
+            <div className="appPageSection">
+                <div className="appPageSection__actions">
+                    <Button
+                        onClick={goToAllEvaluations}
+                        label={__('Tutti valutazioni', 'gepafin')} icon="pi pi-arrow-right" iconPos="right"/>
+                </div>
+            </div>
+        </div>
+    )
+}
+
+export default DashboardInstructor;
\ No newline at end of file
diff --git a/src/pages/Evaluations/index.js b/src/pages/Evaluations/index.js
new file mode 100644
index 0000000..f5913b7
--- /dev/null
+++ b/src/pages/Evaluations/index.js
@@ -0,0 +1,23 @@
+import React from 'react';
+import { __ } from '@wordpress/i18n';
+
+// components
+import MyEvaluationsTable from '../DashboardInstructor/components/MyEvaluationsTable';
+
+const Bandi = () => {
+    return(
+        <div className="appPage">
+            <div className="appPage__pageHeader">
+                <h1>{__('Domande da valutare', 'gepafin')}</h1>
+            </div>
+
+            <div className="appPage__spacer"></div>
+
+            <div className="appPageSection">
+                <MyEvaluationsTable/>
+            </div>
+        </div>
+    )
+}
+
+export default Bandi;
\ No newline at end of file
diff --git a/src/pages/Profile/index.js b/src/pages/Profile/index.js
index 35fbd56..d7b3474 100644
--- a/src/pages/Profile/index.js
+++ b/src/pages/Profile/index.js
@@ -129,88 +129,7 @@ const Profile = () => {
                 </div>
 
                 <div className="appPageSection">
-                    <h2>{__('Consensi', 'gepafin')}</h2>
-
-                    <div className="appForm__switchFieldWrapper">
-                        <FormField
-                            type="switch"
-                            disabled={true}
-                            fieldName="privacy"
-                            label={''}
-                            control={control}
-                            errors={errors}
-                            onLabel={''}
-                            offLabel={''}
-                        />
-                        <div>
-                            {__('Dichiaro di aver preso visione, prima dell\'accesso al portale https://bandi.gepafin.it, dell\' "Informativa Privacy" all\'interno dell\'Appendice 10 dell\'Avviso secondo il Regolamento UE 2016/679 relativo alla protezione delle persone fisiche con riguardo al trattamento dei dati personale, nonché alla libera circolazione di tali dati e che abroga la Direttiva 95/46 CE.', 'gepafin')}
-                        </div>
-                    </div>
-
-                    <div className="appForm__switchFieldWrapper">
-                        <FormField
-                            type="switch"
-                            disabled={true}
-                            fieldName="terms"
-                            label={''}
-                            control={control}
-                            errors={errors}
-                            onLabel={''}
-                            offLabel={''}
-                        />
-                        <div>
-                            {__('Termini e condizioni', 'gepafin')}
-                        </div>
-                    </div>
-
-                    <div className="appForm__switchFieldWrapper">
-                        <FormField
-                            type="switch"
-                            fieldName="marketing"
-                            label={''}
-                            control={control}
-                            errors={errors}
-                            onLabel={''}
-                            offLabel={''}
-                        />
-                        <div>
-                            {__('Invio di materiale pubblicitario, vendita diretta, compimento di ricerche di mercato o comunicazione commerciale riguardanti promozione e vendita di prodotti e servizi della Gepafin, mediante modalità di contatto automatizzate (posta elettronica, PEC, messaggi tramite canali informatici, network ed applicazioni web) e tradizionali (come posta cartacea e chiamate telefoniche con operatore)', 'gepafin')}
-                        </div>
-                    </div>
-
-                    <div className="appForm__switchFieldWrapper">
-                        <FormField
-                            type="switch"
-                            fieldName="offers"
-                            label={''}
-                            control={control}
-                            errors={errors}
-                            onLabel={''}
-                            offLabel={''}
-                        />
-                        <div>
-                            {__('Elaborazione, in forma elettronica, dei dati relativi ai rapporti e servizi forniti, per l’analisi di comportamenti e preferenze della clientela, da utilizzare a scopo commerciale, per la individuazione ed offerta di prodotti e servizi di suo interesse', 'gepafin')}
-                        </div>
-                    </div>
-
-                    <div className="appForm__switchFieldWrapper">
-                        <FormField
-                            type="switch"
-                            fieldName="thirdParty"
-                            label={''}
-                            control={control}
-                            errors={errors}
-                            onLabel={''}
-                            offLabel={''}
-                        />
-                        <div>
-                            {__('Comunicazione dei miei dati ad altre società in ambito bancario, finanziario od assicurativo e enti pubblici che li tratteranno per invio di materiale pubblicitario, vendita diretta, compimento di ricerche di mercato o comunicazione commerciale riguardanti loro prodotti o servizi, mediante le modalità automatizzate e tradizionali di comunicazione sopra indicate', 'gepafin')}
-                        </div>
-                    </div>
-                </div>
-
-                <div className="appPageSection">
-                    <h2>{__('Utenti Associati', 'gepafin')}</h2>
+                    <h2>{__('Impostazioni', 'gepafin')}</h2>
                     <div className="appForm__cols">
                         <FormField
                             type="select"
diff --git a/src/pages/ProfileBeneficiario/index.js b/src/pages/ProfileBeneficiario/index.js
new file mode 100644
index 0000000..9c2f3cb
--- /dev/null
+++ b/src/pages/ProfileBeneficiario/index.js
@@ -0,0 +1,288 @@
+import React, { useMemo, useRef } from 'react';
+import { __ } from '@wordpress/i18n';
+import { useForm } from 'react-hook-form';
+
+// store
+import { storeSet, useStore } from '../../store';
+
+// components
+import set404FromErrorResponse from '../../helpers/set404FromErrorResponse';
+import FormField from '../../components/FormField';
+import { Button } from 'primereact/button';
+import { Toast } from 'primereact/toast';
+
+// api
+import UserService from '../../service/user-service';
+
+// tools
+import getDateFromISOstring from '../../helpers/getDateFromISOstring';
+
+const ProfileBeneficiario = () => {
+    const isAsyncRequest = useStore().main.isAsyncRequest();
+    const userData = useStore().main.userData();
+    const toast = useRef(null);
+
+    const {
+        control,
+        handleSubmit,
+        formState: { errors }
+    } = useForm({
+        defaultValues: useMemo(() => {
+            return userData;
+        }, [userData]),
+        mode: 'onChange'
+    });
+
+    const onSubmit = (formData) => {
+        storeSet.main.setAsyncRequest();
+
+        UserService.updateUser(userData.id, formData, updateCallback, updateError);
+    };
+
+    const updateCallback = (data) => {
+        if (data.status === 'SUCCESS') {
+            storeSet.main.userData(data.data);
+            if (toast.current) {
+                toast.current.show({
+                    severity: 'success',
+                    summary: '',
+                    detail: __('L\'utente è stato aggiornato!', 'gepafin')
+                });
+            }
+        }
+        storeSet.main.unsetAsyncRequest();
+    }
+
+    const updateError = (data) => {
+        set404FromErrorResponse(data);
+        storeSet.main.unsetAsyncRequest();
+    }
+
+    return (
+        <div className="appPage">
+            <div className="appPage__pageHeader">
+                <h1>{__('Profilo utente', 'gepafin')}</h1>
+            </div>
+
+            <div className="appPage__spacer"></div>
+            <Toast ref={toast}/>
+
+            <form className="appForm" onSubmit={handleSubmit(onSubmit)}>
+
+                <div className="appPageSection">
+                    <h2>{__('Informazioni personali', 'gepafin')}</h2>
+                    <div className="appForm__cols">
+                        <FormField
+                            type="textinput"
+                            disabled={true}
+                            fieldName="firstName"
+                            label={__('Nome', 'gepafin')}
+                            control={control}
+                            errors={errors}
+                            config={{ required: __('È obbligatorio', 'gepafin') }}
+                            placeholder="Francesco"
+                        />
+
+                        <FormField
+                            type="textinput"
+                            disabled={true}
+                            fieldName="lastName"
+                            label={__('Cognome', 'gepafin')}
+                            control={control}
+                            errors={errors}
+                            config={{ required: __('È obbligatorio', 'gepafin') }}
+                            placeholder="Moli"
+                        />
+
+                        <FormField
+                            type="textinput"
+                            disabled={true}
+                            fieldName="codiceFiscale"
+                            label={__('Codice fiscale', 'gepafin')}
+                            control={control}
+                            errors={errors}
+                            config={{ required: __('È obbligatorio', 'gepafin') }}
+                            placeholder="XXXXXXXX"
+                        />
+                    </div>
+                    <div className="appForm__cols">
+                        <FormField
+                            type="textinput"
+                            fieldName="email"
+                            label={__('Email', 'gepafin')}
+                            control={control}
+                            errors={errors}
+                            config={{ required: __('È obbligatorio', 'gepafin') }}
+                            placeholder="user@example.com"
+                        />
+
+                        <FormField
+                            type="textinput"
+                            fieldName="phoneNumber"
+                            label={__('Telefono', 'gepafin')}
+                            control={control}
+                            errors={errors}
+                            config={{ required: __('È obbligatorio', 'gepafin') }}
+                            placeholder="1234567"
+                        />
+                    </div>
+                </div>
+
+                <div className="appPageSection">
+                    <h2>{__('Consensi', 'gepafin')}</h2>
+
+                    <div className="appForm__switchFieldWrapper">
+                        <FormField
+                            type="switch"
+                            disabled={true}
+                            fieldName="privacy"
+                            label={''}
+                            control={control}
+                            errors={errors}
+                            onLabel={''}
+                            offLabel={''}
+                        />
+                        <div>
+                            {__('Dichiaro di aver preso visione, prima dell\'accesso al portale https://bandi.gepafin.it, dell\' "Informativa Privacy" all\'interno dell\'Appendice 10 dell\'Avviso secondo il Regolamento UE 2016/679 relativo alla protezione delle persone fisiche con riguardo al trattamento dei dati personale, nonché alla libera circolazione di tali dati e che abroga la Direttiva 95/46 CE.', 'gepafin')}
+                        </div>
+                    </div>
+
+                    <div className="appForm__switchFieldWrapper">
+                        <FormField
+                            type="switch"
+                            disabled={true}
+                            fieldName="terms"
+                            label={''}
+                            control={control}
+                            errors={errors}
+                            onLabel={''}
+                            offLabel={''}
+                        />
+                        <div>
+                            {__('Termini e condizioni', 'gepafin')}
+                        </div>
+                    </div>
+
+                    <div className="appForm__switchFieldWrapper">
+                        <FormField
+                            type="switch"
+                            fieldName="marketing"
+                            label={''}
+                            control={control}
+                            errors={errors}
+                            onLabel={''}
+                            offLabel={''}
+                        />
+                        <div>
+                            {__('Invio di materiale pubblicitario, vendita diretta, compimento di ricerche di mercato o comunicazione commerciale riguardanti promozione e vendita di prodotti e servizi della Gepafin, mediante modalità di contatto automatizzate (posta elettronica, PEC, messaggi tramite canali informatici, network ed applicazioni web) e tradizionali (come posta cartacea e chiamate telefoniche con operatore)', 'gepafin')}
+                        </div>
+                    </div>
+
+                    <div className="appForm__switchFieldWrapper">
+                        <FormField
+                            type="switch"
+                            fieldName="offers"
+                            label={''}
+                            control={control}
+                            errors={errors}
+                            onLabel={''}
+                            offLabel={''}
+                        />
+                        <div>
+                            {__('Elaborazione, in forma elettronica, dei dati relativi ai rapporti e servizi forniti, per l’analisi di comportamenti e preferenze della clientela, da utilizzare a scopo commerciale, per la individuazione ed offerta di prodotti e servizi di suo interesse', 'gepafin')}
+                        </div>
+                    </div>
+
+                    <div className="appForm__switchFieldWrapper">
+                        <FormField
+                            type="switch"
+                            fieldName="thirdParty"
+                            label={''}
+                            control={control}
+                            errors={errors}
+                            onLabel={''}
+                            offLabel={''}
+                        />
+                        <div>
+                            {__('Comunicazione dei miei dati ad altre società in ambito bancario, finanziario od assicurativo e enti pubblici che li tratteranno per invio di materiale pubblicitario, vendita diretta, compimento di ricerche di mercato o comunicazione commerciale riguardanti loro prodotti o servizi, mediante le modalità automatizzate e tradizionali di comunicazione sopra indicate', 'gepafin')}
+                        </div>
+                    </div>
+                </div>
+
+                <div className="appPageSection">
+                    <h2>{__('Impostazioni', 'gepafin')}</h2>
+                    <div className="appForm__cols">
+                        <FormField
+                            type="select"
+                            disabled={true}
+                            fieldName="language"
+                            defaultValue={'it'}
+                            label={__('Lingua predefinita', 'gepafin')}
+                            control={control}
+                            errors={errors}
+                            config={{ required: __('È obbligatorio', 'gepafin') }}
+                            options={[
+                                { label: __('Italiano', 'gepafin'), name: 'it' }
+                            ]}
+                        />
+
+                        <FormField
+                            type="select"
+                            disabled={true}
+                            fieldName="timezone"
+                                defaultValue={'Europe/Rome'}
+                                label={__('Fuso Orario', 'gepafin')}
+                                control={control}
+                                errors={errors}
+                                config={{ required: __('È obbligatorio', 'gepafin') }}
+                                options={[
+                                    { label: __('Europe/Rome', 'gepafin'), name: 'Europe/Rome' }
+                                ]}
+                            />
+
+                            <FormField
+                                type="select"
+                                disabled={true}
+                                fieldName="dateformat"
+                                defaultValue={'DD/MM/YY'}
+                                label={__('Formato Data', 'gepafin')}
+                                control={control}
+                                errors={errors}
+                                config={{ required: __('È obbligatorio', 'gepafin') }}
+                                options={[
+                                    { label: __('DD/MM/YY', 'gepafin'), name: 'DD/MM/YY' }
+                                ]}
+                            />
+                        </div>
+                    </div>
+
+                    <div className="appPageSection">
+                        <h2>{__('Sicurezza', 'gepafin')}</h2>
+                        <div className="appForm__row">
+                            <label>{__('Ultimo accesso', 'gepafin')}</label>
+                            <span>{getDateFromISOstring(userData.lastLogin)}</span>
+                        </div>
+                    </div>
+
+                    <div className="appPage__spacer"></div>
+
+                    <div className="appPageSection__hr">
+                        <span>{__('Azioni rapide', 'gepafin')}</span>
+                    </div>
+
+                    <div className="appPageSection">
+                        <div className="appPageSection__actions">
+                            <Button
+                                disabled={isAsyncRequest}
+                                label={__('Salva modifiche', 'gepafin')}
+                                icon="pi pi-check" iconPos="right"/>
+                        </div>
+                    </div>
+            </form>
+
+        </div>
+)
+
+}
+
+export default ProfileBeneficiario;
\ No newline at end of file
diff --git a/src/pages/Users/components/AllUsersTable/index.js b/src/pages/Users/components/AllUsersTable/index.js
index b0972df..643ab95 100644
--- a/src/pages/Users/components/AllUsersTable/index.js
+++ b/src/pages/Users/components/AllUsersTable/index.js
@@ -152,7 +152,7 @@ const AllUsersTable = () => {
                        header={header}
                        emptyMessage={__('Nessun dato disponibile', 'gepafin')}
                        onFilter={(e) => setFilters(e.filters)}>
-                <Column field="name" header={__('Nome utente', 'gepafin')} filter filterPlaceholder="Search by name"
+                <Column field="name" header={__('Nome utente', 'gepafin')} filter filterPlaceholder={__('Cerca il nome', 'gepafin')}
                         style={{ minWidth: '12rem' }}/>
                 <Column field="email" header={__('Email', 'gepafin')} filter filterPlaceholder="Search by email"
                         style={{ minWidth: '12rem' }}/>
diff --git a/src/routes.js b/src/routes.js
index 7bb4124..8e36701 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -25,6 +25,9 @@ import ProfileCompany from './pages/ProfileCompany';
 import Users from './pages/Users';
 import AddCompany from './pages/AddCompany';
 import ResetPassword from './pages/ResetPassword';
+import DashboardInstructor from './pages/DashboardInstructor';
+import ProfileBeneficiario from './pages/ProfileBeneficiario';
+import Evaluations from './pages/Evaluations';
 
 const routes = ({ role, chosenCompanyId }) => {
 
@@ -34,62 +37,82 @@ const routes = ({ role, chosenCompanyId }) => {
                 <Route path="/" element={<DefaultLayout>
                     {'ROLE_SUPER_ADMIN' === role ? <Dashboard/> : null}
                     {'ROLE_BENEFICIARY' === role ? <DashboardBeneficiario/> : null}
+                    {'ROLE_PRE_INSTRUCTOR' === role ? <DashboardInstructor/> : null}
                 </DefaultLayout>}/>
                 <Route path="/bandi" element={<DefaultLayout>
                     {'ROLE_SUPER_ADMIN' === role ? <Bandi/> : null}
                     {'ROLE_BENEFICIARY' === role ? <BandiBeneficiario/> : null}
+                    {'ROLE_PRE_INSTRUCTOR' === role ? <PageNotFound/> : null}
                 </DefaultLayout>}/>
                 <Route path="/bandi/:id" element={<DefaultLayout>
                     {'ROLE_SUPER_ADMIN' === role ? <BandoEdit/> : null}
                     {'ROLE_BENEFICIARY' === role ? <BandoViewBeneficiario/> : null}
+                    {'ROLE_PRE_INSTRUCTOR' === role ? <PageNotFound/> : null}
                 </DefaultLayout>}/>
                 <Route path="/bandi/:id/preview" element={<DefaultLayout>
                     {'ROLE_SUPER_ADMIN' === role ? <BandoView/> : null}
                     {'ROLE_BENEFICIARY' === role ? <PageNotFound/> : null}
+                    {'ROLE_PRE_INSTRUCTOR' === role ? <PageNotFound/> : null}
                 </DefaultLayout>}/>
                 <Route path="/bandi/:id/preview-evaluation" element={<DefaultLayout>
                     {'ROLE_SUPER_ADMIN' === role ? <BandoView/> : null}
                     {'ROLE_BENEFICIARY' === role ? <PageNotFound/> : null}
+                    {'ROLE_PRE_INSTRUCTOR' === role ? <PageNotFound/> : null}
                 </DefaultLayout>}/>
                 <Route path="/bandi/:id/forms" element={<DefaultLayout>
                     {'ROLE_SUPER_ADMIN' === role ? <BandoForms/> : null}
                     {'ROLE_BENEFICIARY' === role ? <PageNotFound/> : null}
+                    {'ROLE_PRE_INSTRUCTOR' === role ? <PageNotFound/> : null}
                 </DefaultLayout>}/>
                 <Route path="/bandi/:id/forms/:formId" element={<DefaultLayout>
                     {'ROLE_SUPER_ADMIN' === role ? <BandoFormsEdit/> : null}
                     {'ROLE_BENEFICIARY' === role ? <PageNotFound/> : null}
+                    {'ROLE_PRE_INSTRUCTOR' === role ? <PageNotFound/> : null}
                 </DefaultLayout>}/>
                 <Route path="/bandi/:id/forms/:formId/preview" element={<DefaultLayout>
                     {'ROLE_SUPER_ADMIN' === role ? <BandoFormsPreview/> : null}
                     {'ROLE_BENEFICIARY' === role ? <PageNotFound/> : null}
+                    {'ROLE_PRE_INSTRUCTOR' === role ? <PageNotFound/> : null}
                 </DefaultLayout>}/>
                 <Route path="/bandi/:id/flow" element={<DefaultLayout>
                     {'ROLE_SUPER_ADMIN' === role ? <BandoFlowEdit/> : null}
                     {'ROLE_BENEFICIARY' === role ? <PageNotFound/> : null}
+                    {'ROLE_PRE_INSTRUCTOR' === role ? <PageNotFound/> : null}
                 </DefaultLayout>}/>
                 <Route path="/imieibandi" element={<DefaultLayout>
                     {'ROLE_SUPER_ADMIN' === role ? <PageNotFound/> : null}
                     {'ROLE_BENEFICIARY' === role ? <Applications/> : null}
+                    {'ROLE_PRE_INSTRUCTOR' === role ? <PageNotFound/> : null}
                 </DefaultLayout>}/>
                 <Route path="/imieibandi/:id/" element={<DefaultLayout>
                     {'ROLE_SUPER_ADMIN' === role ? <PageNotFound/> : null}
                     {'ROLE_BENEFICIARY' === role ? <BandoApplication/> : null}
+                    {'ROLE_PRE_INSTRUCTOR' === role ? <PageNotFound/> : null}
+                </DefaultLayout>}/>
+                <Route path="/valutazioni" element={<DefaultLayout>
+                    {'ROLE_SUPER_ADMIN' === role ? <PageNotFound/> : null}
+                    {'ROLE_BENEFICIARY' === role ? <PageNotFound/> : null}
+                    {'ROLE_PRE_INSTRUCTOR' === role ? <Evaluations/> : null}
                 </DefaultLayout>}/>
                 <Route path="/profilo" element={<DefaultLayout>
                     {'ROLE_SUPER_ADMIN' === role ? <Profile/> : null}
-                    {'ROLE_BENEFICIARY' === role ? <Profile/> : null}
+                    {'ROLE_BENEFICIARY' === role ? <ProfileBeneficiario/> : null}
+                    {'ROLE_PRE_INSTRUCTOR' === role ? <Profile/> : null}
                 </DefaultLayout>}/>
                 <Route path="/profilo-aziendale" element={<DefaultLayout>
                     {'ROLE_SUPER_ADMIN' === role ? <PageNotFound/> : null}
                     {'ROLE_BENEFICIARY' === role && chosenCompanyId > 0 ? <ProfileCompany/> : <PageNotFound/>}
+                    {'ROLE_PRE_INSTRUCTOR' === role ? <PageNotFound/> : null}
                 </DefaultLayout>}/>
                 <Route path="/agguingi-azienda" element={<DefaultLayout>
                     {'ROLE_SUPER_ADMIN' === role ? <PageNotFound/> : null}
                     {'ROLE_BENEFICIARY' === role ? <AddCompany/> : null}
+                    {'ROLE_PRE_INSTRUCTOR' === role ? <PageNotFound/> : null}
                 </DefaultLayout>}/>
                 <Route path="/utenti" element={<DefaultLayout>
                     {'ROLE_SUPER_ADMIN' === role ? <Users/> : null}
                     {'ROLE_BENEFICIARY' === role ? <PageNotFound/> : null}
+                    {'ROLE_PRE_INSTRUCTOR' === role ? <PageNotFound/> : null}
                 </DefaultLayout>}/>
             </Route>
             <Route exact path="/reset-password" element={<ResetPassword/>}/>

From eddfaaf0d7146cad0fbb5fe4518a79bfe4b2ee83 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Wed, 16 Oct 2024 13:50:47 +0200
Subject: [PATCH 4/5] - progress with cerating users form;

---
 src/helpers/getBandoLabel.js                  |  3 ++
 src/helpers/getBandoSeverity.js               |  3 ++
 .../components/AppSidebar/index.js            |  3 +-
 src/pages/Registration/index.js               |  4 +-
 .../Users/components/AllUsersTable/index.js   | 49 +++++++++++++------
 src/pages/Users/index.js                      |  9 +++-
 6 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/src/helpers/getBandoLabel.js b/src/helpers/getBandoLabel.js
index 585def9..0986759 100644
--- a/src/helpers/getBandoLabel.js
+++ b/src/helpers/getBandoLabel.js
@@ -2,6 +2,9 @@ import { __ } from '@wordpress/i18n';
 
 const getBandoLabel = (status) => {
     switch (status) {
+        case 'ACTIVE':
+            return __('Attivo', 'gepafin');
+
         case 'SUBMIT':
             return __('Inviato', 'gepafin');
 
diff --git a/src/helpers/getBandoSeverity.js b/src/helpers/getBandoSeverity.js
index f0b2dad..72c8421 100644
--- a/src/helpers/getBandoSeverity.js
+++ b/src/helpers/getBandoSeverity.js
@@ -2,6 +2,9 @@ import { __ } from '@wordpress/i18n';
 
 const getBandoSeverity = (status) => {
     switch (status) {
+        case 'ACTIVE':
+            return 'success';
+
         case 'SUBMIT':
             return 'success';
 
diff --git a/src/layouts/DefaultLayout/components/AppSidebar/index.js b/src/layouts/DefaultLayout/components/AppSidebar/index.js
index c7672cf..005dc21 100644
--- a/src/layouts/DefaultLayout/components/AppSidebar/index.js
+++ b/src/layouts/DefaultLayout/components/AppSidebar/index.js
@@ -52,8 +52,7 @@ const AppSidebar = () => {
             icon: 'pi pi-users',
             href: '/utenti',
             id: 5,
-            enable: false
-            //enable: intersection(permissions, ['VIEW_USERS', 'MANAGE_USERS']).length
+            enable: intersection(permissions, ['VIEW_USERS', 'MANAGE_USERS']).length
         },
         {
             label: __('Configurazione', 'gepafin'),
diff --git a/src/pages/Registration/index.js b/src/pages/Registration/index.js
index 8cd123e..eefc3d8 100644
--- a/src/pages/Registration/index.js
+++ b/src/pages/Registration/index.js
@@ -85,7 +85,7 @@ const Registration = () => {
             setValue('codiceFiscale', codiceFiscale);
             setValue('firstName', firstName);
             setValue('lastName', lastName);
-            setValue('birthDate', dateOfBirthObj);
+            setValue('dateOfBirth', dateOfBirthObj);
         } else {
             errorMsgs.current.show([
                 {
@@ -199,7 +199,7 @@ const Registration = () => {
                         <FormField
                             type="datepicker"
                             disabled={true}
-                            fieldName="birthDate"
+                            fieldName="dateOfBirth"
                             label={__('Data di nascita', 'gepafin')}
                             control={control}
                             errors={errors}
diff --git a/src/pages/Users/components/AllUsersTable/index.js b/src/pages/Users/components/AllUsersTable/index.js
index 643ab95..df7e56d 100644
--- a/src/pages/Users/components/AllUsersTable/index.js
+++ b/src/pages/Users/components/AllUsersTable/index.js
@@ -40,19 +40,25 @@ const AllUsersTable = () => {
         const sample = [
             {
                 id: 11,
-                name: 'Mario Rossi',
+                firstName: 'Mario',
+                lastName: 'Rossi',
                 email: 'mario.rossi@example.com',
-                role: 'Beneficiario',
-                status: 'active',
-                last_access: '2024-08-01 10:30'
+                role: {
+                    roleName: 'Beneficiario'
+                },
+                status: 'ACTIVE',
+                lastLogin: '2024-08-01 10:30'
             },
             {
                 id: 12,
-                name: 'Mario Rossi2',
-                email: 'mario.rossi@example.com',
-                role: 'Beneficiario',
-                status: 'active',
-                last_access: '2024-08-01 10:30'
+                firstName: 'John',
+                lastName: 'Doe',
+                email: 'john.doe@example.com',
+                role: {
+                    roleName: 'Beneficiario'
+                },
+                status: 'ACTIVE',
+                lastLogin: '2024-08-01 10:30'
             }
         ];
         setItems(sample);
@@ -75,7 +81,7 @@ const AllUsersTable = () => {
 
     const getFormattedData = (data) => {
         return data.map((d) => {
-            d.last_access = is(String, d.last_access) ? new Date(d.last_access) : (d.last_access ? d.last_access : '');
+            d.lastLogin	 = is(String, d.lastLogin) ? new Date(d.lastLogin) : (d.lastLogin ? d.lastLogin : '');
             return d;
         });
     };
@@ -98,7 +104,7 @@ const AllUsersTable = () => {
         setFilters({
             global: { value: null, matchMode: FilterMatchMode.CONTAINS },
             name: { operator: FilterOperator.AND, constraints: [{ value: null, matchMode: FilterMatchMode.STARTS_WITH }] },
-            last_access: { operator: FilterOperator.AND, constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }] },
+            lastLogin: { operator: FilterOperator.AND, constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }] },
             status: { operator: FilterOperator.OR, constraints: [{ value: null, matchMode: FilterMatchMode.EQUALS }] },
         });
         setGlobalFilterValue('');
@@ -117,13 +123,21 @@ const AllUsersTable = () => {
     };
 
     const dateLastAccessBodyTemplate = (rowData) => {
-        return getDateFromISOstring(rowData.last_access);
+        return getDateFromISOstring(rowData.lastLogin);
     };
 
     const dateFilterTemplate = (options) => {
         return <Calendar value={options.value} onChange={(e) => options.filterCallback(e.value, options.index)} dateFormat="mm/dd/yy" placeholder="mm/dd/yyyy" mask="99/99/9999" />;
     };
 
+    const nameBodyTemplate = (rowData) => {
+        return `${rowData.firstName} ${rowData.lastName}`
+    }
+
+    const roleBodyTemplate = (rowData) => {
+        return rowData.role.roleName;
+    }
+
     const statusBodyTemplate = (rowData) => {
         return <ProperBandoLabel status={rowData.status}/>;
     };
@@ -152,16 +166,21 @@ const AllUsersTable = () => {
                        header={header}
                        emptyMessage={__('Nessun dato disponibile', 'gepafin')}
                        onFilter={(e) => setFilters(e.filters)}>
-                <Column field="name" header={__('Nome utente', 'gepafin')} filter filterPlaceholder={__('Cerca il nome', 'gepafin')}
+                <Column field="name" header={__('Nome utente', 'gepafin')}
+                        body={nameBodyTemplate}
+                        filter filterPlaceholder={__('Cerca il nome', 'gepafin')}
                         style={{ minWidth: '12rem' }}/>
-                <Column field="email" header={__('Email', 'gepafin')} filter filterPlaceholder="Search by email"
+                <Column field="email" header={__('Email', 'gepafin')}
+                        filter filterPlaceholder="Search by email"
                         style={{ minWidth: '12rem' }}/>
                 <Column field="role" header={__('Ruolo', 'gepafin')}
+                        body={roleBodyTemplate}
                         style={{ minWidth: '12rem' }}/>
                 <Column field="status" header={__('Stato', 'gepafin')} filterMenuStyle={{ width: '14rem' }}
                         style={{ width: '120px' }} body={statusBodyTemplate} filter
                         filterElement={statusFilterTemplate}/>
-                <Column header={__('Ultimo accesso', 'gepafin')} filterField="last_access" dataType="date"
+                <Column header={__('Ultimo accesso', 'gepafin')} filterField="lastLogin"
+                        dataType="date"
                         style={{ minWidth: '10rem' }}
                         body={dateLastAccessBodyTemplate} filter filterElement={dateFilterTemplate}/>
                 <Column header={__('Azioni', 'gepafin')}
diff --git a/src/pages/Users/index.js b/src/pages/Users/index.js
index 4bd7509..75b7fdd 100644
--- a/src/pages/Users/index.js
+++ b/src/pages/Users/index.js
@@ -13,6 +13,7 @@ import set404FromErrorResponse from '../../helpers/set404FromErrorResponse';
 import { storeSet } from '../../store';
 import { klona } from 'klona';
 import { classNames } from 'primereact/utils';
+import { isEmail } from '../../helpers/validators';
 
 const Users = () => {
     const [isVisibleEditDialog, setIsVisibleEditDialog] = useState(false);
@@ -45,7 +46,10 @@ const Users = () => {
     }
 
     const saveEditDialog = () => {
-
+        const emptyValues = Object.values(newUserData).filter(v => isEmpty(v));
+        if (isEmpty(emptyValues)) {
+            console.log(newUserData)
+        }
     }
 
     const onChangeEditItem = (value, key) => {
@@ -129,12 +133,13 @@ const Users = () => {
                         <div className="appForm__field">
                             <label className={classNames({ 'p-error': isEmpty(newUserData.email) || isNil(newUserData.email) })}>{__('Email', 'gepafin')}*</label>
                             <InputText value={newUserData.email}
-                                       invalid={isEmpty(newUserData.email) || isNil(newUserData.email)}
+                                       invalid={isEmpty(newUserData.email) || isNil(newUserData.email) || !isEmail(newUserData.email)}
                                        onChange={(e) => onChangeEditItem(e.target.value, 'email')}/>
                         </div>
                         <div className="appForm__field">
                             <label className={classNames({ 'p-error': isEmpty(newUserData.phoneNumber) || isNil(newUserData.phoneNumber) })}>{__('Telefono', 'gepafin')}</label>
                             <InputText value={newUserData.phoneNumber}
+                                       keyfilter="int"
                                        invalid={isEmpty(newUserData.phoneNumber) || isNil(newUserData.phoneNumber)}
                                        onChange={(e) => onChangeEditItem(e.target.value, 'phoneNumber')}/>
                         </div>

From f0b7f83ec14b4bc7f2bd7cfcced4a82444e01aed Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Fri, 18 Oct 2024 16:56:05 +0200
Subject: [PATCH 5/5] - updated;

---
 .../BandoFormsEdit/components/BuilderElementSettings/index.js | 2 +-
 src/pages/BandoFormsEdit/index.js                             | 2 +-
 src/pages/LoginAdmin/index.js                                 | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/BandoFormsEdit/components/BuilderElementSettings/index.js b/src/pages/BandoFormsEdit/components/BuilderElementSettings/index.js
index 6d0edf0..204cd60 100644
--- a/src/pages/BandoFormsEdit/components/BuilderElementSettings/index.js
+++ b/src/pages/BandoFormsEdit/components/BuilderElementSettings/index.js
@@ -114,7 +114,7 @@ const BuilderElementSettings = ({ closeSettingsFn }) => {
             default :
                 return [
                     { label: 'company name', value: 'company.companyName' },
-                    { label: 'company vatNumber', value: 'company.vatNumber' },
+                    { label: 'company piva', value: 'company.vatNumber' },
                     { label: 'company codiceFiscale', value: 'company.codiceFiscale' },
                     { label: 'company address', value: 'company.address' },
                     { label: 'company phoneNumber', value: 'company.phoneNumber' },
diff --git a/src/pages/BandoFormsEdit/index.js b/src/pages/BandoFormsEdit/index.js
index 2519744..107483d 100644
--- a/src/pages/BandoFormsEdit/index.js
+++ b/src/pages/BandoFormsEdit/index.js
@@ -247,7 +247,7 @@ const BandoFormsEdit = () => {
     const getBandoCallback = (data) => {
         if (data.status === 'SUCCESS') {
             const criteria = pathOr([], ['data', 'criteria'], data);
-            const criteriaOptions = criteria.map(o => ({value: o.lookUpDataId, label: o.value}));
+            const criteriaOptions = criteria.map(o => ({value: o.id, label: o.value}));
             storeSet.main.bandoCriteria(criteriaOptions);
         }
     }
diff --git a/src/pages/LoginAdmin/index.js b/src/pages/LoginAdmin/index.js
index 8f76524..f14f3d4 100644
--- a/src/pages/LoginAdmin/index.js
+++ b/src/pages/LoginAdmin/index.js
@@ -111,9 +111,9 @@ const LoginAdmin = () => {
                         label={__('Accedi', 'gepafin')}
                         disabled={loading}/>
 
-                    <Button
+                    {/*<Button
                         label={__('Password dimenticata?', 'gepafin')}
-                        link onClick={gotToResetPassword}/>
+                        link onClick={gotToResetPassword}/>*/}
                 </form>
             </div>
         </div>