From daf58423c739559a25d696b38e9c95425e6a3451 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 20 Nov 2023 00:31:37 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20=D0=BA=D0=BE=D0=BD?=
 =?UTF-8?q?=D1=86=D0=B5=D0=BF=D1=86=D0=B8=D1=8E.=20=D0=A2=D0=B5=D0=BF?=
 =?UTF-8?q?=D0=B5=D1=80=D1=8C=20=D0=B8=D0=B7=20=D0=B4=D0=B5=D1=80=D0=B5?=
 =?UTF-8?q?=D0=B2=D0=B0=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B9,=20=D0=BC?=
 =?UTF-8?q?=D0=BE=D0=B6=D0=BD=D0=BE=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D1=8F=D1=82=D1=8C=20=D1=82=D0=B5=D1=81=D1=82=D1=8B=20=D0=BA=20?=
 =?UTF-8?q?=D1=82=D0=B5=D0=BA=D1=83=D1=89=D0=B5=D0=B9=20=D0=B3=D1=80=D1=83?=
 =?UTF-8?q?=D0=BF=D0=BF=D0=B5,=20=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=BE=20?=
 =?UTF-8?q?=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=BE=D0=B9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  16 ---
 .../CreateTestsGroupFromSelectedVersions.java | 120 ++++++++----------
 src/Visual_DVM_2021/Passes/PassCode_2021.java |   2 +-
 3 files changed, 53 insertions(+), 85 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5c205789..9682dab3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,25 +7,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.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/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/TestsMenuBar/TestsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSubscriber.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSubscriber.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSubscriberOnServer.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSubscriber.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSubscriber.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditSubscriberOnServer.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetMaxMinBlockDistribution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetMaxMinBlockDistribution.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/Passes/Server/DeleteServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/EditServerObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerAccountObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerAccountObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/PublishServerObject.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" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java b/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
index f317cbb6..cc090b88 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
@@ -5,7 +5,6 @@ import Common.Global;
 import Common.UI.UI;
 import Common.Utils.Utils;
 import ProjectData.Project.db_project_info;
-import TestingSystem.Common.Test.TestType;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
@@ -19,7 +18,7 @@ public class CreateTestsGroupFromSelectedVersions extends Pass_2021<Vector<db_pr
     }
     @Override
     public String getIconPath() {
-        return "/icons/DownloadAll.png";
+        return "/icons/Publish.png";
     }
     @Override
     public String getButtonText() {
@@ -35,7 +34,11 @@ public class CreateTestsGroupFromSelectedVersions extends Pass_2021<Vector<db_pr
             Log.Writeln_("Нажмите правую клавишу мыши, и перейдите в режим выбора версий.");
             return false;
         }
+        if (!Current.Check(Log, Current.Group)) {
+            return false;
+        }
         target = new Vector<>();
+        group_id = Current.getGroup().id;
         Current.getRoot().getSelectedVersions(target);
         if (target.size() == 0) {
             Log.Writeln_("Не отмечено ни одной версии.");
@@ -54,7 +57,9 @@ public class CreateTestsGroupFromSelectedVersions extends Pass_2021<Vector<db_pr
                 }
             }
         }
-        return UI.Question("Будет сформирована группа из " + target.size() + " тестов.\n" + cp_info +
+        return UI.Question("В текущую группу " + Utils.Brackets(Current.getGroup().description) +
+                "\nбудет добавлено " + target.size() + " тестов.\n" + cp_info +
+                "\nТекущий проект будет закрыт." +
                 "\nПродолжить");
     }
     @Override
@@ -67,73 +72,52 @@ public class CreateTestsGroupFromSelectedVersions extends Pass_2021<Vector<db_pr
     }
     @Override
     protected void body() throws Exception {
-        PublishGroup publishGroup = new PublishGroup() {
-            @Override
-            public String getDescription() {
-                return "Добавление группы";
-            }
-            @Override
-            public boolean fillObjectFields() throws Exception {
-                //тут имя надо генерить, потому что может совпасть.
-                target.description = Utils.getDateName(Current.getRoot().name);
-                target.type = TestType.Default;
-                return true;
-            }
-            @Override
-            protected boolean needsAnimation() {
-                return false;
-            }
-        };
-        ShowMessage1("Публикация группы ");
-        if (publishGroup.Do()) {
-            group_id = (int) publishGroup.pk;
-            for (db_project_info vizTestProject : target) {
-                //на случай если версия в текущем сеансе еще не открывалась.
-                vizTestProject.Open();
-                vizTestProject.Close();
-                ShowMessage1("Публикация теста " + vizTestProject.getTitle());
-                PublishTest pass = new PublishTest() {
-                    @Override
-                    protected boolean needsAnimation() {
-                        return false;
-                    }
-                    @Override
-                    public boolean setProject() {
-                        project = vizTestProject;
-                        return true;
-                    }
-                    @Override
-                    public boolean fillObjectFields() throws Exception {
-                        if (setProject() && project.checkSubdirectories(Log)) {
-                            target.description = project.getLocalName() + " " + project.description;
-                            target.group_id = group_id;
-                            switch (project.languageName) {
-                                case fortran:
-                                    target.dim = Current.getSapfor().getTextMaxDim(null, project);
-                                    return true;
-                                case c:
-                                    target.dim = Utils.getCProjectMaxDim(project);
-                                    return true;
-                                default:
-                                    return false;
-                            }
+        for (db_project_info vizTestProject : target) {
+            //на случай если версия в текущем сеансе еще не открывалась.
+            vizTestProject.Open();
+            vizTestProject.Close();
+            ShowMessage1("Публикация теста " + vizTestProject.getTitle());
+            PublishTest pass = new PublishTest() {
+                @Override
+                protected boolean needsAnimation() {
+                    return false;
+                }
+                @Override
+                public boolean setProject() {
+                    project = vizTestProject;
+                    return true;
+                }
+                @Override
+                public boolean fillObjectFields() throws Exception {
+                    if (setProject() && project.checkSubdirectories(Log)) {
+                        target.description = project.getLocalName() + " " + project.description;
+                        target.group_id = group_id;
+                        switch (project.languageName) {
+                            case fortran:
+                                target.dim = Current.getSapfor().getTextMaxDim(null, project);
+                                return true;
+                            case c:
+                                target.dim = Utils.getCProjectMaxDim(project);
+                                return true;
+                            default:
+                                return false;
                         }
-                        return false;
                     }
-                    @Override
-                    public String getDescription() {
-                        return "Добавление версии " + vizTestProject.name;
-                    }
-                    @Override
-                    protected void performDone() throws Exception {
-                        test_id = (int) pk;
-                    }
-                    @Override
-                    protected void showDone() throws Exception {
-                    }
-                };
-                if (!pass.Do()) return;
-            }
+                    return false;
+                }
+                @Override
+                public String getDescription() {
+                    return "Добавление версии " + vizTestProject.name;
+                }
+                @Override
+                protected void performDone() throws Exception {
+                    test_id = (int) pk;
+                }
+                @Override
+                protected void showDone() throws Exception {
+                }
+            };
+            if (!pass.Do()) return;
         }
     }
     @Override
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index 1650c170..80942683 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -399,7 +399,7 @@ public enum PassCode_2021 {
             case IncludeSelectedFiles:
                 return "Включить в рассмотрение отмеченные файлы";
             case CreateTestsGroupFromSelectedVersions:
-                return "Создать группу тестов из отмеченных версий";
+                return "Создать тесты из отмеченных версий, и опубликовать в текущей группе";
             case DeleteSelectedVersions:
                 return "Удаление отмеченных версий";
             case SaveFunctionsGraphCoordinates: