From 743368308dd00db3bfe72369ea4d178aaa340869 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 25 Oct 2023 20:46:17 +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=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=20=D1=82=D0=B5=D0=BA=D1=83?=
 =?UTF-8?q?=D1=89=D0=B5=D0=B3=D0=BE=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=B0?=
 =?UTF-8?q?=20SAPFOR?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 18 ++++++-----------
 .../SapforTasksBar/SapforTasksMenuBar.java    |  7 +++++++
 src/Common/UI/UI.java                         |  3 +++
 .../SapforTask/SapforTask.java                |  5 +++++
 .../SapforTask/SapforTasksDBTable.java        | 15 +++++++++++---
 .../UI/Interface/TestingWindow.java           |  1 -
 src/Visual_DVM_2021/UI/Main/TestingForm.form  | 11 ++++------
 src/Visual_DVM_2021/UI/Main/TestingForm.java  | 20 +++++--------------
 8 files changed, 42 insertions(+), 38 deletions(-)
 create mode 100644 src/Common/UI/Menus_2023/SapforTasksBar/SapforTasksMenuBar.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9d37cc03..ad017abe 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,14 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforTasksBar/SapforTasksMenuBar.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/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforVersion_json.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.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/SapforTestingSystem/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TasksDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TasksDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingPlanner.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.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/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/src/Common/UI/Menus_2023/SapforTasksBar/SapforTasksMenuBar.java b/src/Common/UI/Menus_2023/SapforTasksBar/SapforTasksMenuBar.java
new file mode 100644
index 00000000..bfd31841
--- /dev/null
+++ b/src/Common/UI/Menus_2023/SapforTasksBar/SapforTasksMenuBar.java
@@ -0,0 +1,7 @@
+package Common.UI.Menus_2023.SapforTasksBar;
+import Common.UI.Menus_2023.DataMenuBar;
+public class SapforTasksMenuBar extends DataMenuBar {
+    public SapforTasksMenuBar() {
+        super("задачи");
+    }
+}
diff --git a/src/Common/UI/UI.java b/src/Common/UI/UI.java
index 72efae1f..42b3660f 100644
--- a/src/Common/UI/UI.java
+++ b/src/Common/UI/UI.java
@@ -18,6 +18,7 @@ import Common.UI.Menus_2023.ModulesMenuBar.ModulesMenuBar;
 import Common.UI.Menus_2023.RunConfigurationsMenuBar.RunConfigurationsMenuBar;
 import Common.UI.Menus_2023.SapforConfigurationCommandsMenuBar.SapforConfigurationCommandsMenuBar;
 import Common.UI.Menus_2023.SapforConfigurationsMenuBar.SapforConfigurationsMenuBar;
+import Common.UI.Menus_2023.SapforTasksBar.SapforTasksMenuBar;
 import Common.UI.Menus_2023.SapforTasksPackagesBar.SapforTasksPackagesBar;
 import Common.UI.Menus_2023.ServerSapforsBar.ServerSapforsBar;
 import Common.UI.Menus_2023.SubscribersMenuBar.SubscribersMenuBar;
@@ -70,6 +71,7 @@ import Repository.Component.UI.ComponentsForm;
 import Repository.Subscribes.SubsribersDBTable;
 import SapforTestingSystem.SapforConfiguration.SapforConfigurationDBTable;
 import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
+import SapforTestingSystem.SapforTask.SapforTasksDBTable;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable;
 import SapforTestingSystem.ServerSapfor.ServerSapforsDBTable;
 import TestingSystem.Configuration.UI.ConfigurationDBTable;
@@ -248,6 +250,7 @@ public class UI {
         menuBars.put(SubsribersDBTable.class, new SubscribersMenuBar());
         menuBars.put(SapforProfilesDBTable.class, new DataMenuBar("профили", PassCode_2021.SaveProfile, PassCode_2021.EditProfile, PassCode_2021.ApplyProfile,PassCode_2021.DeleteProfile));
         menuBars.put(ServerSapforsDBTable.class, new ServerSapforsBar());
+        menuBars.put(SapforTasksDBTable.class, new SapforTasksMenuBar());
         //---->>
     }
     public static void CreateWindows() {
diff --git a/src/SapforTestingSystem/SapforTask/SapforTask.java b/src/SapforTestingSystem/SapforTask/SapforTask.java
index 340e6eba..2f8d72fd 100644
--- a/src/SapforTestingSystem/SapforTask/SapforTask.java
+++ b/src/SapforTestingSystem/SapforTask/SapforTask.java
@@ -1,5 +1,6 @@
 package SapforTestingSystem.SapforTask;
 import Common.Constants;
+import Common.Current;
 import Common.Database.DBObject;
 import Common.Utils.Utils;
 import GlobalData.Tasks.TaskState;
@@ -143,4 +144,8 @@ public class SapforTask extends DBObject {
         }
         return false;
     }
+    @Override
+    public boolean isVisible() {
+        return Current.HasSapforTasksPackage()&&Current.getSapforTasksPackage().id.equals(this.sapfortaskspackage_id);
+    }
 }
