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

This commit is contained in:
Vitalii Kiiko
2024-11-21 16:50:06 +01:00
18 changed files with 384 additions and 31 deletions

View File

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

View File

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

View File

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