From 0dd1bbc8f6477e382e8d534c902081221fa64260 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 20 Nov 2023 18:01:31 +0300
Subject: [PATCH] fix

---
 .idea/workspace.xml                           |  3 +-
 .../CreateTestsGroupFromSelectedVersions.java | 54 +------------------
 .../Passes/All/PublishTest.java               | 54 ++++++++++++++-----
 3 files changed, 45 insertions(+), 66 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9682dab3..01ef6d44 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,8 +8,9 @@
   <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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" 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/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/All/PublishTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.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 cc090b88..ca1653bd 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
@@ -76,62 +76,10 @@ public class CreateTestsGroupFromSelectedVersions extends Pass_2021<Vector<db_pr
             //на случай если версия в текущем сеансе еще не открывалась.
             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;
+            if (!passes.get(PassCode_2021.PublishTest).Do(vizTestProject, Current.getGroup())) break;
         }
     }
     @Override
-    protected void performFinish() throws Exception {
-        super.performDone();
-        passes.get(PassCode_2021.SynchronizeTests).Do();
-    }
-    @Override
-    protected void showDone() throws Exception {
-        super.showDone();
-        Global.testingServer.db.groups.ui_.Show(group_id);
-        Global.testingServer.db.tests.ui_.Show(test_id);
-    }
-    @Override
     protected void FocusResult() {
         UI.getMainWindow().FocusTests();
     }
diff --git a/src/Visual_DVM_2021/Passes/All/PublishTest.java b/src/Visual_DVM_2021/Passes/All/PublishTest.java
index 7d6644aa..1fcc8c29 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishTest.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishTest.java
@@ -2,32 +2,62 @@ package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import Common.Global;
 import Common.UI.UI;
+import Common.Utils.Utils;
 import ProjectData.Project.db_project_info;
+import TestingSystem.Common.Group.Group;
 import TestingSystem.Common.Test.Test;
 import TestingSystem.Common.TestingServer;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Server.PublishServerObject;
 public class PublishTest extends PublishServerObject<TestingServer, Test> {
+    boolean from_current_project;
+    protected Group group = null;
+    protected db_project_info project = null;
     public PublishTest() {
         super(Global.testingServer, Test.class);
     }
-    db_project_info project = null;
-    protected boolean setProject() {
-        if (Current.Check(Log, Current.Group, Current.Project) && UI.Question("Добавить текущий проект в глобальную базу тестов")) {
-            project = Current.getProject();
-            return true;
-        }
-        return false;
-    }
     @Override
     public boolean fillObjectFields() throws Exception {
-        if (setProject()&&project.checkSubdirectories(Log)) {
-            target.description = project.getLocalName() + " " + project.description;
+        target.description = project.getLocalName() + " " + project.description;
+        target.group_id = group.id;
+        if (from_current_project) {
             target.dim = project.testMaxDim;
-            target.group_id = Current.getGroup().id;
             return super.fillObjectFields();
+        } else {
+            switch (project.languageName) {
+                case fortran:
+                    target.dim = Current.getSapfor().getTextMaxDim(null, project);
+                    break;
+                case c:
+                    target.dim = Utils.getCProjectMaxDim(project);
+                    break;
+            }
+            return true;
         }
-        return false;
+    }
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        group = null;
+        project = null;
+        if (args.length == 0) {
+            from_current_project = true;
+            if (Current.Check(Log, Current.Group, Current.Project) && UI.Question("Добавить текущий проект в глобальную базу тестов")) {
+                project = Current.getProject();
+                group= Current.getGroup();
+            }
+        } else {
+            from_current_project = false;
+            project = (db_project_info) args[0];
+            group = (Group) args[1];
+        }
+        //--
+        if (project == null)
+            return false;
+        //--
+        if (!project.checkSubdirectories(Log))
+            return false;
+        //-
+        return super.canStart(args);
     }
     @Override
     protected void performDone() throws Exception {