- updated filters;

- fixed store persistance new version;
This commit is contained in:
Vitalii Kiiko
2025-04-14 15:28:43 +02:00
parent 1e75bdc6a8
commit a3f7e250c7
16 changed files with 34 additions and 29 deletions

View File

@@ -130,11 +130,13 @@ const AllBandiTable = () => {
filter sortable
filterPlaceholder={__('Cerca', 'gepafin')}
style={{ minWidth: '8rem' }}/>
<Column header={__('Data Pubblicazione', 'gepafin')} filterField="dateStart" 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="dateEnd" dataType="date"
<Column header={__('Data Scadenza', 'gepafin')}
filterField="dateEnd" dataType="date"
style={{ minWidth: '8rem' }}
body={dateEndBodyTemplate} filter
filterElement={dateFilterTemplate}/>

View File

@@ -36,8 +36,8 @@ const AllBandiTableAsync = () => {
sortOrder: null,
filters: {
name: { value: null, matchMode: 'contains' },
startDate: { value: null, matchMode: 'date_is' },
endDate: { value: null, matchMode: 'date_is' },
startDate: { value: null, matchMode: 'dateIs' },
endDate: { value: null, matchMode: 'dateIs' },
status: { value: null, matchMode: 'equals' }
}
});

View File

@@ -36,8 +36,8 @@ const AllBandiPreInstructorTableAsync = () => {
sortOrder: null,
filters: {
name: { value: null, matchMode: 'contains' },
startDate: { value: null, matchMode: 'date_is' },
endDate: { value: null, matchMode: 'date_is' },
startDate: { value: null, matchMode: 'dateIs' },
endDate: { value: null, matchMode: 'dateIs' },
status: { value: null, matchMode: 'equals' }
}
});

View File

@@ -27,7 +27,6 @@ const BuilderElementSettings = ({ closeSettingsFn, callStatus, context }) => {
const [settings, setSettings] = useState([]);
const [validators, setValidators] = useState({});
const [dynamicData, setDynamicData] = useState([]);
const [reportData, setReportData] = useState({});
const [criteria, setCriteria] = useState([]);
const numberBasedValidatorFields = ['min', 'max', 'minLength', 'maxLength'];
const customValidationOptions = [

View File

@@ -36,8 +36,8 @@ const LatestBandiTableAsync = () => {
sortOrder: null,
filters: {
name: { value: null, matchMode: 'contains' },
startDate: { value: null, matchMode: 'date_is' },
endDate: { value: null, matchMode: 'date_is' },
startDate: { value: null, matchMode: 'dateIs' },
endDate: { value: null, matchMode: 'dateIs' },
status: { value: null, matchMode: 'equals' }
}
});

View File

@@ -40,8 +40,8 @@ const LatestBandiBeneficiarioTableAsync = () => {
sortOrder: null,
filters: {
name: { value: null, matchMode: 'contains' },
startDate: { value: null, matchMode: 'date_is' },
endDate: { value: null, matchMode: 'date_is' },
startDate: { value: null, matchMode: 'dateIs' },
endDate: { value: null, matchMode: 'dateIs' },
status: { value: null, matchMode: 'equals' }
}
});

View File

@@ -45,7 +45,8 @@ const MyLatestSubmissionsTableAsync = () => {
id: { value: null, matchMode: 'equals' },
callTitle: { value: null, matchMode: 'contains' },
companyName: { value: null, matchMode: 'contains' },
submissionDate: { value: null, matchMode: 'date_is' },
callEndDate: { value: null, matchMode: 'dateIs' },
modifiedDate: { value: null, matchMode: 'dateIs' },
assignedUserName: { value: null, matchMode: 'equals' },
status: { value: null, matchMode: 'equals' }
}
@@ -222,12 +223,14 @@ const MyLatestSubmissionsTableAsync = () => {
style={{ minWidth: '8rem' }}/>
<Column header={__('Scadenza', 'gepafin')}
filterField="callEndDate" dataType="date"
filterMatchModeOptions={translationStrings.dateFilterOptions}
style={{ minWidth: '8rem' }}
body={dateEndBodyTemplate}
filter
filterElement={dateFilterTemplate}/>
<Column header={__('Ultima modifica', 'gepafin')}
filterField="modifiedDate" dataType="date"
filterMatchModeOptions={translationStrings.dateFilterOptions}
style={{ minWidth: '8rem' }}
body={dateModifyBodyTemplate}
filter

View File

@@ -34,8 +34,8 @@ const LatestBandiTableInstructorManagerAsync = () => {
sortOrder: null,
filters: {
name: { value: null, matchMode: 'contains' },
startDate: { value: null, matchMode: 'date_is' },
endDate: { value: null, matchMode: 'date_is' },
startDate: { value: null, matchMode: 'dateIs' },
endDate: { value: null, matchMode: 'dateIs' },
status: { value: null, matchMode: 'equals' }
}
});

View File

