- updated page for imstructor manager;

- updated fetching applications - added new status in various tables;
This commit is contained in:
Vitalii Kiiko
2025-10-01 10:07:15 +02:00
parent f623bbe200
commit 0ea7fc5ca5
6 changed files with 49 additions and 7 deletions

View File

@@ -80,7 +80,7 @@ const DomandaEditInstructorManager = () => {
const [isVisibleAppointmentDialog, setIsVisibleAppointmentDialog] = useState(false); const [isVisibleAppointmentDialog, setIsVisibleAppointmentDialog] = useState(false);
const [isVisiblePreTecEvalDialog, setIsVisiblePreTecEvalDialog] = useState(false); const [isVisiblePreTecEvalDialog, setIsVisiblePreTecEvalDialog] = useState(false);
const [preTecEvalData, setPreTecEvalData] = useState({ const [preTecEvalData, setPreTecEvalData] = useState({
amendmentDocumentType: 0, amendmentDocumentType: '',
pec: '', pec: '',
amount: 0 amount: 0
}); });
@@ -789,7 +789,7 @@ const DomandaEditInstructorManager = () => {
<Button <Button
type="button" type="button"
disabled={loading} disabled={loading}
label={__('Invia', 'gepafin')} onClick={hidePreTecEvalDialog}/> label={__('Invia', 'gepafin')} onClick={doCreateSpecialAmendment}/>
</div> </div>
} }
@@ -845,6 +845,48 @@ const DomandaEditInstructorManager = () => {
storeSet('unsetAsyncRequest'); storeSet('unsetAsyncRequest');
} }
const doCreateSpecialAmendment = useCallback(() => {
if (
!isEmpty(preTecEvalData.amount) && !isEmpty(preTecEvalData.pec) && !isEmpty(preTecEvalData.amendmentDocumentType)
) {
storeSet('setAsyncRequest');
AmendmentsService.createAmendmentSpecial(preTecEvalData, getAmendmentSpecialCallback, errGetAmendmentSpecialCallback,
[
['applicationEvaluationId', data.id]
]);
}
}, [preTecEvalData, data]);
const getAmendmentSpecialCallback = (data) => {
if (data.status === 'SUCCESS') {
if (toast.current && data.message) {
toast.current.show({
severity: 'success',
summary: '',
detail: data.message
});
}
}
setIsVisiblePreTecEvalDialog(false);
setPreTecEvalData({});
storeSet('unsetAsyncRequest');
}
const errGetAmendmentSpecialCallback = (data) => {
if (toast.current && data.message) {
toast.current.show({
severity: data.status === 'SUCCESS' ? 'info' : 'error',
summary: '',
detail: data.message
});
}
setIsVisiblePreTecEvalDialog(false);
setPreTecEvalData({});
set404FromErrorResponse(data);
storeSet('unsetAsyncRequest');
}
const doMakeAdmisible = () => { const doMakeAdmisible = () => {
doSaveDraft(null, { doSaveDraft(null, {
applicationStatus: 'ADMISSIBLE' applicationStatus: 'ADMISSIBLE'

View File

@@ -37,7 +37,7 @@ const AllDomandeTable = ({ openDialogFn, updaterString = '' }) => {
ApplicationService.getApplications(getCallback, errGetCallbacks, [ ApplicationService.getApplications(getCallback, errGetCallbacks, [
['statuses', [ ['statuses', [
'SUBMIT', 'EVALUATION', 'SOCCORSO', 'SUBMIT', 'EVALUATION', 'SOCCORSO',
'APPOINTMENT', 'NDG', 'ADMISSIBLE', 'TECHNICAL_EVALUATION' 'APPOINTMENT', 'NDG', 'ADMISSIBLE', 'AWAITING_TECHNICAL_EVALUATION', 'TECHNICAL_EVALUATION'
]] ]]
]); ]);
}, [updaterString]); }, [updaterString]);

View File

@@ -43,7 +43,7 @@ const AllDomandeTableAsync = ({ openDialogFn, updaterString = '' }) => {
status: { value: null, matchMode: 'equals' } status: { value: null, matchMode: 'equals' }
} }
}); });
const statuses = ['SUBMIT', 'EVALUATION', 'SOCCORSO', 'APPOINTMENT', 'NDG', 'ADMISSIBLE', 'TECHNICAL_EVALUATION']; const statuses = ['SUBMIT', 'EVALUATION', 'SOCCORSO', 'APPOINTMENT', 'NDG', 'ADMISSIBLE', 'AWAITING_TECHNICAL_EVALUATION', 'TECHNICAL_EVALUATION'];
const getPaginationQuery = useCallback(() => getQueryParamsForPaginatedEndpoint(lazyState, statuses, 'id'), [lazyState]); const getPaginationQuery = useCallback(() => getQueryParamsForPaginatedEndpoint(lazyState, statuses, 'id'), [lazyState]);

View File

@@ -92,7 +92,7 @@ const AllDomandeBeneficiarioTableAsync = ({ statuses }) => {
const actionsBodyTemplate = (rowData) => { const actionsBodyTemplate = (rowData) => {
return <div className="appPageSection__tableActions"> return <div className="appPageSection__tableActions">
{rowData.status === 'SOCCORSO' {['SOCCORSO', 'AWAITING_TECHNICAL_EVALUATION'].includes(rowData.status)
? <Link to={`/domande/${rowData.id}`}> ? <Link to={`/domande/${rowData.id}`}>
<Button severity="info" label={__('Dettagli', 'gepafin')} icon="pi pi-eye" size="small" <Button severity="info" label={__('Dettagli', 'gepafin')} icon="pi pi-eye" size="small"
iconPos="right"/> iconPos="right"/>

View File

@@ -42,7 +42,7 @@ const BeneficiarioDomandeTable = () => {
['companyId', chosenCompanyId], ['companyId', chosenCompanyId],
['statuses', [ ['statuses', [
'SOCCORSO', 'APPROVED', 'REJECTED', 'EVALUATION', 'SUBMIT', 'SOCCORSO', 'APPROVED', 'REJECTED', 'EVALUATION', 'SUBMIT',
'APPOINTMENT', 'NDG', 'ADMISSIBLE', 'TECHNICAL_EVALUATION' 'APPOINTMENT', 'NDG', 'ADMISSIBLE', 'AWAITING_TECHNICAL_EVALUATION', 'TECHNICAL_EVALUATION'
] ]
] // 'NDG', 'ADMISSIBLE', 'APPOINTMENT' ] // 'NDG', 'ADMISSIBLE', 'APPOINTMENT'
]); ]);

View File

@@ -24,7 +24,7 @@ const DomandeBeneficiario = () => {
<div className="appPageSection"> <div className="appPageSection">
<AllDomandeBeneficiarioTableAsync statuses={['SOCCORSO', 'APPROVED', 'REJECTED', 'EVALUATION', 'SUBMIT', <AllDomandeBeneficiarioTableAsync statuses={['SOCCORSO', 'APPROVED', 'REJECTED', 'EVALUATION', 'SUBMIT',
'APPOINTMENT', 'NDG', 'ADMISSIBLE', 'TECHNICAL_EVALUATION']}/> 'APPOINTMENT', 'NDG', 'ADMISSIBLE', 'AWAITING_TECHNICAL_EVALUATION', 'TECHNICAL_EVALUATION']}/>
</div> </div>
</div> </div>
) )