- fixed filter for calls table;

- implemented call table async on all pages;
- added applications table async;

src/pages/Dashboard/components/LatestBandiTableAsync/index.js

@@ -1,23 +1,28 @@
 import React, { useEffect, useState, useCallback } from 'react';
 import { __ } from '@wordpress/i18n';
-import { FilterMatchMode } from 'primereact/api';
+import { isEmpty, pathOr } from 'ramda';
+import { Link } from 'react-router-dom';
 
 import translationStrings from '../../../../translationStringsForComponents';
 
 // api
 import BandoService from '../../../../service/bando-service';
 
+// tools
+import getTimeParsedFromString from '../../../../helpers/getTimeParsedFromString';
+import getTimeFromISOstring from '../../../../helpers/getTimeFromISOstring';
+import getFormattedDateString from '../../../../helpers/getFormattedDateString';
+import getBandoLabel from '../../../../helpers/getBandoLabel';
+import getBandoSeverity from '../../../../helpers/getBandoSeverity';
+
 // components
 import { DataTable } from 'primereact/datatable';
 import { Column } from 'primereact/column';
-import { Link } from 'react-router-dom';
 import { Button } from 'primereact/button';
 import ProperBandoLabel from '../../../../components/ProperBandoLabel';
 import { Dropdown } from 'primereact/dropdown';
 import { Tag } from 'primereact/tag';
-import getBandoLabel from '../../../../helpers/getBandoLabel';
-import getBandoSeverity from '../../../../helpers/getBandoSeverity';
-import { isEmpty, pathOr } from 'ramda';
+import { Calendar } from 'primereact/calendar';
 
 const LatestBandiTableAsync = () => {
     const [localAsyncRequest, setLocalAsyncRequest] = useState(false);
@@ -30,55 +35,54 @@ const LatestBandiTableAsync = () => {
         sortField: null,
         sortOrder: null,
         filters: {
-            name: { value: '', matchMode: 'contains' },
-            status: { value: '', matchMode: 'equals' }
+            name: { value: null, matchMode: 'contains' },
+            startDate: { value: null, matchMode: 'date_is' },
+            endDate: { value: null, matchMode: 'date_is' },
+            status: { value: null, matchMode: 'equals' }
         }
     });
     const statuses = ['PUBLISH'];
 
     const getPaginationQuery = useCallback(() => {
         let sortBy = {
-            "columnName": "ID",
-            "sortDesc": true
+            columnName: "ID",
+            sortDesc: true
         };
 
         if (lazyState.sortField) {
             sortBy = {
-                "columnName": lazyState.sortField,
-                "sortDesc": lazyState.sortOrder === -1
+                columnName: lazyState.sortField,
+                sortDesc: lazyState.sortOrder === -1
             }
         }
         return {
             globalFilters: {
                 page: lazyState.page ? lazyState.page + 1 : 1,
                 limit: lazyState.rows,
-                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;
-                }, {}),
                 sortBy
             },
-            status: statuses
+            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) => {
-        //console.log('onPage', event);
         setLazyState(event);
     };
 
     const onSort = (event) => {
-        //console.log('onSort', event);
         event['first'] = 0;
         event['page'] = 0;
         setLazyState(event);
     };
 
     const onFilter = useCallback((event) => {
-        //console.log('onFilter', event);
         event['first'] = 0;
         event['page'] = 0;
         setLazyState(event);
@@ -90,7 +94,7 @@ const LatestBandiTableAsync = () => {
                 //currentPage, totalPages, pageSize
             } = resp.data;
             setTotalRecordsNum(totalRecords);
-            setItems(getFormattedBandiData(body));
+            setItems(getFormattedData(body));
         }
         setLocalAsyncRequest(false);
     }
@@ -99,10 +103,10 @@ const LatestBandiTableAsync = () => {
         setLocalAsyncRequest(false);
     }
 
