From 7c4b511dac0914505458b7b9c2b16dba0fdd25f7 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Wed, 20 Nov 2024 11:26:41 +0100
Subject: [PATCH 1/3] - fixed request data for update ammendment API;

---
 src/pages/SoccorsoEditPreInstructor/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/SoccorsoEditPreInstructor/index.js b/src/pages/SoccorsoEditPreInstructor/index.js
index 6a3bcc4..3ee425e 100644
--- a/src/pages/SoccorsoEditPreInstructor/index.js
+++ b/src/pages/SoccorsoEditPreInstructor/index.js
@@ -238,7 +238,7 @@ const SoccorsoEditPreInstructor = () => {
             }, []);
 
         const submitData = {
-            updatedFormFields: newFormValues,
+            applicationFormFields: newFormValues,
         }
 
         storeSet.main.setAsyncRequest();
@@ -537,12 +537,12 @@ const SoccorsoEditPreInstructor = () => {
                         }) : null}
                     </form>
 
-                    <Button
+                    {/*<Button
                         style={{ marginTop: 30 }}
                         type="button"
                         disabled={data.status === 'CLOSE'}
                         onClick={doUpdateAmendment}
-                        label={__('Aggiorna', 'gepafin')}/>
+                        label={__('Aggiorna', 'gepafin')}/>*/}
                 </div>
 
                 <div className="appPage__spacer"></div>

From cf5ff862b71f67f15537a8fd4c31340486132713 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Wed, 20 Nov 2024 12:07:09 +0100
Subject: [PATCH 2/3] - saving progress;

---
 .../components/AppSidebar/index.js            |   7 +
 .../AllBandiPreferredAccordion/index.js       | 215 ++++++++++++++++++
 src/pages/BandiPreferredBeneficiario/index.js |  43 ++++
 src/routes.js                                 |   6 +
 src/service/preferred-bando-service.js        |   4 +
 5 files changed, 275 insertions(+)
 create mode 100644 src/pages/BandiPreferredBeneficiario/components/AllBandiPreferredAccordion/index.js
 create mode 100644 src/pages/BandiPreferredBeneficiario/index.js

diff --git a/src/layouts/DefaultLayout/components/AppSidebar/index.js b/src/layouts/DefaultLayout/components/AppSidebar/index.js
index 5155f78..37aa0eb 100644
--- a/src/layouts/DefaultLayout/components/AppSidebar/index.js
+++ b/src/layouts/DefaultLayout/components/AppSidebar/index.js
@@ -41,6 +41,13 @@ const AppSidebar = () => {
             id: 4,
             enable: intersection(permissions, ['VIEW_CALLS']).length
         },