diff --git a/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java b/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java
index 74519128..5e3cdcd6 100644
--- a/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java
+++ b/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java
@@ -25,7 +25,7 @@ public class SapforTasksDBTable extends DBTable<Long, SapforTask> {
         return new DataSetControlForm(this) {
             @Override
             protected void AdditionalInitColumns() {
-                columns.get(2).setRenderer(RendererStatusEnum);
+                columns.get(4).setRenderer(RendererStatusEnum);
             }
             @Override
             public void MouseAction2() throws Exception {
@@ -36,17 +36,26 @@ public class SapforTasksDBTable extends DBTable<Long, SapforTask> {
     @Override
     public String[] getUIColumnNames() {
         return new String[]{
+                "Группа",
                 "Тест",
-                "Статус"
+                "Флаги",
+                "Статус",
+                "Версии"
         };
     }
     @Override
     public Object getFieldAt(SapforTask object, int columnIndex) {
         switch (columnIndex) {
             case 1:
-                return object.test_description;
+                return object.group_description;
             case 2:
+                return object.test_description;
+            case 3:
+                return object.flags;
+            case 4:
                 return object.state;
+            case 5:
+                return object.versionsDescription;
             default:
                 return null;
         }
diff --git a/src/Visual_DVM_2021/UI/Interface/TestingWindow.java b/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
index 64dae31b..006d635c 100644
--- a/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
+++ b/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
@@ -6,7 +6,6 @@ public interface TestingWindow extends VisualizerForm {
     void DropTestRunTasksComparison();
     void ShowCurrentTestRunTask();
     void ShowNoTestRunTask();
-    void DropSapforTasksComparison();
     //-
     void RefreshTabsNames();
     void FocusTestingSystem();
diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.form b/src/Visual_DVM_2021/UI/Main/TestingForm.form
index e29d156f..1ea5ab7f 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.form
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.form
@@ -135,10 +135,9 @@
                                     </properties>
                                     <border type="none"/>
                                     <children>
-                                      <splitpane id="6ef86" binding="SC50">
+                                      <splitpane id="f24" binding="SC50">
                                         <constraints border-constraint="Center"/>
                                         <properties>
-                                          <dividerLocation value="300"/>
                                           <dividerSize value="3"/>
                                         </properties>
                                         <border type="none"/>
@@ -207,14 +206,12 @@
                                 <properties/>
                                 <border type="none"/>
                                 <children>
-                                  <splitpane id="ff9dc" binding="SC57">
+                                  <grid id="8a833" binding="sapforTasksPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
                                     <constraints border-constraint="Center"/>
-                                    <properties>
-                                      <dividerSize value="3"/>
-                                    </properties>
+                                    <properties/>
                                     <border type="none"/>
                                     <children/>
-                                  </splitpane>
+                                  </grid>
                                 </children>
                               </grid>
                               <grid id="7718" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.java b/src/Visual_DVM_2021/UI/Main/TestingForm.java
index 585f1070..dfa4e775 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.java
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.java
@@ -19,7 +19,6 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     public JSplitPane SC46;
     public JSplitPane SC53;
     public JSplitPane SC56;
-    public JSplitPane SC57;
     public JSplitPane SC63;
     public JSplitPane SC59;
     //-
@@ -42,6 +41,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     private JPanel sapforScenariosPanel;
     private JPanel serverSapforsPanel;
     private JPanel sapforTasksPackagesPanel;
+    private JPanel sapforTasksPanel;
     private JPanel testsRunTasksBackground;
     private JCheckBox filterFinished;
     private JButton bTest;
@@ -57,10 +57,6 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     private TestRunTasksComparisonForm dvmTestingRunMaster; //сравнение тестов двм системы.
     private TestRunTasksComparisonForm dvmTestingRunSlave;
     //-
-    //сравнение версий полученных в результате выполнения пакета.
-    public SapforPackagesComparisonForm sapforTestingMaster;
-    public SapforPackagesComparisonForm sapforTestingSlave;
-    //-
     public TestingForm() {
         content.add(UI.testingBar, BorderLayout.NORTH);
         LoadSplitters();
@@ -80,10 +76,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         Global.testingServer.db.sapforConfigurationCommands.mountUI(sapforConfigurationCommandsPanel);
         Global.testingServer.db.serverSapfors.mountUI(serverSapforsPanel);
         Global.testingServer.account_db.sapforTasksPackages.mountUI(sapforTasksPackagesPanel);
-        //--------------------------------------------------------------------->>>>
-        sapforTestingMaster = new SapforPackagesComparisonForm(sapforTestingSlave = new SapforPackagesComparisonForm(null));
-        SC57.setLeftComponent(sapforTestingMaster.getContent());
-        SC57.setRightComponent(sapforTestingSlave.getContent());
+        //---
+        Global.testingServer.account_db.sapforTasks.mountUI(sapforTasksPanel);
     }
     //-
     @Override
@@ -138,15 +132,11 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         UI.Clear(packagesPanel);
         UI.Clear(testsRunTasksPanel);
         UI.Clear(sapforTasksPackagesPanel);
+        UI.Clear(sapforTasksPanel);
         //-->>
         Global.testingServer.account_db.packages.mountUI(packagesPanel);
         Global.testingServer.account_db.testRunTasks.mountUI(testsRunTasksPanel);
         Global.testingServer.account_db.sapforTasksPackages.mountUI(sapforTasksPackagesPanel);
-    }
-    //--->>>
-    @Override
-    public void DropSapforTasksComparison() {
-        sapforTestingMaster.RemoveObject();
-        sapforTestingSlave.RemoveObject();
+        Global.testingServer.account_db.sapforTasksPackages.mountUI(sapforTasksPanel);
     }
 }