From fcebae094fca312c58a4a378e365563212838371 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 23 Mar 2025 16:17:32 +0300
Subject: [PATCH] fix

---
 .idea/workspace.xml                                           | 4 +++-
 .../TestingSystem/SAPFOR/SapforPackage/SapforPackage.java     | 4 +++-
 src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java | 4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2b684550..5e9cf71e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,7 +7,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
index 3d8b27c1..b548bb1d 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
@@ -6,13 +6,16 @@ import Common.Utils.Utils_;
 import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Tasks.TaskState;
+import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.TestingSystem.Common.TasksPackageState;
 import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage;
 import _VisualDVM.TestingSystem.SAPFOR.Json.SapforPackage_json;
 import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
+import _VisualDVM.TestingSystem.SAPFOR.SapforTask.ComparisonState;
 import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask;
 import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
 import com.sun.org.glassfish.gmbal.Description;
+import javafx.util.Pair;
 
 import java.io.File;
 import java.util.Vector;
@@ -103,7 +106,6 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
                 bad++;
             else good++;
         }
-        bad+=mismatchesCount;
         state = (bad > 0) ? TasksPackageState.DoneWithErrors : TasksPackageState.Done;
         double percent = (((double) (good)) / tasksCount) * 100.0;
         description = "Выполнено на " + ((int) percent) + "%\n" +
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
index e120f38b..73a5b7ad 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
@@ -194,6 +194,10 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
                 }
                 Print("сравнение завершено");
                 log.Writeln_("Различий с эталоном: " + testingPackage.mismatchesCount);
+                if (testingPackage.mismatchesCount>0){
+                    testingPackage.doneTasksCount-=testingPackage.mismatchesCount;
+                    testingPackage.state = TasksPackageState.DoneWithErrors;
+                }
                 return;
             } else {
                 Print("сравнение с эталоном невозможно");