- added conditions for approve/reject buttons;

This commit is contained in:
Vitalii Kiiko
2025-02-14 16:20:17 +01:00
parent 153e17132a
commit 66078ea904

View File

@@ -812,7 +812,7 @@ const DomandaEditPreInstructor = () => {
? <Button ? <Button
type="button" type="button"
disabled={!isAdmissible disabled={!isAdmissible
|| ['APPROVED'].includes(data.applicationStatus) || ['APPROVED','REJECTED'].includes(data.applicationStatus)
|| evaluationBlockedForUser(data) || evaluationBlockedForUser(data)
|| (APP_EVALUATION_FLOW_ID === '1' && !['ADMISSIBLE'].includes(data.applicationStatus)) || (APP_EVALUATION_FLOW_ID === '1' && !['ADMISSIBLE'].includes(data.applicationStatus))
} }
@@ -822,9 +822,11 @@ const DomandaEditPreInstructor = () => {
{data.id {data.id
? <Button ? <Button
type="button" type="button"
disabled={APP_EVALUATION_FLOW_ID === '1' disabled={['APPROVED','REJECTED'].includes(data.applicationStatus)
|| APP_EVALUATION_FLOW_ID === '1'
&& (!['EVALUATION', 'ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus) && (!['EVALUATION', 'ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus)
|| evaluationBlockedForUser(data))} || evaluationBlockedForUser(data))
}
onClick={initiateRejecting} onClick={initiateRejecting}
label={__('Respingi domanda', 'gepafin')} label={__('Respingi domanda', 'gepafin')}
icon="pi pi-times" iconPos="right"/> : null} icon="pi pi-times" iconPos="right"/> : null}