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

- fixed enabling buttons approve/reject;

Browse Source
This commit is contained in:
Vitalii Kiiko
2025-11-14 12:34:15 +01:00
parent 1b970b5750
commit baebc7496b
4 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/pages/DomandaEditInstructorManager/index.js
View File

@@ -1119,7 +1119,7 @@ const DomandaEditInstructorManager = () => {
disabled={!isAdmissible disabled={!isAdmissible
|| ['APPROVED', 'REJECTED'].includes(data.applicationStatus) || ['APPROVED', 'REJECTED'].includes(data.applicationStatus)
|| evaluationBlockedForUser(data) || 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 || connectedSoccorsoId !== 0
} }
onClick={initiateApproving} onClick={initiateApproving}
@@ -1129,10 +1129,7 @@ const DomandaEditInstructorManager = () => {
? <Button ? <Button
type="button" type="button"
disabled={['APPROVED', 'REJECTED'].includes(data.applicationStatus) disabled={['APPROVED', 'REJECTED'].includes(data.applicationStatus)
|| (APP_EVALUATION_FLOW_ID === '1' || evaluationBlockedForUser(data)}
&& (!['EVALUATION', 'ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus)
|| 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}

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

@@ -1119,7 +1119,7 @@ const DomandaEditPreInstructor = () => {
disabled={!isAdmissible disabled={!isAdmissible
|| ['APPROVED', 'REJECTED'].includes(data.applicationStatus) || ['APPROVED', 'REJECTED'].includes(data.applicationStatus)
|| evaluationBlockedForUser(data) || 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 || connectedSoccorsoId !== 0
} }
onClick={initiateApproving} onClick={initiateApproving}
@@ -1129,10 +1129,7 @@ const DomandaEditPreInstructor = () => {
? <Button ? <Button
type="button" type="button"
disabled={['APPROVED', 'REJECTED'].includes(data.applicationStatus) disabled={['APPROVED', 'REJECTED'].includes(data.applicationStatus)
|| (APP_EVALUATION_FLOW_ID === '1' || evaluationBlockedForUser(data)}
&& (!['EVALUATION', 'ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus)
|| 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}

2
src/pages/SoccorsoEditInstructorManager/index.js
View File

@@ -435,7 +435,7 @@ const SoccorsoEditInstructorManager = () => {
</div> : null} </div> : null}
{(data.formFields && !isEmpty(data.formFields)) || (data.amendmentType === 'SPECIAL' && !isNil(data.amendmentDocumentType) {(data.formFields && !isEmpty(data.formFields)) || (data.amendmentType === 'SPECIAL' && !isNil(data.amendmentDocumentType)
&& amendmentRequestedDocs[data.amendmentDocumentType]) && amendmentRequestedDocs[data.amendmentDocumentType] && !isNil(amendmentRequestedDocs[data.amendmentDocumentType].map))
? <div className="appPageSection"> ? <div className="appPageSection">
<h3>{__('Documenti richiesti', 'gepafin')}</h3> <h3>{__('Documenti richiesti', 'gepafin')}</h3>
<ol className="appPageSection__list"> <ol className="appPageSection__list">

2
src/pages/SoccorsoEditPreInstructor/index.js
View File

@@ -435,7 +435,7 @@ const SoccorsoEditPreInstructor = () => {
</div> : null} </div> : null}
{(data.formFields && !isEmpty(data.formFields)) || (data.amendmentType === 'SPECIAL' && !isNil(data.amendmentDocumentType) {(data.formFields && !isEmpty(data.formFields)) || (data.amendmentType === 'SPECIAL' && !isNil(data.amendmentDocumentType)
&& amendmentRequestedDocs[data.amendmentDocumentType]) && amendmentRequestedDocs[data.amendmentDocumentType] && !isNil(amendmentRequestedDocs[data.amendmentDocumentType].map))
? <div className="appPageSection"> ? <div className="appPageSection">
<h3>{__('Documenti richiesti', 'gepafin')}</h3> <h3>{__('Documenti richiesti', 'gepafin')}</h3>
<ol className="appPageSection__list"> <ol className="appPageSection__list">