Merge branch 'master' into develop

This commit is contained in:
Vitalii Kiiko
2025-11-14 14:26:57 +01:00
4 changed files with 14 additions and 18 deletions

View File

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