From 12e963ca1b3ad9bb931883b8b414d75e26e03eb5 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 11 Dec 2023 18:29:15 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B0=D1=88=D0=B8=D0=BD=D1=8B?=
 =?UTF-8?q?=20=D0=B8=20=D0=BF=D0=BE=D0=BB=D0=B7=D0=BE=D0=B2=D0=B0=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BB=D1=8F=20=D0=BD=D0=B0=20=D0=B2=D0=BA=D0=BB=D0=B0?=
 =?UTF-8?q?=D0=B4=D0=BA=D0=B5=20=D1=82=D0=B5=D1=81=D1=82=D0=B8=D1=80=D0=BE?=
 =?UTF-8?q?=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                           |  20 +++++-
 properties                                    |   2 +-
 .../DVMPackagesBar/DVMPackagesBar.java        |  10 +++
 .../UI/Menus_2023/MainMenuBar/MainWindow.java |   1 +
 src/Common/UI/Menus_2023/MenuBarButton.java   |   3 +
 .../UI/Menus_2023/TestingBar/TestingBar.java  |  51 ++++++++++++--
 .../UI/Menus_2023/VisualiserMenuBar.java      |  18 +++++
 src/Common/UI/UI.java                         |   5 +-
 src/GlobalData/Machine/MachinesDBTable.java   |   3 +
 src/GlobalData/User/UsersDBTable.java         |   2 +
 .../Common/TestingPackage/TestingPackage.java |   4 +-
 src/TestingSystem/Common/TestsDatabase.java   |   4 +-
 .../DVM/DVMPackage/DVMPackageDBTable.java     |  16 +++--
 .../DVM/TasksPackage/TasksPackageState.java   |   6 ++
 .../Passes/All/AddDVMPackage.java             |  63 ++++++++++++++++++
 src/Visual_DVM_2021/Passes/PassCode_2021.java |   4 ++
 src/Visual_DVM_2021/UI/Main/MainForm.java     |   4 ++
 src/Visual_DVM_2021/UI/Main/TestingForm.form  |   2 +-
 src/Visual_DVM_2021/UI/Main/TestingForm.java  |  15 +++--
 src/icons/Kernels.png                         | Bin 0 -> 1653 bytes
 20 files changed, 208 insertions(+), 25 deletions(-)
 create mode 100644 src/Common/UI/Menus_2023/DVMPackagesBar/DVMPackagesBar.java
 create mode 100644 src/Visual_DVM_2021/Passes/All/AddDVMPackage.java
 create mode 100644 src/icons/Kernels.png

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4342a09c..6425fd09 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,10 +7,26 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/DVMPackagesBar/DVMPackagesBar.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/icons/Kernels.png" 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/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Current.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MenuBarButton.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MenuBarButton.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestingBar/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestingBar/TestingBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/VisualiserMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/VisualiserMenuBar.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$/src/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UsersDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackageState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackageState.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/UI/Main/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 2653b49e..3808db41 100644
--- a/properties
+++ b/properties
@@ -28,5 +28,5 @@
   "TestingKernels": 28,
   "AutoCheckTesting": true,
   "CheckTestingIntervalSeconds": 10,
-  "EmailOnTestingProgress": false
+  "EmailOnTestingProgress": true
 }
\ No newline at end of file
diff --git a/src/Common/UI/Menus_2023/DVMPackagesBar/DVMPackagesBar.java b/src/Common/UI/Menus_2023/DVMPackagesBar/DVMPackagesBar.java
new file mode 100644
index 00000000..1a638223
--- /dev/null
+++ b/src/Common/UI/Menus_2023/DVMPackagesBar/DVMPackagesBar.java
@@ -0,0 +1,10 @@
+package Common.UI.Menus_2023.DVMPackagesBar;
+import Common.UI.Menus_2023.DataMenuBar;
+import Visual_DVM_2021.Passes.PassCode_2021;
+public class DVMPackagesBar extends DataMenuBar {
+    public DVMPackagesBar() {
+        super("пакеты задач DVM", PassCode_2021.AddDVMPackage
+             //   PassCode_2021.ExportTasksPackageToExcel,PassCode_2021.AbortTaskPackage, PassCode_2021.DeleteTasksPackage
+        );
+    }
+}
diff --git a/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java b/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java
index 619eeca9..9c0e9bb4 100644
--- a/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java
+++ b/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java
@@ -19,4 +19,5 @@ public interface MainWindow {
     //-
     void ShowCredentials();
     void ShowCheckedTestsCount();
+    void FocusCredentials();
 }
diff --git a/src/Common/UI/Menus_2023/MenuBarButton.java b/src/Common/UI/Menus_2023/MenuBarButton.java
index 5edf9d10..00351f58 100644
--- a/src/Common/UI/Menus_2023/MenuBarButton.java
+++ b/src/Common/UI/Menus_2023/MenuBarButton.java
@@ -29,4 +29,7 @@ public class MenuBarButton extends JButton {
     public void setIcon(String icon_path) {
         setIcon(Utils.getIcon(icon_path));
     }
+    public void setFont(VisualiserFonts font_in){
+        setFont(Current.getTheme().Fonts.get(font_in));
+    }
 }
diff --git a/src/Common/UI/Menus_2023/TestingBar/TestingBar.java b/src/Common/UI/Menus_2023/TestingBar/TestingBar.java
index 70586840..b5786c65 100644
--- a/src/Common/UI/Menus_2023/TestingBar/TestingBar.java
+++ b/src/Common/UI/Menus_2023/TestingBar/TestingBar.java
@@ -7,22 +7,49 @@ import Common.UI.Themes.VisualiserFonts;
 import Common.UI.UI;
 import Common.Utils.Utils;
 import TestingSystem.Common.TestingServer;
-import Visual_DVM_2021.Passes.PassCode_2021;
 
 import javax.swing.*;
 import java.awt.*;
 public class TestingBar extends VisualiserMenuBar {
+    public MenuBarButton MachineButton;
+    public MenuBarButton UserButton;
+
+ //   public JLabel MachineLabel;
+ //   public JLabel UserLabel;
+    public JLabel KernelsLabel;
+
     public JButton autorefreshButton;
     JSpinner sCheckTime;
     JSpinner sKernels;
     public TestingBar() {
-        addPasses(PassCode_2021.SynchronizeTestsTasks);
+       // addPasses(PassCode_2021.SynchronizeTestsTasks);
         //--
-        add(new JLabel(" ядер ") {
+     //   AddLabel("машина: ", "/icons/Machine.png");
+        add(MachineButton = new MenuBarButton() {
             {
-                setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
+                setIcon("/icons/Machine.png");
+                setFont(VisualiserFonts.TreePlain);
+                setToolTipText("Машина тестирования");
+                addActionListener(e -> {
+                   UI.getMainWindow().FocusCredentials();
+                });
             }
         });
+        //--
+        add(UserButton = new MenuBarButton() {
+            {
+                setIcon("/icons/User.png");
+                setFont(VisualiserFonts.TreePlain);
+                setToolTipText("Учетная запись машины тестирования");
+                addActionListener(e -> {
+                    UI.getMainWindow().FocusCredentials();
+                });
+            }
+        });
+        //-
+        KernelsLabel = addLabel("", "/icons/Kernels.png");
+        KernelsLabel.setHorizontalTextPosition(JLabel.LEFT);
+        KernelsLabel.setToolTipText("количество ядер, задействованное при тестировании");
         add(sKernels = new JSpinner());
         sKernels.setPreferredSize(new Dimension(60, 26));
         sKernels.setMaximumSize(new Dimension(60, 26));
@@ -33,6 +60,9 @@ public class TestingBar extends VisualiserMenuBar {
         UI.MakeSpinnerRapid(sKernels, e -> {
             Global.properties.updateField("TestingKernels", sKernels.getValue());
         });
+
+
+        addLabel("  ");
         //--
         add(new MenuBarButton() {
             {
@@ -48,6 +78,7 @@ public class TestingBar extends VisualiserMenuBar {
                 setIcon(Utils.getIcon(Global.properties.EmailOnTestingProgress ? "/icons/Pick.png" : "/icons/NotPick.png"));
             }
         });
+
         //--
         add(autorefreshButton = new MenuBarButton() {
             {
@@ -88,4 +119,16 @@ public class TestingBar extends VisualiserMenuBar {
     public void ShowAutoCheckTesting() {
         autorefreshButton.setIcon(Utils.getIcon(Global.properties.AutoCheckTesting ? "/icons/Pick.png" : "/icons/NotPick.png"));
     }
+    public void ShowMachine(){
+        MachineButton.setText(Current.getMachine().getURL());
+    }
+    public void ShowUser(){
+        UserButton.setText(Current.getUser().login);
+    }
+    public void ShowNoMachine(){
+        MachineButton.setText("?");
+    }
+    public void ShowNoUser(){
+        UserButton.setText("?");
+    }
 }
diff --git a/src/Common/UI/Menus_2023/VisualiserMenuBar.java b/src/Common/UI/Menus_2023/VisualiserMenuBar.java
index 036bd01e..8d2f0cb2 100644
--- a/src/Common/UI/Menus_2023/VisualiserMenuBar.java
+++ b/src/Common/UI/Menus_2023/VisualiserMenuBar.java
@@ -1,4 +1,7 @@
 package Common.UI.Menus_2023;
+import Common.Current;
+import Common.UI.Themes.VisualiserFonts;
+import Common.Utils.Utils;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
@@ -25,6 +28,21 @@ public class VisualiserMenuBar extends JToolBar {
         add(bar);
         return bar;
     }
+    public JLabel addLabel(String text_in) {
+        return addLabel(text_in, null);
+    }
+    public JLabel addLabel(String text_in, String icon_path_in) {
+        JLabel res = new JLabel(text_in) {
+            {
+                setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
+                if (icon_path_in != null) {
+                    setIcon(Utils.getIcon(icon_path_in));
+                }
+            }
+        };
+        add(res);
+        return res;
+    }
     public void setSizeLimits() {
         setPreferredSize(new Dimension(0, 30));
     }
diff --git a/src/Common/UI/UI.java b/src/Common/UI/UI.java
index 6d9a23d3..e1a244d5 100644
--- a/src/Common/UI/UI.java
+++ b/src/Common/UI/UI.java
@@ -5,6 +5,7 @@ import Common.Global;
 import Common.UI.Menus_2023.BugReportsMenuBar.BugReportsMenuBar;
 import Common.UI.Menus_2023.CompilersMenuBar.CompilersMenuBar;
 import Common.UI.Menus_2023.ConfigurationsMenuBar.ConfigurationsMenuBar;
+import Common.UI.Menus_2023.DVMPackagesBar.DVMPackagesBar;
 import Common.UI.Menus_2023.DVMParametersMenuBar.DVMParametersMenuBar;
 import Common.UI.Menus_2023.DataMenuBar;
 import Common.UI.Menus_2023.EnvironmentValuesMenuBar.EnvironmentValuesMenuBar;
@@ -59,6 +60,7 @@ import GlobalData.User.UsersDBTable;
 import ProjectData.DBArray.ArraysDBTable;
 import ProjectData.Files.UI.FilesTreeCellRenderer;
 import Repository.SubscriberWorkspace.SubscriberWorkspaceDBTable;
+import TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
 import TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer;
 import ProjectData.Project.UI.VersionsTreeCellRenderer;
 import ProjectData.SapforData.Arrays.ArraysSet;
@@ -220,7 +222,8 @@ public class UI {
         menuBars.put(GroupsDBTable.class, new GroupsMenuBar());
         menuBars.put(TestDBTable.class, new TestsMenuBar());
         menuBars.put(ConfigurationDBTable.class, new ConfigurationsMenuBar());
-        menuBars.put(TasksPackageDBTable.class, new TasksPackagesMenuBar());
+        menuBars.put(DVMPackageDBTable.class, new DVMPackagesBar());
+     //   menuBars.put(TasksPackageDBTable.class, new TasksPackagesMenuBar());
         menuBars.put(TestRunTasksDBTable.class, new TestRunTasksMenuBar());
         //--->>>
         menuBars.put(MachinesDBTable.class, new MachinesMenuBar());
diff --git a/src/GlobalData/Machine/MachinesDBTable.java b/src/GlobalData/Machine/MachinesDBTable.java
index fb649446..2e16a07c 100644
--- a/src/GlobalData/Machine/MachinesDBTable.java
+++ b/src/GlobalData/Machine/MachinesDBTable.java
@@ -58,6 +58,7 @@ public class MachinesDBTable extends iDBTable<Machine> {
             public void SetEditLimits() {
                 fields.cbMachineType.setEnabled(false);
             }
+
         };
     }
     @Override
@@ -83,11 +84,13 @@ public class MachinesDBTable extends iDBTable<Machine> {
             public void ShowCurrentObject() throws Exception {
                 super.ShowCurrentObject();
                 UI.getMainWindow().ShowCredentials();
+                UI.testingBar.ShowMachine();
             }
             @Override
             public void ShowNoCurrentObject() throws Exception {
                 super.ShowNoCurrentObject();
                 UI.getMainWindow().ShowCredentials();
+                UI.testingBar.ShowNoMachine();
             }
             @Override
             protected void AdditionalInitColumns() {
diff --git a/src/GlobalData/User/UsersDBTable.java b/src/GlobalData/User/UsersDBTable.java
index 2cdbb56c..0c234012 100644
--- a/src/GlobalData/User/UsersDBTable.java
+++ b/src/GlobalData/User/UsersDBTable.java
@@ -77,11 +77,13 @@ public class UsersDBTable extends iDBTable<User> {
             public void ShowCurrentObject() throws Exception {
                 super.ShowCurrentObject();
                 UI.getMainWindow().ShowCredentials();
+                UI.testingBar.ShowUser();
             }
             @Override
             public void ShowNoCurrentObject() throws Exception {
                 super.ShowNoCurrentObject();
                 UI.getMainWindow().ShowCredentials();
+                UI.testingBar.ShowNoUser();
             }
 
         };
diff --git a/src/TestingSystem/Common/TestingPackage/TestingPackage.java b/src/TestingSystem/Common/TestingPackage/TestingPackage.java
index 03a2d8be..271f32da 100644
--- a/src/TestingSystem/Common/TestingPackage/TestingPackage.java
+++ b/src/TestingSystem/Common/TestingPackage/TestingPackage.java
@@ -16,7 +16,8 @@ public class TestingPackage extends rDBObject {
     public String version = ""; //версия тестируемого объекта
     public String drv = ""; //пусть к исполняемому файлы тестируемого объекта
     //--
-    public TasksPackageState state = TasksPackageState.Queued;
+    public int progress = 0; //прогресс выполнения
+    public TasksPackageState state = TasksPackageState.Draft;
     //--
     @Override
     public Object getPK() {
@@ -34,6 +35,7 @@ public class TestingPackage extends rDBObject {
         version = tasksPackage.version;
         drv = tasksPackage.drv;
         kernels = tasksPackage.kernels;
+        progress = tasksPackage.progress;
         state = tasksPackage.state;
     }
 }
diff --git a/src/TestingSystem/Common/TestsDatabase.java b/src/TestingSystem/Common/TestsDatabase.java
index 12b302c6..5bf2484f 100644
--- a/src/TestingSystem/Common/TestsDatabase.java
+++ b/src/TestingSystem/Common/TestsDatabase.java
@@ -20,7 +20,7 @@ public class TestsDatabase extends SQLiteDatabase {
     public ConfigurationDBTable configurations;
     public TestDBTable tests;
     public GroupsDBTable groups;
-    public DVMPackageDBTable dvm_packages;
+    public DVMPackageDBTable dvmPackages;
     //--
     public SapforConfigurationDBTable sapforConfigurations;
     public SapforConfigurationCommandsDBTable sapforConfigurationCommands;
@@ -34,7 +34,7 @@ public class TestsDatabase extends SQLiteDatabase {
         addTable(configurations = new ConfigurationDBTable());
         addTable(groups = new GroupsDBTable());
         addTable(tests = new TestDBTable());
-        addTable(dvm_packages = new DVMPackageDBTable());
+        addTable(dvmPackages = new DVMPackageDBTable());
         addTable(settings = new TSettingsDBTable());
         //-
         addTable(sapforConfigurations = new SapforConfigurationDBTable());
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java b/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
index 09ca7201..9fa36292 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
@@ -9,8 +9,7 @@ import TestingSystem.DVM.TasksPackage.TasksPackage;
 import java.util.Date;
 import java.util.LinkedHashMap;
 
-import static Common.UI.Tables.TableRenderers.RendererDate;
-import static Common.UI.Tables.TableRenderers.RendererStatusEnum;
+import static Common.UI.Tables.TableRenderers.*;
 public class DVMPackageDBTable extends DBTable<Long, DVMPackage> {
     public DVMPackageDBTable() {
         super(Long.class, DVMPackage.class);
@@ -36,10 +35,10 @@ public class DVMPackageDBTable extends DBTable<Long, DVMPackage> {
             }
             @Override
             protected void AdditionalInitColumns() {
-                // columns.get(0).setVisible(false);
-                columns.get(8).setRenderer(RendererDate);
+                columns.get(8).setRenderer(RendererProgress);
                 columns.get(9).setRenderer(RendererDate);
-                columns.get(10).setRenderer(RendererStatusEnum);
+                columns.get(10).setRenderer(RendererDate);
+                columns.get(11).setRenderer(RendererStatusEnum);
             }
             @Override
             public void ShowCurrentObject() throws Exception {
@@ -65,6 +64,7 @@ public class DVMPackageDBTable extends DBTable<Long, DVMPackage> {
                 "Задач",
 
                 "Ядер",
+                "Прогресс",
                 "Начало",
                 "Изменено",
                 "Статус"
@@ -86,10 +86,12 @@ public class DVMPackageDBTable extends DBTable<Long, DVMPackage> {
             case 7:
                 return object.kernels;
             case 8:
-                return new Date(object.date);
+                return object.progress;
             case 9:
-                return new Date(object.change_date);
+                return new Date(object.date);
             case 10:
+                return new Date(object.change_date);
+            case 11:
                 return object.state;
             default:
                 return null;
diff --git a/src/TestingSystem/DVM/TasksPackage/TasksPackageState.java b/src/TestingSystem/DVM/TasksPackage/TasksPackageState.java
index c53b6321..8e9350ad 100644
--- a/src/TestingSystem/DVM/TasksPackage/TasksPackageState.java
+++ b/src/TestingSystem/DVM/TasksPackage/TasksPackageState.java
@@ -8,6 +8,8 @@ import java.util.Arrays;
 import java.util.Vector;
 import java.util.stream.Collectors;
 public enum TasksPackageState implements StatusEnum {
+    Draft,
+    //--
     Queued,
     //--
     TestsSynchronize, //оставить.
@@ -31,6 +33,7 @@ public enum TasksPackageState implements StatusEnum {
         switch (this) {
             case Done:
             case Aborted:
+            case Draft:
                 return false;
             default:
                 return true;
@@ -41,6 +44,7 @@ public enum TasksPackageState implements StatusEnum {
         switch (this) {
             case TestsSynchronize:
             case Analysis:
+            case Draft:
                 return Current.getTheme().Fonts.get(VisualiserFonts.BlueState);
             case CompilationExecution:
             case RunningExecution:
@@ -54,6 +58,8 @@ public enum TasksPackageState implements StatusEnum {
     //-
     public String getDescription() {
         switch (this) {
+            case Draft:
+                return "Подготовка к публикации";
             case Aborted:
                 return "Прерван";
             case Queued:
diff --git a/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java b/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java
new file mode 100644
index 00000000..2d42cf67
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java
@@ -0,0 +1,63 @@
+package Visual_DVM_2021.Passes.All;
+import Common.Current;
+import Common.Database.Database;
+import Common.Global;
+import GlobalData.Compiler.CompilerType;
+import GlobalData.Machine.MachineType;
+import GlobalData.User.UserState;
+import TestingSystem.DVM.DVMPackage.DVMPackage;
+import TestingSystem.DVM.TasksPackage.TasksPackage;
+import Visual_DVM_2021.Passes.AddObjectPass;
+import Visual_DVM_2021.Passes.PassCode_2021;
+
+import java.util.Date;
+public class AddDVMPackage extends AddObjectPass<DVMPackage> {
+    public AddDVMPackage() {
+        super(DVMPackage.class);
+    }
+    @Override
+    protected Database getDb() {
+        return Global.testingServer.db;
+    }
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        if (!Current.getAccount().CheckRegistered(Log)) {
+            return false;
+        }
+        if (Current.Check(Log, Current.Machine, Current.User, Current.Compiler)) {
+            if (!Current.getMachine().type.equals(MachineType.Server)) {
+                Log.Writeln_("Тестирование поддерживается только на одиночном удалённом сервере.");
+                return false;
+            }
+            if (!Current.getUser().state.equals(UserState.ready_to_work)) {
+                Log.Writeln_("Пользователь не готов к работе. Выполните инициализацию пользователя!");
+                return false;
+            }
+            if (!Current.getCompiler().type.equals(CompilerType.dvm)) {
+                Log.Writeln_("Тестирование поддерживается только для DVM компиляторов.");
+                return false;
+            }
+            if (!Current.getCompiler().versionLoaded)
+                passes.get(PassCode_2021.ShowCompilerVersion).Do(Current.getCompiler(), false);
+            //--
+            target = new DVMPackage();
+            //-
+            target.sender_name=Current.getAccount().name;
+            target.sender_address = Current.getAccount().email;
+            //-
+            target.machine_name = Current.getMachine().name;
+            target.machine_address = Current.getMachine().address;
+            target.machine_port = Current.getMachine().port;
+            //-
+            target.user_name = Current.getUser().login;
+            target.user_password = Current.getUser().password;
+            target.user_workspace = Current.getUser().workspace;
+            target.drv = Current.getCompiler().call_command;
+            target.version = Current.getCompiler().getVersionInfo();
+            target.kernels = Global.properties.TestingKernels;
+            //--
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index 880412a8..201b9f80 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -309,11 +309,15 @@ public enum PassCode_2021 {
     ActualizeSAPFORPackages,
     ActualizePackages,
     //->
+    AddDVMPackage,
+    //->
     TestPass;
     public String getDescription() {
         switch (this) {
             case Undefined:
                 return "?";
+            case AddDVMPackage:
+                return "Добавить пакет тестирования DVM";
             case ActualizePackages:
                 return "Обновить пакеты задач";
             case ActualizeDVMPackages:
diff --git a/src/Visual_DVM_2021/UI/Main/MainForm.java b/src/Visual_DVM_2021/UI/Main/MainForm.java
index e4415b5d..6dcf10b4 100644
--- a/src/Visual_DVM_2021/UI/Main/MainForm.java
+++ b/src/Visual_DVM_2021/UI/Main/MainForm.java
@@ -229,6 +229,10 @@ public class MainForm extends Form implements MainWindow {
         globalTabs.setSelectedIndex(1);
     }
     @Override
+    public void FocusCredentials() {
+        globalTabs.setSelectedIndex(2);
+    }
+    @Override
     public void FocusTests() {
         globalTabs.setSelectedIndex(3);
     }
diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.form b/src/Visual_DVM_2021/UI/Main/TestingForm.form
index 4b63c258..f8f02e76 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.form
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.form
@@ -80,7 +80,7 @@
                             </properties>
                             <border type="none"/>
                             <children>
-                              <grid id="b1fe2" binding="packagesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                              <grid id="b1fe2" binding="dvmPackagesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
                                 <constraints border-constraint="Center"/>
                                 <properties/>
                                 <border type="none"/>
diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.java b/src/Visual_DVM_2021/UI/Main/TestingForm.java
index 2e5563e5..0076cdfa 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.java
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.java
@@ -34,7 +34,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     private JButton bChangeKernels;
     private JTextField filterName;
     private JPanel configurationsPanel;
-    private JPanel packagesPanel;
+    private JPanel dvmPackagesPanel;
     private JButton bCompilationFilter;
     private JPanel dvmTestingPanel;
     private JPanel sapforTestingPanel;
@@ -85,8 +85,10 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         SC66.setRightComponent(sapforVersionSlave.getContent());
         //-
         Global.testingServer.db.configurations.mountUI(configurationsPanel);
-        Global.testingServer.account_db.packages.mountUI(packagesPanel);
-        Global.testingServer.account_db.testRunTasks.mountUI(testsRunTasksPanel);
+        Global.testingServer.db.dvmPackages.mountUI(dvmPackagesPanel);
+
+      //  Global.testingServer.account_db.packages.mountUI(packagesPanel);
+       // Global.testingServer.account_db.testRunTasks.mountUI(testsRunTasksPanel);
         //--
         Global.testingServer.db.sapforConfigurations.mountUI(sapforConfigurationsPanel);
         Global.testingServer.db.sapforConfigurationCommands.mountUI(sapforConfigurationCommandsPanel);
@@ -99,7 +101,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     @Override
     public void ShowAll() {
         Global.testingServer.db.configurations.ShowUI();
-        Global.testingServer.account_db.packages.ShowUI();
+      //  Global.testingServer.account_db.packages.ShowUI();
+        Global.testingServer.db.dvmPackages.ShowUI();
         //--
         Global.testingServer.db.serverSapfors.ShowUI();
         Global.testingServer.db.sapforConfigurations.ShowUI();
@@ -163,13 +166,13 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     }
     @Override
     public void RemountTestTable() {
-        UI.Clear(packagesPanel);
+        UI.Clear(dvmPackagesPanel);
         UI.Clear(testsRunTasksPanel);
         UI.Clear(sapforTasksPackagesPanel);
         UI.Clear(sapforTasksPanel);
         DropSapforComparison();
         //-->>
-        Global.testingServer.account_db.packages.mountUI(packagesPanel);
+        Global.testingServer.account_db.packages.mountUI(dvmPackagesPanel);
         Global.testingServer.account_db.testRunTasks.mountUI(testsRunTasksPanel);
         Global.testingServer.account_db.sapforTasksPackages.mountUI(sapforTasksPackagesPanel);
         Global.testingServer.account_db.sapforTasks.mountUI(sapforTasksPanel);
diff --git a/src/icons/Kernels.png b/src/icons/Kernels.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cb287a1ed91ddaeafaeda84ad78f6cc21cc91fe
GIT binary patch
literal 1653
zcmV-*28#KKP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ>`$<GWRCwByR$XY5SsH%M`OcRwsitY;4^6CTQ)8P(p@YhJr+DLzE+~89ER?m3
z$g*Nt7g@a#W$A?%gY{yE#VM=c->Ph(1&0L(DMI(kfvv8c#@J5!quDm4C25nU{gSWW
zIq%*iA(JWdbKtu;=Y7v}-tT>%_dExtX|jAi52X~8QXnGSzJ2=?fYi&EFZU1;1_lO>
z0!R%F4Sh^R7#bS-7(i-ZVBl9ogt@u7dH|`57cc&Wh+tV3Ow(j*YirCjO(qy)Fiq2l
z#bQAsVos-1B@&4?0N#m-i9NNowf6M%bQpj)9*;--et#w&k4FG_r>CdGu~_WG?Ck7z
z0Nz5Our-s()JiGWy<V@G&*vEt0ZJ*ndi5&obUJfF2#YaB0LtIbnU~g_PUrfzZQIh#
z&CQcHZ{GZ)ZQC$SlQE?fUcY|be&E1?C=sdJ+S(b;xnhhdr4$Fiia<&!#fgY9#)xyS
zh=>yr13;W}rIgZa+ZL;<tIfKuTW{aK-4zT5|0ft@aJ$_r0GP+)nd$24`iOIG0g#L_
zR1Kz-;+%6;{FCq50B|X#<Np2o|IKEzyQGwwrfCqDE?w$bSXgKzB5=;7!{IO)W74*5
zUfc)(kW!+dp~0@JtHbQ<EX(C`oO51zh!jHDoO8)JmjLki@#D@wATYxKqyf|efY<9C
zKXc~H9sn2|9Q@bv@^Y{eW%K6EcRM;dKA)PJ`g<~&JXC4poWJz@{hu8<azuah=+U>S
zRI06Lvc%lnTzG73tnKL0qyLstYNbu-bUK{LWST31ve~S^p`ih(RH|iZX{oI$U5hm}
zH6S7sYl#OB9(>x`+WMXF`Fsn7Lg5F=*EFqAy{7BBt?N28O|z<PoO7#`z9JcL`0(N3
zKp?Onu3x|Y=VUS&C^{<q$S6knV=iEfp-5@;_xJxc7z|E{t5>h~0N7M?C^IIX&%3Ju
z3Wb78N(sxdHdWh{QkzPFl!Co{`SKS4NK8yj?2W}@Z6{Bj{8~z>5fKwYs1qknd|_GE
zb|ONF%8apL+qSV|$But!n)V+e0uez7fn+inpP!!x=bV*l(%0A56$*tW#qQm^XB-Yk
zz63->TnJ&i-R{pV%PJpWSr+#1-;cGmHH?jo-FCTLV2qUy$!4=?Y;1&K7*I+v#u$zr
zJN9)T5LgtqZr%DUkw^rK5fkTJ*|yF5`};3vGMVj_DH$Cd9X@#Q;8!nRy!id%;$pa}
z7V-A>_Af2V0_U8F2+y89`y><!O^WXB?mhrUMd3+G$vEd10Qf6`VzHRZ>2!Xj>-z5i
z9I7hIH@RHyODQFlYI5$}xd#A9jEsyN7#|<s-PzeWSjuHFvXu=eY&skc09f6CRjVZm
zmvDM}doKio!6~tC-@dUeTed7#^82S~{4;zQ0Gv8?>Ysr?U_m^2^5i$~-@k9Erm&RK
zsNQVbwvbXnO6k~u!VW1VDshH~hYz>5w#G$gXXju=*Ooi2uCDGKW9)lfZy3g0eSJMv
zR#v9+`FvyLEzLQf^msgAjFoY^y1M!SC~@b`oz6re5$x&dxvrFAL<CLK<niOjf31{a
zRcVkupAQ`!9e+rt(_GWE%9^N}ni>F5QcCV}xe8~`p6zowooPly7#|;R3Wvip9*<}8
z^y$-OJ=y5i0Kfrks3(juE~RwbyLWHY>2%hA`0&B&a=A!IDWPea5<;wJGMQa>@7^6P
z>O!S5D#jR<l#z3;IOpYgNg0WVDW$YrF4trj#!@De@#wm~4AV53ZQJPW?Y+>{)HJ<y
z>((X1FzjEV@zrx7#Jb<_Pt4EH*R8Lw1EpsR5h0aI)hsVBd(NLf|2F{i{Q2`k(P%W>
z-QE3H0QB_f(@&z&X!y#ND?I?{#*G_)ibkX1hYufq3V^O%yVetpM%zb5Mj~(CylKtl
za$5OGL`2Bv^UUpbuj#rD!!Q;Br1$RKJL>cKmi>PJcL36nNaWj4C^XyH*f;?o-O|$X
zE)t2n%jI$!fb`CtJI5oDNUYRPg+c)U*#8Frpi(n2vl7?O00000NkvXXu0mjf>mVuc

literal 0
HcmV?d00001