From 7177d02a5e755428a4ceabeee74b3715a1a25970 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 27 Oct 2023 22:48:09 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  8 ++--
 .../SapforTask/SapforTasksDBTable.java        | 14 +++---
 .../SapforTasksPackagesDBTable.java           |  3 ++
 .../UI/Interface/TestingWindow.java           |  2 +
 src/Visual_DVM_2021/UI/Main/TestingForm.form  | 43 +++++++++++++++++--
 src/Visual_DVM_2021/UI/Main/TestingForm.java  | 18 ++++++++
 6 files changed, 76 insertions(+), 12 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9be2f5f2..454b5b8a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,9 +8,11 @@
   <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$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageForm.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/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.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/SapforTestingSystem/SapforTask/SapforTasksDBTable.java b/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java
index ccc5c1ba..e5b220d0 100644
--- a/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java
+++ b/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java
@@ -25,16 +25,18 @@ public class SapforTasksDBTable extends DBTable<Long, SapforTask> {
         return new DataSetControlForm(this) {
             @Override
             protected void AdditionalInitColumns() {
-                columns.get(5).setRenderer(RendererStatusEnum);
+                columns.get(4).setRenderer(RendererStatusEnum);
             }
             @Override
             public void MouseAction2() throws Exception {
               //  Pass_2021.passes.get(PassCode_2021.OpenSapforTest).Do();
             }
+            /*
             @Override
             public boolean hasCheckBox() {
                 return true;
             }
+             */
         };
     }
     @Override
@@ -50,15 +52,15 @@ public class SapforTasksDBTable extends DBTable<Long, SapforTask> {
     @Override
     public Object getFieldAt(SapforTask object, int columnIndex) {
         switch (columnIndex) {
-            case 2:
+            case 1:
                 return object.group_description;
-            case 3:
+            case 2:
                 return object.test_description;
-            case 4:
+            case 3:
                 return object.flags;
-            case 5:
+            case 4:
                 return object.state;
-            case 6:
+            case 5:
                 return object.versionsDescription;
             default:
                 return null;
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java
index 70bdc69d..91f9d1fd 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java
@@ -2,6 +2,7 @@ package SapforTestingSystem.SapforTasksPackage;
 import Common.Current;
 import Common.Database.*;
 import Common.UI.DataSetControlForm;
+import Common.UI.UI;
 import SapforTestingSystem.SapforTask.SapforTask;
 
 import java.util.Date;
@@ -38,11 +39,13 @@ public class SapforTasksPackagesDBTable extends DBTable<String, SapforTasksPacka
             public void ShowCurrentObject() throws Exception {
                 super.ShowCurrentObject();
                 // UI.getNewMainWindow().getTestingWindow().DropTestRunTasksComparison();
+                UI.getMainWindow().getTestingWindow().ShowCurrentSapforTasksPackage();
             }
             @Override
             public void ShowNoCurrentObject() throws Exception {
                 super.ShowNoCurrentObject();
                 // UI.getNewMainWindow().getTestingWindow().DropTestRunTasksComparison();
+                UI.getMainWindow().getTestingWindow().ShowNoCurrentSapforTasksPackage();
             }
         };
     }
diff --git a/src/Visual_DVM_2021/UI/Interface/TestingWindow.java b/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
index 006d635c..7024e6bf 100644
--- a/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
+++ b/src/Visual_DVM_2021/UI/Interface/TestingWindow.java
@@ -13,4 +13,6 @@ public interface TestingWindow extends VisualizerForm {
     void RemountTestTable();
     //-
     void FocusTestingTasks();
+    void ShowCurrentSapforTasksPackage();
+    void ShowNoCurrentSapforTasksPackage();
 }
diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.form b/src/Visual_DVM_2021/UI/Main/TestingForm.form
index 1ea5ab7f..6b114e4f 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.form
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.form
@@ -206,12 +206,49 @@
                                 <properties/>
                                 <border type="none"/>
                                 <children>
-                                  <grid id="8a833" binding="sapforTasksPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                  <tabbedpane id="30729" binding="sapforPackageTabs">
                                     <constraints border-constraint="Center"/>
                                     <properties/>
                                     <border type="none"/>
-                                    <children/>
-                                  </grid>
+                                    <children>
+                                      <grid id="68338" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                        <constraints>
+                                          <tabbedpane title="" icon="icons/MassFiles.png">
+                                            <tooltip value="Список задач"/>
+                                          </tabbedpane>
+                                        </constraints>
+                                        <properties>
+                                          <enabled value="true"/>
+                                        </properties>
+                                        <border type="none"/>
+                                        <children>
+                                          <grid id="1beb4" binding="sapforTasksPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                            <constraints border-constraint="Center"/>
+                                            <properties/>
+                                            <border type="none"/>
+                                            <children/>
+                                          </grid>
+                                        </children>
+                                      </grid>
+                                      <grid id="27fda" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                        <constraints>
+                                          <tabbedpane title="" icon="icons/VersionsTree.png">
+                                            <tooltip value="Дерево версий"/>
+                                          </tabbedpane>
+                                        </constraints>
+                                        <properties/>
+                                        <border type="none"/>
+                                        <children>
+                                          <grid id="17ec9" binding="sapforPackageTreePanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                            <constraints border-constraint="Center"/>
+                                            <properties/>
+                                            <border type="none"/>
+                                            <children/>
+                                          </grid>
+                                        </children>
+                                      </grid>
+                                    </children>
+                                  </tabbedpane>
                                 </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 13310594..b5aee4c8 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.java
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.java
@@ -1,7 +1,10 @@
 package Visual_DVM_2021.UI.Main;
+import Common.Current;
 import Common.Global;
 import Common.UI.TextField.StyledTextField;
 import Common.UI.UI;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageTree;
 import Visual_DVM_2021.UI.Interface.FormWithSplitters;
 import Visual_DVM_2021.UI.Interface.TestingWindow;
 
@@ -41,7 +44,9 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     private JPanel sapforScenariosPanel;
     private JPanel serverSapforsPanel;
     private JPanel sapforTasksPackagesPanel;
+    private JTabbedPane sapforPackageTabs;
     private JPanel sapforTasksPanel;
+    private JPanel sapforPackageTreePanel;
     private JPanel testsRunTasksBackground;
     private JCheckBox filterFinished;
     private JButton bTest;
@@ -139,4 +144,17 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         Global.testingServer.account_db.sapforTasksPackages.mountUI(sapforTasksPackagesPanel);
         Global.testingServer.account_db.sapforTasks.mountUI(sapforTasksPanel);
     }
+    @Override
+    public void ShowCurrentSapforTasksPackage() {
+        UI.Clear(sapforPackageTreePanel);
+        if (SapforTasksPackageInterface.isLoaded(Current.getSapforTasksPackage())){
+            sapforPackageTreePanel.add(
+            new JScrollPane(
+                    new SapforTasksPackageTree(SapforTasksPackageInterface.getTree(Current.getSapforTasksPackage()))));
+        }
+    }
+    @Override
+    public void ShowNoCurrentSapforTasksPackage() {
+        UI.Clear(sapforPackageTreePanel);
+    }
 }