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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Vitalii Kiiko
2025-11-14 14:26:57 +01:00
parent 390d7c0e27 a445ddc135
commit cacc2f4ec7
4 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1218,7 +1218,7 @@ const DomandaEditInstructorManager = () => {
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 DomandaEditInstructorManager = () => {
? <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}

7
src/pages/DomandaEditPreInstructor/index.js
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}

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

@@ -435,7 +435,7 @@ const SoccorsoEditInstructorManager = () => {
</div> : null}
{(data.formFields && !isEmpty(data.formFields)) || (data.amendmentType === 'SPECIAL' && !isNil(data.amendmentDocumentType)
&& amendmentRequestedDocs[data.amendmentDocumentType])
&& !isNil(amendmentRequestedDocs[data.amendmentDocumentType]) && !isNil(amendmentRequestedDocs[data.amendmentDocumentType].map))
? <div className="appPageSection">
<h3>{__('Documenti richiesti', 'gepafin')}</h3>
<ol className="appPageSection__list">
@@ -444,10 +444,11 @@ const SoccorsoEditInstructorManager = () => {
style={{ flexDirection: 'row' }}>
<span>{o.label}</span>
</li>) : null}
{amendmentRequestedDocs[data.amendmentDocumentType].map((v) => <li key={v}
{!isNil(amendmentRequestedDocs[data.amendmentDocumentType]) ?? !isNil(amendmentRequestedDocs[data.amendmentDocumentType].map)
? amendmentRequestedDocs[data.amendmentDocumentType].map((v) => <li key={v}
style={{ flexDirection: 'row' }}>
<span>{v}</span>
</li>)}
</li>) : null}
</ol>
</div> : null}
@@ -554,7 +555,7 @@ const SoccorsoEditInstructorManager = () => {
<Button
type="button"
onClick={openCloseAmendmentDialog}
disabled={isAsyncRequest || ['CLOSE', 'AWAITING', 'EXPIRED'].includes(data.status)}
disabled={isAsyncRequest || ['CLOSE', 'EXPIRED'].includes(data.status)}
label={__('Chiudi Soccorso Istruttorio', 'gepafin')}
icon="pi pi-times" iconPos="right"/>
</div>

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

@@ -435,7 +435,7 @@ const SoccorsoEditPreInstructor = () => {
</div> : null}
{(data.formFields && !isEmpty(data.formFields)) || (data.amendmentType === 'SPECIAL' && !isNil(data.amendmentDocumentType)
&& amendmentRequestedDocs[data.amendmentDocumentType])
&& !isNil(amendmentRequestedDocs[data.amendmentDocumentType]))
? <div className="appPageSection">
<h3>{__('Documenti richiesti', 'gepafin')}</h3>
<ol className="appPageSection__list">
@@ -444,10 +444,11 @@ const SoccorsoEditPreInstructor = () => {
style={{ flexDirection: 'row' }}>
<span>{o.label}</span>
</li>) : null}
{amendmentRequestedDocs[data.amendmentDocumentType].map((v) => <li key={v}
{!isNil(amendmentRequestedDocs[data.amendmentDocumentType]) ?? !isNil(amendmentRequestedDocs[data.amendmentDocumentType].map)
? amendmentRequestedDocs[data.amendmentDocumentType].map((v) => <li key={v}
style={{ flexDirection: 'row' }}>
<span>{v}</span>
</li>)}
</li>) : null}
</ol>
</div> : null}
@@ -554,7 +555,7 @@ const SoccorsoEditPreInstructor = () => {
<Button
type="button"
onClick={openCloseAmendmentDialog}
disabled={isAsyncRequest || ['CLOSE', 'AWAITING', 'EXPIRED'].includes(data.status)}
disabled={isAsyncRequest || ['CLOSE', 'EXPIRED'].includes(data.status)}
label={__('Chiudi Soccorso Istruttorio', 'gepafin')}
icon="pi pi-times" iconPos="right"/>
</div>