diff --git a/src/pages/DomandaEditInstructorManager/index.js b/src/pages/DomandaEditInstructorManager/index.js index 6f27ef3..28e4f10 100644 --- a/src/pages/DomandaEditInstructorManager/index.js +++ b/src/pages/DomandaEditInstructorManager/index.js @@ -1228,9 +1228,9 @@ const DomandaEditInstructorManager = () => { useEffect(() => { const maxScore = pathOr(0, ['minScore'], data); const criteria = pathOr([], ['criteria'], data); - const scoreSum = sum(criteria.map(o => o.score)); + const scoreSum = pathOr(0, [], sum(criteria.map(o => o.score))); - setIsAdmissible(scoreSum !== 0 && scoreSum >= maxScore); + setIsAdmissible(scoreSum >= maxScore); }, [data]); useEffect(() => { diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js index 23cf7e2..210d34b 100644 --- a/src/pages/DomandaEditPreInstructor/index.js +++ b/src/pages/DomandaEditPreInstructor/index.js @@ -1228,9 +1228,9 @@ const DomandaEditPreInstructor = () => { useEffect(() => { const maxScore = pathOr(0, ['minScore'], data); const criteria = pathOr([], ['criteria'], data); - const scoreSum = sum(criteria.map(o => o.score)); + const scoreSum = pathOr(0, [], sum(criteria.map(o => o.score))); - setIsAdmissible(scoreSum !== 0 && scoreSum >= maxScore); + setIsAdmissible(scoreSum >= maxScore); }, [data]); useEffect(() => { diff --git a/src/pages/SoccorsoEditBeneficiario/index.js b/src/pages/SoccorsoEditBeneficiario/index.js index 3b894cc..db61208 100644 --- a/src/pages/SoccorsoEditBeneficiario/index.js +++ b/src/pages/SoccorsoEditBeneficiario/index.js @@ -62,7 +62,7 @@ console.log('data', data.amendmentType) const entityId = !isNaN(parsedId) ? parsedId : 0; AmendmentsService.getSoccorsoByApplId(entityId, getCallback, errGetCallback, [ - ['statuses', 'AWAITING,RESPONSE_RECEIVED'] + ['statuses', 'AWAITING, RESPONSE_RECEIVED'] ]); }, [id]); diff --git a/src/pages/SoccorsoEditInstructorManager/index.js b/src/pages/SoccorsoEditInstructorManager/index.js index 56647cb..042418f 100644 --- a/src/pages/SoccorsoEditInstructorManager/index.js +++ b/src/pages/SoccorsoEditInstructorManager/index.js @@ -232,9 +232,17 @@ const SoccorsoEditInstructorManager = () => { } - const doCloseAmendment = () => { - doUpdateAmendment(true); - } + const doCloseAmendment = useCallback(() => { + if (data.status === 'AWAITING') { + const submitData = { + internalNote + } + storeSet('setAsyncRequest'); + AmendmentsService.closeSoccorso(amendmentId, submitData, closeAmendmentCallback, errCloseAmendmentCallback); + } else { + doUpdateAmendment(true); + } + }, [data]); const closeAmendmentCallback = (data) => { if (data.status === 'SUCCESS') { diff --git a/src/pages/SoccorsoEditPreInstructor/index.js b/src/pages/SoccorsoEditPreInstructor/index.js index 345752c..702e2b6 100644 --- a/src/pages/SoccorsoEditPreInstructor/index.js +++ b/src/pages/SoccorsoEditPreInstructor/index.js @@ -232,9 +232,17 @@ const SoccorsoEditPreInstructor = () => { } - const doCloseAmendment = () => { - doUpdateAmendment(true); - } + const doCloseAmendment = useCallback(() => { + if (data.status === 'AWAITING') { + const submitData = { + internalNote + } + storeSet('setAsyncRequest'); + AmendmentsService.closeSoccorso(amendmentId, submitData, closeAmendmentCallback, errCloseAmendmentCallback); + } else { + doUpdateAmendment(true); + } + }, [data]); const closeAmendmentCallback = (data) => { if (data.status === 'SUCCESS') {