From 008a78a8b11cf62e09d288e1006ac78803e0df84 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Tue, 18 Feb 2025 13:55:50 +0100
Subject: [PATCH] - fixed bug when was sending the wrong ID for uploading
 files;

---
 src/pages/DomandaEditInstructorManager/index.js | 4 ++--
 src/pages/DomandaEditPreInstructor/index.js     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/DomandaEditInstructorManager/index.js b/src/pages/DomandaEditInstructorManager/index.js
index 6be4f55..f2f9ced 100644
--- a/src/pages/DomandaEditInstructorManager/index.js
+++ b/src/pages/DomandaEditInstructorManager/index.js
@@ -739,7 +739,7 @@ const DomandaEditInstructorManager = () => {
         if (data.evaluationVersion === 'V1') {
             return !allFilesRated || !atLeastOneChecked;
         } else if (data.evaluationVersion === 'V2') {
-            return !atLeastOneChecked;
+            return !allFilesRated || !atLeastOneChecked;
         } else {
             return true;
         }
@@ -939,7 +939,7 @@ const DomandaEditInstructorManager = () => {
                                 ['evaluationDocument']
                             )}
                             shouldDisable={['APPROVED', 'REJECTED'].includes(data.applicationStatus) || evaluationBlockedForUser(data)}
-                            sourceId={data.assignedApplicationId}
+                            sourceId={data.applicationId}
                             sourceName="evaluation"/>
                     </div>
 
diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index 2be4553..65e4e5e 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -741,7 +741,7 @@ const DomandaEditPreInstructor = () => {
         if (data.evaluationVersion === 'V1') {
             return !allFilesRated || !atLeastOneChecked;
         } else if (data.evaluationVersion === 'V2') {
-            return !atLeastOneChecked;
+            return !allFilesRated || !atLeastOneChecked;
         } else {
             return true;
         }
@@ -944,7 +944,7 @@ const DomandaEditPreInstructor = () => {
                                 ['evaluationDocument']
                             )}
                             shouldDisable={['APPROVED', 'REJECTED'].includes(data.applicationStatus) || evaluationBlockedForUser(data)}
-                            sourceId={data.assignedApplicationId}
+                            sourceId={data.applicationId}
                             sourceName="evaluation"/>
                     </div>