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

- implemented feature-132 - new status technical_evaluation;

Browse Source
This commit is contained in:
Vitalii Kiiko
2025-03-04 12:42:47 +01:00
parent 69ca33f232
commit 7b5bdc8785
5 changed files with 165 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -168,10 +168,14 @@ const DomandaEditPreInstructor = () => {
if (connectedSoccorsoId !== 0) {
navigate(`/domande/${id}/soccorso/${connectedSoccorsoId}`);
} else {
doSaveDraft(`/domande/${id}/aggiungi-soccorso/`)
doSaveDraft(navigateToNewSoccorso)
}
}
const navigateToNewSoccorso = () => {
navigate(`/domande/${id}/aggiungi-soccorso/`);
}
const getVersion = (resp) => {
if (resp.status === 'SUCCESS') {
if (resp.data.evaluationVersion === 'V1') {
@@ -307,7 +311,7 @@ const DomandaEditPreInstructor = () => {
}, []);
}
const doSaveDraft = useCallback((doRedirect = '') => {
const doSaveDraft = useCallback((afterUpdateCallback = null, cfgModifier = {}) => {
if (data.evaluationVersion === 'V1') {
const submitData = {
criteria: klona(data.criteria),
@@ -319,13 +323,14 @@ const DomandaEditPreInstructor = () => {
})
)),
amendmentDetails: klona(data.amendmentDetails),
note: data.note
note: data.note,
...cfgModifier
};
ApplicationEvaluationService.updateEvaluation(
data.assignedApplicationId,
submitData,
(data) => updateCallback(data, doRedirect),
(data) => updateCallback(data, afterUpdateCallback),
errUpdateCallback
);
} else if (data.evaluationVersion === 'V2') {
@@ -339,20 +344,26 @@ const DomandaEditPreInstructor = () => {
})
)),
amendmentDetails: klona(data.amendmentDetails),
note: data.note
note: data.note,
...cfgModifier
}
ApplicationEvaluationService.updateEvaluationV2(
data.assignedApplicationId,
formId,
submitData,
(data) => updateCallback(data, doRedirect),
(data) => updateCallback(data, afterUpdateCallback),
errUpdateCallback
);
}
}, [data]);
const updateCallback = (data, doRedirect = '') => {
/**
*
* @param data {object}
* @param afterUpdateCallback {function}
*/
const updateCallback = (data, afterUpdateCallback = null) => {
if (data.status === 'SUCCESS') {
setData(getFormattedData(data.data));
if (toast.current) {
@@ -362,8 +373,8 @@ const DomandaEditPreInstructor = () => {
detail: data.message
});
}
if (!isEmpty(doRedirect)) {
navigate(doRedirect);
if (afterUpdateCallback) {
afterUpdateCallback();
}
}
storeSet.main.unsetAsyncRequest();
@@ -398,8 +409,8 @@ const DomandaEditPreInstructor = () => {
ApplicationEvaluationService.updateEvaluation(
data.assignedApplicationId,
submitData,
updateStatusCallback,
errUpdateStatusCallback
approveRejectCallback,
errApproveRejectCallback
);
} else if (data.evaluationVersion === 'V2') {
const newFormValues = getTransformedSubmitData();
@@ -413,7 +424,8 @@ const DomandaEditPreInstructor = () => {
)),
amendmentDetails: klona(data.amendmentDetails),
note: data.note,
motivation
motivation,
amountAccepted
}
setLoading(true);
@@ -422,8 +434,8 @@ const DomandaEditPreInstructor = () => {
data.assignedApplicationId,
formId,
submitData,
updateStatusCallback,
errUpdateStatusCallback
approveRejectCallback,
errApproveRejectCallback
);
}
}
@@ -444,8 +456,8 @@ const DomandaEditPreInstructor = () => {
ApplicationEvaluationService.updateEvaluation(
data.assignedApplicationId,
submitData,
updateStatusCallback,
errUpdateStatusCallback
approveRejectCallback,
errApproveRejectCallback
);
} else if (data.evaluationVersion === 'V2') {
const newFormValues = getTransformedSubmitData();
@@ -468,13 +480,13 @@ const DomandaEditPreInstructor = () => {
data.assignedApplicationId,
formId,
submitData,
updateStatusCallback,
errUpdateStatusCallback
approveRejectCallback,
errApproveRejectCallback
);
}
}
const updateStatusCallback = (data) => {
const approveRejectCallback = (data) => {
if (data.status === 'SUCCESS') {
setData(getFormattedData(data.data));
if (toast.current) {
@@ -488,7 +500,7 @@ const DomandaEditPreInstructor = () => {
setLoading(false);
}
const errUpdateStatusCallback = (data) => {
const errApproveRejectCallback = (data) => {
if (toast.current && data.message) {
toast.current.show({
severity: 'error',
@@ -577,10 +589,10 @@ const DomandaEditPreInstructor = () => {
set404FromErrorResponse(data);
}
const shouldDisableField = (fieldName) => {
return !['EVALUATION'].includes(data.applicationStatus)
const shouldDisableField = useCallback((fieldName) => {
return !['EVALUATION', 'ADMISSIBLE'].includes(data.applicationStatus)
|| (['ADMISSIBLE'].includes(data.applicationStatus) && fieldName !== 'criteria')
}
}, [data.applicationStatus]);
const headerCompleteDialog = () => {
return 'approve' === operationType
@@ -594,15 +606,15 @@ const DomandaEditPreInstructor = () => {
setMotivation('');
}
const footerCompleteDialog = () => {
const footerCompleteDialog = useCallback(() => {
return <div>
<Button type="button" label={__('Anulla', 'gepafin')} onClick={hideCompleteDialog} outlined/>
<Button
type="button"
disabled={loading}
disabled={loading || ('approve' === operationType && (!amountAccepted || isEmpty(amountAccepted) || amountAccepted === 0))}
label={__('Invia', 'gepafin')} onClick={'approve' === operationType ? doApprove : doReject}/>
</div>
}
}, [amountAccepted])
const initiateApproving = () => {
setOperationType('approve');
@@ -616,11 +628,12 @@ const DomandaEditPreInstructor = () => {
}
const doCheckNDG = () => {
doSaveDraft(doGetNDGRequest);
}
const doGetNDGRequest = () => {
storeSet.main.setAsyncRequest();
doSaveDraft();
setTimeout(() => {
AppointmentService.getNdg(id, getNdgCallback, errGetNdgCallback);
}, 100);
AppointmentService.getNdg(id, getNdgCallback, errGetNdgCallback);
}
const getNdgCallback = (data) => {
@@ -735,58 +748,18 @@ const DomandaEditPreInstructor = () => {
}
const doMakeAdmisible = () => {
storeSet.main.setAsyncRequest();
//doSaveDraft();
setTimeout(() => {
const submitData = {
applicationsStatus: 'ADMISSIBLE',
}
if (data.evaluationVersion === 'V1') {
ApplicationEvaluationService.updateEvaluation(
data.assignedApplicationId,
submitData,
updateCallback,
errUpdateCallback
);
} else if (data.evaluationVersion === 'V2') {
ApplicationEvaluationService.updateEvaluationV2(
data.assignedApplicationId,
formId,
submitData,
updateCallback,
errUpdateCallback
);
}
}, 100);
doSaveDraft(null, {
applicationStatus: 'ADMISSIBLE'
});
}
const doPassTechnicalEvaluation = () => {
storeSet.main.setAsyncRequest();
doSaveDraft();
setTimeout(() => {
const submitData = {
applicationsStatus: 'TECHNICAL_EVALUATION',
}
if (data.evaluationVersion === 'V1') {
ApplicationEvaluationService.updateEvaluation(
data.assignedApplicationId,
submitData,
updateCallback,
errUpdateCallback
);
} else if (data.evaluationVersion === 'V2') {
ApplicationEvaluationService.updateEvaluationV2(
data.assignedApplicationId,
formId,
submitData,
updateCallback,
errUpdateCallback
);
}
}, 100);
}
const doPassTechnicalEvaluation = useCallback(() => {
if (isAdmissible) {
doSaveDraft(null, {
applicationStatus: 'TECHNICAL_EVALUATION'
});
}
}, [isAdmissible]);
const evaluationBlockedForUser = (data = {}) => {
const userData = storeGet.main.userData()
@@ -859,8 +832,12 @@ const DomandaEditPreInstructor = () => {
/>
<Button
type="button"
disabled={!data.id || !['ADMISSIBLE'].includes(data.applicationStatus) || !isAdmissible || evaluationBlockedForUser(data)}
disabled={!data.id || !['ADMISSIBLE'].includes(data.applicationStatus) || evaluationBlockedForUser(data)}
onClick={doPassTechnicalEvaluation}
icon="pi pi-info-circle" iconPos="right"
tooltip={isAdmissible
? __('Punteggio sufficiente per passaggio alla valutazione tecnica ed economico finanziaria', 'gepafin')
: __('Punteggio non sufficiente per passaggio alla valutazione tecnica ed economico finanziaria', 'gepafin')}
severity={isAdmissible ? 'success' : 'warning'}
label={__('Valutazione tecnico-finanziaria positiva', 'gepafin')}
/>
@@ -870,7 +847,7 @@ const DomandaEditPreInstructor = () => {
disabled={!isAdmissible
|| ['APPROVED', 'REJECTED'].includes(data.applicationStatus)
|| evaluationBlockedForUser(data)
|| (APP_EVALUATION_FLOW_ID === '1' && !['ADMISSIBLE'].includes(data.applicationStatus))
|| (APP_EVALUATION_FLOW_ID === '1' && !['TECHNICAL_EVALUATION'].includes(data.applicationStatus))
}
onClick={initiateApproving}
label={__('Domanda deliberata', 'gepafin')}
@@ -880,8 +857,8 @@ const DomandaEditPreInstructor = () => {
type="button"
disabled={['APPROVED', 'REJECTED'].includes(data.applicationStatus)
|| (APP_EVALUATION_FLOW_ID === '1'
&& (!['EVALUATION', 'ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus)
|| evaluationBlockedForUser(data)))
&& (!['EVALUATION', 'ADMISSIBLE', 'APPOINTMENT', 'TECHNICAL_EVALUATION'].includes(data.applicationStatus)
|| evaluationBlockedForUser(data)))
}
onClick={initiateRejecting}
label={__('Respingi domanda', 'gepafin')}
@@ -1225,10 +1202,10 @@ const DomandaEditPreInstructor = () => {
<td>
{isAdmissible
? <Tag icon="pi pi-check" severity="success"
value={__('Punteggio sufficiente per passaggio alla valutazione tecnica ed economico finanziaria')}></Tag> : null}
value={__('Punteggio sufficiente per passaggio alla valutazione tecnica ed economico finanziaria', 'gepafin')}></Tag> : null}
{!isAdmissible
? <Tag icon="pi pi-times" severity="warning"
value={__('Punteggio non sufficiente per passaggio alla valutazione tecnica ed economico finanziaria')}></Tag> : null}
value={__('Punteggio non sufficiente per passaggio alla valutazione tecnica ed economico finanziaria', 'gepafin')}></Tag> : null}
</td>
</tr>
</tbody>
@@ -1266,17 +1243,18 @@ const DomandaEditPreInstructor = () => {
footer={footerCompleteDialog}
style={{ maxWidth: '600px', width: '100%' }}
onHide={hideCompleteDialog}>
<div className="appForm__field">
<label
className={classNames({ 'p-error': isEmpty(amountAccepted) || amountAccepted === 0 })}>
{__('Importo approvato', 'gepafin')}
</label>
<InputNumber
value={amountAccepted}
keyfilter="int"
invalid={isEmpty(amountAccepted) || amountAccepted === 0}
onChange={(e) => setAmountAccepted(e.value)}/>
</div>
{operationType === 'approve'
? <div className="appForm__field">
<label
className={classNames({ 'p-error': !amountAccepted || isEmpty(amountAccepted) || amountAccepted === 0 })}>
{__('Importo approvato', 'gepafin')}
</label>
<InputNumber
value={amountAccepted}
keyfilter="int"
invalid={!amountAccepted || isEmpty(amountAccepted) || amountAccepted === 0}
onChange={(e) => setAmountAccepted(e.value)}/>
</div> : null}
<div className="appForm__field">
<label>{__('Motivazione', 'gepafin')}</label>
<Editor