+        {
+            label: __('Bandi osservati', 'gepafin'),
+            icon: 'pi pi-star',
+            href: '/bandi-osservati',
+            id: 13,
+            enable: intersection(permissions, ['VIEW_CALLS']).length
+        },
         {
             label: __('Gestione domande', 'gepafin'),
             icon: 'pi pi-file',
diff --git a/src/pages/BandiPreferredBeneficiario/components/AllBandiPreferredAccordion/index.js b/src/pages/BandiPreferredBeneficiario/components/AllBandiPreferredAccordion/index.js
new file mode 100644
index 0000000..f1c7495
--- /dev/null
+++ b/src/pages/BandiPreferredBeneficiario/components/AllBandiPreferredAccordion/index.js
@@ -0,0 +1,215 @@
+import React, { useState, useEffect} from 'react';
+import { __ } from '@wordpress/i18n';
+import { is, uniq, isNil, isEmpty } from 'ramda';
+import { wrap } from 'object-path-immutable';
+import { useNavigate } from 'react-router-dom';
+
+// store
+import { storeGet, storeSet, useStore } from '../../../../store';
+
+// tools
+import getBandoSeverity from '../../../../helpers/getBandoSeverity';
+import getBandoLabel from '../../../../helpers/getBandoLabel';
+import getDateFromISOstring from '../../../../helpers/getDateFromISOstring';
+import set404FromErrorResponse from '../../../../helpers/set404FromErrorResponse';
+import getNumberWithCurrency from '../../../../helpers/getNumberWithCurrency';
+import renderHtmlContent from '../../../../helpers/renderHtmlContent';
+
+// api
+import PreferredBandoService from '../../../../service/preferred-bando-service';
+
+// components
+import { DataTable } from 'primereact/datatable';
+import { Column } from 'primereact/column';
+import { Dropdown } from 'primereact/dropdown';
+import { Tag } from 'primereact/tag';
+import ProperBandoLabel from '../../../../components/ProperBandoLabel';
+import { Button } from 'primereact/button';
+
+
+const AllBandiPreferredAccordion = () => {
+    const chosenCompanyId = useStore().main.chosenCompanyId();
+    const isAsyncRequest = useStore().main.isAsyncRequest();
+    const [items, setItems] = useState(null);
+    const [filters, setFilters] = useState(null);
+    const [expandedRows, setExpandedRows] = useState(null);
+    const [statuses, setStatuses] = useState([]);
+    const navigate = useNavigate();
+
+    useEffect(() => {
+        storeSet.main.setAsyncRequest();
+        const userData = storeGet.main.userData();
+        PreferredBandoService.getPreferredCalls(getCallback, errGetCallbacks, [
+            ['companyId', chosenCompanyId],
+            ['userId', userData.id]
+        ]);
+    }, [chosenCompanyId]);
+
+    const getCallback = (data) => {
+        if (data.status === 'SUCCESS') {
+            setItems(getFormattedBandiData(data.data));
+            setStatuses(uniq(data.data.map(o => o.status)))
+        }
+        storeSet.main.unsetAsyncRequest();
+    }
+
+    const errGetCallbacks = (data) => {
+        set404FromErrorResponse(data);
+        storeSet.main.unsetAsyncRequest();
+    }
+
+    const getFormattedBandiData = (data) => {
+        return data.map((d) => {
+            d.dates = d.dates.map(v => is(String, v) ? new Date(v) : (v ? v : ''));
+            return d;
+        });
+    };
+
+    const nameBodyTemplate = (rowData) => {
+        return <span
+            className="appPageSection__titleClickable"
+            onClick={() => {
+                let newExpandedRows;
+                if (isNil(expandedRows) || isNil(expandedRows[rowData.id])) {
+                    newExpandedRows = isNil(expandedRows)
+                        ? wrap({}).set([rowData.id], true).value()
+                        : wrap(expandedRows).set([rowData.id], true).value();
+                } else {
+                    newExpandedRows = wrap(expandedRows).del([rowData.id]).value();
+                }
+                setExpandedRows(newExpandedRows);
+            }}>{rowData.name}</span>
+    }
+
+    const amountBodyTemplate = (rowData) => {
+        return getNumberWithCurrency(rowData.amount);
+    };
+
+    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)} />;
+    };
+
+    const addToFavourites = (id, preferredId) => {
+        const companyId = storeGet.main.chosenCompanyId()
+        const data = {
+            companyId,
+            callId: id
+        }
+        if (preferredId && preferredId !== 0) {
+            PreferredBandoService.deleteFromPreferred(preferredId, (data) => removeFavCallback(data, id), errToggleFavCallback);
+        } else {
+            PreferredBandoService.addToPreferred(data, addFavCallback, errToggleFavCallback);
+        }
+    }
+
+    const removeFavCallback = (data, id) => {
+        if (data.status === 'SUCCESS') {
+            const newItems = items.map((o) => {
+                if (o.id === id) {
+                    return {
+                        ...o,
+                        preferredCallId: null
+                    }
+                } else {
+                    return o;
+                }
+            });
+            setItems(newItems)
+        }
+    }
+    const addFavCallback = (data) => {
+        if (data.status === 'SUCCESS') {
+            const newItems = items.map((o) => {
+                if (o.id === data.data.callId) {
+                    return {
+                        ...o,
+                        preferredCallId: data.data.id
+                    }
+                } else {
+                    return o;
+                }
+            });
+            setItems(newItems)
+        }
+    }
+
+    const errToggleFavCallback = (data) => {
+        set404FromErrorResponse(data);
+    }
+
+    const goToBandoPage = (id) => {
+        navigate(`/bandi/${id}`)
+    }
+
+    const actionsBodyTemplate = (rowData) => {
+        return <div className="appPageSection__tableActions">
+            <button type="button"
+                    className="appPageSection__addToFavourites"
+                    data-active={!isNil(rowData.preferredCallId)}
+                    onClick={() => addToFavourites(rowData.id, rowData.preferredCallId)}>
+                <i className="pi pi-heart" style={{ fontSize: '1rem' }}></i>
+            </button>
+        </div>
+    }
+
+    const rowExpansionTemplate = (data) => {
+        return (
+            <div className="p-3">
+                {renderHtmlContent(data.descriptionShort)}
+                <p>{__('Scadenza', 'gepafin')}: {getDateFromISOstring(data.dates[1])}</p>
+                {!isEmpty(chosenCompanyId) && chosenCompanyId !== 0 && !data.confidi
+                    ? <Button onClick={() => goToBandoPage(data.id)} severity="info">
+                    {__('Partecipa', 'gepafin')}
+                </Button> : null}
+                {!isEmpty(chosenCompanyId) && chosenCompanyId !== 0 && data.confidi
+                    ? <Button onClick={() => goToBandoPage(data.id)} severity="info">
+                        {__('Mostra', 'gepafin')}
+                    </Button> : null}
+            </div>
+        );
+    };
+
+    const allowExpansion = (rowData) => {
+        return true;
+    };
+
+    return(
+        <div className="appPageSection__table">
+            <DataTable value={items}
+                       paginator
+                       rows={10}
+                       loading={isAsyncRequest}
+                       dataKey="id"
+                       filters={filters}
+                       emptyMessage={__('Nessun dato disponibile', 'gepafin')}
+                       expandedRows={expandedRows}
+                       onRowToggle={(e) => setExpandedRows(e.data)}
+                       rowExpansionTemplate={rowExpansionTemplate}
+                       onFilter={(e) => setFilters(e.filters)}>
+                <Column expander={allowExpansion} style={{ width: '5rem' }} />
+                <Column field="name" header={__('Bando', 'gepafin')}
+                        body={nameBodyTemplate}
+                        style={{ minWidth: '12rem' }}/>
+                <Column header={__('Importo totale', 'gepafin')} filterField="amount"
+                        style={{ minWidth: '10rem' }} body={amountBodyTemplate} sortable/>
+                <Column field="status" header={__('Stato', 'gepafin')} filterMenuStyle={{ width: '14rem' }}
+                        style={{ width: '8rem' }} body={statusBodyTemplate} filter sortable
+                        filterElement={statusFilterTemplate}/>
+                {!isEmpty(chosenCompanyId) && chosenCompanyId !== 0
+                    ? <Column header={__('Azioni', 'gepafin')}
+                        style={{ width: '8rem' }}
+                        body={actionsBodyTemplate}/> : null}
+            </DataTable>
+        </div>
+    )
+}
+
+export default AllBandiPreferredAccordion;
\ No newline at end of file
diff --git a/src/pages/BandiPreferredBeneficiario/index.js b/src/pages/BandiPreferredBeneficiario/index.js
new file mode 100644
index 0000000..360090f
--- /dev/null
+++ b/src/pages/BandiPreferredBeneficiario/index.js
@@ -0,0 +1,43 @@
+import React from 'react';
+import { __ } from '@wordpress/i18n';
+import { Link } from 'react-router-dom';
+import { isEmpty } from 'ramda';
+
+// store
+import { useStore } from '../../store';
+
+// components
+import AllBandiPreferredAccordion from './components/AllBandiPreferredAccordion';
+
+const BandiPreferredBeneficiario = () => {
+    const chosenCompanyId = useStore().main.chosenCompanyId();
+
+    return (
+        <div className="appPage">
+            <div className="appPage__pageHeader">
+                <h1>{__('Bandi osservati', 'gepafin')}</h1>
+            </div>
+
+            <div className="appPage__spacer"></div>
+
+            {isEmpty(chosenCompanyId) || chosenCompanyId === 0
+                ? <>
+                    <div className="appPageSection__message warning">
+                        <i className="pi pi-exclamation-triangle"></i>
+                        <span className="summary">{__('Attenzione', 'gepafin')}</span>
+                        <span>
+                            {__('Per applicare ai bandi devi Registare un Azienda clicca', 'gepafin')}
+                            <Link to={`/agguingi-azienda`} style={{marginLeft: '0.5ch'}}>{__('qua', 'gepafin')}</Link>
+                        </span>
+                    </div>
+                    <div className="appPage__spacer"></div>
+                </> : null}
+
+            <div className="appPageSection">
+                <AllBandiPreferredAccordion/>
+            </div>
+        </div>
+    )
+}
+
+export default BandiPreferredBeneficiario;
\ No newline at end of file
diff --git a/src/routes.js b/src/routes.js
index dfb0234..34a9ba3 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -36,6 +36,7 @@ import SoccorsoAddPreInstructor from './pages/SoccorsoAddPreInstructor';
 import DomandeBeneficiario from './pages/DomandeBeneficiario';
 import DomandaBeneficiario from './pages/DomandaBeneficiario';
 import BandoApplicationPreview from './pages/BandoApplicationPreview';
