BFLOWS/bflows-bandi-fe
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/74-new-evaluation-flow

Browse Source
This commit is contained in:
Vitalii Kiiko
2024-11-21 16:50:06 +01:00
parent 8fd8f3116f 7a9939ce87
commit bf698e0b22
18 changed files with 384 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js
View File

@@ -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')}

5
src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js
View File

@@ -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')}
sortable