From 5fcb0d765c8de426c6524fa18af907378280a8e6 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Mon, 24 Mar 2025 15:51:56 +0100
Subject: [PATCH 1/5] saving progress;

---
 .../Bandi/components/AllBandiTable/index.js   |  26 ++-
 .../components/AllBandiTable/index.js         |   2 +-
 .../components/LatestBandiTable/index.js      |   2 +-
 .../components/LatestBandiTableAsync/index.js |   2 +-
 .../LatestUsersActivityTable/index.js         |   2 +-
 .../components/LatestBandiTable/index.js      |   2 +-
 .../MyLatestSubmissionsTable/index.js         |   2 +-
 .../InstructorManagerMieDomandeTable/index.js |   2 +-
 .../index.js                                  |   2 +-
 .../index.js                                  |   2 +-
 .../index.js                                  |   2 +-
 .../DomandeTablePreInstructorAsync/index.js   |   2 +-
 .../PreInstructorDomandeTable/index.js        |   2 +-
 .../components/DocumentsTable/index.js        |   2 +-
 .../components/AllDomandeTable/index.js       |   2 +-
 .../components/AllDomandeTableAsync/index.js  |   2 +-
 .../AllDomandeArchiveTable/index.js           |   2 +-
 .../BeneficiarioDomandeTable/index.js         |   2 +-
 .../index.js                                  |   7 +-
 .../InstructorManagerSoccorsiTable/index.js   |   2 +-
 .../index.js                                  | 220 ++++++++++++++++++
 .../index.js                                  |   7 +-
 .../PreInstructorSoccorsiTable/index.js       |   2 +-
 .../SoccorsiPreInstructorTableAsync/index.js  | 220 ++++++++++++++++++
 .../SoccorsoIstruttorioPreInstructor/index.js |   6 +-
 .../Users/components/AllUsersTable/index.js   |   2 +-
 src/service/amendments-service.js             |   4 +
 27 files changed, 492 insertions(+), 38 deletions(-)
 create mode 100644 src/pages/SoccorsoIstruttorioMioInstructorManager/components/SoccorsiInstructorManagerMioTableAsync/index.js
 create mode 100644 src/pages/SoccorsoIstruttorioPreInstructor/components/SoccorsiPreInstructorTableAsync/index.js

diff --git a/src/pages/Bandi/components/AllBandiTable/index.js b/src/pages/Bandi/components/AllBandiTable/index.js
index 14e457b..9e268e3 100644
--- a/src/pages/Bandi/components/AllBandiTable/index.js
+++ b/src/pages/Bandi/components/AllBandiTable/index.js
@@ -49,7 +49,8 @@ const AllBandiTable = () => {
 
     const getFormattedBandiData = (data) => {
         return data.map((d) => {
-            d.dates = d.dates.map(v => is(String, v) ? new Date(v) : (v ? v : ''));
+            d.dateStart = is(String, d.dates[0]) ? new Date(d.dates[0]) : (d.dates[0] ? d.dates[0] : '');
+            d.dateEnd = is(String, d.dates[1]) ? new Date(d.dates[1]) : (d.dates[1] ? d.dates[1] : '');
             return d;
         });
     };
@@ -62,8 +63,8 @@ const AllBandiTable = () => {
         setFilters({
             global: { value: null, matchMode: FilterMatchMode.CONTAINS },
             name: { operator: FilterOperator.AND, constraints: [{ value: null, matchMode: FilterMatchMode.STARTS_WITH }] },
-            start_date: { operator: FilterOperator.AND, constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }] },
-            end_date: { operator: FilterOperator.AND, constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }] },
+            dateStart: { operator: FilterOperator.AND, constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }] },
+            dateEnd: { operator: FilterOperator.AND, constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }] },
             status: { operator: FilterOperator.OR, constraints: [{ value: null, matchMode: FilterMatchMode.EQUALS }] },
         });
     };
@@ -81,15 +82,15 @@ const AllBandiTable = () => {
     }*/
 
     const dateStartBodyTemplate = (rowData) => {
-        return getDateFromISOstring(rowData.dates[0]);
+        return getDateFromISOstring(rowData.dateStart);
     };
 
     const dateEndBodyTemplate = (rowData) => {
-        return getDateFromISOstring(rowData.dates[1]);
+        return getDateFromISOstring(rowData.dateEnd);
     };
 
     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" />;
