From ac5757160e8c4c2a3f148c0b830952abb216cad8 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 15 Dec 2023 20:29:24 +0300
Subject: [PATCH] =?UTF-8?q?fix=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=BE=D0=B2=20?=
 =?UTF-8?q?=D0=B5=D1=81=D0=BB=D0=B8=20=D1=81=D1=80=D0=B5=D0=B4=D0=B8=20?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=85=20=D0=B5=D1=81=D1=82=D1=8C=20=D1=87=D0=B5?=
 =?UTF-8?q?=D1=80=D0=BD=D0=BE=D0=B2=D0=B8=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  9 +++--
 properties                                    |  2 +-
 .../SapforPackage/SapforPackagesBar.java      |  1 +
 .../Passes/All/AddDVMPackage.java             |  2 +-
 .../Passes/All/AddSapforPackage.java          |  4 +++
 .../Passes/All/DeleteDVMPackage.java          | 36 +++++++++++++++++--
 src/Visual_DVM_2021/Passes/PassCode_2021.java |  4 +++
 7 files changed, 51 insertions(+), 7 deletions(-)
 create mode 100644 src/Visual_DVM_2021/Passes/All/AddSapforPackage.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3052e9df..3ccadccd 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,10 +7,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddSapforPackage.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/Common/UI/Menus_2023/DVMPackagesBar/DVMPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDVMPackage.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 0ce55c18..2653b49e 100644
--- a/properties
+++ b/properties
@@ -26,7 +26,7 @@
   "PerformanceAnalyzerPath": "",
   "ComponentsBackUpsCount": 10,
   "TestingKernels": 28,
-  "AutoCheckTesting": false,
+  "AutoCheckTesting": true,
   "CheckTestingIntervalSeconds": 10,
   "EmailOnTestingProgress": false
 }
\ No newline at end of file
diff --git a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java
index 010b8ac3..2789a61f 100644
--- a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java
+++ b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java
@@ -4,6 +4,7 @@ import Visual_DVM_2021.Passes.PassCode_2021;
 public class SapforPackagesBar extends DataMenuBar {
     public SapforPackagesBar() {
         super("пакеты задач SAPFOR"
+              //,  PassCode_2021.AddSapforPackage
                // PassCode_2021.AbortSapforTaskPackage,
                // PassCode_2021.DeleteSapforTasksPackage
                 );
diff --git a/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java b/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java
index 4170a656..24e95ad1 100644
--- a/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java
@@ -77,7 +77,7 @@ public class AddDVMPackage extends AddObjectPass<DVMPackage> {
     }
     @Override
     protected void body() throws Exception {
-        //черновик не вставляется в бд.
+        //черновик не вставляется в бд. идет только как элемент списка.
        Global.testingServer.db.dvmPackages.Data.put(target.id, target);
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/AddSapforPackage.java b/src/Visual_DVM_2021/Passes/All/AddSapforPackage.java
new file mode 100644
index 00000000..d223f66c
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/AddSapforPackage.java
@@ -0,0 +1,4 @@
+package Visual_DVM_2021.Passes.All;
+import Visual_DVM_2021.Passes.Pass_2021;
+public class AddSapforPackage extends Pass_2021 {
+}
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDVMPackage.java b/src/Visual_DVM_2021/Passes/All/DeleteDVMPackage.java
index 74256ebf..71a0fae1 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteDVMPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteDVMPackage.java
@@ -1,11 +1,14 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Constants;
 import Common.Global;
 import Common.UI.UI;
 import TestingSystem.Common.TestingServer;
 import TestingSystem.DVM.DVMPackage.DVMPackage;
-import TestingSystem.DVM.TasksPackage.TasksPackageState;
 import Visual_DVM_2021.Passes.DeleteServerObjects;
+
+import java.util.Vector;
 public class DeleteDVMPackage extends DeleteServerObjects<TestingServer, DVMPackage> {
+    boolean delete_draft;
     public DeleteDVMPackage() {
         super(Global.testingServer, DVMPackage.class);
     }
@@ -26,10 +29,39 @@ public class DeleteDVMPackage extends DeleteServerObjects<TestingServer, DVMPack
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        return super.canStart(args) && checkActivity();
+        delete_draft = false;
+        Vector<Object> target_ = new Vector<>();
+        if (super.canStart(args) && checkActivity()) {
+            for (Object key : target) {
+                int id = (int) key;
+                if (id == Constants.Nan) {
+                    delete_draft = true;
+                } else {
+                    target_.add(id);
+                }
+            }
+            //-
+            if (delete_draft) {
+                if (target.size() == 1) {
+                    DeleteDraftOnly();
+                    return false;
+                } else {
+                    target = target_;
+                    return true;
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+    void DeleteDraftOnly() throws Exception {
+        showPreparation();
+        server.db.dvmPackages.Data.remove(Constants.Nan);
+        server.db.dvmPackages.ShowUI();
     }
     @Override
     protected void showPreparation() throws Exception {
+        super.showPreparation();
         UI.getMainWindow().getTestingWindow().DropTestRunTasksComparison();
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index b71757ed..8b3820c7 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -315,11 +315,15 @@ public enum PassCode_2021 {
     DeleteDVMPackage,
     AbortDVMPackage,
     //->
+    AddSapforPackage,
+    //->
     TestPass;
     public String getDescription() {
         switch (this) {
             case Undefined:
                 return "?";
+            case AddSapforPackage:
+                return "Добавить пакет задач SAPFOR";
             case AbortDVMPackage:
                 return "Прервать пакет тестирования DVM";
             case DeleteDVMPackage: