From f70015439433c7d89b4be3432c5f1877842e7ab5 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 12 Dec 2023 01:01:36 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  22 +++-
 properties                                    |   2 +-
 src/Common/Global.java                        |   1 +
 .../ConfigurationsMenuBar.java                |   3 +-
 .../DVMPackagesBar/DVMPackagesBar.java        |   3 +-
 .../Common/TestingPackage/TestingPackage.java |   9 --
 .../DVM/DVMPackage/DVMPackage.java            |   7 ++
 .../DVM/DVMPackage/DVMPackageDBTable.java     |   4 +-
 .../DVM/DVMPackage/DVMPackageDatabase.java    |   3 +
 .../DVM/DVMTasks/DVMCompilationTask.java      |  26 +++++
 .../DVM/DVMTasks/DVMRunTask.java              | 108 ++++++++++++++++++
 src/TestingSystem/DVM/DVMTasks/DVMTask.java   |  63 ++++++++++
 .../ServerSapfor/ServerSapforsDBTable.java    |  11 ++
 .../Passes/All/AddDVMPackage.java             |  11 ++
 .../Passes/All/AddTasksToDVMPackage.java      |  28 +++++
 src/Visual_DVM_2021/Passes/PassCode_2021.java |   3 +
 .../UI/Interface/TestingWindow.java           |   2 +
 src/Visual_DVM_2021/UI/Main/TestingForm.java  |   8 ++
 src/icons/AddTasks.png                        | Bin 0 -> 1486 bytes
 src/icons/Down.png                            | Bin 0 -> 1123 bytes
 20 files changed, 295 insertions(+), 19 deletions(-)
 create mode 100644 src/TestingSystem/DVM/DVMPackage/DVMPackageDatabase.java
 create mode 100644 src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java
 create mode 100644 src/TestingSystem/DVM/DVMTasks/DVMRunTask.java
 create mode 100644 src/TestingSystem/DVM/DVMTasks/DVMTask.java
 create mode 100644 src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java
 create mode 100644 src/icons/AddTasks.png
 create mode 100644 src/icons/Down.png

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 239914cb..f553b7d9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,13 +7,25 @@
   </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/DVMPackageDatabase.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMTask.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/icons/AddTasks.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/icons/Down.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/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/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersDBTable.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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Global.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/DVMPackagesBar/DVMPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/DVMPackagesBar/DVMPackagesBar.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/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage.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/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.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/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/Interface/TestingWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.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.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/properties b/properties
index 3808db41..1570469b 100644
--- a/properties
+++ b/properties
@@ -26,7 +26,7 @@
   "PerformanceAnalyzerPath": "",
   "ComponentsBackUpsCount": 10,
   "TestingKernels": 28,
-  "AutoCheckTesting": true,
+  "AutoCheckTesting": false,
   "CheckTestingIntervalSeconds": 10,
   "EmailOnTestingProgress": true
 }
\ No newline at end of file
diff --git a/src/Common/Global.java b/src/Common/Global.java
index 49fbf1a6..3f6c14d0 100644
--- a/src/Common/Global.java
+++ b/src/Common/Global.java
@@ -115,6 +115,7 @@ public class Global {
         Utils.CheckDirectory(StsDirectory = Paths.get(Home, Sts).toFile());
         Utils.CheckDirectory(TestsDirectory = Paths.get(Home, Tests).toFile());
         Utils.CheckDirectory(PerformanceAnalyzerDirectory = Paths.get(Home, PerformanceAnalyzer).toFile());
+        Utils.CheckDirectory(PackagesDirectory = Paths.get(Home, Packages).toFile());
         Utils.CheckAndCleanDirectory(SapforPackagesDirectory = Paths.get(Home, "SapforPackages").toFile());
     }
     public static void CheckServerDirectories() {
diff --git a/src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java b/src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java
index fdcf69b4..22b6a8df 100644
--- a/src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java
+++ b/src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java
@@ -5,7 +5,8 @@ public class ConfigurationsMenuBar extends DataMenuBar {
     public ConfigurationsMenuBar() {
         super("конфигурации");
         addPasses(
-                PassCode_2021.StartTests,
+              //  PassCode_2021.StartTests,
+
                 PassCode_2021.PublishConfiguration,
                 PassCode_2021.EditConfiguration,
                 PassCode_2021.DeleteConfiguration
diff --git a/src/Common/UI/Menus_2023/DVMPackagesBar/DVMPackagesBar.java b/src/Common/UI/Menus_2023/DVMPackagesBar/DVMPackagesBar.java
index 1a638223..c7d7ceb1 100644
--- a/src/Common/UI/Menus_2023/DVMPackagesBar/DVMPackagesBar.java
+++ b/src/Common/UI/Menus_2023/DVMPackagesBar/DVMPackagesBar.java
@@ -3,7 +3,8 @@ 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
+        super("пакеты задач DVM", PassCode_2021.AddDVMPackage,
+                PassCode_2021.AddTasksToDVMPackage
              //   PassCode_2021.ExportTasksPackageToExcel,PassCode_2021.AbortTaskPackage, PassCode_2021.DeleteTasksPackage
         );
     }
diff --git a/src/TestingSystem/Common/TestingPackage/TestingPackage.java b/src/TestingSystem/Common/TestingPackage/TestingPackage.java
index 271f32da..47386ad4 100644
--- a/src/TestingSystem/Common/TestingPackage/TestingPackage.java
+++ b/src/TestingSystem/Common/TestingPackage/TestingPackage.java
@@ -5,9 +5,6 @@ import Common.Database.rDBObject;
 import TestingSystem.DVM.TasksPackage.TasksPackageState;
 import com.sun.org.glassfish.gmbal.Description;
 public class TestingPackage extends rDBObject {
-    @Description("PRIMARY KEY, UNIQUE")
-    public long id = Constants.Nan;
-    //--
     public int tasksCount = 0; //Общее число задач
     //--
     public int kernels = 1;
@@ -20,16 +17,10 @@ public class TestingPackage extends rDBObject {
     public TasksPackageState state = TasksPackageState.Draft;
     //--
     @Override
-    public Object getPK() {
-        return id;
-    }
-    //--
-    @Override
     public void SynchronizeFields(DBObject src) {
         super.SynchronizeFields(src);
         TestingPackage tasksPackage = (TestingPackage) src;
         //--
-        id = tasksPackage.id;
         tasksCount = tasksPackage.tasksCount;
         needsEmail = tasksPackage.needsEmail;
         version = tasksPackage.version;
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackage.java b/src/TestingSystem/DVM/DVMPackage/DVMPackage.java
index b38ee7b8..17f33a07 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackage.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackage.java
@@ -1,6 +1,9 @@
 package TestingSystem.DVM.DVMPackage;
 import Common.Database.DBObject;
+import Common.Global;
 import TestingSystem.Common.TestingPackage.TestingPackage;
+
+import java.io.File;
 public class DVMPackage extends TestingPackage {
     public String PID = ""; //сишная часть.
     //---
@@ -24,4 +27,8 @@ public class DVMPackage extends TestingPackage {
         user_workspace = tasksPackage.user_workspace;
         user_password = tasksPackage.user_password;
     }
+    public File getLocalWorkspace(){
+        return new File(Global.PackagesDirectory, id);
+    }
+    //public File
 }
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java b/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
index 9fa36292..3aff3043 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
@@ -10,9 +10,9 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 
 import static Common.UI.Tables.TableRenderers.*;
-public class DVMPackageDBTable extends DBTable<Long, DVMPackage> {
+public class DVMPackageDBTable extends DBTable<String, DVMPackage> {
     public DVMPackageDBTable() {
-        super(Long.class, DVMPackage.class);
+        super(String.class, DVMPackage.class);
     }
     @Override
     public Current CurrentName() {
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackageDatabase.java b/src/TestingSystem/DVM/DVMPackage/DVMPackageDatabase.java
new file mode 100644
index 00000000..8c4b232d
--- /dev/null
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackageDatabase.java
@@ -0,0 +1,3 @@
+package TestingSystem.DVM.DVMPackage;
+public class DVMPackageDatabase {
+}
diff --git a/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java b/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java
new file mode 100644
index 00000000..13a8833c
--- /dev/null
+++ b/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java
@@ -0,0 +1,26 @@
+package TestingSystem.DVM.DVMTasks;
+import Common.Database.DBObject;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.Common.Test.Test;
+import TestingSystem.DVM.Configuration.Configuration;
+import TestingSystem.DVM.Tasks.TestCompilationTask;
+import TestingSystem.DVM.Tasks.TestRunTask;
+import com.sun.org.glassfish.gmbal.Description;
+
+import java.util.Vector;
+public class DVMCompilationTask extends DVMTask {
+    public String makefile_text = "";
+    public String test_home = ""; //место где лежит код теста.
+    public DVMCompilationTask(Configuration configuration, Group group, Test test, String flags_in) {
+        super(configuration, group, test, flags_in);
+        flags = flags_in;
+        maxtime = configuration.c_maxtime;
+    }
+    @Override
+    public void SynchronizeFields(DBObject src) {
+        super.SynchronizeFields(src);
+        DVMCompilationTask ct = (DVMCompilationTask) src;
+        makefile_text = ct.makefile_text;
+        test_home = ct.test_home;
+    }
+}
diff --git a/src/TestingSystem/DVM/DVMTasks/DVMRunTask.java b/src/TestingSystem/DVM/DVMTasks/DVMRunTask.java
new file mode 100644
index 00000000..4da1bbc4
--- /dev/null
+++ b/src/TestingSystem/DVM/DVMTasks/DVMRunTask.java
@@ -0,0 +1,108 @@
+package TestingSystem.DVM.DVMTasks;
+import Common.Constants;
+import Common.Current;
+import Common.Database.DBObject;
+import Common.Global;
+import GlobalData.Tasks.TaskState;
+import ProjectData.LanguageName;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.Common.Test.Test;
+import TestingSystem.DVM.Configuration.Configuration;
+import TestingSystem.DVM.Tasks.TestRunTask;
+import TestingSystem.DVM.Tasks.TestTask;
+import com.sun.org.glassfish.gmbal.Description;
+
+import java.util.Vector;
+public class DVMRunTask extends DVMTask {
+    //не факт что тут нужно переводить на полный интерфейс. достаточно убрать фильтрацию
+    public int dvmcompilationtask_id = Constants.Nan;
+    public String matrix = "";
+    public String args = "";
+    public double CleanTime = 0.0;
+    public int progress = 0;
+    public LanguageName language = LanguageName.fortran;
+    public int cube = 1;
+    public int min_dim = 1;
+    public int max_dim = 1;
+    public String environments = "";
+    public String usr_par = "";
+    public int compilation_maxtime = 40;
+    public String compilation_output = "";
+    public String compilation_errors = "";
+    public TaskState compilation_state = TaskState.Waiting;
+    public double compilation_time = 0.0;
+    public String statistic = "";
+    public DVMRunTask(Configuration configuration,
+                      Group group, Test test,
+                      String matrix_in, String flags_in,
+                      String environments_in,
+                      String par_in) {
+        super(configuration, group, test, flags_in);
+        //--------------------------
+        //инфа о компиляции.
+        language = group.language;
+        compilation_maxtime = configuration.c_maxtime;
+        compilation_output = "";
+        compilation_errors = "";
+        compilation_state = TaskState.Waiting;
+        //инфа о запуске
+        cube = configuration.cube;
+        min_dim = configuration.max_dim_proc_count;
+        max_dim = configuration.max_dim_proc_count;
+        maxtime = configuration.r_maxtime;
+        environments = environments_in;
+        usr_par = par_in;
+        args = test.args;
+        //---------
+        matrix = matrix_in;
+    }
+    public DVMRunTask() {
+    }
+    @Override
+    public void SynchronizeFields(DBObject src) {
+        super.SynchronizeFields(src);
+        DVMRunTask rt = (DVMRunTask) src;
+        dvmcompilationtask_id = rt.dvmcompilationtask_id;
+        matrix = rt.matrix;
+        CleanTime = rt.CleanTime;
+        progress = rt.progress;
+        language = rt.language;
+        cube = rt.cube;
+        min_dim = rt.min_dim;
+        max_dim = rt.max_dim;
+        maxtime = rt.maxtime;
+        environments = rt.environments;
+        usr_par = rt.usr_par;
+        compilation_maxtime = rt.compilation_maxtime;
+        compilation_output = rt.compilation_output;
+        compilation_errors = rt.compilation_errors;
+        compilation_state = rt.compilation_state;
+        compilation_time = rt.compilation_time;
+        statistic = rt.statistic;
+        args = rt.args;
+    }
+    public DVMRunTask(TestRunTask src) {
+        this.SynchronizeFields(src);
+    }
+    //-
+    @Override
+    public Vector<String> pack(int kernels_in) {
+        Vector<String> res = new Vector<>();
+        res.add(String.valueOf(id)); //1
+        res.add(String.valueOf(maxtime)); //2
+        res.add(String.valueOf(dvmcompilationtask_id)); //3
+        res.add(matrix); //4
+        res.add(environments); //5
+        res.add(usr_par.replace("\n", "|")); //6
+        res.add(args); //7
+        res.add(String.valueOf(kernels_in)); //8
+        return res;
+    }
+    public String getEnvironments() {
+        return environments.replace("\n", ";");
+    }
+    public String getUsrPar() {
+        return usr_par.replace("\n", ";");
+    }
+}
+//--
diff --git a/src/TestingSystem/DVM/DVMTasks/DVMTask.java b/src/TestingSystem/DVM/DVMTasks/DVMTask.java
new file mode 100644
index 00000000..707ea2d7
--- /dev/null
+++ b/src/TestingSystem/DVM/DVMTasks/DVMTask.java
@@ -0,0 +1,63 @@
+package TestingSystem.DVM.DVMTasks;
+import Common.Constants;
+import Common.Database.DBObject;
+import Common.Database.iDBObject;
+import GlobalData.Tasks.TaskState;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.Common.Test.Test;
+import TestingSystem.Common.Test.TestType;
+import TestingSystem.DVM.Configuration.Configuration;
+import com.sun.org.glassfish.gmbal.Description;
+
+import java.util.Date;
+import java.util.Vector;
+public class DVMTask extends iDBObject {
+    public int group_id = Constants.Nan;
+    public String group_description = "";
+    public int test_id = Constants.Nan;
+    public String test_description = "";
+    public String flags = "";
+    public int kernels = 1;
+    public TaskState state = TaskState.Inactive;
+    public int maxtime = 40;
+    public TestType test_type = TestType.Default;
+    //результаты-------------------------------
+    public double Time; //время выполнения.
+    public String output = "";
+    public String errors = "";
+    //------------------------------------------------------
+    @Override
+    public void SynchronizeFields(DBObject src) {
+        super.SynchronizeFields(src);
+        DVMTask t = (DVMTask) src;
+        group_id = t.group_id;
+        group_description = t.group_description;
+        test_id = t.test_id;
+        test_description = t.test_description;
+        flags = t.flags;
+        kernels = t.kernels;
+        state = t.state;
+        maxtime = t.maxtime;
+        test_type = t.test_type;
+        Time = t.Time;
+        output = t.output;
+        errors = t.errors;
+    }
+    public DVMTask(DVMTask src) {
+        this.SynchronizeFields(src);
+    }
+    public DVMTask() {
+    }
+    public DVMTask(Configuration configuration,
+                    Group group, Test test, String flags_in) {
+        group_id = group.id;
+        test_id = test.id;
+        group_description = group.description;
+        test_description = test.description;
+        test_type = group.type;
+        flags = flags_in;
+    }
+    public Vector<String> pack(int kernels) {
+        return null;
+    }
+}
diff --git a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
index 210fa8c1..a6f45238 100644
--- a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
+++ b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
@@ -3,6 +3,7 @@ import Common.Current;
 import Common.Database.iDBTable;
 import Common.UI.DataSetControlForm;
 import Common.UI.Tables.TableRenderers;
+import Common.UI.UI;
 public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
     public ServerSapforsDBTable() {
         super(ServerSapfor.class);
@@ -41,6 +42,16 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
                // columns.get(0).setVisible(false);
                 columns.get(2).setRenderer(TableRenderers.RendererDate);
             }
+            @Override
+            public void ShowCurrentObject() throws Exception {
+                super.ShowCurrentObject();
+                UI.getMainWindow().getTestingWindow().ShowCurrentServerSapfor();
+            }
+            @Override
+            public void ShowNoCurrentObject() throws Exception {
+                super.ShowNoCurrentObject();
+                UI.getMainWindow().getTestingWindow().ShowNoServerSapfor();
+            }
         };
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java b/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java
index 2d42cf67..9c1b949f 100644
--- a/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java
@@ -1,12 +1,15 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Constants;
 import Common.Current;
 import Common.Database.Database;
 import Common.Global;
+import Common.UI.UI;
 import GlobalData.Compiler.CompilerType;
 import GlobalData.Machine.MachineType;
 import GlobalData.User.UserState;
 import TestingSystem.DVM.DVMPackage.DVMPackage;
 import TestingSystem.DVM.TasksPackage.TasksPackage;
+import TestingSystem.DVM.TasksPackage.TasksPackageState;
 import Visual_DVM_2021.Passes.AddObjectPass;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
@@ -39,8 +42,16 @@ public class AddDVMPackage extends AddObjectPass<DVMPackage> {
             }
             if (!Current.getCompiler().versionLoaded)
                 passes.get(PassCode_2021.ShowCompilerVersion).Do(Current.getCompiler(), false);
+            //-
+            for (DVMPackage dvmPackage: Global.testingServer.db.dvmPackages.Data.values()){
+                if (dvmPackage.state.equals(TasksPackageState.Draft)){
+                    Log.Writeln_("Может существовать только один пакет, готовящийся к публикации.");
+                    return false;
+                }
+            }
             //--
             target = new DVMPackage();
+            target.genName();
             //-
             target.sender_name=Current.getAccount().name;
             target.sender_address = Current.getAccount().email;
diff --git a/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java b/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java
new file mode 100644
index 00000000..540e5c81
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java
@@ -0,0 +1,28 @@
+package Visual_DVM_2021.Passes.All;
+import Common.Current;
+import Common.Utils.Utils;
+import TestingSystem.DVM.DVMPackage.DVMPackage;
+import TestingSystem.DVM.TasksPackage.TasksPackageState;
+import Visual_DVM_2021.Passes.Pass_2021;
+public class AddTasksToDVMPackage extends Pass_2021<DVMPackage> {
+    @Override
+    public String getIconPath() {
+        return "/icons/AddTasks.png";
+    }
+    @Override
+    public String getButtonText() {
+        return "";
+    }
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        if (Current.Check(Log, Current.DVMPackage)) {
+            target = Current.getDVMPackage();
+            if (!target.state.equals(TasksPackageState.Draft)) {
+                Log.Writeln_("Пакет " + Utils.Brackets(target.id) + " не готовится к публикации!");
+                return false;
+            }
+            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 201b9f80..e93d182b 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -310,12 +310,15 @@ public enum PassCode_2021 {
     ActualizePackages,
     //->
     AddDVMPackage,
+    AddTasksToDVMPackage,
     //->
     TestPass;
     public String getDescription() {
         switch (this) {
             case Undefined:
                 return "?";
+            case AddTasksToDVMPackage:
+                return "Добавить задачи в пакет тестирования DVM";
             case AddDVMPackage:
                 return "Добавить пакет тестирования DVM";
             case ActualizePackages:
diff --git a/src/Visual_DVM_2021/UI/Interface/TestingWindow.java b/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
index 8b07e20d..7cd7ce91 100644
--- a/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
+++ b/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
@@ -18,4 +18,6 @@ public interface TestingWindow extends VisualizerForm {
     void ShowNoSapforPackageVersion();
     void FocusSapforTesting();
     void ShowCurrentCompiler();
+    void ShowCurrentServerSapfor();
+    void ShowNoServerSapfor();
 }
diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.java b/src/Visual_DVM_2021/UI/Main/TestingForm.java
index 774836d6..d102eb63 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.java
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.java
@@ -188,4 +188,12 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
                 "DVM система: " + Current.getCompiler().description: "DVM система: ?";
         testingTabs.setTitleAt(0, title);
     }
+    @Override
+    public void ShowCurrentServerSapfor() {
+        testingTabs.setTitleAt(1,  "SAPFOR: " + Current.getServerSapfor().version);
+    }
+    @Override
+    public void ShowNoServerSapfor() {
+        testingTabs.setTitleAt(1,  "SAPFOR: ?");
+    }
 }
diff --git a/src/icons/AddTasks.png b/src/icons/AddTasks.png
new file mode 100644
index 0000000000000000000000000000000000000000..de83feaa4a14b3cb29b06269a1e04f54c7de005e
GIT binary patch
literal 1486
zcmV;<1u^=GP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ>R7pfZRCwBamfwqAR~5%UYoC42y>oNt-bpfznK(@hrIb{YF(|YZq_Gq9#l994
zYw^LVMS{dYi1tDIApQYTD2fnB+klE#iUw1JS`idXn^ao{BW3bye%#Ejn|pqry_XO7
z-pNd6()DuA!`^$X?{|OKcP}}9{FtaJJDQ_4)<Xcj?^jjnuB~R)T0}&+e<&cf$a6h%
z^m9*~I(7Q20IG^^T&0R42nvJq1oT(GeC4&bE?)R)v)R=9BpOzQ_1?2{=dSjF2PYrq
z<5q46ukif0zw?tl5A3PE`s&#qwOXThE7)e6MFi)ZA6D%LhxoF>*#MIy1l}Q|EmRc|
zAxl%d_nbI!;!IUl{`~oKFSc5(A)+mHnT@Ftp}f=O+I#P^&|Tw$Km3-?uU|%Nu!%zF
zJ>Gi&PM$pZ<7c1!*3Z%;K~=W{jvXAop1u@A^x<XpmMNpZKS%e4)5wk{Mgh~`A4N4*
zyIubIuS=lHQ^&u2CP|b0;-CNY(h%(yBq9RZPgEI8_Q+w<A3jg`^fSn#M@V`xH*eiy
zZf>51g$_$gw~6C~tSFh7Jix?*`<edASHE7X)s6RFw?T4OQ36B)%L<(r&ai9hF>0$T
zFh0KNPMuepqiv$7&aR!~gb{?HO;tVH3C#{ER21)(s8;7QhmTNA9mV<z8%Br`CK`>t
zvb<7xXzboW<`U-PS;ll6Rk=rC+uTWC{evE{Az@WQtp+PAxU$6W9tTyN7rOZhSC-zU
zC{q&OV`p<OpWspHZ{ETdW*vzt7(>=s;KM(@!Oi6*ZoK^$mf!pxQjb9Ts#1kgOR_wr
z%qohkpjUQLba2$RbZw5@MvTt9&w;Tf*+2fu-1O7zZjT`fY7K#a^&y#$DO^F~dqgx)
z-4?{=BsyqiXG8KYe2MDpFEG!27uh$->e33cv)8~F42G^>Cbm5)Uy^8-hHoJv%0Q)C
zlE}J8^(l)4x;EnKbKl3e#~6uIf{_+BsAEJhSVC%~E~fN3vEE@!D{3^H6oI2Khza_s
zLXR31t3wHEUpe(ggQHWQr9v?3S<J3;HGhv_UqJ3F6i-~PkarStP07hv$Y*&c`_074
zQ~x>beC5T6P)Rj%dGG7ta&z7edtG%%o8XOsvP8o=SCbD|T=<B>mt;O6)0l!BFBKUn
z1sSVJhYQKMiQbc)pPLAX`plTy_4%;Vdd;rC5r71Sw6n;6-@iimse@#fudpnCr+WAx
zRhm#y;?z-6kdshIMk)z2$-6AM4%Qk_4-TjRCm=(ETyG*FE-Tu9dy7MzIX?a7dF*J!
zDjm|OOB!`aYHK7>mz0=<9y7@$Zo2DK5$K3V2i*7qa8hoz6;(u`uo2l4$0)z|4fF>u
z(%L`8Av#>YHcLbLh-226X}`n&(tmTq-C(Nyd8YN7v**sge5NcaZ`2rdl(mJiiv(UQ
z3|v#dt5Oq~v30tqUZR{l$mm+cLk}HecRY)T!Ai(dHOGbI73SRyG=x3TevZl4mfyH^
z;q@#}F=o)?!9ZPiJ086EwAy1l{@CL<`$e=Uut9(c0v<Vh2n9kBuE&<{l_g9B5<=xF
zQqv23R0XQesZrV5j02n3!H^JGi%~_x5LLxFhjXsaH4$Y|BB4MqaFI$N0{J+D6eGq4
z1}}m)x<Sqx|NCeI5sWc->mUR?c;_)D2=C`BRzxWBytla6x#heURo#Sa_&<Db1VfVN
zv=;Xf7at*+VQkkYS!=CcyJyh3J77&uKPfg0O{>*zZkoBIZ~gbqAF4`VEJ<~Twc<8`
oSRNRe#JQ?mU0F`IqwN0!03>hfI^eVYivR!s07*qoM6N<$f)NnEod5s;

literal 0
HcmV?d00001

diff --git a/src/icons/Down.png b/src/icons/Down.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f431b1d42c088f2de3947cb1199ad8d98ef1777
GIT binary patch
literal 1123
zcmV-p1f2VcP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00009a7bBm000tn
z000tn0p4aGcmMzZAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ<=}AOERCwB~)JtqsRUF6h?>YA|_s*S}7FuY@Sgc?{gawEaB~4JU3&CKbD?>CI
z-Dp_2GVVxN>PA=H8585e#OOwr5)FwE3<(>P0tV7n9;J`zJn!7cIe!<vn_?#!PjWXm
z`QJ}||J?IaBEkme*GseCSDW!Ff?&j8#9*x<3L=g@`qDAr{C|DGW#d!5xje(cvBR{p
zHdYK4gQHxo*RKK``acjnx4_-@Jl(vDu{jot2;>q2JhRb!PsqLYJbvKQH65(ZvC3dY
zF&EEZB-`vLuRp}toTcspQKwAm#Hi4clOY;XHw9F^?<87j(mdsUV*x29;8~2yF=ANF
zmQm0@V#Ki0SSBqP6d97|EGBojo!lVH6B64YbSnKJjik=K)w^u2<iw`Ve0+miwun-S
zu;7#0ZvTj*92#kpR<p^S>=&%g(aJ?c5Z9rgi}bxN-|=bKB^s?|oKWHUE+QZT$`wS2
z`$lT<5-nD6e1#uqoPq)cpuo#%W-E)KTj~!<OoHo!=PCT6!i_Xaf&Ag*<OcyCNP9-w
zS(8@UKmm^Suw;vVLALn5A}A^Rl0p<{4c2N}-PY6!_itFtH4$!wZd5P%l{4`78r7PD
zoc!+Q*B3s#@(vxF;CT+BGm<pH4;0a`i;fi9fxy#rIzqCj3AIn76Z6#QVNN{qDo3`w
zaR9jb*IiqiWZ&@9?DLPJ{0=(k;ug&Bz@S4^QVbL|+bS+2B~3Yk(y&3oCgUU9m>Ba3
zT<5EQ0_!E&4$Rc!)$rvnci~hUh$viNF*xiHg^E%^Q4Smsp^;eXaZb|M#GxG(PDS6`
z+Tu?fQ0RZPz}h5pz?p$?kWWuu#7i_vD=M2DHkB2nP*Eyqe64V_q7;Bbk%{37C!>$q
z>hC_a7Fc&(z%;P((BL?4?)->yF~<T{6xKp+A<iwS6_#3>YEWfD9cIiqat^q-ZvU<G
zu9fD=*(-CGC}v}fr28=)%R<dkixrEpu+$aiRx>uc4^vS&#ii%?>DHyQ^|*!=+Y^HC
z7CzZp9zB=jO?D(N5;TS&)6{A?^@gxm&j|BvRLfnw+2iEKPDh2}<)~0bE8Y8L93R^G
zZqbi^R>~=L7GB}X{m;k;6tyH_Fc@OjxS})jBvrll^ZjE_yf-njXI<cdN&fr^ww6cV
zKf31y4ppCJM{)wMZEz^FdnlkgyPc|;`eAa{<lDPP_ofd5da0G^N-*&Fk;kS^1KhrP
zohZCU=dQ<icCvNs!1J$<4ph?(Ygj~jdEUxQ_Tz<X=jHUbQ}V^-X{oiBKj?9`X9N+!
pnEbW*mD%NX(h?Dw>~-$90RRM0GGz&Z`^^9V002ovPDHLkV1n%P8Uz3U

literal 0
HcmV?d00001