+        return <Calendar value={options.value} onChange={(e) => options.filterCallback(e.value, options.index)} dateFormat="dd/mm/yy" placeholder="dd/mm/yyyy" mask="99/99/9999" />;
     };
 
     const statusBodyTemplate = (rowData) => {
@@ -130,14 +131,17 @@ const AllBandiTable = () => {
                         filter sortable
                         filterPlaceholder={__('Cerca', 'gepafin')}
                         style={{ minWidth: '8rem' }}/>
-                <Column header={__('Data Pubblicazione', 'gepafin')} filterField="start_date" dataType="date"
+                <Column header={__('Data Pubblicazione', 'gepafin')} filterField="dateStart" dataType="date"
                         style={{ minWidth: '8rem' }}
-                        body={dateStartBodyTemplate} filter filterElement={dateFilterTemplate}/>
-                <Column header={__('Data Scadenza', 'gepafin')} filterField="end_date" dataType="date"
+                        body={dateStartBodyTemplate} filter
+                        filterElement={dateFilterTemplate}/>
+                <Column header={__('Data Scadenza', 'gepafin')} filterField="dateEnd" dataType="date"
                         style={{ minWidth: '8rem' }}
-                        body={dateEndBodyTemplate} filter filterElement={dateFilterTemplate}/>
+                        body={dateEndBodyTemplate} filter
+                        filterElement={dateFilterTemplate}/>
                 <Column field="status" header={__('Stato', 'gepafin')} filterMenuStyle={{ width: '14rem' }}
-                        style={{ minWidth: '7rem' }} body={statusBodyTemplate} filter
+                        style={{ minWidth: '7rem' }} body={statusBodyTemplate}
+                        filter sortable
                         filterElement={statusFilterTemplate}/>
                 <Column header={__('Azioni', 'gepafin')}
                         body={actionsBodyTemplate}/>
diff --git a/src/pages/BandiPreInstructor/components/AllBandiTable/index.js b/src/pages/BandiPreInstructor/components/AllBandiTable/index.js
index a5dbe61..06b57d7 100644
--- a/src/pages/BandiPreInstructor/components/AllBandiTable/index.js
+++ b/src/pages/BandiPreInstructor/components/AllBandiTable/index.js
@@ -89,7 +89,7 @@ const AllBandiTable = () => {
     };
 
     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" />;
+        return <Calendar value={options.value} onChange={(e) => options.filterCallback(e.value, options.index)} dateFormat="dd/mm/yy" placeholder="dd/mm/yyyy" mask="99/99/9999" />;
     };
 
     const statusBodyTemplate = (rowData) => {
diff --git a/src/pages/Dashboard/components/LatestBandiTable/index.js b/src/pages/Dashboard/components/LatestBandiTable/index.js
index b37a87d..92a2635 100644
--- a/src/pages/Dashboard/components/LatestBandiTable/index.js
+++ b/src/pages/Dashboard/components/LatestBandiTable/index.js
@@ -119,7 +119,7 @@ const LatestBandiTable = () => {
     };
 
     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" />;
+        return <Calendar value={options.value} onChange={(e) => options.filterCallback(e.value, options.index)} dateFormat="dd/mm/yy" placeholder="dd/mm/yyyy" mask="99/99/9999" />;
     };
 
     const statusBodyTemplate = (rowData) => {
diff --git a/src/pages/Dashboard/components/LatestBandiTableAsync/index.js b/src/pages/Dashboard/components/LatestBandiTableAsync/index.js
index 6959e8d..e994b2d 100644
--- a/src/pages/Dashboard/components/LatestBandiTableAsync/index.js
+++ b/src/pages/Dashboard/components/LatestBandiTableAsync/index.js
@@ -144,7 +144,7 @@ const LatestBandiTableAsync = () => {
 
     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"/>;
+                         dateFormat="dd/mm/yy" placeholder="dd/mm/yyyy" mask="99/99/9999"/>;
     };
 
     const dateStartBodyTemplate = (rowData) => {
diff --git a/src/pages/Dashboard/components/LatestUsersActivityTable/index.js b/src/pages/Dashboard/components/LatestUsersActivityTable/index.js
index 5717740..7c48723 100644
--- a/src/pages/Dashboard/components/LatestUsersActivityTable/index.js
+++ b/src/pages/Dashboard/components/LatestUsersActivityTable/index.js
@@ -96,7 +96,7 @@ const LatestUsersActivityTable = () => {
     };
 
     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" />;
+        return <Calendar value={options.value} onChange={(e) => options.filterCallback(e.value, options.index)} dateFormat="dd/mm/yy" placeholder="dd/mm/yyyy" mask="99/99/9999" />;
     };
 
     const header = renderHeader();
diff --git a/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js b/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js
index a64a27e..c802754 100644
--- a/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js
+++ b/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js
@@ -164,7 +164,7 @@ const LatestBandiTable = () => {
 
     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"/>;
+                         dateFormat="dd/mm/yy" placeholder="dd/mm/yyyy" mask="99/99/9999"/>;
     };
 
     const statusBodyTemplate = (rowData) => {
diff --git a/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js b/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js
index e3e043a..077e297 100644
--- a/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js
+++ b/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js
@@ -142,7 +142,7 @@ const MyLatestSubmissionsTable = () => {
 
     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"/>;
+                         dateFormat="dd/mm/yy" placeholder="dd/mm/yyyy" mask="99/99/9999"/>;
     };
 
     const statusBodyTemplate = (rowData) => {
diff --git a/src/pages/DashboardInstructorManager/components/InstructorManagerMieDomandeTable/index.js b/src/pages/DashboardInstructorManager/components/InstructorManagerMieDomandeTable/index.js
index d15bd47..c11bfda 100644
--- a/src/pages/DashboardInstructorManager/components/InstructorManagerMieDomandeTable/index.js
+++ b/src/pages/DashboardInstructorManager/components/InstructorManagerMieDomandeTable/index.js
@@ -124,7 +124,7 @@ const InstructorManagerMieDomandeTable = ({ userId = null, statuses = [] }) => {
     };
 
     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" />;
+        return <Calendar value={options.value} onChange={(e) => options.filterCallback(e.value, options.index)} dateFormat="dd/mm/yy" placeholder="dd/mm/yyyy" mask="99/99/9999" />;
     };
 
     const statusBodyTemplate = (rowData) => {
diff --git a/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManager/index.js b/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManager/index.js
index a4b2da1..9c86aea 100644
--- a/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManager/index.js
+++ b/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManager/index.js
@@ -94,7 +94,7 @@ const LatestBandiTable = () => {
     };
 
     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" />;
+        return <Calendar value={options.value} onChange={(e) => options.filterCallback(e.value, options.index)} dateFormat="dd/mm/yy" placeholder="dd/mm/yyyy" mask="99/99/9999" />;
     };
 
     const statusBodyTemplate = (rowData) => {
diff --git a/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js b/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js
index 46acaf1..fec0f6f 100644
--- a/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js
+++ b/src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js
@@ -136,7 +136,7 @@ const LatestBandiTableInstructorManagerAsync = () => {
 
     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"/>;
+                         dateFormat="dd/mm/yy" placeholder="dd/mm/yyyy" mask="99/99/9999"/>;
     };
 
     const dateStartBodyTemplate = (rowData) => {
diff --git a/src/pages/DashboardInstructorManager/components/MieDomandeTableInstructorManagerAsync/index.js b/src/pages/DashboardInstructorManager/components/MieDomandeTableInstructorManagerAsync/index.js
index 2a9cb73..ff1c0ce 100644
--- a/src/pages/DashboardInstructorManager/components/MieDomandeTableInstructorManagerAsync/index.js
+++ b/src/pages/DashboardInstructorManager/components/MieDomandeTableInstructorManagerAsync/index.js
@@ -146,7 +146,7 @@ const MieDomandeTableInstructorManagerAsync = ({ userId = null, statuses = [] })
 
     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"/>;
+                         dateFormat="dd/mm/yy" placeholder="dd/mm/yyyy" mask="99/99/9999"/>;
     };
 
     const dateAppliedBodyTemplate = (rowData) => {
diff --git a/src/pages/DashboardPreInstructor/components/DomandeTablePreInstructorAsync/index.js b/src/pages/DashboardPreInstructor/components/DomandeTablePreInstructorAsync/index.js
index 6677a31..6e73de6 100644
--- a/src/pages/DashboardPreInstructor/components/DomandeTablePreInstructorAsync/index.js
+++ b/src/pages/DashboardPreInstructor/components/DomandeTablePreInstructorAsync/index.js
@@ -146,7 +146,7 @@ const DomandeTablePreInstructorAsync = ({ userId = null, statuses = [] }) => {
 
     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"/>;
+                         dateFormat="dd/mm/yy" placeholder="dd/mm/yyyy" mask="99/99/9999"/>;
     };
 
     const dateAppliedBodyTemplate = (rowData) => {
diff --git a/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js b/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js
index 18785d7..381923b 100644
--- a/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js
+++ b/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js
@@ -124,7 +124,7 @@ const PreInstructorDomandeTable = ({ userId = null, statuses = [] }) => {
     };
 
     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" />;
+        return <Calendar value={options.value} onChange={(e) => options.filterCallback(e.value, options.index)} dateFormat="dd/mm/yy" placeholder="dd/mm/yyyy" mask="99/99/9999" />;
     };
 
     const statusBodyTemplate = (rowData) => {
diff --git a/src/pages/DocumentsBeneficiary/components/DocumentsTable/index.js b/src/pages/DocumentsBeneficiary/components/DocumentsTable/index.js
index 9b4ff4e..8450ad7 100644
--- a/src/pages/DocumentsBeneficiary/components/DocumentsTable/index.js
+++ b/src/pages/DocumentsBeneficiary/components/DocumentsTable/index.js
@@ -113,7 +113,7 @@ const DocumentsTable = ({ type, reload = 0 }) => {
 
     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"/>;
+                         dateFormat="dd/mm/yy" placeholder="dd/mm/yyyy" mask="99/99/9999"/>;
     };
 
     const catBodyTemplate = (rowData) => {
diff --git a/src/pages/Domande/components/AllDomandeTable/index.js b/src/pages/Domande/components/AllDomandeTable/index.js
index 90721e2..1b8bf9e 100644
--- a/src/pages/Domande/components/AllDomandeTable/index.js
+++ b/src/pages/Domande/components/AllDomandeTable/index.js
@@ -110,7 +110,7 @@ const AllDomandeTable = ({ openDialogFn, updaterString = '' }) => {
 
     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"/>;
+                         dateFormat="dd/mm/yy" placeholder="dd/mm/yyyy" mask="99/99/9999"/>;
     };
 
     const statusBodyTemplate = (rowData) => {
diff --git a/src/pages/Domande/components/AllDomandeTableAsync/index.js b/src/pages/Domande/components/AllDomandeTableAsync/index.js
index 7ba74b7..511827d 100644
--- a/src/pages/Domande/components/AllDomandeTableAsync/index.js
+++ b/src/pages/Domande/components/AllDomandeTableAsync/index.js
@@ -156,7 +156,7 @@ const AllDomandeTableAsync = ({ openDialogFn, updaterString = '' }) => {
 
     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"/>;
+                         dateFormat="dd/mm/yy" placeholder="dd/mm/yyyy" mask="99/99/9999"/>;
     };
 
     const dateAppliedBodyTemplate = (rowData) => {
diff --git a/src/pages/DomandeArchive/components/AllDomandeArchiveTable/index.js b/src/pages/DomandeArchive/components/AllDomandeArchiveTable/index.js
index f0c29a8..0309588 100644
--- a/src/pages/DomandeArchive/components/AllDomandeArchiveTable/index.js
+++ b/src/pages/DomandeArchive/components/AllDomandeArchiveTable/index.js
@@ -116,7 +116,7 @@ const AllDomandeArchiveTable = ({ updaterString = '' }) => {
 
     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"/>;
+                         dateFormat="dd/mm/yy" placeholder="dd/mm/yyyy" mask="99/99/9999"/>;
     };
 
     const statusBodyTemplate = (rowData) => {
diff --git a/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js b/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js
index 8a92fc7..e295999 100644
--- a/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js
+++ b/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js
@@ -119,7 +119,7 @@ const BeneficiarioDomandeTable = () => {
 
     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"/>;
+                         dateFormat="dd/mm/yy" placeholder="dd/mm/yyyy" mask="99/99/9999"/>;
     };
 
     const statusBodyTemplate = (rowData) => {
diff --git a/src/pages/SoccorsoIstruttorioInstructorManager/index.js b/src/pages/SoccorsoIstruttorioInstructorManager/index.js
index c4ef886..c9ae154 100644
--- a/src/pages/SoccorsoIstruttorioInstructorManager/index.js
+++ b/src/pages/SoccorsoIstruttorioInstructorManager/index.js
@@ -5,7 +5,9 @@ import { __ } from '@wordpress/i18n';
 import DashboardService from '../../service/dashboard-service';
 import { pathOr } from 'ramda';
 import NumberFlow from '@number-flow/react';
-import PreInstructorSoccorsiTable from '../SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable';
+//import PreInstructorSoccorsiTable from '../SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable';
+import SoccorsiPreInstructorTableAsync
+    from '../SoccorsoIstruttorioPreInstructor/components/SoccorsiPreInstructorTableAsync';
 
 const SoccorsoIstruttorioInstructorManager = () => {
     const [mainStats, setMainStats] = useState({});
@@ -86,7 +88,8 @@ const SoccorsoIstruttorioInstructorManager = () => {
             <div className="appPage__spacer"></div>
 
             <div className="appPageSection">
-                <PreInstructorSoccorsiTable userId={0}/>
+                {/*<PreInstructorSoccorsiTable userId={0}/>*/}
+                <SoccorsiPreInstructorTableAsync userId={0}/>
             </div>
         </div>
     )
diff --git a/src/pages/SoccorsoIstruttorioMioInstructorManager/components/InstructorManagerSoccorsiTable/index.js b/src/pages/SoccorsoIstruttorioMioInstructorManager/components/InstructorManagerSoccorsiTable/index.js
index 5bbb927..4434fbb 100644
--- a/src/pages/SoccorsoIstruttorioMioInstructorManager/components/InstructorManagerSoccorsiTable/index.js
+++ b/src/pages/SoccorsoIstruttorioMioInstructorManager/components/InstructorManagerSoccorsiTable/index.js
@@ -112,7 +112,7 @@ const InstructorManagerSoccorsiTable = () => {
     };
 
     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" />;
+        return <Calendar value={options.value} onChange={(e) => options.filterCallback(e.value, options.index)} dateFormat="dd/mm/yy" placeholder="dd/mm/yyyy" mask="99/99/9999" />;
     };
 
     const statusBodyTemplate = (rowData) => {
diff --git a/src/pages/SoccorsoIstruttorioMioInstructorManager/components/SoccorsiInstructorManagerMioTableAsync/index.js b/src/pages/SoccorsoIstruttorioMioInstructorManager/components/SoccorsiInstructorManagerMioTableAsync/index.js
new file mode 100644
index 0000000..51c1951
--- /dev/null
+++ b/src/pages/SoccorsoIstruttorioMioInstructorManager/components/SoccorsiInstructorManagerMioTableAsync/index.js
@@ -0,0 +1,220 @@
+import React, { useEffect, useState, useCallback } from 'react';
+import { __ } from '@wordpress/i18n';
+import { is, isEmpty, pathOr } from 'ramda';
+import { Link } from 'react-router-dom';
+
+import translationStrings from '../../../../translationStringsForComponents';
+
+// api
+import AmendmentsService from '../../../../service/amendments-service';
+
+//
+import getBandoLabel from '../../../../helpers/getBandoLabel';
+import getBandoSeverity from '../../../../helpers/getBandoSeverity';
+import getFormattedDateString from '../../../../helpers/getFormattedDateString';
+
+// components
+import { DataTable } from 'primereact/datatable';
+import { Column } from 'primereact/column';
+import { Button } from 'primereact/button';
+import ProperBandoLabel from '../../../../components/ProperBandoLabel';
+import { Dropdown } from 'primereact/dropdown';
+import { Tag } from 'primereact/tag';
+import { Calendar } from 'primereact/calendar';
+
+const SoccorsiInstructorManagerMioTableAsync = ({ userId = null }) => {
+    const [localAsyncRequest, setLocalAsyncRequest] = useState(false);
+    const [items, setItems] = useState(null);
+    const [totalRecordsNum, setTotalRecordsNum] = useState(0);
+    const [lazyState, setLazyState] = useState({
+        first: 0,
+        rows: 5,
+        page: 0,
+        sortField: null,
+        sortOrder: null,
+        filters: {
+            applicationId: { value: null, matchMode: 'contains' },
+            callName: { value: null, matchMode: 'contains' },
+            companyName: { value: null, matchMode: 'contains' },
+            startDate: { value: null, matchMode: 'dateIs' },
+            expirationDate: { value: null, matchMode: 'dateIs' },
+            status: { value: null, matchMode: 'equals' }
+        }
+    });
+    const statuses = [];
+
+    const getPaginationQuery = useCallback((defaultSortBy = 'id') => {
+        let sortBy = {
+            columnName: 'applicationId',
+            sortDesc: true
+        };
+
+        if (lazyState.sortField) {
+            sortBy = {
+                columnName: lazyState.sortField,
+                sortDesc: lazyState.sortOrder === -1
+            }
+        }
+        return {
+            globalFilters: {
+                page: lazyState.page ? lazyState.page + 1 : 1,
+                limit: lazyState.rows,
+                sortBy
+            },
+            status: statuses,
+            filters: Object.keys(lazyState.filters).reduce((acc, cur) => {
+                const value = pathOr('', ['filters', cur, 'value'], lazyState);
+                if (!isEmpty(value)) {
+                    acc[cur] = lazyState.filters[cur];
+                }
+                return acc;
+            }, {}),
+        }
+    }, [lazyState]);
+
+    const onPage = (event) => {
+        setLazyState(event);
+    };
+
+    const onSort = (event) => {
+        event['first'] = 0;
+        event['page'] = 0;
+        setLazyState(event);
+    };
+
+    const onFilter = useCallback((event) => {
+        event['first'] = 0;
+        event['page'] = 0;
+        setLazyState(event);
+    }, [lazyState]);
+
+    const getCallback = (resp) => {
+        if (resp.status === 'SUCCESS') {
+            const {
+                body, totalRecords,
+                //currentPage, totalPages, pageSize
+            } = resp.data;
+            setTotalRecordsNum(totalRecords);
+            setItems(getFormattedData(body));
+        }
+        setLocalAsyncRequest(false);
+    }
+
+    const errGetCallbacks = () => {
+        setLocalAsyncRequest(false);
+    }
+
+    const getFormattedData = (data) => {
+        return data.map((d) => {
+            d.startDate = is(String, d.startDate) ? new Date(d.startDate) : (d.startDate ? d.startDate : '');
+            d.expirationDate = is(String, d.expirationDate) ? new Date(d.expirationDate) : (d.expirationDate ? d.expirationDate : '');
+            return d;
+        });
+    };
+
+    const actionsBodyTemplate = (rowData) => {
+        return <Link to={`/mie-domande/${rowData.applicationId}/soccorso/${rowData.id}`}>
+            <Button severity="info" label={__('Dettagli', 'gepafin')} size="small"/>
+        </Link>
+    }
+
+    const statusBodyTemplate = (rowData) => {
+        return <ProperBandoLabel status={rowData.status}/>;
+    };
+
+    const statusItemTemplate = (option) => {
+        return <Tag value={getBandoLabel(option)} severity={getBandoSeverity(option)}/>;
+    };
+
+    const statusFilterTemplate = (options) => {
+        return <Dropdown value={options.value} options={statuses}
+                         onChange={(e) => {
+                             options.filterCallback(e.value, options.index)
+                             const filters = { ...lazyState.filters };
+                             if (e.value) {
+                                 filters['status'] = { value: e.value, matchMode: 'equals' };
+                             } else {
+                                 delete filters['status'];
+                             }
+                             setLazyState({ ...lazyState, filters, first: 0 });
+                         }}
+                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel}
+                         className="p-column-filter"
+                         showClear/>;
+    };
+
+    const dateFilterTemplate = (options) => {
+        return <Calendar value={options.value} onChange={(e) => options.filterCallback(e.value, options.index)}
+                         dateFormat="dd/mm/yy" placeholder="dd/mm/yyyy" mask="99/99/9999"/>;
+    };
+
+    const dateStartBodyTemplate = (rowData) => {
+        return getFormattedDateString(rowData.startDate);
+    };
+
+    const dateExpirationBodyTemplate = (rowData) => {
+        return rowData.expirationDate ? getFormattedDateString(rowData.expirationDate) : '';
+    };
+
+    useEffect(() => {
+        setLocalAsyncRequest(true);
+        const paginationQuery = getPaginationQuery();
+
+        AmendmentsService.getSoccorsiPaginated(userId, paginationQuery, getCallback, errGetCallbacks);
+    }, [lazyState, userId]);
+
+    return (
+        <div className="appPageSection__table">
+            <DataTable
+                value={items} stripedRows showGridlines
+                lazy filterDisplay="menu" dataKey="id" paginator
+                first={lazyState.first} rows={lazyState.rows} totalRecords={totalRecordsNum} onPage={onPage}
+                onSort={onSort} sortField={lazyState.sortField} sortOrder={lazyState.sortOrder}
+                onFilter={onFilter} filters={lazyState.filters} loading={localAsyncRequest}
+                emptyMessage={translationStrings.emptyMessage}>
+                <Column field="applicationId" header={__('ID domanda', 'gepafin')}
+                        sortable
+                        filterField="applicationId" filter
+                        filterMatchModeOptions={translationStrings.textFilterOptions}
+                        filterPlaceholder={__('Cerca', 'gepafin')}
+                        style={{ minWidth: '6rem' }}/>
+                <Column field="protocolNumber" header={__('Protocollo', 'gepafin')}
+                        style={{ minWidth: '6rem' }}/>
+                <Column field="callName" header={__('Bando', 'gepafin')}
+                        filterField="callName" filter
+                        filterMatchModeOptions={translationStrings.textFilterOptions}
+                        filterPlaceholder={__('Cerca il nome', 'gepafin')}
+                        style={{ minWidth: '10rem' }}/>
+                <Column field="companyName" header={__('Azienda Beneficiaria', 'gepafin')}
+                        filterField="companyName" filter
+                        filterMatchModeOptions={translationStrings.textFilterOptions}
+                        filterPlaceholder={__('Cerca il nome', 'gepafin')}
+                        style={{ minWidth: '8rem' }}/>
+                <Column header={__('Data richiesta', 'gepafin')}
+                        filterElement={dateFilterTemplate} filter
+                        filterField="startDate" dataType="date"
+                        filterMatchModeOptions={translationStrings.dateFilterOptions}
+                        style={{ minWidth: '8rem' }}
+                        body={dateStartBodyTemplate}/>
+                <Column header={__('Scadenza', 'gepafin')}
+                        filterElement={dateFilterTemplate} filter
+                        filterField="expirationDate" dataType="date"
+                        filterMatchModeOptions={translationStrings.dateFilterOptions}
+                        style={{ minWidth: '8rem' }}
+                        body={dateExpirationBodyTemplate}/>
+
+                <Column field="assignedUserName" header={__('Assegnato', 'gepafin')}
+                        style={{ minWidth: '8rem' }}/>
+                <Column field="status" header={__('Stato', 'gepafin')}
+                        filterElement={statusFilterTemplate} filter
+                        filterMatchModeOptions={translationStrings.statusFilterOptions}
+                        style={{ minWidth: '8rem' }}
+                        body={statusBodyTemplate}/>
+                <Column header={__('Azioni', 'gepafin')}
+                        body={actionsBodyTemplate}/>
+            </DataTable>
+        </div>
+    )
+}
+
+export default SoccorsiInstructorManagerMioTableAsync;
\ No newline at end of file
diff --git a/src/pages/SoccorsoIstruttorioMioInstructorManager/index.js b/src/pages/SoccorsoIstruttorioMioInstructorManager/index.js
index e7a90e0..38ed1dd 100644
--- a/src/pages/SoccorsoIstruttorioMioInstructorManager/index.js
+++ b/src/pages/SoccorsoIstruttorioMioInstructorManager/index.js
@@ -2,9 +2,12 @@ import React from 'react';
 import { __ } from '@wordpress/i18n';
 
 // components
-import InstructorManagerSoccorsiTable from './components/InstructorManagerSoccorsiTable';
+import SoccorsiInstructorManagerMioTableAsync from './components/SoccorsiInstructorManagerMioTableAsync';
+import { useStore } from '../../store';
 
 const SoccorsoIstruttorioMioInstructorManager = () => {
+    const userData = useStore().main.userData();
+
     return(
         <div className="appPage">
             <div className="appPage__pageHeader">
@@ -14,7 +17,7 @@ const SoccorsoIstruttorioMioInstructorManager = () => {
             <div className="appPage__spacer"></div>
 
             <div className="appPageSection">
-                <InstructorManagerSoccorsiTable/>
+                <SoccorsiInstructorManagerMioTableAsync userId={userData.id}/>
             </div>
         </div>
     )
diff --git a/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js b/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js
index e6683e7..673f93a 100644
--- a/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js
+++ b/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js
@@ -115,7 +115,7 @@ const PreInstructorSoccorsiTable = ({ userId = null }) => {
     };
 
     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" />;
+        return <Calendar value={options.value} onChange={(e) => options.filterCallback(e.value, options.index)} dateFormat="dd/mm/yy" placeholder="dd/mm/yyyy" mask="99/99/9999" />;
     };
 
     const statusBodyTemplate = (rowData) => {
diff --git a/src/pages/SoccorsoIstruttorioPreInstructor/components/SoccorsiPreInstructorTableAsync/index.js b/src/pages/SoccorsoIstruttorioPreInstructor/components/SoccorsiPreInstructorTableAsync/index.js
new file mode 100644
index 0000000..e8e5099
--- /dev/null
+++ b/src/pages/SoccorsoIstruttorioPreInstructor/components/SoccorsiPreInstructorTableAsync/index.js
@@ -0,0 +1,220 @@
+import React, { useEffect, useState, useCallback } from 'react';
+import { __ } from '@wordpress/i18n';
+import { is, isEmpty, pathOr } from 'ramda';
+import { Link } from 'react-router-dom';
+
+import translationStrings from '../../../../translationStringsForComponents';
+
+// api
+import AmendmentsService from '../../../../service/amendments-service';
+
+//
+import getBandoLabel from '../../../../helpers/getBandoLabel';
+import getBandoSeverity from '../../../../helpers/getBandoSeverity';
+import getFormattedDateString from '../../../../helpers/getFormattedDateString';
+
+// components
+import { DataTable } from 'primereact/datatable';
+import { Column } from 'primereact/column';
+import { Button } from 'primereact/button';
+import ProperBandoLabel from '../../../../components/ProperBandoLabel';
+import { Dropdown } from 'primereact/dropdown';
+import { Tag } from 'primereact/tag';
+import { Calendar } from 'primereact/calendar';
+
+const SoccorsiPreInstructorTableAsync = ({ userId = null }) => {
+    const [localAsyncRequest, setLocalAsyncRequest] = useState(false);
+    const [items, setItems] = useState(null);
+    const [totalRecordsNum, setTotalRecordsNum] = useState(0);
+    const [lazyState, setLazyState] = useState({
+        first: 0,
+        rows: 5,
+        page: 0,
+        sortField: null,
+        sortOrder: null,
+        filters: {
+            applicationId: { value: null, matchMode: 'contains' },
+            callName: { value: null, matchMode: 'contains' },
+            companyName: { value: null, matchMode: 'contains' },
+            startDate: { value: null, matchMode: 'date_is' },
+            expirationDate: { value: null, matchMode: 'date_is' },
+            status: { value: null, matchMode: 'equals' }
+        }
+    });
+    const statuses = [];
+
+    const getPaginationQuery = useCallback(() => {
+        let sortBy = {
+            columnName: 'applicationId',
+            sortDesc: true
+        };
+
+        if (lazyState.sortField) {
+            sortBy = {
+                columnName: lazyState.sortField,
+                sortDesc: lazyState.sortOrder === -1
+            }
+        }
+        return {
+            globalFilters: {
+                page: lazyState.page ? lazyState.page + 1 : 1,
+                limit: lazyState.rows,
+                sortBy
+            },
+            status: statuses,
+            filters: Object.keys(lazyState.filters).reduce((acc, cur) => {
+                const value = pathOr('', ['filters', cur, 'value'], lazyState);
+                if (!isEmpty(value)) {
+                    acc[cur] = lazyState.filters[cur];
+                }
+                return acc;
+            }, {}),
+        }
+    }, [lazyState]);
+
+    const onPage = (event) => {
+        setLazyState(event);
+    };
+
+    const onSort = (event) => {
+        event['first'] = 0;
+        event['page'] = 0;
+        setLazyState(event);
+    };
+
+    const onFilter = useCallback((event) => {
+        event['first'] = 0;
+        event['page'] = 0;
+        setLazyState(event);
+    }, [lazyState]);
+
+    const getCallback = (resp) => {
+        if (resp.status === 'SUCCESS') {
+            const {
+                body, totalRecords,
+                //currentPage, totalPages, pageSize
+            } = resp.data;
+            setTotalRecordsNum(totalRecords);
+            setItems(getFormattedData(body));
+        }
+        setLocalAsyncRequest(false);
+    }
+
+    const errGetCallbacks = () => {
+        setLocalAsyncRequest(false);
+    }
+
+    const getFormattedData = (data) => {
+        return data.map((d) => {
+            d.startDate = is(String, d.startDate) ? new Date(d.startDate) : (d.startDate ? d.startDate : '');
+            d.expirationDate = is(String, d.expirationDate) ? new Date(d.expirationDate) : (d.expirationDate ? d.expirationDate : '');
+            return d;
+        });
+    };
+
+    const actionsBodyTemplate = (rowData) => {
+        return <Link to={`/domande/${rowData.applicationId}/soccorso/${rowData.id}`}>
+            <Button severity="info" label={__('Dettagli', 'gepafin')} size="small"/>
+        </Link>
+    }
+
+    const statusBodyTemplate = (rowData) => {
+        return <ProperBandoLabel status={rowData.status}/>;
+    };
+
+    const statusItemTemplate = (option) => {
+        return <Tag value={getBandoLabel(option)} severity={getBandoSeverity(option)}/>;
+    };
+
+    const statusFilterTemplate = (options) => {
+        return <Dropdown value={options.value} options={statuses}
+                         onChange={(e) => {
+                             options.filterCallback(e.value, options.index)
+                             const filters = { ...lazyState.filters };
+                             if (e.value) {
+                                 filters['status'] = { value: e.value, matchMode: 'equals' };
+                             } else {
+                                 delete filters['status'];
+                             }
+                             setLazyState({ ...lazyState, filters, first: 0 });
+                         }}
+                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel}
+                         className="p-column-filter"
+                         showClear/>;
+    };
+
+    const dateFilterTemplate = (options) => {
+        return <Calendar value={options.value} onChange={(e) => options.filterCallback(e.value, options.index)}
+                         dateFormat="dd/mm/yy" placeholder="dd/mm/yyyy" mask="99/99/9999"/>;
+    };
+
+    const dateStartBodyTemplate = (rowData) => {
+        return getFormattedDateString(rowData.startDate);
+    };
+
+    const dateExpirationBodyTemplate = (rowData) => {
+        return rowData.expirationDate ? getFormattedDateString(rowData.expirationDate) : '';
+    };
+
+    useEffect(() => {
+        setLocalAsyncRequest(true);
+        const paginationQuery = getPaginationQuery();
+
+        AmendmentsService.getSoccorsiPaginated(userId, paginationQuery, getCallback, errGetCallbacks);
+    }, [lazyState, userId]);
+
+    return (
+        <div className="appPageSection__table">
+            <DataTable
+                value={items} stripedRows showGridlines
+                lazy filterDisplay="menu" dataKey="id" paginator
+                first={lazyState.first} rows={lazyState.rows} totalRecords={totalRecordsNum} onPage={onPage}
+                onSort={onSort} sortField={lazyState.sortField} sortOrder={lazyState.sortOrder}
+                onFilter={onFilter} filters={lazyState.filters} loading={localAsyncRequest}
+                emptyMessage={translationStrings.emptyMessage}>
+                <Column field="applicationId" header={__('ID domanda', 'gepafin')}
+                        sortable
+                        filterField="applicationId" filter
+                        filterMatchModeOptions={translationStrings.textFilterOptions}
+                        filterPlaceholder={__('Cerca', 'gepafin')}
+                        style={{ minWidth: '6rem' }}/>
+                <Column field="protocolNumber" header={__('Protocollo', 'gepafin')}
+                        style={{ minWidth: '6rem' }}/>
+                <Column field="callName" header={__('Bando', 'gepafin')}
+                        filterField="callName" filter
+                        filterMatchModeOptions={translationStrings.textFilterOptions}
+                        filterPlaceholder={__('Cerca il nome', 'gepafin')}
+                        style={{ minWidth: '10rem' }}/>
+                <Column field="companyName" header={__('Azienda Beneficiaria', 'gepafin')}
+                        filterField="companyName" filter
+                        filterMatchModeOptions={translationStrings.textFilterOptions}
+                        filterPlaceholder={__('Cerca il nome', 'gepafin')}
+                        style={{ minWidth: '8rem' }}/>
+                <Column header={__('Data richiesta', 'gepafin')}
+                        filterElement={dateFilterTemplate} filter
+                        filterField="startDate" dataType="date"
+                        filterMatchModeOptions={translationStrings.dateFilterOptions}
+                        style={{ minWidth: '8rem' }}
+                        body={dateStartBodyTemplate}/>
+                <Column header={__('Scadenza', 'gepafin')}
+                        filterElement={dateFilterTemplate} filter
+                        filterField="expirationDate" dataType="date"
+                        filterMatchModeOptions={translationStrings.dateFilterOptions}
+                        style={{ minWidth: '8rem' }}
+                        body={dateExpirationBodyTemplate}/>
+
+                <Column field="assignedUserName" header={__('Assegnato', 'gepafin')}
+                        style={{ minWidth: '8rem' }}/>
+                <Column field="status" header={__('Stato', 'gepafin')}
+                        filterElement={statusFilterTemplate} filter
+                        filterMatchModeOptions={translationStrings.statusFilterOptions}
+                        style={{ minWidth: '8rem' }}
+                        body={statusBodyTemplate}/>
+                <Column header={__('Azioni', 'gepafin')}
+                        body={actionsBodyTemplate}/>
+            </DataTable>
+        </div>
+    )
+}
+
+export default SoccorsiPreInstructorTableAsync;
\ No newline at end of file
diff --git a/src/pages/SoccorsoIstruttorioPreInstructor/index.js b/src/pages/SoccorsoIstruttorioPreInstructor/index.js
index b0959b7..4fd4dd6 100644
--- a/src/pages/SoccorsoIstruttorioPreInstructor/index.js
+++ b/src/pages/SoccorsoIstruttorioPreInstructor/index.js
@@ -7,12 +7,12 @@ import NumberFlow from '@number-flow/react';
 import { useStore } from '../../store';
 
 // components
-import PreInstructorSoccorsiTable from './components/PreInstructorSoccorsiTable';
 import DashboardService from '../../service/dashboard-service';
+import SoccorsiPreInstructorTableAsync from './components/SoccorsiPreInstructorTableAsync';
 
 const SoccorsoIstruttorioPreInstructor = () => {
     const [mainStats, setMainStats] = useState({});
-    const userData = useStore().main.userData()
+    const userData = useStore().main.userData();
 
     const getStats = (data) => {
         if (data.status === 'SUCCESS') {
@@ -90,7 +90,7 @@ const SoccorsoIstruttorioPreInstructor = () => {
             <div className="appPage__spacer"></div>
 
             <div className="appPageSection">
-                <PreInstructorSoccorsiTable userId={userData.id}/>
+                <SoccorsiPreInstructorTableAsync userId={userData.id}/>
             </div>
         </div>
     )
diff --git a/src/pages/Users/components/AllUsersTable/index.js b/src/pages/Users/components/AllUsersTable/index.js
index 1115587..1eda25e 100644
--- a/src/pages/Users/components/AllUsersTable/index.js
+++ b/src/pages/Users/components/AllUsersTable/index.js
@@ -96,7 +96,7 @@ const AllUsersTable = ({ updaterString = '' }) => {
 
     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"/>;
+                         dateFormat="dd/mm/yy" placeholder="dd/mm/yyyy" mask="99/99/9999"/>;
     };
 
     const nameBodyTemplate = (rowData) => {
diff --git a/src/service/amendments-service.js b/src/service/amendments-service.js
index 4e8d3de..9b9cc55 100644
--- a/src/service/amendments-service.js
+++ b/src/service/amendments-service.js
@@ -20,6 +20,10 @@ export default class AmendmentsService {
         NetworkService.get(`${API_BASE_URL}/amendments/user`, callback, errCallback, queryParams);
     };
 
+    static getSoccorsiPaginated = (id, callback, errCallback, queryParams) => {
+        NetworkService.post(`${API_BASE_URL}/amendments/user/${id}/pagination`, callback, errCallback, queryParams);
+    };
+
     static createSoccorso = (body, callback, errCallback, queryParams) => {
         NetworkService.post(`${API_BASE_URL}/amendments`, body, callback, errCallback, queryParams);
     };

From cd1f27648a9172212dfddde315b67b85568756a5 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Tue, 25 Mar 2025 09:06:30 +0100
Subject: [PATCH 2/5] - updated code related to ndg;

---
 src/pages/DomandaEditInstructorManager/index.js | 6 ++++++
 src/pages/DomandaEditPreInstructor/index.js     | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/src/pages/DomandaEditInstructorManager/index.js b/src/pages/DomandaEditInstructorManager/index.js
index 5697d1c..0bf167c 100644
--- a/src/pages/DomandaEditInstructorManager/index.js
+++ b/src/pages/DomandaEditInstructorManager/index.js
@@ -646,6 +646,12 @@ const DomandaEditInstructorManager = () => {
                     detail: data.message
                 });
             }
+            if (data.data.ndg) {
+                setData((data) => ({
+                    ...data,
+                    ndg: data.data.ndg
+                }));
+            }
         }
         storeSet.main.unsetAsyncRequest();
     }
diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index 5bc09db..68138e9 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -646,6 +646,12 @@ const DomandaEditPreInstructor = () => {
                     detail: data.message
                 });
             }
+            if (data.data.ndg) {
+                setData((data) => ({
+                    ...data,
+                    ndg: data.data.ndg
+                }));
+            }
         }
         storeSet.main.unsetAsyncRequest();
     }

From ee7a0ef68179ccbc3ec8a954dcabfd2f4ef76d12 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Tue, 25 Mar 2025 09:16:57 +0100
Subject: [PATCH 3/5] - updates to gitignore;

---
 .env       | 2 +-
 .gitignore | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.env b/.env
index 871e4c5..cfb92ea 100644
--- a/.env
+++ b/.env
@@ -4,6 +4,6 @@ REACT_APP_API_ADDRESS=https://api-dev-gepafin.memento.credit
 REACT_APP_API_ADDRESS_WS=https://api-dev-gepafin.memento.credit/wss
 REACT_APP_LOGO_FILENAME=gepafin-logo.svg
 REACT_APP_FAVICON_FILENAME=gepafin-favicon.ico
-REACT_APP_HUB_ID=p4lk3bcx1RStqTaIVVbXs
+REACT_APP_HUB_ID=t7jh5wfg9QXylNaTZkPoE
 REACT_APP_EVALUATION_FLOW_ID=1
 REACT_APP_LOCAL_DEVELOPMENT=1
diff --git a/.gitignore b/.gitignore
index 24b2bac..0ed4d77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ package-lock.json
 
 # misc
 .DS_Store
+.env
 .env.local
 .env.development.local
 .env.test.local

From 431b9f5b45dc597926e60a3e93512dd8c92b29f0 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Tue, 25 Mar 2025 10:30:35 +0100
Subject: [PATCH 4/5] - updated pre instructor table async - fixed proper date
 for filter;

---
 .env                                          |  2 +-
 package.json                                  |  8 ++---
 .../getQueryParamsForPaginatedEndpoint.js     | 35 ++++++++++++++++++
 src/pages/BandoApplication/index.js           |  4 +--
 src/pages/Dashboard/index.js                  |  7 ++--
 .../index.js                                  |  2 +-
 .../SoccorsiPreInstructorTableAsync/index.js  | 36 +++----------------
 7 files changed, 53 insertions(+), 41 deletions(-)
 create mode 100644 src/helpers/getQueryParamsForPaginatedEndpoint.js

diff --git a/.env b/.env
index cfb92ea..871e4c5 100644
--- a/.env
+++ b/.env
@@ -4,6 +4,6 @@ REACT_APP_API_ADDRESS=https://api-dev-gepafin.memento.credit
 REACT_APP_API_ADDRESS_WS=https://api-dev-gepafin.memento.credit/wss
 REACT_APP_LOGO_FILENAME=gepafin-logo.svg
 REACT_APP_FAVICON_FILENAME=gepafin-favicon.ico
-REACT_APP_HUB_ID=t7jh5wfg9QXylNaTZkPoE
+REACT_APP_HUB_ID=p4lk3bcx1RStqTaIVVbXs
 REACT_APP_EVALUATION_FLOW_ID=1
 REACT_APP_LOCAL_DEVELOPMENT=1
diff --git a/package.json b/package.json
index 7edb643..05d514e 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "copy-to-clipboard": "3.3.3",
     "deep-object-diff": "1.1.9",
     "dompurify": "3.2.3",
-    "expression-language": "^1.2.0",
+    "expression-language": "1.2.0",
     "fast-deep-equal": "3.1.3",
     "hotkeys-js": "3.13.9",
     "html-react-parser": "5.2.2",
@@ -26,8 +26,8 @@
     "klona": "2.0.6",
     "leader-line-new": "1.1.9",
     "luxon": "3.5.0",
-    "mathjs": "^14.0.1",
-    "mustache": "^4.2.0",
+    "mathjs": "14.0.1",
+    "mustache": "4.2.0",
     "object-path-immutable": "4.1.2",
     "primeicons": "7.0.0",
     "primereact": "10.9.2",
@@ -41,7 +41,7 @@
     "react-router-dom": "7.1.3",
     "react-scripts": "5.0.1",
     "recharts": "2.15.0",
-    "sockjs-client": "^1.6.1",
+    "sockjs-client": "1.6.1",
     "validate.js": "0.13.1",
     "zustand": "4.5.4",
     "zustand-x": "3.0.4"
diff --git a/src/helpers/getQueryParamsForPaginatedEndpoint.js b/src/helpers/getQueryParamsForPaginatedEndpoint.js
new file mode 100644
index 0000000..155210b
--- /dev/null
+++ b/src/helpers/getQueryParamsForPaginatedEndpoint.js
@@ -0,0 +1,35 @@
+import { isEmpty, pathOr } from 'ramda';
+import formatDateString from './formatDateString';
+
+const getQueryParamsForPaginatedEndpoint = (lazyState, statuses) => {
+    let sortBy = {
+        columnName: 'applicationId',
+        sortDesc: true
+    };
+
+    if (lazyState.sortField) {
+        sortBy = {
+            columnName: lazyState.sortField,
+            sortDesc: lazyState.sortOrder === -1
+        }
+    }
+    return {
+        globalFilters: {
+            page: lazyState.page ? lazyState.page + 1 : 1,
+            limit: lazyState.rows,
+            sortBy
+        },
+        status: statuses,
+        filters: Object.keys(lazyState.filters).reduce((acc, cur) => {
+            const value = pathOr('', ['filters', cur, 'value'], lazyState);
+            if (!isEmpty(value)) {
+                acc[cur] = typeof value.getMonth === 'function'
+                    ? formatDateString(value)
+                    : lazyState.filters[cur];
+            }
+            return acc;
+        }, {}),
+    }
+}
+
+export default getQueryParamsForPaginatedEndpoint;
\ No newline at end of file
diff --git a/src/pages/BandoApplication/index.js b/src/pages/BandoApplication/index.js
index 4b526eb..2dee58d 100644
--- a/src/pages/BandoApplication/index.js
+++ b/src/pages/BandoApplication/index.js
@@ -49,7 +49,7 @@ import FileuploadApplicationSignedPdf from '../../components/FileuploadApplicati
 
 import { defaultMaxFileSize } from '../../configData';
 
-const APP_HUB_ID = process.env.REACT_APP_HUB_ID;
+const REACT_APP_HUB_ID = process.env.REACT_APP_HUB_ID;
 
 const BandoApplication = () => {
     const chosenCompanyId = useStore().main.chosenCompanyId();
@@ -686,7 +686,7 @@ const BandoApplication = () => {
                         setVisibleConfirmation(false);
                     }}>
                 <p>
-                    {APP_HUB_ID === 't7jh5wfg9QXylNaTZkPoE'
+                    {REACT_APP_HUB_ID === 't7jh5wfg9QXylNaTZkPoE'
                         ? __('Grazie, la tua domanda è stata inviata correttamente. Entro 24 ore riceverai una email con data, ora e numero di protocollo.', 'gepafin')
                         : __('Grazie, la tua domanda è stata inviata correttamente. Entro 24 ore riceverai una pec con data, ora e numero di protocollo.', 'gepafin')
                     }
diff --git a/src/pages/Dashboard/index.js b/src/pages/Dashboard/index.js
index fd46b4d..ccc50c7 100644
--- a/src/pages/Dashboard/index.js
+++ b/src/pages/Dashboard/index.js
@@ -15,6 +15,8 @@ import LatestBandiTableAsync from './components/LatestBandiTableAsync';
 import AllDomandeTableAsync from '../Domande/components/AllDomandeTableAsync';
 import DraftApplicationsTableAsync from './components/DraftApplicationsTableAsync';
 
+const REACT_APP_HUB_ID = process.env.REACT_APP_HUB_ID;
+
 const Dashboard = () => {
     const navigate = useNavigate();
     const [mainStats, setMainStats] = useState({});
@@ -64,7 +66,8 @@ const Dashboard = () => {
 
             <div className="appPage__spacer"></div>
 
-            <div className={`appPageSection__withBorder${pecUsage > 91 ? ' danger' : ''}`}>
+            {REACT_APP_HUB_ID === 'p4lk3bcx1RStqTaIVVbXs' // only for GEPAFIN
+                ? <div className={`appPageSection__withBorder${pecUsage > 91 ? ' danger' : ''}`}>
                 <p className="appPageSection__pMeta">
                     <span>{__('PEC inbox quota', 'gepafin')}</span>
                     <span>{<NumberFlow
@@ -73,7 +76,7 @@ const Dashboard = () => {
                         suffix={'%'}
                         locales="it-IT"/>}</span>
                 </p>
-            </div>
+            </div> : null}
 
             <div className="appPage__spacer"></div>
 
diff --git a/src/pages/SoccorsoIstruttorioMioInstructorManager/components/SoccorsiInstructorManagerMioTableAsync/index.js b/src/pages/SoccorsoIstruttorioMioInstructorManager/components/SoccorsiInstructorManagerMioTableAsync/index.js
index 51c1951..b1265d7 100644
--- a/src/pages/SoccorsoIstruttorioMioInstructorManager/components/SoccorsiInstructorManagerMioTableAsync/index.js
+++ b/src/pages/SoccorsoIstruttorioMioInstructorManager/components/SoccorsiInstructorManagerMioTableAsync/index.js
@@ -43,7 +43,7 @@ const SoccorsiInstructorManagerMioTableAsync = ({ userId = null }) => {
     });
     const statuses = [];
 
-    const getPaginationQuery = useCallback((defaultSortBy = 'id') => {
+    const getPaginationQuery = useCallback(() => {
         let sortBy = {
             columnName: 'applicationId',
             sortDesc: true
diff --git a/src/pages/SoccorsoIstruttorioPreInstructor/components/SoccorsiPreInstructorTableAsync/index.js b/src/pages/SoccorsoIstruttorioPreInstructor/components/SoccorsiPreInstructorTableAsync/index.js
index e8e5099..ae790d9 100644
--- a/src/pages/SoccorsoIstruttorioPreInstructor/components/SoccorsiPreInstructorTableAsync/index.js
+++ b/src/pages/SoccorsoIstruttorioPreInstructor/components/SoccorsiPreInstructorTableAsync/index.js
@@ -8,10 +8,11 @@ import translationStrings from '../../../../translationStringsForComponents';
 // api
 import AmendmentsService from '../../../../service/amendments-service';
 
-//
+// tools
 import getBandoLabel from '../../../../helpers/getBandoLabel';
 import getBandoSeverity from '../../../../helpers/getBandoSeverity';
 import getFormattedDateString from '../../../../helpers/getFormattedDateString';
+import getQueryParamsForPaginatedEndpoint from '../../../../helpers/getQueryParamsForPaginatedEndpoint';
 
 // components
 import { DataTable } from 'primereact/datatable';
@@ -36,41 +37,14 @@ const SoccorsiPreInstructorTableAsync = ({ userId = null }) => {
             applicationId: { value: null, matchMode: 'contains' },
             callName: { value: null, matchMode: 'contains' },
             companyName: { value: null, matchMode: 'contains' },
-            startDate: { value: null, matchMode: 'date_is' },
-            expirationDate: { value: null, matchMode: 'date_is' },
+            startDate: { value: null, matchMode: 'dateIs' },
+            expirationDate: { value: null, matchMode: 'dateIs' },
             status: { value: null, matchMode: 'equals' }
         }
     });
     const statuses = [];
 
-    const getPaginationQuery = useCallback(() => {
-        let sortBy = {
-            columnName: 'applicationId',
-            sortDesc: true
-        };
-
-        if (lazyState.sortField) {
-            sortBy = {
-                columnName: lazyState.sortField,
-                sortDesc: lazyState.sortOrder === -1
-            }
-        }
-        return {
-            globalFilters: {
-                page: lazyState.page ? lazyState.page + 1 : 1,
-                limit: lazyState.rows,
-                sortBy
-            },
-            status: statuses,
-            filters: Object.keys(lazyState.filters).reduce((acc, cur) => {
-                const value = pathOr('', ['filters', cur, 'value'], lazyState);
-                if (!isEmpty(value)) {
-                    acc[cur] = lazyState.filters[cur];
-                }
-                return acc;
-            }, {}),
-        }
-    }, [lazyState]);
+    const getPaginationQuery = useCallback(getQueryParamsForPaginatedEndpoint(lazyState, statuses), [lazyState]);
 
     const onPage = (event) => {
         setLazyState(event);

From 34b079c9cc2b7a7c73284157b885d3981f13d0e3 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Tue, 25 Mar 2025 11:37:46 +0100
Subject: [PATCH 5/5] - fixed request for signed document in applications; -
 added filter by status to the table of draft applications; - temp reverted
 back to previous api for getting amendments;

---
 .../components/AllBandiAccordion/index.js     |  2 +-
 .../AllBandiPreferredAccordion/index.js       |  2 +-
 src/pages/BandoApplication/index.js           | 11 +++++--
 .../DraftApplicationsTableAsync/index.js      | 29 ++++++++++++++++++-
 .../MyLatestSubmissionsTable/index.js         |  2 +-
 .../components/DocumentsTable/index.js        |  2 +-
 .../BeneficiarioDomandeTable/index.js         |  2 +-
 .../index.js                                  |  9 +++---
 .../index.js                                  | 10 ++++---
 .../SoccorsoIstruttorioPreInstructor/index.js |  6 ++--
 .../BeneficiarioUltimeDomandeTable/index.js   |  2 +-
 src/pages/StatsBeneficiary/index.js           |  2 +-
 12 files changed, 58 insertions(+), 21 deletions(-)

diff --git a/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js b/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js
index 60edd5c..8fd5d57 100644
--- a/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js
+++ b/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js
@@ -55,7 +55,7 @@ const AllBandiAccordion = ({ showOnlyPreferred = false }) => {
                 ['onlyPreferredCall', showOnlyPreferred]
             ]);
         }
-    }, [chosenCompanyId]);
+    }, [chosenCompanyId, companies]);
 
     const getCallback = (data) => {
         if (data.status === 'SUCCESS') {
diff --git a/src/pages/BandiPreferredBeneficiario/components/AllBandiPreferredAccordion/index.js b/src/pages/BandiPreferredBeneficiario/components/AllBandiPreferredAccordion/index.js
index c576d1b..6f9b8fa 100644
--- a/src/pages/BandiPreferredBeneficiario/components/AllBandiPreferredAccordion/index.js
+++ b/src/pages/BandiPreferredBeneficiario/components/AllBandiPreferredAccordion/index.js
@@ -49,7 +49,7 @@ const AllBandiPreferredAccordion = () => {
                 ['userId', userData.id]
             ]);
         }
-    }, [chosenCompanyId]);
+    }, [chosenCompanyId, companies]);
 
     const getCallback = (data) => {
         if (data.status === 'SUCCESS') {
diff --git a/src/pages/BandoApplication/index.js b/src/pages/BandoApplication/index.js
index 2dee58d..16e1de7 100644
--- a/src/pages/BandoApplication/index.js
+++ b/src/pages/BandoApplication/index.js
@@ -554,7 +554,6 @@ const BandoApplication = () => {
         }
     }
 
-
     const errDocsGetCallbacks = () => {
     }
 
@@ -604,13 +603,21 @@ const BandoApplication = () => {
     }, [formValues]);
 
     useEffect(() => {
-        if (previousStatus.current === applicationStatus || (previousStatus.current !== applicationStatus && isEmpty(previousStatus.current))) {
+        console.log('applicationStatus', previousStatus.current, applicationStatus,
+            previousStatus.current === applicationStatus, (previousStatus.current !== applicationStatus && isEmpty(previousStatus.current)))
+        /*if (previousStatus.current === applicationStatus || (previousStatus.current !== applicationStatus && isEmpty(previousStatus.current))) {
             previousStatus.current = applicationStatus;
             return;
         } else {
             previousStatus.current = applicationStatus;
+        }*/
+        if (previousStatus.current === applicationStatus) {
+            return
         }
 
+        previousStatus.current = applicationStatus;
+
+        console.log('applicationStatus ...')
         if ('DRAFT' === applicationStatus && !isRequestForApplData) {
             const applId = getApplicationId();
 
diff --git a/src/pages/Dashboard/components/DraftApplicationsTableAsync/index.js b/src/pages/Dashboard/components/DraftApplicationsTableAsync/index.js
index ccbb04a..b435c4f 100644
--- a/src/pages/Dashboard/components/DraftApplicationsTableAsync/index.js
+++ b/src/pages/Dashboard/components/DraftApplicationsTableAsync/index.js
@@ -16,6 +16,10 @@ import { Button } from 'primereact/button';
 import ProperBandoLabel from '../../../../components/ProperBandoLabel';
 import { Link } from 'react-router-dom';
 import translationStrings from '../../../../translationStringsForComponents';
+import { Dropdown } from 'primereact/dropdown';
+import { Tag } from 'primereact/tag';
+import getBandoLabel from '../../../../helpers/getBandoLabel';
+import getBandoSeverity from '../../../../helpers/getBandoSeverity';
 
 const DraftApplicationsTableAsync = () => {
     const chosenCompanyId = useStore().main.chosenCompanyId();
@@ -31,7 +35,8 @@ const DraftApplicationsTableAsync = () => {
         filters: {
             id: { value: null, matchMode: 'contains' },
             callTitle: { value: null, matchMode: 'contains' },
-            companyName: { value: null, matchMode: 'contains' }
+            companyName: { value: null, matchMode: 'contains' },
+            status: { value: null, matchMode: 'contains' }
         }
     });
     const statuses = ['DRAFT', 'AWAITING', 'READY'];
@@ -120,6 +125,26 @@ const DraftApplicationsTableAsync = () => {
         return <ProgressBar value={options.progress} color={'#64748B'}></ProgressBar>;
     };
 
+    const statusItemTemplate = (option) => {
+        return <Tag value={getBandoLabel(option)} severity={getBandoSeverity(option)}/>;
+    };
+
+    const statusFilterTemplate = (options) => {
+        return <Dropdown value={options.value} options={statuses}
+                         onChange={(e) => {
+                             options.filterCallback(e.value, options.index)
+                             const filters = { ...lazyState.filters };
+                             if (e.value) {
+                                 filters['status'] = { value: e.value, matchMode: 'equals' };
+                             } else {
+                                 delete filters['status'];
+                             }
+                             setLazyState({ ...lazyState, filters, first: 0 });
+                         }}
+                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"
+                         showClear/>;
+    };
+
     const actionsBodyTemplate = (rowData) => {
         return <Link to={`/domande/${rowData.id}/preview`}>
             <Button severity="info" label={__('Anteprima', 'gepafin')} icon="pi pi-eye" size="small"
@@ -155,6 +180,8 @@ const DraftApplicationsTableAsync = () => {
                         filterPlaceholder={__('Cerca il nome', 'gepafin')}
                         style={{ minWidth: '8rem' }}/>
                 <Column field="status" header={__('Stato', 'gepafin')}
+                        filterElement={statusFilterTemplate} filter
+                        filterMatchModeOptions={translationStrings.statusFilterOptions}
                         style={{ minWidth: '7rem' }} body={statusBodyTemplate}/>
                 <Column header={__('Progressi', 'gepafin')}
                         style={{ minWidth: '10rem' }} field="progress" body={progressBodyTemplate}/>
diff --git a/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js b/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js
index 077e297..f5e8cc2 100644
--- a/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js
+++ b/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js
@@ -45,7 +45,7 @@ const MyLatestSubmissionsTable = () => {
                 ['statuses', ['DRAFT', 'AWAITING', 'READY']]
             ]);
         }
-    }, [chosenCompanyId]);
+    }, [chosenCompanyId, companies]);
 
     const getApplCallback = (data) => {
         if (data.status === 'SUCCESS') {
diff --git a/src/pages/DocumentsBeneficiary/components/DocumentsTable/index.js b/src/pages/DocumentsBeneficiary/components/DocumentsTable/index.js
index 8450ad7..255ebc6 100644
--- a/src/pages/DocumentsBeneficiary/components/DocumentsTable/index.js
+++ b/src/pages/DocumentsBeneficiary/components/DocumentsTable/index.js
@@ -41,7 +41,7 @@ const DocumentsTable = ({ type, reload = 0 }) => {
                 ['documentType', type]
             ]);
         }
-    }, [chosenCompanyId, reload]);
+    }, [chosenCompanyId, reload, companies]);
 
     useEffect(() => {
         const existingCompany = head(companies.filter(o => o.id === chosenCompanyId));
diff --git a/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js b/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js
index e295999..a208487 100644
--- a/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js
+++ b/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js
@@ -43,7 +43,7 @@ const BeneficiarioDomandeTable = () => {
                 ['statuses', ['SOCCORSO', 'APPROVED', 'REJECTED', 'EVALUATION', 'SUBMIT']] // 'NDG', 'ADMISSIBLE', 'APPOINTMENT'
             ]);
         }
-    }, [chosenCompanyId]);
+    }, [chosenCompanyId, companies]);
 
     const getApplCallback = (data) => {
         if (data.status === 'SUCCESS') {
diff --git a/src/pages/SoccorsoIstruttorioInstructorManager/index.js b/src/pages/SoccorsoIstruttorioInstructorManager/index.js
index c9ae154..3194714 100644
--- a/src/pages/SoccorsoIstruttorioInstructorManager/index.js
+++ b/src/pages/SoccorsoIstruttorioInstructorManager/index.js
@@ -5,9 +5,8 @@ import { __ } from '@wordpress/i18n';
 import DashboardService from '../../service/dashboard-service';
 import { pathOr } from 'ramda';
 import NumberFlow from '@number-flow/react';
-//import PreInstructorSoccorsiTable from '../SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable';
-import SoccorsiPreInstructorTableAsync
-    from '../SoccorsoIstruttorioPreInstructor/components/SoccorsiPreInstructorTableAsync';
+//import SoccorsiPreInstructorTableAsync from '../SoccorsoIstruttorioPreInstructor/components/SoccorsiPreInstructorTableAsync';
+import PreInstructorSoccorsiTable from '../SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable';
 
 const SoccorsoIstruttorioInstructorManager = () => {
     const [mainStats, setMainStats] = useState({});
@@ -88,8 +87,8 @@ const SoccorsoIstruttorioInstructorManager = () => {
             <div className="appPage__spacer"></div>
 
             <div className="appPageSection">
-                {/*<PreInstructorSoccorsiTable userId={0}/>*/}
-                <SoccorsiPreInstructorTableAsync userId={0}/>
+                <PreInstructorSoccorsiTable userId={0}/>
+                {/*<SoccorsiPreInstructorTableAsync userId={0}/>*/}
             </div>
         </div>
     )
diff --git a/src/pages/SoccorsoIstruttorioMioInstructorManager/index.js b/src/pages/SoccorsoIstruttorioMioInstructorManager/index.js
index 38ed1dd..6904007 100644
--- a/src/pages/SoccorsoIstruttorioMioInstructorManager/index.js
+++ b/src/pages/SoccorsoIstruttorioMioInstructorManager/index.js
@@ -2,11 +2,12 @@ import React from 'react';
 import { __ } from '@wordpress/i18n';
 
 // components
-import SoccorsiInstructorManagerMioTableAsync from './components/SoccorsiInstructorManagerMioTableAsync';
-import { useStore } from '../../store';
+//import SoccorsiInstructorManagerMioTableAsync from './components/SoccorsiInstructorManagerMioTableAsync';
+//import { useStore } from '../../store';
+import InstructorManagerSoccorsiTable from './components/InstructorManagerSoccorsiTable';
 
 const SoccorsoIstruttorioMioInstructorManager = () => {
-    const userData = useStore().main.userData();
+    //const userData = useStore().main.userData();
 
     return(
         <div className="appPage">
@@ -17,7 +18,8 @@ const SoccorsoIstruttorioMioInstructorManager = () => {
             <div className="appPage__spacer"></div>
 
             <div className="appPageSection">
-                <SoccorsiInstructorManagerMioTableAsync userId={userData.id}/>
+                {/*<SoccorsiInstructorManagerMioTableAsync userId={userData.id}/>*/}
+                <InstructorManagerSoccorsiTable/>
             </div>
         </div>
     )
diff --git a/src/pages/SoccorsoIstruttorioPreInstructor/index.js b/src/pages/SoccorsoIstruttorioPreInstructor/index.js
index 4fd4dd6..f4c880f 100644
--- a/src/pages/SoccorsoIstruttorioPreInstructor/index.js
+++ b/src/pages/SoccorsoIstruttorioPreInstructor/index.js
@@ -8,7 +8,8 @@ import { useStore } from '../../store';
 
 // components
 import DashboardService from '../../service/dashboard-service';
-import SoccorsiPreInstructorTableAsync from './components/SoccorsiPreInstructorTableAsync';
+//import SoccorsiPreInstructorTableAsync from './components/SoccorsiPreInstructorTableAsync';
+import PreInstructorSoccorsiTable from './components/PreInstructorSoccorsiTable';
 
 const SoccorsoIstruttorioPreInstructor = () => {
     const [mainStats, setMainStats] = useState({});
@@ -90,7 +91,8 @@ const SoccorsoIstruttorioPreInstructor = () => {
             <div className="appPage__spacer"></div>
 
             <div className="appPageSection">
-                <SoccorsiPreInstructorTableAsync userId={userData.id}/>
+                {/*<SoccorsiPreInstructorTableAsync userId={userData.id}/>*/}
+                <PreInstructorSoccorsiTable userId={userData.id}/>
             </div>
         </div>
     )
diff --git a/src/pages/StatsBeneficiary/components/BeneficiarioUltimeDomandeTable/index.js b/src/pages/StatsBeneficiary/components/BeneficiarioUltimeDomandeTable/index.js
index c65d3d3..bc2457a 100644
--- a/src/pages/StatsBeneficiary/components/BeneficiarioUltimeDomandeTable/index.js
+++ b/src/pages/StatsBeneficiary/components/BeneficiarioUltimeDomandeTable/index.js
@@ -58,7 +58,7 @@ const BeneficiarioUltimeDomandeTable = () => {
                 ['statuses', ['SOCCORSO', 'APPROVED', 'REJECTED', 'EVALUATION', 'SUBMIT']] // 'NDG', 'ADMISSIBLE', 'APPOINTMENT'
             ]);
         }
-    }, [chosenCompanyId]);
+    }, [chosenCompanyId, companies]);
 
     const getApplCallback = (resp) => {
         if (resp.status === 'SUCCESS') {
diff --git a/src/pages/StatsBeneficiary/index.js b/src/pages/StatsBeneficiary/index.js
index 6643afc..ddbd477 100644
--- a/src/pages/StatsBeneficiary/index.js
+++ b/src/pages/StatsBeneficiary/index.js
@@ -37,7 +37,7 @@ const StatsBeneficiary = () => {
         if (existingCompany) {
             DashboardService.getBeneficiaryStatsPage(chosenCompanyId, getStats, errGetStats);
         }
-    }, [chosenCompanyId]);
+    }, [chosenCompanyId, companies]);
 
     return(
         <div className="appPage">