From e1da90d705605f1ceb00e529316d199e0ee4ac63 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 6 Dec 2023 03:04:26 +0300
Subject: [PATCH] =?UTF-8?q?v++=20=D0=BC=D0=B0=D1=81=D1=81=D0=BE=D0=B2?=
 =?UTF-8?q?=D1=8B=D0=B5=20=D0=BE=D0=BF=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D0=B8?=
 =?UTF-8?q?=20=D1=81=20=D0=B1=D0=B4=20=D1=82=D0=B5=D1=81=D1=82=D0=B8=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  9 +++--
 src/Repository/Component/Visualiser.java      |  2 +-
 .../SapforConfigurationCommandsDBTable.java   |  6 +++-
 .../SapforTasksPackagesDBTable.java           | 24 +++++++------
 .../All/DeleteSapforConfigurationCommand.java |  4 +--
 .../Passes/All/DeleteSapforTasksPackage.java  | 36 +++++++++++++++----
 .../Passes/All/DeleteTasksPackage.java        |  6 ----
 7 files changed, 58 insertions(+), 29 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c4021973..59161ada 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,8 +7,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.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/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.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/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java
index 1c128893..7604d059 100644
--- a/src/Repository/Component/Visualiser.java
+++ b/src/Repository/Component/Visualiser.java
@@ -62,7 +62,7 @@ public class Visualiser extends Component {
     //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
     @Override
     public void GetVersionInfo() {
-        version = 1043;
+        version = 1044;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());
diff --git a/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java b/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java
index cd9df82d..464073c4 100644
--- a/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsDBTable.java
@@ -21,6 +21,10 @@ public class SapforConfigurationCommandsDBTable extends iDBTable<SapforConfigura
     @Override
     protected DataSetControlForm createUI() {
         return new DataSetControlForm(this){
+            @Override
+            public boolean hasCheckBox() {
+                return true;
+            }
             @Override
             protected void AdditionalInitColumns() {
                 //columns.get(0).setVisible(false);
@@ -36,7 +40,7 @@ public class SapforConfigurationCommandsDBTable extends iDBTable<SapforConfigura
     @Override
     public Object getFieldAt(SapforConfigurationCommand object, int columnIndex) {
         switch (columnIndex) {
-            case 1:
+            case 2:
                 return object.passCode.getDescription();
             default:
                 return null;
diff --git a/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java
index 9de303a5..cd7992dc 100644
--- a/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/SapforTasksPackagesDBTable.java
@@ -28,13 +28,17 @@ public class SapforTasksPackagesDBTable extends DBTable<Long,SapforTasksPackage>
     @Override
     protected DataSetControlForm createUI() {
         return new DataSetControlForm(this) {
+            @Override
+            public boolean hasCheckBox() {
+                return true;
+            }
             @Override
             protected void AdditionalInitColumns() {
              //   columns.get(0).setVisible(false);
-                columns.get(2).setMaxWidth(200);
-                columns.get(5).setRenderer(RendererDate);
+                columns.get(3).setMaxWidth(200);
                 columns.get(6).setRenderer(RendererDate);
-                columns.get(7).setRenderer(RendererStatusEnum);
+                columns.get(7).setRenderer(RendererDate);
+                columns.get(8).setRenderer(RendererStatusEnum);
             }
         };
     }
@@ -53,19 +57,19 @@ public class SapforTasksPackagesDBTable extends DBTable<Long,SapforTasksPackage>
     @Override
     public Object getFieldAt(SapforTasksPackage object, int columnIndex) {
         switch (columnIndex) {
-            case 1:
-                return object.sapfor_version;
             case 2:
-                return object.testsNames;
+                return object.sapfor_version;
             case 3:
-                return object.tasksCount;
+                return object.testsNames;
             case 4:
-                return object.kernels;
+                return object.tasksCount;
             case 5:
-                return new Date(object.StartDate);
+                return object.kernels;
             case 6:
-                return new Date(object.ChangeDate);
+                return new Date(object.StartDate);
             case 7:
+                return new Date(object.ChangeDate);
+            case 8:
                 return object.state;
             default:
                 return null;
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java b/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java
index c7ba4f1e..adf58f19 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSapforConfigurationCommand.java
@@ -2,8 +2,8 @@ package Visual_DVM_2021.Passes.All;
 import Common.Global;
 import TestingSystem.Common.TestingServer;
 import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
-import Visual_DVM_2021.Passes.Server.DeleteServerObject;
-public class DeleteSapforConfigurationCommand extends DeleteServerObject<TestingServer, SapforConfigurationCommand> {
+import Visual_DVM_2021.Passes.DeleteServerObjects;
+public class DeleteSapforConfigurationCommand extends DeleteServerObjects<TestingServer, SapforConfigurationCommand> {
     public DeleteSapforConfigurationCommand() {
         super(Global.testingServer, SapforConfigurationCommand.class);
     }
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java b/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java
index b1e09e86..77977d56 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java
@@ -1,17 +1,38 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Current;
+import Common.Database.Database;
+import Common.Global;
 import Common.UI.UI;
 import Common.Utils.Utils;
+import TestingSystem.Common.TestingServer;
 import TestingSystem.DVM.TasksPackage.TasksPackageState;
 import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
-import Visual_DVM_2021.Passes.Server.DeleteServerAccountObject;
-public class DeleteSapforTasksPackage extends DeleteServerAccountObject<SapforTasksPackage> {
+import Visual_DVM_2021.Passes.DeleteServerObjects;
+
+import java.util.Vector;
+public class DeleteSapforTasksPackage extends DeleteServerObjects<TestingServer,SapforTasksPackage> {
     public DeleteSapforTasksPackage() {
-        super(SapforTasksPackage.class);
+        super(Global.testingServer,SapforTasksPackage.class);
     }
+    protected Database getDb() {
+        return server.account_db;
+    }
+    protected String getEmail() {
+        return Current.getAccount().email;
+    }
+    Vector<SapforTasksPackage> to_delete;
+    //---
     public boolean checkActivity() {
-        if (!target.state.equals(TasksPackageState.Done) && !target.state.equals(TasksPackageState.Aborted)) {
-            Log.Writeln_("Нельзя удалить активный пакет!");
-            return false;
+        to_delete = new Vector<>();
+        for (Object key : target) {
+            SapforTasksPackage tasksPackage = server.account_db.sapforTasksPackages.get(key);
+            if (!tasksPackage.state.equals(TasksPackageState.Done) &&
+                    !tasksPackage.state.equals(TasksPackageState.Aborted)
+            ) {
+                Log.Writeln_("Нельзя удалить активный пакет " + key + " !");
+                return false;
+            }
+            to_delete.add(tasksPackage);
         }
         return true;
     }
@@ -26,7 +47,8 @@ public class DeleteSapforTasksPackage extends DeleteServerAccountObject<SapforTa
     @Override
     protected void performDone() throws Exception {
         super.performDone();
-        Utils.delete_with_check(target.getLocalWorkspace());
+        for (SapforTasksPackage tasksPackage: to_delete)
+            Utils.delete_with_check(tasksPackage.getLocalWorkspace());
     }
 }
 
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteTasksPackage.java b/src/Visual_DVM_2021/Passes/All/DeleteTasksPackage.java
index d11fcf54..d0f037e7 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteTasksPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteTasksPackage.java
@@ -23,12 +23,6 @@ public class DeleteTasksPackage extends DeleteServerObjects<TestingServer, Tasks
             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;