- fixed respingi domanda;

This commit is contained in:
Vitalii Kiiko
2025-03-25 17:33:29 +01:00
parent a32fa7a26c
commit d1ece8116a
2 changed files with 12 additions and 11 deletions

View File

@@ -392,7 +392,7 @@ const DomandaEditInstructorManager = () => {
storeSet.main.unsetAsyncRequest(); storeSet.main.unsetAsyncRequest();
} }
const doApprove = () => { const doApprove = useCallback(() => {
if (data.evaluationVersion === 'V1') { if (data.evaluationVersion === 'V1') {
const submitData = { const submitData = {
applicationStatus: 'APPROVED', applicationStatus: 'APPROVED',
@@ -438,9 +438,10 @@ const DomandaEditInstructorManager = () => {
errApproveRejectCallback errApproveRejectCallback
); );
} }
} }, [data]);
const doReject = () => { const doReject = useCallback(() => {
console.log('doReject', data.evaluationVersion)
if (data.evaluationVersion === 'V1') { if (data.evaluationVersion === 'V1') {
const submitData = { const submitData = {
applicationStatus: 'REJECTED', applicationStatus: 'REJECTED',
@@ -450,7 +451,7 @@ const DomandaEditInstructorManager = () => {
note: data.note, note: data.note,
motivation motivation
} }
console.log('doReject2', data.assignedApplicationId)
setLoading(true); setLoading(true);
setIsVisibleCompleteDialog(false); setIsVisibleCompleteDialog(false);
ApplicationEvaluationService.updateEvaluation( ApplicationEvaluationService.updateEvaluation(
@@ -484,7 +485,7 @@ const DomandaEditInstructorManager = () => {
errApproveRejectCallback errApproveRejectCallback
); );
} }
} }, [data]);
const approveRejectCallback = (data) => { const approveRejectCallback = (data) => {
if (data.status === 'SUCCESS') { if (data.status === 'SUCCESS') {
@@ -615,7 +616,7 @@ const DomandaEditInstructorManager = () => {
disabled={loading || ('approve' === operationType && (!amountAccepted || isEmpty(amountAccepted) || amountAccepted === 0))} disabled={loading || ('approve' === operationType && (!amountAccepted || isEmpty(amountAccepted) || amountAccepted === 0))}
label={__('Invia', 'gepafin')} onClick={'approve' === operationType ? doApprove : doReject}/> label={__('Invia', 'gepafin')} onClick={'approve' === operationType ? doApprove : doReject}/>
</div> </div>
}, [amountAccepted]) }, [amountAccepted, data]);
const initiateApproving = () => { const initiateApproving = () => {
setOperationType('approve'); setOperationType('approve');

View File

@@ -392,7 +392,7 @@ const DomandaEditPreInstructor = () => {
storeSet.main.unsetAsyncRequest(); storeSet.main.unsetAsyncRequest();
} }
const doApprove = () => { const doApprove = useCallback(() => {
if (data.evaluationVersion === 'V1') { if (data.evaluationVersion === 'V1') {
const submitData = { const submitData = {
applicationStatus: 'APPROVED', applicationStatus: 'APPROVED',
@@ -438,9 +438,9 @@ const DomandaEditPreInstructor = () => {
errApproveRejectCallback errApproveRejectCallback
); );
} }
} }, [data]);
const doReject = () => { const doReject = useCallback(() => {
if (data.evaluationVersion === 'V1') { if (data.evaluationVersion === 'V1') {
const submitData = { const submitData = {
applicationStatus: 'REJECTED', applicationStatus: 'REJECTED',
@@ -484,7 +484,7 @@ const DomandaEditPreInstructor = () => {
errApproveRejectCallback errApproveRejectCallback
); );
} }
} }, [data]);
const approveRejectCallback = (data) => { const approveRejectCallback = (data) => {
if (data.status === 'SUCCESS') { if (data.status === 'SUCCESS') {
@@ -615,7 +615,7 @@ const DomandaEditPreInstructor = () => {
disabled={loading || ('approve' === operationType && (!amountAccepted || isEmpty(amountAccepted) || amountAccepted === 0))} disabled={loading || ('approve' === operationType && (!amountAccepted || isEmpty(amountAccepted) || amountAccepted === 0))}
label={__('Invia', 'gepafin')} onClick={'approve' === operationType ? doApprove : doReject}/> label={__('Invia', 'gepafin')} onClick={'approve' === operationType ? doApprove : doReject}/>
</div> </div>
}, [amountAccepted]) }, [amountAccepted, data]);
const initiateApproving = () => { const initiateApproving = () => {
setOperationType('approve'); setOperationType('approve');