From 41b0c93f474656a16d30e09d9278cc1757d4a35d Mon Sep 17 00:00:00 2001 From: Vitalii Kiiko Date: Wed, 26 Mar 2025 09:15:13 +0100 Subject: [PATCH] - fixed rejecting/approving for V2 of evaluation; --- src/pages/DomandaEditInstructorManager/index.js | 5 +++-- src/pages/DomandaEditPreInstructor/index.js | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pages/DomandaEditInstructorManager/index.js b/src/pages/DomandaEditInstructorManager/index.js index 39b08c4..a3a807b 100644 --- a/src/pages/DomandaEditInstructorManager/index.js +++ b/src/pages/DomandaEditInstructorManager/index.js @@ -415,6 +415,7 @@ const DomandaEditInstructorManager = () => { } else if (data.evaluationVersion === 'V2') { const newFormValues = getTransformedSubmitData(); const submitData = { + applicationStatus: 'APPROVED', formFields: newFormValues, files: klona(data.files), evaluationDocument: klona(data.evaluationDocument.map(o => ({ @@ -441,7 +442,6 @@ const DomandaEditInstructorManager = () => { }, [data]); const doReject = useCallback(() => { - console.log('doReject', data.evaluationVersion) if (data.evaluationVersion === 'V1') { const submitData = { applicationStatus: 'REJECTED', @@ -451,7 +451,7 @@ const DomandaEditInstructorManager = () => { note: data.note, motivation } - console.log('doReject2', data.assignedApplicationId) + setLoading(true); setIsVisibleCompleteDialog(false); ApplicationEvaluationService.updateEvaluation( @@ -463,6 +463,7 @@ const DomandaEditInstructorManager = () => { } else if (data.evaluationVersion === 'V2') { const newFormValues = getTransformedSubmitData(); const submitData = { + applicationStatus: 'REJECTED', formFields: newFormValues, files: klona(data.files), evaluationDocument: klona(data.evaluationDocument.map(o => ({ diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js index 4db81ea..0c005aa 100644 --- a/src/pages/DomandaEditPreInstructor/index.js +++ b/src/pages/DomandaEditPreInstructor/index.js @@ -462,6 +462,7 @@ const DomandaEditPreInstructor = () => { } else if (data.evaluationVersion === 'V2') { const newFormValues = getTransformedSubmitData(); const submitData = { + applicationStatus: 'REJECTED', formFields: newFormValues, files: klona(data.files), evaluationDocument: klona(data.evaluationDocument.map(o => ({