From c1d3d9208e752cc2b8cb68fadf732f432b71a559 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 4 Dec 2023 23:13:19 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=B0=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=B4=D0=B0=D1=87(=20=D0=BD=D0=B5=D0=B0=D0=BA=D1=82=D0=B8?=
 =?UTF-8?q?=D0=B2=D0=BD=D0=BE=D0=B3=D0=BE)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  5 +++-
 .../TestRunTasksMenuBar.java                  |  3 ++-
 .../Passes/All/DeleteTasksPackage.java        | 25 +++++++++++++++++++
 src/Visual_DVM_2021/Passes/PassCode_2021.java |  3 +++
 4 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 src/Visual_DVM_2021/Passes/All/DeleteTasksPackage.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 81a8aeac..0121dc19 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,7 +7,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/TestsSupervisor_2022.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TestsSupervisor_2022.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteTasksPackage.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/TestRunTasksMenuBar/TestRunTasksMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestRunTasksMenuBar/TestRunTasksMenuBar.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/src/Common/UI/Menus_2023/TestRunTasksMenuBar/TestRunTasksMenuBar.java b/src/Common/UI/Menus_2023/TestRunTasksMenuBar/TestRunTasksMenuBar.java
index 7aed90cc..c4a97f00 100644
--- a/src/Common/UI/Menus_2023/TestRunTasksMenuBar/TestRunTasksMenuBar.java
+++ b/src/Common/UI/Menus_2023/TestRunTasksMenuBar/TestRunTasksMenuBar.java
@@ -17,6 +17,7 @@ public class TestRunTasksMenuBar extends DataMenuBar {
         filters= addMenus(cFilterMenu, rFilterMenu);
     }
     public TestRunTasksMenuBar() {
-        super("задачи", PassCode_2021.DownloadTaskTest);
+        super("задачи",
+                PassCode_2021.DownloadTaskTest, PassCode_2021.DeleteTasksPackage);
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteTasksPackage.java b/src/Visual_DVM_2021/Passes/All/DeleteTasksPackage.java
new file mode 100644
index 00000000..9759987b
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/DeleteTasksPackage.java
@@ -0,0 +1,25 @@
+package Visual_DVM_2021.Passes.All;
+import Common.UI.UI;
+import TestingSystem.DVM.TasksPackage.TasksPackage;
+import TestingSystem.DVM.TasksPackage.TasksPackageState;
+import Visual_DVM_2021.Passes.Server.DeleteServerAccountObject;
+public class DeleteTasksPackage extends DeleteServerAccountObject<TasksPackage> {
+    public DeleteTasksPackage() {
+        super(TasksPackage.class);
+    }
+    public boolean checkActivity() {
+        if (!target.state.equals(TasksPackageState.Done) && !target.state.equals(TasksPackageState.Aborted)) {
+            Log.Writeln_("Нельзя удалить активный пакет!");
+            return false;
+        }
+        return true;
+    }
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        return super.canStart(args) && checkActivity();
+    }
+    @Override
+    protected void showPreparation() throws Exception {
+        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 5d35df5f..47b002eb 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -303,12 +303,15 @@ public enum PassCode_2021 {
     CreateTestFromFile,
     CreateTestsFromFiles,
     CreateGroupFromFiles,
+    DeleteTasksPackage,
     //->
     TestPass;
     public String getDescription() {
         switch (this) {
             case Undefined:
                 return "?";
+            case DeleteTasksPackage:
+                return "Удалить пакет задач";
             case CreateGroupFromFiles:
                 return "Создать группу из файлов в папке";
             case CreateTestsFromFiles: