From 9d491999a3775b08d23b3203a9fb8b4a76fa1656 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 30 Oct 2023 21:15:39 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  5 ---
 .../SapforTasksPackageInterface.java          | 34 ++++++++++++++++---
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index cd89eea4..5a4561b3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,12 +8,7 @@
   <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/Json/SapforTasksResults_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksResults_json.java" 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/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.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/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
index a9322e1e..6df818fa 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
@@ -5,6 +5,7 @@ import Common.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.FileType;
 import SapforTestingSystem.Json.SapforTasksResults_json;
+import SapforTestingSystem.Json.SapforVersion_json;
 import SapforTestingSystem.SapforTask.SapforTask;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
@@ -51,6 +52,29 @@ public class SapforTasksPackageInterface {
         res.add(flagsNode);
         return res;
     }
+    public static DefaultMutableTreeNode getTaskVersionsTree(SapforTask task) {
+        DefaultMutableTreeNode root = null;
+        DefaultMutableTreeNode child = null;
+        DefaultMutableTreeNode parent = null;
+        //--
+        for (SapforVersion_json version_json : task.versions) {
+            child = new DefaultMutableTreeNode(version_json.description);
+            if (parent == null) {
+                root = child;
+                parent = child;
+            } else {
+                parent.add(child);
+                parent = child;
+            }
+        }
+        if (parent != null) {
+            for (SapforVersion_json version_json : task.variants) {
+                parent.add(new DefaultMutableTreeNode(version_json.description));
+            }
+        }
+        //--
+        return root;
+    }
     public static DefaultMutableTreeNode getTreeRoot(SapforTasksPackage package_in) {
         SapforTasksResults_json results_json = getLocalResults(package_in);
         //--  флаги                 группы
@@ -61,18 +85,20 @@ public class SapforTasksPackageInterface {
         //  root.add(configurationsTitleNode);
         for (String configuration_id : tasksByConfigurations.keySet()) {
             DefaultMutableTreeNode configurationNode = new DefaultMutableTreeNode(configuration_id);
-           // DefaultMutableTreeNode groupsTitleNode = new DefaultMutableTreeNode("Группы тестов");
+            // DefaultMutableTreeNode groupsTitleNode = new DefaultMutableTreeNode("Группы тестов");
             //  Vector<DefaultMutableTreeNode> configurationDescription = null;
             LinkedHashMap<String, Vector<SapforTask>> groups_tasks = tasksByConfigurations.get(configuration_id);
             for (String group : groups_tasks.keySet()) {
                 DefaultMutableTreeNode groupNode = new DefaultMutableTreeNode(group);
                 for (SapforTask task : groups_tasks.get(group)) {
-
                     /*
                     if (configurationDescription == null)
                         configurationDescription = getTaskConfigurationDescription(task);
                      */
                     DefaultMutableTreeNode taskNode = new DefaultMutableTreeNode(task.test_description);
+                    //--
+                    taskNode.add(getTaskVersionsTree(task));
+                    //--
                     groupNode.add(taskNode);
                 }
                 /*
@@ -81,10 +107,10 @@ public class SapforTasksPackageInterface {
                         configurationNode.add(node);
                 }
                  */
-              //  groupsTitleNode.add(groupNode);
+                //  groupsTitleNode.add(groupNode);
                 configurationNode.add(groupNode);
             }
-          //  configurationNode.add(groupsTitleNode);
+            //  configurationNode.add(groupsTitleNode);
             //   configurationsTitleNode.add(configurationNode);
             root.add(configurationNode);
         }