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

Merge branch 'develop' into new-role-director

Browse Source
This commit is contained in:
Vitalii Kiiko
2025-11-12 11:15:38 +01:00
parent ab09a0e28a 2954915506
commit c367c73cb4
30 changed files with 56 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/pages/Bandi/components/AllBandiTable/index.js
View File

@@ -100,6 +100,7 @@ const AllBandiTable = () => {
const statusFilterTemplate = (options) => {
return <Dropdown
value={options.value}
valueTemplate={getBandoLabel(options.value)}
options={statuses}
onChange={(e) => options.filterCallback(e.value, options.index)}
itemTemplate={statusItemTemplate}

1
src/pages/Bandi/components/AllBandiTableAsync/index.js
View File

@@ -174,6 +174,7 @@ const AllBandiTableAsync = () => {
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value} options={statuses}
valueTemplate={getBandoLabel(options.value)}
onChange={(e) => {
options.filterCallback(e.value, options.index)
const filters = { ...lazyState.filters };

1
src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js
View File

@@ -132,6 +132,7 @@ const AllBandiAccordion = ({ showOnlyPreferred = false, isAntiMoneylaundry = fal
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value} options={statuses}
valueTemplate={getBandoLabel(options.value)}
onChange={(e) => options.filterCallback(e.value, options.index)}
itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>;
};

1
src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js
View File

@@ -141,6 +141,7 @@ const AllBandiPreInstructorTableAsync = () => {
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value} options={statuses}
valueTemplate={getBandoLabel(options.value)}
onChange={(e) => {
options.filterCallback(e.value, options.index)
const filters = { ...lazyState.filters };

1
src/pages/BandiPreInstructor/components/AllBandiTable/index.js
View File

@@ -99,6 +99,7 @@ const AllBandiTable = () => {
const statusFilterTemplate = (options) => {
return <Dropdown
value={options.value}
valueTemplate={getBandoLabel(options.value)}
options={statuses}
onChange={(e) => options.filterCallback(e.value, options.index)}
itemTemplate={statusItemTemplate}

1
src/pages/BandiPreferredBeneficiario/components/AllBandiPreferredAccordion/index.js
View File

@@ -97,6 +97,7 @@ const AllBandiPreferredAccordion = () => {
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value}
valueTemplate={getBandoLabel(options.value)}
options={statuses}
onChange={(e) => options.filterCallback(e.value, options.index)}
itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel}

1
src/pages/Dashboard/components/DraftApplicationsTable/index.js
View File

@@ -112,6 +112,7 @@ const DraftApplicationsTable = () => {
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value} options={statuses}
valueTemplate={getBandoLabel(options.value)}
onChange={(e) => options.filterCallback(e.value, options.index)}
itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>;
};

1
src/pages/Dashboard/components/DraftApplicationsTableAsync/index.js
View File

@@ -108,6 +108,7 @@ const DraftApplicationsTableAsync = ({ disableActions = false }) => {
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value} options={statuses}
valueTemplate={getBandoLabel(options.value)}
onChange={(e) => {
options.filterCallback(e.value, options.index)
const filters = { ...lazyState.filters };

1
src/pages/Dashboard/components/LatestBandiTableAsync/index.js
View File

@@ -169,6 +169,7 @@ const LatestBandiTableAsync = ({ disableActions = false }) => {
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value} options={statuses}
valueTemplate={getBandoLabel(options.value)}
onChange={(e) => {
options.filterCallback(e.value, options.index)
const filters = { ...lazyState.filters };

1
src/pages/DashboardBeneficiario/components/LatestBandiBeneficiarioTableAsync/index.js
View File

@@ -178,6 +178,7 @@ const LatestBandiBeneficiarioTableAsync = ({ isAntiMoneylaundry = false }) => {
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value} options={statuses}
valueTemplate={getBandoLabel(options.value)}
onChange={(e) => {
options.filterCallback(e.value, options.index)
const filters = { ...lazyState.filters };

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

@@ -151,6 +151,7 @@ const MyLatestSubmissionsTable = () => {
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value} options={statuses}
valueTemplate={getBandoLabel(options.value)}
onChange={(e) => options.filterCallback(e.value, options.index)}
itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel}
className="p-column-filter"/>;

1
src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTableAsync/index.js
View File

@@ -171,6 +171,7 @@ const MyLatestSubmissionsTableAsync = () => {
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value} options={statuses}
valueTemplate={getBandoLabel(options.value)}
onChange={(e) => {
options.filterCallback(e.value, options.index)
const filters = { ...lazyState.filters };

1
src/pages/DashboardInstructorManager/components/InstructorManagerMieDomandeTable/index.js
View File

@@ -133,6 +133,7 @@ const InstructorManagerMieDomandeTable = ({ userId = null, statuses = [] }) => {
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value} options={statusesForFilter}
valueTemplate={getBandoLabel(options.value)}
onChange={(e) => options.filterCallback(e.value, options.index)}
itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel}
className="p-column-filter"/>;

1
src/pages/DashboardInstructorManager/components/LatestBandiTableInstructorManagerAsync/index.js
View File

@@ -96,6 +96,7 @@ const LatestBandiTableInstructorManagerAsync = () => {
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value} options={statuses}
valueTemplate={getBandoLabel(options.value)}
onChange={(e) => {
options.filterCallback(e.value, options.index)
const filters = { ...lazyState.filters };

1
src/pages/DashboardInstructorManager/components/MieDomandeTableInstructorManagerAsync/index.js
View File

@@ -106,6 +106,7 @@ const MieDomandeTableInstructorManagerAsync = ({ userId = null, statuses = [] })
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value} options={statuses}
valueTemplate={getBandoLabel(options.value)}
onChange={(e) => {
options.filterCallback(e.value, options.index)
const filters = { ...lazyState.filters };

7
src/pages/DashboardPreInstructor/components/DomandeTablePreInstructorAsync/index.js
View File

@@ -114,7 +114,9 @@ const DomandeTablePreInstructorAsync = ({
};
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value} options={applicationStatuses}
return <Dropdown value={options.value}
valueTemplate={getBandoLabel(options.value)}
options={applicationStatuses}
onChange={(e) => {
options.filterCallback(e.value, options.index)
const filters = { ...lazyState.filters };
@@ -125,7 +127,8 @@ const DomandeTablePreInstructorAsync = ({
}
setLazyState({ ...lazyState, filters, first: 0 });
}}
itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel}
itemTemplate={statusItemTemplate}
placeholder={translationStrings.selectOneLabel}
className="p-column-filter"/>;
};

1
src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js
View File

@@ -133,6 +133,7 @@ const PreInstructorDomandeTable = ({ userId = null, statuses = [] }) => {
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value} options={statusesForFilter}
valueTemplate={getBandoLabel(options.value)}
onChange={(e) => options.filterCallback(e.value, options.index)}
itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel}
className="p-column-filter"/>;

1
src/pages/DocumentsBeneficiary/components/DocumentsTable/index.js
View File

@@ -126,6 +126,7 @@ const DocumentsTable = ({ type, reload = 0 }) => {
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value} options={statuses}
valueTemplate={getBandoLabel(options.value)}
onChange={(e) => options.filterCallback(e.value, options.index)}
itemTemplate={statusItemTemplate} placeholder={__('Scegli uno', 'gepafin')}
className="p-column-filter"/>;

8
src/pages/DomandaEditInstructorManager/index.js
View File

@@ -760,10 +760,10 @@ const DomandaEditInstructorManager = () => {
setIsVisibleCompleteDialog(true);
}
const initiateTFRejecting = () => {
/*const initiateTFRejecting = () => {
setOperationType('tf_reject');
setIsVisibleCompleteDialog(true);
}
}*/
const doCheckNDG = () => {
doSaveDraft(doGetNDGRequest);
@@ -1204,14 +1204,14 @@ const DomandaEditInstructorManager = () => {
: __('Punteggio non sufficiente per passaggio alla valutazione tecnica ed economico finanziaria', 'gepafin')}
severity={isAdmissible ? 'success' : 'warning'}
model={tecnicalEvalItems}/> : null}
<Button
{/*<Button
type="button"
disabled={!data.id || !['TECHNICAL_EVALUATION'].includes(data.applicationStatus) || evaluationBlockedForUser(data)}
onClick={initiateTFRejecting}
icon="pi pi-info-circle" iconPos="right"
severity={isAdmissible ? 'success' : 'warning'}
label={__('Respingi domanda per valutazione TF negativa', 'gepafin')}
/>
/>*/}
{data.id
? <Button
type="button"

8
src/pages/DomandaEditPreInstructor/index.js
View File

@@ -760,10 +760,10 @@ const DomandaEditPreInstructor = () => {
setIsVisibleCompleteDialog(true);
}
const initiateTFRejecting = () => {
/*const initiateTFRejecting = () => {
setOperationType('tf_reject');
setIsVisibleCompleteDialog(true);
}
}*/
const doCheckNDG = () => {
doSaveDraft(doGetNDGRequest);
@@ -1204,14 +1204,14 @@ const DomandaEditPreInstructor = () => {
: __('Punteggio non sufficiente per passaggio alla valutazione tecnica ed economico finanziaria', 'gepafin')}
severity={isAdmissible ? 'success' : 'warning'}
model={tecnicalEvalItems}/> : null}
<Button
{/*<Button
type="button"
disabled={!data.id || !['TECHNICAL_EVALUATION'].includes(data.applicationStatus) || evaluationBlockedForUser(data)}
onClick={initiateTFRejecting}
icon="pi pi-info-circle" iconPos="right"
severity={isAdmissible ? 'success' : 'warning'}
label={__('Respingi domanda per valutazione TF negativa', 'gepafin')}
/>
/>*/}
{data.id
? <Button
type="button"

1
src/pages/Domande/components/AllDomandeTable/index.js
View File

@@ -110,6 +110,7 @@ const AllDomandeTable = ({ openDialogFn, updaterString = '' }) => {
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value} options={statuses}
valueTemplate={getBandoLabel(options.value)}
onChange={(e) => options.filterCallback(e.value, options.index)}
itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>;
};

26
src/pages/Domande/components/AllDomandeTableAsync/index.js
View File

@@ -43,7 +43,10 @@ const AllDomandeTableAsync = ({ openDialogFn, updaterString = '', disableActions
status: { value: null, matchMode: 'equals' }
}
});
const statuses = ['SUBMIT', 'EVALUATION', 'SOCCORSO', 'APPOINTMENT', 'NDG', 'ADMISSIBLE', 'AWAITING_TECHNICAL_EVALUATION', 'TECHNICAL_EVALUATION'];
const statuses = [
'SUBMIT', 'EVALUATION', 'SOCCORSO', 'APPOINTMENT', 'NDG', 'ADMISSIBLE',
'AWAITING_TECHNICAL_EVALUATION', 'TECHNICAL_EVALUATION'
];
const getPaginationQuery = useCallback(() => getQueryParamsForPaginatedEndpoint(lazyState, statuses, 'id'), [lazyState]);
@@ -65,7 +68,8 @@ const AllDomandeTableAsync = ({ openDialogFn, updaterString = '', disableActions
const getCallback = (resp) => {
if (resp.status === 'SUCCESS') {
const { body, totalRecords,
const {
body, totalRecords,
//currentPage, totalPages, pageSize
} = resp.data;
setTotalRecordsNum(totalRecords);
@@ -89,15 +93,16 @@ const AllDomandeTableAsync = ({ openDialogFn, updaterString = '', disableActions
const actionsBodyTemplate = (rowData) => {
return <div className="appPageSection__tableActions lessGap">
{openDialogFn && ['SUBMIT', 'EVALUATION', 'SOCCORSO'].includes(rowData.status)
{openDialogFn
? <Button severity="info"
onClick={() => openDialogFn(rowData.id)}
label={__('Assegnare', 'gepafin')}
icon="pi pi-pencil" size="small" iconPos="right"/>
: location.pathname !== '/domande'
? <Link to={'/domande'}>
<Button severity="info" label={__('Gestire', 'gepafin')} size="small"/>
</Link> : null}
: null}
{location.pathname !== '/domande'
? <Link to={'/domande'}>
<Button severity="info" label={__('Gestire', 'gepafin')} size="small"/>
</Link> : null}
<Link to={`/domande/${rowData.id}/preview`}>
<Button severity="info" label={__('Anteprima', 'gepafin')} icon="pi pi-eye" size="small"
iconPos="right"/>
@@ -115,6 +120,7 @@ const AllDomandeTableAsync = ({ openDialogFn, updaterString = '', disableActions
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value} options={statuses}
valueTemplate={getBandoLabel(options.value)}
onChange={(e) => {
options.filterCallback(e.value, options.index)
const filters = { ...lazyState.filters };
@@ -125,7 +131,8 @@ const AllDomandeTableAsync = ({ openDialogFn, updaterString = '', disableActions
}
setLazyState({ ...lazyState, filters, first: 0 });
}}
itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>;
itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel}
className="p-column-filter"/>;
};
const dateFilterTemplate = (options) => {
@@ -158,7 +165,8 @@ const AllDomandeTableAsync = ({ openDialogFn, updaterString = '', disableActions
const renderHeader = () => {
return (
<div className="flex justify-content-between">
<Button type="button" icon="pi pi-filter-slash" label={__('Pulisci', 'gepafin')} outlined onClick={clearFilter} />
<Button type="button" icon="pi pi-filter-slash" label={__('Pulisci', 'gepafin')} outlined
onClick={clearFilter}/>
</div>
);
};

1
src/pages/DomandeArchive/components/AllDomandeArchiveTable/index.js
View File

@@ -109,6 +109,7 @@ const AllDomandeArchiveTable = ({ updaterString = '' }) => {
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value} options={statuses}
valueTemplate={getBandoLabel(options.value)}
onChange={(e) => options.filterCallback(e.value, options.index)}
itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"/>;
};

1
src/pages/DomandeBeneficiario/components/AllDomandeBeneficiarioTableAsync/index.js
View File

@@ -144,6 +144,7 @@ const AllDomandeBeneficiarioTableAsync = ({ statuses }) => {
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value} options={statuses}
valueTemplate={getBandoLabel(options.value)}
onChange={(e) => {
options.filterCallback(e.value, options.index)
const filters = { ...lazyState.filters };

1
src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js
View File

@@ -132,6 +132,7 @@ const BeneficiarioDomandeTable = () => {
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value} options={statuses}
valueTemplate={getBandoLabel(options.value)}
onChange={(e) => options.filterCallback(e.value, options.index)}
itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel}
className="p-column-filter"/>;

1
src/pages/SoccorsoIstruttorioMioInstructorManager/components/InstructorManagerSoccorsiTable/index.js
View File

@@ -121,6 +121,7 @@ const InstructorManagerSoccorsiTable = () => {
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value} options={statuses}
valueTemplate={getBandoLabel(options.value)}
onChange={(e) => options.filterCallback(e.value, options.index)}
itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel}
className="p-column-filter"/>;

1
src/pages/SoccorsoIstruttorioMioInstructorManager/components/SoccorsiInstructorManagerMioTableAsync/index.js
View File

@@ -126,6 +126,7 @@ const SoccorsiInstructorManagerMioTableAsync = ({ userId = null }) => {
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value} options={statuses}
valueTemplate={getBandoLabel(options.value)}
onChange={(e) => {
options.filterCallback(e.value, options.index)
const filters = { ...lazyState.filters };

1
src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js
View File

@@ -124,6 +124,7 @@ const PreInstructorSoccorsiTable = ({ userId = null }) => {
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value} options={statuses}
valueTemplate={getBandoLabel(options.value)}
onChange={(e) => options.filterCallback(e.value, options.index)}
itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel}
className="p-column-filter"/>;

1
src/pages/SoccorsoIstruttorioPreInstructor/components/SoccorsiPreInstructorTableAsync/index.js
View File

@@ -126,6 +126,7 @@ const SoccorsiPreInstructorTableAsync = ({ userId = null }) => {
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value} options={statuses}
valueTemplate={getBandoLabel(options.value)}
onChange={(e) => {
options.filterCallback(e.value, options.index)
const filters = { ...lazyState.filters };

1
src/pages/Users/components/AllUsersTable/index.js
View File

@@ -130,6 +130,7 @@ const AllUsersTable = ({ updaterString = '' }) => {
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value} options={statuses}
valueTemplate={getBandoLabel(options.value)}
onChange={(e) => options.filterCallback(e.value, options.index)}
itemTemplate={statusItemTemplate} placeholder={__('Scegli uno', 'gepafin')}
className="p-column-filter"/>;