@@ -43,12 +43,12 @@ const MieDomandeTableInstructorManagerAsync = ({ userId = null, statuses = [] })
sortField: null,
sortOrder: null,
filters: {
applicationId: { value: null, matchMode: 'contains' },
protocolNumber: { value: null, matchMode: 'contains' },
applicationId: { value: null, matchMode: 'equals' },
protocolNumber: { value: null, matchMode: 'equals' },
callName: { value: null, matchMode: 'contains' },
companyName: { value: null, matchMode: 'contains' },
submissionDate: { value: null, matchMode: 'date_is' },
evaluationEndDate: { value: null, matchMode: 'date_is' },
submissionDate: { value: null, matchMode: 'dateIs' },
evaluationEndDate: { value: null, matchMode: 'dateIs' },
applicationStatus: { value: null, matchMode: 'equals' }
}
});
@@ -201,7 +201,7 @@ const MieDomandeTableInstructorManagerAsync = ({ userId = null, statuses = [] })
<Column field="protocolNumber" header={__('Protocollo', 'gepafin')}
sortable
filterField="protocolNumber" filter
filterMatchModeOptions={translationStrings.textFilterOptions}
filterMatchModeOptions={translationStrings.numberFilterOptions}
filterPlaceholder={__('Cerca', 'gepafin')}
style={{ minWidth: '6rem' }}/>
{APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE'

View File

@@ -43,12 +43,12 @@ const DomandeTablePreInstructorAsync = ({ userId = null, statuses = [] }) => {
sortField: null,
sortOrder: null,
filters: {
applicationId: { value: null, matchMode: 'contains' },
protocolNumber: { value: null, matchMode: 'contains' },
applicationId: { value: null, matchMode: 'equals' },
protocolNumber: { value: null, matchMode: 'equals' },
callName: { value: null, matchMode: 'contains' },
companyName: { value: null, matchMode: 'contains' },
submissionDate: { value: null, matchMode: 'date_is' },
evaluationEndDate: { value: null, matchMode: 'date_is' },
submissionDate: { value: null, matchMode: 'dateIs' },
evaluationEndDate: { value: null, matchMode: 'dateIs' },
applicationStatus: { value: null, matchMode: 'equals' }
}
});
@@ -201,7 +201,7 @@ const DomandeTablePreInstructorAsync = ({ userId = null, statuses = [] }) => {
<Column field="protocolNumber" header={__('Protocollo', 'gepafin')}
sortable
filterField="protocolNumber" filter
filterMatchModeOptions={translationStrings.textFilterOptions}
filterMatchModeOptions={translationStrings.numberFilterOptions}
filterPlaceholder={__('Cerca', 'gepafin')}
style={{ minWidth: '6rem' }}/>
{APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE'

View File

@@ -38,7 +38,7 @@ const AllDomandeTableAsync = ({ openDialogFn, updaterString = '' }) => {
id: { value: null, matchMode: 'equals' },
callTitle: { value: null, matchMode: 'contains' },
companyName: { value: null, matchMode: 'contains' },
submissionDate: { value: null, matchMode: 'date_is' },
submissionDate: { value: null, matchMode: 'dateIs' },
assignedUserName: { value: null, matchMode: 'equals' },
status: { value: null, matchMode: 'equals' }
}

View File

@@ -42,7 +42,7 @@ const AllDomandeBeneficiarioTableAsync = ({ statuses }) => {
id: { value: null, matchMode: 'equals' },
callTitle: { value: null, matchMode: 'contains' },
companyName: { value: null, matchMode: 'contains' },
submissionDate: { value: null, matchMode: 'date_is' },
submissionDate: { value: null, matchMode: 'dateIs' },
assignedUserName: { value: null, matchMode: 'equals' },
status: { value: null, matchMode: 'equals' }
}

View File

@@ -34,7 +34,7 @@ const SoccorsiInstructorManagerMioTableAsync = ({ userId = null }) => {
sortField: null,
sortOrder: null,
filters: {
applicationId: { value: null, matchMode: 'contains' },
applicationId: { value: null, matchMode: 'equals' },
callName: { value: null, matchMode: 'contains' },
companyName: { value: null, matchMode: 'contains' },
startDate: { value: null, matchMode: 'dateIs' },

View File

@@ -34,7 +34,7 @@ const SoccorsiPreInstructorTableAsync = ({ userId = null }) => {
sortField: null,
sortOrder: null,
filters: {
applicationId: { value: null, matchMode: 'contains' },
applicationId: { value: null, matchMode: 'equals' },
callName: { value: null, matchMode: 'contains' },
companyName: { value: null, matchMode: 'contains' },
startDate: { value: null, matchMode: 'dateIs' },

View File

@@ -29,7 +29,7 @@ const UserActivityTableAsync = ({ chosenActivity = '', chosenPeriod = '' }) => {
sortOrder: null,
filters: {
id: { value: null, matchMode: 'contains' },
createdDate: { value: null, matchMode: 'date_is' },
createdDate: { value: null, matchMode: 'dateIs' },
ipAddress: { value: null, matchMode: 'contains' }
}
});

View File

@@ -4,6 +4,7 @@ const zustandXOpts = {
},
persist: {
enabled: true,
name: 'main',
partialize: (state) => ({
token: state.token,
chosenCompanyId: state.chosenCompanyId,