From 0f74b3168e02cb5a7e2820baf8d2769541976591 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 6 Dec 2023 02:33:01 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BC=D0=B0=D1=81=D1=81=D0=BE=D0=B2=D0=BE?=
 =?UTF-8?q?=D0=B5=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=BE=D0=B2=20DVM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  2 +-
 .../Passes/All/DeleteTasksPackage.java        | 34 +++++++++++++++----
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1aa5f55f..69eff3c0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,7 +8,7 @@
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteTasksPackage.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteTasksPackage.java b/src/Visual_DVM_2021/Passes/All/DeleteTasksPackage.java
index 9759987b..d11fcf54 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteTasksPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteTasksPackage.java
@@ -1,16 +1,38 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Current;
+import Common.Database.Database;
+import Common.Global;
 import Common.UI.UI;
+import TestingSystem.Common.TestingServer;
 import TestingSystem.DVM.TasksPackage.TasksPackage;
 import TestingSystem.DVM.TasksPackage.TasksPackageState;
-import Visual_DVM_2021.Passes.Server.DeleteServerAccountObject;
-public class DeleteTasksPackage extends DeleteServerAccountObject<TasksPackage> {
+import Visual_DVM_2021.Passes.DeleteServerObjects;
+public class DeleteTasksPackage extends DeleteServerObjects<TestingServer, TasksPackage> {
     public DeleteTasksPackage() {
-        super(TasksPackage.class);
+        super(Global.testingServer, TasksPackage.class);
     }
+    protected Database getDb() {
+        return server.account_db;
+    }
+    protected String getEmail() {
+        return Current.getAccount().email;
+    }
+    //---
     public boolean checkActivity() {
-        if (!target.state.equals(TasksPackageState.Done) && !target.state.equals(TasksPackageState.Aborted)) {
-            Log.Writeln_("Нельзя удалить активный пакет!");
-            return false;
+        for (Object key : target) {
+            TasksPackage tasksPackage = server.account_db.packages.get(key);
+            if (!tasksPackage.state.equals(TasksPackageState.Done) &&
+                    !tasksPackage.state.equals(TasksPackageState.Aborted)
+                     /*&&
+                    !tasksPackage.state.equals(TasksPackageState.Queued) &&
+                    !tasksPackage.state.equals(TasksPackageState.TestsSynchronize) &&
+                    !tasksPackage.state.equals(TasksPackageState.PackageWorkspaceCreation) &&
+                    !tasksPackage.state.equals(TasksPackageState.PackageStart)
+                      */
+            ) {
+                Log.Writeln_("Нельзя удалить активный пакет " + key + " !");
+                return false;
+            }
         }
         return true;
     }