From aaddd55152b2103f05b984cf982be20b080e9ca8 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 24 Mar 2024 18:02:29 +0300
Subject: [PATCH] =?UTF-8?q?fix.=20=D0=BF=D1=80=D0=B8=20=D0=BA=D0=BB=D0=BE?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B8=20=D0=BF?=
 =?UTF-8?q?=D0=B0=D0=BA=D0=B5=D1=82=D0=B0=20=D1=81=D0=B0=D0=BF=D1=84=D0=BE?=
 =?UTF-8?q?=D1=80,=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B0=D0=BC=20=D0=BD?=
 =?UTF-8?q?=D0=B5=20=D1=80=D0=B0=D0=B7=D0=B4=D0=B0=D0=B2=D0=B0=D0=BB=D0=B8?=
 =?UTF-8?q?=D1=81=D1=8C=20=D0=B8=D0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                                    |  9 ++-------
 properties                                             |  2 +-
 src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java | 10 +++++++---
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 28946848..8ba0c78c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartTestingServer.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/TestingSystem/Common/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PingTestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PingTestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShutdownTestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShutdownTestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/TestingServerSSHPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/TestingServerSSHPass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 4babd077..7e97f998 100644
--- a/properties
+++ b/properties
@@ -35,7 +35,7 @@
   "PerformanceAnalyzerPath": "",
   "ComponentsBackUpsCount": 10,
   "TestingKernels": 16,
-  "AutoCheckTesting": false,
+  "AutoCheckTesting": true,
   "CheckTestingIntervalSeconds": 10,
   "EmailOnTestingProgress": false,
   "eraseTestingWorkspaces": true
diff --git a/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java b/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java
index 5c3b8ad3..8fc9bd64 100644
--- a/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java
@@ -86,7 +86,7 @@ public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
             return false;
         //--
         srcPackages = Global.testingServer.db.sapforPackages.getCheckedOrCurrent();
-        if (srcPackages.isEmpty()){
+        if (srcPackages.isEmpty()) {
             Log.Writeln_("Не отмечено или не выбрано ни одного пакета SAPFOR");
             return false;
         }
@@ -158,6 +158,10 @@ public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
                 }
             }
         }
+        for (SapforTask task : target.package_json.tasks) {
+            task.id = target.package_json.getMaxTaskId();
+            target.package_json.tasks.add(task);
+        }
         target.tasksCount = target.package_json.tasks.size();
         target.testsNames = String.join(";", target.package_json.getTestsNames());
         target.configurationsNames = String.join(";", target.package_json.getConfigurationsNames());
@@ -180,7 +184,7 @@ public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
     protected void body() throws Exception {
         Global.testingServer.db.sapforPackages.Data.put(target.id, target);
         //--
-       // Utils.CheckAndCleanDirectory(target.getLocalWorkspace());
-       // target.saveJson();
+        // Utils.CheckAndCleanDirectory(target.getLocalWorkspace());
+        // target.saveJson();
     }
 }
\ No newline at end of file