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

- removed condition for maxScore to be greater than 0;

Browse Source 
- fixed logic of closing amendment in status AWAITING;
This commit is contained in:
Vitalii Kiiko
2025-11-17 13:03:30 +01:00
parent a445ddc135
commit 68cc6716e9
5 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1228,9 +1228,9 @@ const DomandaEditInstructorManager = () => {
useEffect(() => { useEffect(() => {
const maxScore = pathOr(0, ['minScore'], data); const maxScore = pathOr(0, ['minScore'], data);
const criteria = pathOr([], ['criteria'], 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]); }, [data]);
useEffect(() => { useEffect(() => {

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

@@ -1228,9 +1228,9 @@ const DomandaEditPreInstructor = () => {
useEffect(() => { useEffect(() => {
const maxScore = pathOr(0, ['minScore'], data); const maxScore = pathOr(0, ['minScore'], data);
const criteria = pathOr([], ['criteria'], 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]); }, [data]);
useEffect(() => { useEffect(() => {

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

@@ -62,7 +62,7 @@ console.log('data', data.amendmentType)
const entityId = !isNaN(parsedId) ? parsedId : 0; const entityId = !isNaN(parsedId) ? parsedId : 0;
AmendmentsService.getSoccorsoByApplId(entityId, getCallback, errGetCallback, [ AmendmentsService.getSoccorsoByApplId(entityId, getCallback, errGetCallback, [
['statuses', 'AWAITING,RESPONSE_RECEIVED'] ['statuses', 'AWAITING, RESPONSE_RECEIVED']
]); ]);
}, [id]); }, [id]);

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

@@ -232,9 +232,17 @@ const SoccorsoEditInstructorManager = () => {
</div> </div>
} }
const doCloseAmendment = () => { const doCloseAmendment = useCallback(() => {
if (data.status === 'AWAITING') {
const submitData = {
internalNote
}
storeSet('setAsyncRequest');
AmendmentsService.closeSoccorso(amendmentId, submitData, closeAmendmentCallback, errCloseAmendmentCallback);
} else {
doUpdateAmendment(true); doUpdateAmendment(true);
} }
}, [data]);
const closeAmendmentCallback = (data) => { const closeAmendmentCallback = (data) => {
if (data.status === 'SUCCESS') { if (data.status === 'SUCCESS') {

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

@@ -232,9 +232,17 @@ const SoccorsoEditPreInstructor = () => {
</div> </div>
} }
const doCloseAmendment = () => { const doCloseAmendment = useCallback(() => {
if (data.status === 'AWAITING') {
const submitData = {
internalNote
}
storeSet('setAsyncRequest');
AmendmentsService.closeSoccorso(amendmentId, submitData, closeAmendmentCallback, errCloseAmendmentCallback);
} else {
doUpdateAmendment(true); doUpdateAmendment(true);
} }
}, [data]);
const closeAmendmentCallback = (data) => { const closeAmendmentCallback = (data) => {
if (data.status === 'SUCCESS') { if (data.status === 'SUCCESS') {