From c69e7194bcf17cedf3eb2d07643200ad130f1847 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 11 Feb 2025 23:03:18 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?=
 =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D1=8B=D0=B9.=20=D0=BE=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B7=D0=BC=D0=B5=D1=80=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20=D1=82?=
 =?UTF-8?q?=D0=B5=D1=81=D1=82=D0=BE=D0=B2=20=D0=BD=D0=B0=20=D1=81=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B2=D0=B5=D1=80=D0=B5=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7?=
 =?UTF-8?q?=20=D0=BA=D0=BE=D0=BD=D1=81=D0=BE=D0=BB=D1=8C.=20=D0=BD=D0=BE?=
 =?UTF-8?q?=20=D0=B5=D1=81=D1=82=D1=8C=20=D0=B1=D0=B0=D0=B3.=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D1=87=D0=B5=D0=BC=D1=83=20=D1=82=D0=BE=20=D0=BE=D0=B4?=
 =?UTF-8?q?=D0=B8=D0=BD=20=D0=B8=20=D1=82=D0=BE=D1=82=20=D0=B6=D0=B5=20?=
 =?UTF-8?q?=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=20=D0=BF=D0=BE=D0=B2=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=BD=D0=BE=20=D0=BD=D0=B5=D0=BB=D1=8C=D0=B7=D1=8F=20?=
 =?UTF-8?q?=D1=81=D0=BA=D0=BE=D0=BD=D0=B2=D0=B5=D1=80=D1=82=D0=B8=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=B2=20=D1=82=D0=B5=D1=81?=
 =?UTF-8?q?=D1=82=D1=8B.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  8 +--
 .../All/JoinSapforTestingVersionsToGroup.java | 51 +++++++++++++++++++
 src/_VisualDVM/Passes/PassCode.java           |  3 ++
 .../Repository/Component/Visualiser.java      |  2 +-
 .../Repository/Server/ServerCode.java         |  3 ++
 .../TestingSystem/Common/TestingServer.java   | 16 ++++--
 .../SapforPackage/UI/SapforPackagesForm.java  |  2 +-
 .../ServerSapfor/ServerSapforsDBTable.java    | 16 ++++++
 .../Visual/Menus/MainMenuBar/MainMenuBar.java |  2 +
 9 files changed, 95 insertions(+), 8 deletions(-)
 create mode 100644 src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 71be67f6..051ee7b8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,12 +7,14 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java" afterDir="false" />
       <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/_VisualDVM/Passes/All/TestPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/TestPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java b/src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java
new file mode 100644
index 00000000..04e48749
--- /dev/null
+++ b/src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java
@@ -0,0 +1,51 @@
+package _VisualDVM.Passes.All;
+import Common.Utils.Utils_;
+import _VisualDVM.Global;
+import _VisualDVM.Passes.PassCode;
+import _VisualDVM.Passes.Server.TestingServerPass;
+import _VisualDVM.Repository.Server.ServerCode;
+import _VisualDVM.TestingSystem.Common.Group.Group;
+import _VisualDVM.TestingSystem.Common.TasksPackageState;
+import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
+
+import java.util.Vector;
+public class JoinSapforTestingVersionsToGroup extends TestingServerPass {
+    @Override
+    public String getIconPath() {
+        return "/Common/icons/Publish.png";
+    }
+    Group group;
+    SapforPackage sapforPackage;
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        if (Global.testingServer.db.CheckCurrent(Log, Group.class, SapforPackage.class)){
+            group = Global.testingServer.db.groups.getUI().getCurrent();
+            sapforPackage = Global.testingServer.db.sapforPackages.getUI().getCurrent();
+            if (!sapforPackage.state.equals(TasksPackageState.Done)){
+                Log.Writeln_("Пакет не завершен!");
+                return false;
+            }
+            return SendRequest(ServerCode.JoinSapforVersionsToGroup, group.id+"\n"+sapforPackage.id, null, 0 );
+        }
+        return false;
+    }
+    @Override
+    protected void body() throws Exception {
+        /*
+        Vector<String> res = (Vector<String>) request.server_response.object;
+        System.out.println("--");
+        for (String path: res){
+            System.out.println(Utils_.Brackets(path));
+        }
+        System.out.println("--");
+         */
+    }
+    @Override
+    protected void performFinish() throws Exception {
+        Global.mainModule.getPass(PassCode.SynchronizeTests).Do();
+    }
+    @Override
+    protected void FocusResult() {
+        Global.mainModule.getUI().getMainWindow().FocusTests();
+    }
+}
diff --git a/src/_VisualDVM/Passes/PassCode.java b/src/_VisualDVM/Passes/PassCode.java
index fd22d582..603a0287 100644
--- a/src/_VisualDVM/Passes/PassCode.java
+++ b/src/_VisualDVM/Passes/PassCode.java
@@ -354,11 +354,14 @@ public enum PassCode implements PassCode_ {
     SetSapforConfigurationEthalon,
     PauseDVMPackage,
     ResumeDVMPackage,
+    JoinSapforTestingVersionsToGroup,
     ;
     //--
     @Override
     public String getDescription() {
         switch (this) {
+            case JoinSapforTestingVersionsToGroup:
+                return "Присоединить итоговые версии пакета тестирования SAPFOR к текущей группе тестов";
             case ResumeDVMPackage:
                 return "Возобновить выполнение пакета тестировани DVM";
             case PauseDVMPackage:
diff --git a/src/_VisualDVM/Repository/Component/Visualiser.java b/src/_VisualDVM/Repository/Component/Visualiser.java
index 6548b7a5..9ddb836e 100644
--- a/src/_VisualDVM/Repository/Component/Visualiser.java
+++ b/src/_VisualDVM/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 = 1153;
+        version = 1155;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());
diff --git a/src/_VisualDVM/Repository/Server/ServerCode.java b/src/_VisualDVM/Repository/Server/ServerCode.java
index 41c081fa..57748120 100644
--- a/src/_VisualDVM/Repository/Server/ServerCode.java
+++ b/src/_VisualDVM/Repository/Server/ServerCode.java
@@ -91,9 +91,12 @@ public enum ServerCode {
     GetSapforForCompilation,
     GetMaxSapforVersion,
     PerformAutoSapforTesting,
+    JoinSapforVersionsToGroup,
     TestCode;
     public String getDescription(){
         switch (this){
+            case JoinSapforVersionsToGroup:
+                return "Присоединение версий к группе на сервере";
             case GetComponentsVersionsInfo:
                 return "Получение версий компонент c сервера";
             case UpdateComponent:
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingServer.java b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
index 7a43fe69..0c411b49 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingServer.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
@@ -373,7 +373,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 Print("Получить максимальную установленную версию Sapfor");
                 GetSapforMaxVersion();
                 break;
-            case TestCode:
+            case JoinSapforVersionsToGroup:
                 Print("Получить финальные версии пакета тестирования SAPFOR");
                 JoinSapforPackageToGroup();
                 break;
@@ -773,6 +773,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         return res;
     }
     private void JoinSapforPackageToGroup() throws Exception {
+        response = new ServerExchangeUnit_2021(ServerCode.OK);
         String[] packed = request.arg.split("\n");
         int groupId = Integer.parseInt(packed[0]);
         int packageId = Integer.parseInt(packed[1]);
@@ -806,6 +807,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         }
         ZipFolderPass zip = new ZipFolderPass();
         //создание тестов.
+        Vector<Test> tests = new Vector<>();
         for (String description : versions.keySet()) {
             File src = versions.get(description);
             File [] files = src.listFiles(pathname -> !pathname.isDirectory());
@@ -835,11 +837,19 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                     db.Delete(test);
                     throw new RepositoryRefuseException("Не удалось переписать архив проекта");
                 }
+                tests.add(test);
+            }
+        }
+        //определение размерности тестов
+        ServerSapfor serverSapfor = db.serverSapfors.getLastDoneVersion();
+        if (serverSapfor!=null){
+            File sapfor_copy = Sapfor.getTempCopy(new File(serverSapfor.call_command));
+            for (Test test: tests){
+                Sapfor.getMinMaxDim(sapfor_copy,test.getServerPath(),test);
+                db.Update(test);
             }
         }
         //-
-        response = new ServerExchangeUnit_2021(ServerCode.OK);
-        response.object= paths;
     }
 }
 
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
index 0faf5179..4cfe8ce2 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
@@ -119,7 +119,7 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
                 addSeparator();
                 addPasses(PassCode.AbortSapforPackage);
                 addSeparator();
-                addPasses(PassCode.SetSapforConfigurationEthalon, PassCode.CompareSapforPackages);
+                addPasses(PassCode.SetSapforConfigurationEthalon, PassCode.CompareSapforPackages, PassCode.JoinSapforTestingVersionsToGroup);
                 addSeparator();
                 addPasses(PassCode.DeleteSapforPackage);
             }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
index ebe33b11..e49ae85b 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
@@ -4,6 +4,8 @@ import Common.Visual.DataSetControlForm;
 import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.UI.ServerSapforsForm;
 
 import javax.swing.*;
+import java.util.Comparator;
+import java.util.Vector;
 public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
     public ServerSapforsDBTable() {
         super(ServerSapfor.class);
@@ -20,4 +22,18 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
     protected DataSetControlForm createUI(JPanel mountPanel) {
         return new ServerSapforsForm(this, mountPanel);
     }
+    public ServerSapfor getLastDoneVersion(){
+        Vector<ServerSapfor> versions = new Vector<>();
+        for (ServerSapfor serverSapfor: Data.values()){
+            if (serverSapfor.state.equals(ServerSapforState.Done))
+                versions.add(serverSapfor);
+        }
+        versions.sort(new Comparator<ServerSapfor>() {
+            @Override
+            public int compare(ServerSapfor o1, ServerSapfor o2) {
+                return Long.compare(o1.buildDate,o2.buildDate);
+            }
+        });
+        return versions.isEmpty()?null:versions.lastElement();
+    }
 }
diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
index 6768b47d..03013aec 100644
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
@@ -61,6 +61,7 @@ public class MainMenuBar extends VisualiserMenuBar {
         //-
         setPreferredSize(new Dimension(0, 30));
         //--
+        /*
         add(new MenuBarButton() {
             {
                 setIcon("/Common/icons/Apply.png");
@@ -70,6 +71,7 @@ public class MainMenuBar extends VisualiserMenuBar {
                 });
             }
         });
+         */
         //--
         add(new JSeparator());
         add(MachineButton = new MenuBarButton() {