+import BandiPreferredBeneficiario from './pages/BandiPreferredBeneficiario';
 
 const routes = ({ role, chosenCompanyId }) => {
 
@@ -87,6 +88,11 @@ const routes = ({ role, chosenCompanyId }) => {
                     {'ROLE_BENEFICIARY' === role ? <PageNotFound/> : null}
                     {'ROLE_PRE_INSTRUCTOR' === role ? <PageNotFound/> : null}
                 </DefaultLayout>}/>
+                <Route path="/bandi-osservati" element={<DefaultLayout>
+                    {'ROLE_SUPER_ADMIN' === role ? <PageNotFound/> : null}
+                    {'ROLE_BENEFICIARY' === role ? <BandiPreferredBeneficiario/> : null}
+                    {'ROLE_PRE_INSTRUCTOR' === role ? <PageNotFound/> : null}
+                </DefaultLayout>}/>
                 <Route path="/domande" element={<DefaultLayout>
                     {'ROLE_SUPER_ADMIN' === role ? <Domande/> : null}
                     {'ROLE_BENEFICIARY' === role ? <DomandeBeneficiario/> : null}
diff --git a/src/service/preferred-bando-service.js b/src/service/preferred-bando-service.js
index 95416af..cf34594 100644
--- a/src/service/preferred-bando-service.js
+++ b/src/service/preferred-bando-service.js
@@ -11,4 +11,8 @@ export default class PreferredBandoService {
     static deleteFromPreferred = (id, callback, errCallback) => {
         NetworkService.delete(`${API_BASE_URL}/beneficiaryPreferredCall/${id}`, {}, callback, errCallback);
     };
+
+    static getPreferredCalls = (callback, errCallback, queryParams) => {
+        NetworkService.get(`${API_BASE_URL}/beneficiaryPreferredCall/user`, callback, errCallback, queryParams);
+    };
 }

From bf14a133d8bdec95fb7538ce01084be74f21272c Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Thu, 21 Nov 2024 11:34:28 +0100
Subject: [PATCH 3/3] - added translation config; - implemented 'bandi
 osservati' page;

---
 .../Bandi/components/AllBandiTable/index.js   |  5 +--
 .../components/AllBandiAccordion/index.js     | 34 ++++++++++++++-----
 .../AllBandiPreferredAccordion/index.js       |  5 +--
 src/pages/BandiPreferredBeneficiario/index.js |  4 +--
 .../DraftApplicationsTable/index.js           |  5 +--
 .../components/LatestBandiTable/index.js      |  5 +--
 .../LatestUsersActivityTable/index.js         |  2 +-
 .../components/LatestBandiTable/index.js      | 12 ++++---
 .../MyLatestSubmissionsTable/index.js         |  5 +--
 .../PreInstructorDomandeTable/index.js        | 20 +++++++++--
 .../components/AllDomandeTable/index.js       |  5 +--
 .../BeneficiarioDomandeTable/index.js         |  5 +--
 .../PreInstructorSoccorsiTable/index.js       | 22 ++++++++++--
 .../Users/components/AllUsersTable/index.js   |  3 +-
 src/translationStringsForComponents.js        | 16 +++++++++
 15 files changed, 113 insertions(+), 35 deletions(-)
 create mode 100644 src/translationStringsForComponents.js

diff --git a/src/pages/Bandi/components/AllBandiTable/index.js b/src/pages/Bandi/components/AllBandiTable/index.js
index 8276815..236098e 100644
--- a/src/pages/Bandi/components/AllBandiTable/index.js
+++ b/src/pages/Bandi/components/AllBandiTable/index.js
@@ -23,6 +23,7 @@ import { Calendar } from 'primereact/calendar';
 import { Tag } from 'primereact/tag';
 import ProperBandoLabel from '../../../../components/ProperBandoLabel';
 import { Link } from 'react-router-dom';
+import translationStrings from '../../../../translationStringsForComponents';
 
 
 const AllBandiTable = () => {
@@ -115,7 +116,7 @@ const AllBandiTable = () => {
     };
 
     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 />;
+        return <Dropdown value={options.value} options={statuses} onChange={(e) => options.filterCallback(e.value, options.index)} itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter" showClear />;
     };
 
     const statusItemTemplate = (option) => {
@@ -136,7 +137,7 @@ const AllBandiTable = () => {
                        filters={filters}
                        globalFilterFields={['name', 'status']}
                        header={header}
-                       emptyMessage={__('Nessun dato disponibile', 'gepafin')}
+                       emptyMessage={translationStrings.emptyMessage}
                        onFilter={(e) => setFilters(e.filters)}>
                 <Column field="name" header={__('Nome Bando', 'gepafin')}
                         filter filterPlaceholder={__('Cerca', 'gepafin')}
diff --git a/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js b/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js
index e6a155f..bba88cf 100644
--- a/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js
+++ b/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js
@@ -17,6 +17,7 @@ import renderHtmlContent from '../../../../helpers/renderHtmlContent';
 
 // api
 import BandoService from '../../../../service/bando-service';
+import PreferredBandoService from '../../../../service/preferred-bando-service';
 
 // components
 import { DataTable } from 'primereact/datatable';
@@ -25,10 +26,11 @@ import { Dropdown } from 'primereact/dropdown';
 import { Tag } from 'primereact/tag';
 import ProperBandoLabel from '../../../../components/ProperBandoLabel';
 import { Button } from 'primereact/button';
-import PreferredBandoService from '../../../../service/preferred-bando-service';
 
+// i18n
+import translationStrings from '../../../../translationStringsForComponents';
 
-const AllBandiAccordion = () => {
+const AllBandiAccordion = ({ showOnlyPreferred = false }) => {
     const chosenCompanyId = useStore().main.chosenCompanyId();
     const isAsyncRequest = useStore().main.isAsyncRequest();
     const [items, setItems] = useState(null);
@@ -40,7 +42,8 @@ const AllBandiAccordion = () => {
     useEffect(() => {
         storeSet.main.setAsyncRequest();
         BandoService.getBandi(getCallback, errGetCallbacks, [
-            ['companyId', chosenCompanyId]
+            ['companyId', chosenCompanyId],
+            ['onlyPreferredCall', showOnlyPreferred]
         ]);
     }, [chosenCompanyId]);
 
@@ -81,7 +84,19 @@ const AllBandiAccordion = () => {
     }
 
     const amountBodyTemplate = (rowData) => {
-        return getNumberWithCurrency(rowData.amount);
+        return <span
+            className="appPageSection__titleClickable"
+            onClick={() => {
+                let newExpandedRows;
+                if (isNil(expandedRows) || isNil(expandedRows[rowData.id])) {
+                    newExpandedRows = isNil(expandedRows)
+                        ? wrap({}).set([rowData.id], true).value()
+                        : wrap(expandedRows).set([rowData.id], true).value();
+                } else {
+                    newExpandedRows = wrap(expandedRows).del([rowData.id]).value();
+                }
+                setExpandedRows(newExpandedRows);
+            }}>{getNumberWithCurrency(rowData.amount)}</span>;
     };
 
     const statusBodyTemplate = (rowData) => {
@@ -89,11 +104,14 @@ const AllBandiAccordion = () => {
     };
 
     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 />;
+        return <Dropdown value={options.value} options={statuses}
+                         onChange={(e) => options.filterCallback(e.value, options.index)}
+                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"
+                         showClear/>;
     };
 
     const statusItemTemplate = (option) => {
-        return <Tag value={getBandoLabel(option)} severity={getBandoSeverity(option)} />;
+        return <Tag value={getBandoLabel(option)} severity={getBandoSeverity(option)}/>;
     };
 
     const addToFavourites = (id, preferredId) => {
@@ -188,7 +206,7 @@ const AllBandiAccordion = () => {
                        loading={isAsyncRequest}
                        dataKey="id"
                        filters={filters}
-                       emptyMessage={__('Nessun dato disponibile', 'gepafin')}
+                       emptyMessage={translationStrings.emptyMessage}
                        expandedRows={expandedRows}
                        onRowToggle={(e) => setExpandedRows(e.data)}
                        rowExpansionTemplate={rowExpansionTemplate}
@@ -198,7 +216,7 @@ const AllBandiAccordion = () => {
                         body={nameBodyTemplate}
                         style={{ minWidth: '12rem' }}/>
                 <Column header={__('Importo totale', 'gepafin')} filterField="amount"
-                        style={{ minWidth: '10rem' }} body={amountBodyTemplate} sortable/>
+                        style={{ minWidth: '10rem' }} body={amountBodyTemplate}/>
                 <Column field="status" header={__('Stato', 'gepafin')} filterMenuStyle={{ width: '14rem' }}
                         style={{ width: '8rem' }} body={statusBodyTemplate} filter sortable
                         filterElement={statusFilterTemplate}/>
diff --git a/src/pages/BandiPreferredBeneficiario/components/AllBandiPreferredAccordion/index.js b/src/pages/BandiPreferredBeneficiario/components/AllBandiPreferredAccordion/index.js
index f1c7495..3a8ca31 100644
--- a/src/pages/BandiPreferredBeneficiario/components/AllBandiPreferredAccordion/index.js
+++ b/src/pages/BandiPreferredBeneficiario/components/AllBandiPreferredAccordion/index.js
@@ -25,6 +25,7 @@ import { Dropdown } from 'primereact/dropdown';
 import { Tag } from 'primereact/tag';
 import ProperBandoLabel from '../../../../components/ProperBandoLabel';
 import { Button } from 'primereact/button';
+import translationStrings from '../../../../translationStringsForComponents';
 
 
 const AllBandiPreferredAccordion = () => {
@@ -90,7 +91,7 @@ const AllBandiPreferredAccordion = () => {
     };
 
     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 />;
+        return <Dropdown value={options.value} options={statuses} onChange={(e) => options.filterCallback(e.value, options.index)} itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter" showClear />;
     };
 
     const statusItemTemplate = (option) => {
@@ -189,7 +190,7 @@ const AllBandiPreferredAccordion = () => {
                        loading={isAsyncRequest}
                        dataKey="id"
                        filters={filters}
-                       emptyMessage={__('Nessun dato disponibile', 'gepafin')}
+                       emptyMessage={translationStrings.emptyMessage}
                        expandedRows={expandedRows}
                        onRowToggle={(e) => setExpandedRows(e.data)}
                        rowExpansionTemplate={rowExpansionTemplate}
diff --git a/src/pages/BandiPreferredBeneficiario/index.js b/src/pages/BandiPreferredBeneficiario/index.js
index 360090f..e6e2063 100644
--- a/src/pages/BandiPreferredBeneficiario/index.js
+++ b/src/pages/BandiPreferredBeneficiario/index.js
@@ -7,7 +7,7 @@ import { isEmpty } from 'ramda';
 import { useStore } from '../../store';
 
 // components
-import AllBandiPreferredAccordion from './components/AllBandiPreferredAccordion';
+import AllBandiAccordion from '../BandiBeneficiario/components/AllBandiAccordion';
 
 const BandiPreferredBeneficiario = () => {
     const chosenCompanyId = useStore().main.chosenCompanyId();
@@ -34,7 +34,7 @@ const BandiPreferredBeneficiario = () => {
                 </> : null}
 
             <div className="appPageSection">
-                <AllBandiPreferredAccordion/>
+                <AllBandiAccordion showOnlyPreferred={true}/>
             </div>
         </div>
     )
diff --git a/src/pages/Dashboard/components/DraftApplicationsTable/index.js b/src/pages/Dashboard/components/DraftApplicationsTable/index.js
index 63518ff..e3d9a5c 100644
--- a/src/pages/Dashboard/components/DraftApplicationsTable/index.js
+++ b/src/pages/Dashboard/components/DraftApplicationsTable/index.js
@@ -26,6 +26,7 @@ import { Button } from 'primereact/button';
 import { Tag } from 'primereact/tag';
 import ProperBandoLabel from '../../../../components/ProperBandoLabel';
 import { Link } from 'react-router-dom';
+import translationStrings from '../../../../translationStringsForComponents';
 
 const DraftApplicationsTable = () => {
     const chosenCompanyId = useStore().main.chosenCompanyId();
@@ -142,7 +143,7 @@ const DraftApplicationsTable = () => {
     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"
+                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"
                          showClear/>;
     };
 
@@ -169,7 +170,7 @@ const DraftApplicationsTable = () => {
                        filters={filters}
                        globalFilterFields={['name', 'status']}
                        header={header}
-                       emptyMessage={__('Nessun dato disponibile', 'gepafin')}
+                       emptyMessage={translationStrings.emptyMessage}
                        onFilter={(e) => setFilters(e.filters)}>
                 <Column field="id" header={__('ID domanda', 'gepafin')}
                         filter filterPlaceholder={__('Cerca', 'gepafin')}
diff --git a/src/pages/Dashboard/components/LatestBandiTable/index.js b/src/pages/Dashboard/components/LatestBandiTable/index.js
index b1b1b36..94f32da 100644
--- a/src/pages/Dashboard/components/LatestBandiTable/index.js
+++ b/src/pages/Dashboard/components/LatestBandiTable/index.js
@@ -16,6 +16,7 @@ import { Button } from 'primereact/button';
 import { Calendar } from 'primereact/calendar';
 import ProperBandoLabel from '../../../../components/ProperBandoLabel';
 import { Link } from 'react-router-dom';
+import translationStrings from '../../../../translationStringsForComponents';
 
 
 const LatestBandiTable = () => {
@@ -23,7 +24,7 @@ const LatestBandiTable = () => {
     const [filters, setFilters] = useState(null);
     const [localAsyncRequest, setLocalAsyncRequest] = useState(false);
     const [globalFilterValue, setGlobalFilterValue] = useState('');
-    const [statuses, setStatuses] = useState([]);
+    const [, setStatuses] = useState([]);
 
     useEffect(() => {
         setLocalAsyncRequest(true);
@@ -128,7 +129,7 @@ const LatestBandiTable = () => {
                        filters={filters}
                        globalFilterFields={['name', 'status']}
                        header={header}
-                       emptyMessage={__('Nessun dato disponibile', 'gepafin')}
+                       emptyMessage={translationStrings.emptyMessage}
                        onFilter={(e) => setFilters(e.filters)}>
                 <Column field="name" header={__('Nome Bando', 'gepafin')} filter filterPlaceholder={__('Cerca il nome', 'gepafin')}
                         style={{ minWidth: '8rem' }}/>
diff --git a/src/pages/Dashboard/components/LatestUsersActivityTable/index.js b/src/pages/Dashboard/components/LatestUsersActivityTable/index.js
index 3473117..1c015c1 100644
--- a/src/pages/Dashboard/components/LatestUsersActivityTable/index.js
+++ b/src/pages/Dashboard/components/LatestUsersActivityTable/index.js
@@ -107,7 +107,7 @@ const LatestUsersActivityTable = () => {
                        filters={filters}
                        globalFilterFields={['name', 'status']}
                        header={header}
-                       emptyMessage={__('Nessun dato disponibile', 'gepafin')}
+                       emptyMessage={translationStrings.emptyMessage}{__('Nessun dato disponibile', 'gepafin')}
                        onFilter={(e) => setFilters(e.filters)}>
                 <Column header={__('Timestamp', 'gepafin')} filterField="date" dataType="date"
                         style={{ minWidth: '8rem' }}
diff --git a/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js b/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js
index 0de8d69..8c1a0a5 100644
--- a/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js
+++ b/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js
@@ -8,6 +8,10 @@ import { storeGet, useStore } from '../../../../store';
 
 // api
 import BandoService from '../../../../service/bando-service';
+import PreferredBandoService from '../../../../service/preferred-bando-service';
+
+// tools
+import set404FromErrorResponse from '../../../../helpers/set404FromErrorResponse';
 
 // components
 import { FilterMatchMode, FilterOperator } from 'primereact/api';
@@ -19,8 +23,8 @@ import { InputIcon } from 'primereact/inputicon';
 import { Button } from 'primereact/button';
 import { Calendar } from 'primereact/calendar';
 import ProperBandoLabel from '../../../../components/ProperBandoLabel';
-import PreferredBandoService from '../../../../service/preferred-bando-service';
-import set404FromErrorResponse from '../../../../helpers/set404FromErrorResponse';
+
+import translationStrings from '../../../../translationStringsForComponents';
 
 
 const LatestBandiTable = () => {
@@ -29,7 +33,7 @@ const LatestBandiTable = () => {
     const [filters, setFilters] = useState(null);
     const [loading, setLoading] = useState(false);
     const [globalFilterValue, setGlobalFilterValue] = useState('');
-    const [statuses, setStatuses] = useState([]);
+    const [, setStatuses] = useState([]);
 
     useEffect(() => {
         setLoading(true);
@@ -209,7 +213,7 @@ const LatestBandiTable = () => {
                        filters={filters}
                        globalFilterFields={['name', 'status']}
                        header={header}
-                       emptyMessage={__('Nessun dato disponibile', 'gepafin')}
+                       emptyMessage={translationStrings.emptyMessage}
                        onFilter={(e) => setFilters(e.filters)}>
                 <Column field="name" header={__('Nome Bando', 'gepafin')} filter
                         filterPlaceholder={__('Cerca il nome', 'gepafin')}
diff --git a/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js b/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js
index ce3f987..e7a488d 100644
--- a/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js
+++ b/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js
@@ -26,6 +26,7 @@ import { Calendar } from 'primereact/calendar';
 import { Tag } from 'primereact/tag';
 import ProperBandoLabel from '../../../../components/ProperBandoLabel';
 import { Link } from 'react-router-dom';
+import translationStrings from '../../../../translationStringsForComponents';
 
 const MyLatestSubmissionsTable = () => {
     const chosenCompanyId = useStore().main.chosenCompanyId();
@@ -145,7 +146,7 @@ const MyLatestSubmissionsTable = () => {
     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"
+                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"
                          showClear/>;
     };
 
@@ -175,7 +176,7 @@ const MyLatestSubmissionsTable = () => {
                        filters={filters}
                        globalFilterFields={['name', 'status']}
                        header={header}
-                       emptyMessage={__('Nessun dato disponibile', 'gepafin')}
+                       emptyMessage={translationStrings.emptyMessage}
                        onFilter={(e) => setFilters(e.filters)}>
                 <Column field="callTitle" header={__('Bando', 'gepafin')} filter filterPlaceholder={__('Cerca il nome', 'gepafin')}
                         style={{ minWidth: '8rem' }}/>
diff --git a/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js b/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js
index 5e53e82..ab5fe5a 100644
--- a/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js
+++ b/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js
@@ -9,6 +9,10 @@ import { useStore } from '../../../../store';
 // api
 import AssignedApplicationService from '../../../../service/assigned-application-service';
 
+// tools
+import getBandoLabel from '../../../../helpers/getBandoLabel';
+import getBandoSeverity from '../../../../helpers/getBandoSeverity';
+
 // components
 import { FilterMatchMode, FilterOperator } from 'primereact/api';
 import { DataTable } from 'primereact/datatable';
@@ -19,7 +23,10 @@ import { InputIcon } from 'primereact/inputicon';
 import { Button } from 'primereact/button';
 import { Calendar } from 'primereact/calendar';
 import ProperBandoLabel from '../../../../components/ProperBandoLabel';
+import { Dropdown } from 'primereact/dropdown';
+import { Tag } from 'primereact/tag';
 
+import translationStrings from '../../../../translationStringsForComponents';
 
 const PreInstructorDomandeTable = () => {
     const userData = useStore().main.userData();
@@ -126,6 +133,14 @@ const PreInstructorDomandeTable = () => {
         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={translationStrings.selectOneLabel} className="p-column-filter" showClear />;
+    };
+
+    const statusItemTemplate = (option) => {
+        return <Tag value={getBandoLabel(option)} severity={getBandoSeverity(option)} />;
+    };
+
     const actionsBodyTemplate = (rowData) => {
         return <Link to={`/domande/${rowData.applicationId}`}>
             <Button severity="info" label={__('Valuta', 'gepafin')} icon="pi pi-eye" size="small" iconPos="right"/>
@@ -140,7 +155,7 @@ const PreInstructorDomandeTable = () => {
                        filters={filters}
                        globalFilterFields={['name', 'status']}
                        header={header}
-                       emptyMessage={__('Nessun dato disponibile', 'gepafin')}
+                       emptyMessage={translationStrings.emptyMessage}
                        onFilter={(e) => setFilters(e.filters)}>
                 <Column field="applicationId" header={__('ID domanda', 'gepafin')}
                         filter filterPlaceholder={__('Cerca', 'gepafin')}
@@ -155,7 +170,8 @@ const PreInstructorDomandeTable = () => {
                         style={{ minWidth: '8rem' }}
                         body={dateEndBodyTemplate} filter filterElement={dateFilterTemplate}/>
                 <Column field="status" header={__('Stato', 'gepafin')}
-                        style={{ minWidth: '7rem' }} body={statusBodyTemplate} />
+                        style={{ minWidth: '7rem' }} body={statusBodyTemplate} filter
+                        filterElement={statusFilterTemplate} />
                 <Column header={__('Azioni', 'gepafin')}
                         body={actionsBodyTemplate}/>
             </DataTable>
diff --git a/src/pages/Domande/components/AllDomandeTable/index.js b/src/pages/Domande/components/AllDomandeTable/index.js
index eb0ae9e..6e6a507 100644
--- a/src/pages/Domande/components/AllDomandeTable/index.js
+++ b/src/pages/Domande/components/AllDomandeTable/index.js
@@ -19,6 +19,7 @@ import { InputIcon } from 'primereact/inputicon';
 import { Button } from 'primereact/button';
 import { Calendar } from 'primereact/calendar';
 import ProperBandoLabel from '../../../../components/ProperBandoLabel';
+import translationStrings from '../../../../translationStringsForComponents';
 
 
 const AllDomandeTable = ({ openDialogFn, updaterString = '' }) => {
@@ -26,7 +27,7 @@ const AllDomandeTable = ({ openDialogFn, updaterString = '' }) => {
     const [filters, setFilters] = useState(null);
     const [localAsyncRequest, setLocalAsyncRequest] = useState(false);
     const [globalFilterValue, setGlobalFilterValue] = useState('');
-    const [statuses, setStatuses] = useState([]);
+    const [, setStatuses] = useState([]);
 
     useEffect(() => {
         setLocalAsyncRequest(true);
@@ -154,7 +155,7 @@ const AllDomandeTable = ({ openDialogFn, updaterString = '' }) => {
                        filters={filters}
                        globalFilterFields={['name', 'status']}
                        header={header}
-                       emptyMessage={__('Nessun dato disponibile', 'gepafin')}
+                       emptyMessage={translationStrings.emptyMessage}
                        onFilter={(e) => setFilters(e.filters)}>
                 <Column field="id" header={__('ID domanda', 'gepafin')}
                         filter filterPlaceholder={__('Cerca', 'gepafin')}
diff --git a/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js b/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js
index 56bc773..30e7b80 100644
--- a/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js
+++ b/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js
@@ -25,6 +25,7 @@ import { Calendar } from 'primereact/calendar';
 import ProperBandoLabel from '../../../../components/ProperBandoLabel';
 import { Dropdown } from 'primereact/dropdown';
 import { Tag } from 'primereact/tag';
+import translationStrings from '../../../../translationStringsForComponents';
 
 
 const BeneficiarioDomandeTable = () => {
@@ -141,7 +142,7 @@ const BeneficiarioDomandeTable = () => {
     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"
+                         itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"
                          showClear/>;
     };
 
@@ -169,7 +170,7 @@ const BeneficiarioDomandeTable = () => {
                        filters={filters}
                        globalFilterFields={['name', 'status']}
                        header={header}
-                       emptyMessage={__('Nessun dato disponibile', 'gepafin')}
+                       emptyMessage={translationStrings.emptyMessage}
                        onFilter={(e) => setFilters(e.filters)}>
                 <Column field="id" header={__('ID domanda', 'gepafin')} filter
                         filterPlaceholder={__('Cerca il nome', 'gepafin')}
diff --git a/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js b/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js
index 31a6a70..1dfcdef 100644
--- a/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js
+++ b/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js
@@ -7,7 +7,11 @@ import { Link } from 'react-router-dom';
 import { storeGet } from '../../../../store';
 
 // api
+import AmendmentsService from '../../../../service/amendments-service';
 
+// tools
+import getBandoLabel from '../../../../helpers/getBandoLabel';
+import getBandoSeverity from '../../../../helpers/getBandoSeverity';
 
 // components
 import { FilterMatchMode, FilterOperator } from 'primereact/api';
@@ -19,7 +23,10 @@ import { InputIcon } from 'primereact/inputicon';
 import { Button } from 'primereact/button';
 import { Calendar } from 'primereact/calendar';
 import ProperBandoLabel from '../../../../components/ProperBandoLabel';
-import AmendmentsService from '../../../../service/amendments-service';
+import { Dropdown } from 'primereact/dropdown';
+import { Tag } from 'primereact/tag';
+
+import translationStrings from '../../../../translationStringsForComponents';
 
 
 const PreInstructorSoccorsiTable = ({ openDialogFn }) => {
@@ -129,6 +136,14 @@ const PreInstructorSoccorsiTable = ({ openDialogFn }) => {
         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={translationStrings.selectOneLabel} className="p-column-filter" showClear />;
+    };
+
+    const statusItemTemplate = (option) => {
+        return <Tag value={getBandoLabel(option)} severity={getBandoSeverity(option)} />;
+    };
+
     const actionsBodyTemplate = (rowData) => {
         return <Link to={`/domande/${rowData.applicationId}/soccorso/${rowData.id}`}>
                 <Button severity="info" label={__('Dettagli', 'gepafin')} size="small" />
@@ -143,7 +158,7 @@ const PreInstructorSoccorsiTable = ({ openDialogFn }) => {
                        filters={filters}
                        globalFilterFields={['name', 'status']}
                        header={header}
-                       emptyMessage={__('Nessun dato disponibile', 'gepafin')}
+                       emptyMessage={translationStrings.emptyMessage}
                        onFilter={(e) => setFilters(e.filters)}>
                 <Column field="applicationId" header={__('ID domanda', 'gepafin')}
                         filter filterPlaceholder={__('Cerca', 'gepafin')}
@@ -163,7 +178,8 @@ const PreInstructorSoccorsiTable = ({ openDialogFn }) => {
                         style={{ minWidth: '8rem' }}
                         body={dateExpirationBodyTemplate} filter filterElement={dateFilterTemplate}/>
                 <Column field="status" header={__('Stato', 'gepafin')}
-                        style={{ minWidth: '7rem' }} body={statusBodyTemplate} />
+                        style={{ minWidth: '7rem' }} body={statusBodyTemplate} filter
+                        filterElement={statusFilterTemplate} />
                 <Column header={__('Azioni', 'gepafin')}
                         body={actionsBodyTemplate}/>
             </DataTable>
diff --git a/src/pages/Users/components/AllUsersTable/index.js b/src/pages/Users/components/AllUsersTable/index.js
index b9aef65..5741333 100644
--- a/src/pages/Users/components/AllUsersTable/index.js
+++ b/src/pages/Users/components/AllUsersTable/index.js
@@ -25,6 +25,7 @@ import { Button } from 'primereact/button';
 import { Calendar } from 'primereact/calendar';
 import { Tag } from 'primereact/tag';
 import ProperBandoLabel from '../../../../components/ProperBandoLabel';
+import translationStrings from '../../../../translationStringsForComponents';
 
 const AllUsersTable = () => {
     const users = useStore().main.users();
@@ -150,7 +151,7 @@ const AllUsersTable = () => {
                        filters={filters}
                        globalFilterFields={['name', 'status']}
                        header={header}
-                       emptyMessage={__('Nessun dato disponibile', 'gepafin')}
+                       emptyMessage={translationStrings.emptyMessage}
                        onFilter={(e) => setFilters(e.filters)}>
                 <Column body={nameBodyTemplate}
                         header={__('Nome utente', 'gepafin')}
diff --git a/src/translationStringsForComponents.js b/src/translationStringsForComponents.js
new file mode 100644
index 0000000..e33247e
--- /dev/null
+++ b/src/translationStringsForComponents.js
@@ -0,0 +1,16 @@
+/* data table related */
+import { __ } from '@wordpress/i18n';
+
+const currentPageReportTemplate = '';
+
+const emptyMessage = __('Nessun dato disponibile', 'gepafin');
+
+const selectOneLabel = __('Seleziona', 'gepafin');
+
+const translationStrings = {
+    currentPageReportTemplate,
+    emptyMessage,
+    selectOneLabel
+}
+
+export default translationStrings;
\ No newline at end of file