- removed condition for maxScore to be greater than 0;
- fixed logic of closing amendment in status AWAITING;
This commit is contained in:
@@ -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(() => {
|
||||
|
||||
@@ -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(() => {
|
||||
|
||||
@@ -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]);
|
||||
|
||||
|
||||
@@ -232,9 +232,17 @@ const SoccorsoEditInstructorManager = () => {
|
||||
</div>
|
||||
}
|
||||
|
||||
const doCloseAmendment = () => {
|
||||
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') {
|
||||
|
||||
@@ -232,9 +232,17 @@ const SoccorsoEditPreInstructor = () => {
|
||||
</div>
|
||||
}
|
||||
|
||||
const doCloseAmendment = () => {
|
||||
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') {
|
||||
|
||||
Reference in New Issue
Block a user