-    const getFormattedBandiData = (data) => {
+    const getFormattedData = (data) => {
         return [...(data || [])].map((d) => {
-            d.start_date = new Date(d.dates[0]);
-            d.end_date = new Date(d.dates[1]);
+            d.startDate = new Date(d.dates[0]);
+            d.endDate = new Date(d.dates[1]);
 
             return d;
         });
@@ -138,39 +142,28 @@ const LatestBandiTableAsync = () => {
                          showClear/>;
     };
 
+    const dateFilterTemplate = (options) => {
+        return <Calendar value={options.value} onChange={(e) => options.filterCallback(e.value, options.index)}
+                         dateFormat="mm/dd/yy" placeholder="mm/dd/yyyy" mask="99/99/9999"/>;
+    };
+
     const dateStartBodyTemplate = (rowData) => {
-        return formatDate(rowData.start_date);
+        const startTimeObj = getTimeParsedFromString(rowData.startTime);
+        return getFormattedDateString(rowData.startDate) + ' ' + getTimeFromISOstring(startTimeObj);
     };
 
     const dateEndBodyTemplate = (rowData) => {
-        return formatDate(rowData.end_date);
-    };
-
-    const formatDate = (value) => {
-        return value.toLocaleDateString('it-IT', {
-            day: '2-digit',
-            month: '2-digit',
-            year: 'numeric'
-        });
+        const endTimeObg = getTimeParsedFromString(rowData.endTime);
+        return getFormattedDateString(rowData.endDate)  + ' ' + getTimeFromISOstring(endTimeObg);
     };
 
     useEffect(() => {
-        //console.log('lazyState', lazyState)
         setLocalAsyncRequest(true);
         const paginationQuery = getPaginationQuery();
-        //console.log('paginationQuery', paginationQuery)
 
         BandoService.getBandiPaginated(paginationQuery, getCallback, errGetCallbacks);
     }, [lazyState]);
 
-    /*useEffect(() => {
-        if (!localAsyncRequest) {
-            setLocalAsyncRequest(true);
-            const paginationQuery = getPaginationQuery();
-            BandoService.getBandiPaginated(paginationQuery, getCallback, errGetCallbacks);
-        }
-    }, []);*/
-
     return (
         <div className="appPageSection__table">
             <DataTable
@@ -183,18 +176,24 @@ const LatestBandiTableAsync = () => {
                 <Column field="name"
                         sortable
                         filterField="name" filter
-                        filterMatchModeOptions={[{ label: 'Contiene', value: FilterMatchMode.CONTAINS }]}
+                        filterMatchModeOptions={translationStrings.textFilterOptions}
                         header={__('Nome Bando', 'gepafin')}
                         style={{ minWidth: '8rem' }}/>
                 <Column header={__('Data Pubblicazione', 'gepafin')}
+                        filterElement={dateFilterTemplate} filter
+                        filterField="startDate" dataType="date"
+                        filterMatchModeOptions={translationStrings.dateFilterOptions}
                         style={{ minWidth: '8rem' }}
                         body={dateStartBodyTemplate}/>
                 <Column header={__('Data Scadenza', 'gepafin')}
+                        filterElement={dateFilterTemplate} filter
+                        filterField="endDate" dataType="date"
+                        filterMatchModeOptions={translationStrings.dateFilterOptions}
                         style={{ minWidth: '8rem' }}
                         body={dateEndBodyTemplate}/>
                 <Column field="status"
                         filterElement={statusFilterTemplate} filter
-                        filterMatchModeOptions={[{ label: 'Uguale a', value: FilterMatchMode.EQUALS }]}
+                        filterMatchModeOptions={translationStrings.statusFilterOptions}
                         header={__('Stato', 'gepafin')}
                         style={{ minWidth: '7rem' }}
                         body={statusBodyTemplate} />

src/pages/Dashboard/index.js

@@ -9,11 +9,11 @@ import DashboardService from '../../service/dashboard-service';
 
 // components
 import { Button } from 'primereact/button';
-import AllDomandeTable from '../Domande/components/AllDomandeTable';
 import DraftApplicationsTable from './components/DraftApplicationsTable';
 import ChartDomandePerBando from '../../components/ChartDomandePerBando';
 import ChartStatoDomande from '../../components/ChartStatoDomande';
 import LatestBandiTableAsync from './components/LatestBandiTableAsync';
+import AllDomandeTableAsync from '../Domande/components/AllDomandeTableAsync';
 
 const Dashboard = () => {
     const navigate = useNavigate();
@@ -137,14 +137,13 @@ const Dashboard = () => {
             <div className="appPageSection">
                 <h2>{__('Ultimi bandi pubblicati', 'gepafin')}</h2>
                 <LatestBandiTableAsync/>
-                {/*<LatestBandiTable/>*/}
             </div>
 
             <div className="appPage__spacer"></div>
 
             <div className="appPageSection">
                 <h2>{__('Ultime domande pubblicate', 'gepafin')}</h2>
-                <AllDomandeTable/>
+                <AllDomandeTableAsync/>
             </div>
 
             <div className="appPage__spacer"></div>