From 0fbd2391126ce8cd66a652685c133a7a007c5be7 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 27 Oct 2023 02:07:13 +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=BD=D0=B0=D1=87?=
 =?UTF-8?q?=D0=B0=D0=BB=20=D0=B4=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=20=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=B0=20=D0=B2=D0=B5=D1=80=D1=81?=
 =?UTF-8?q?=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  5 ++
 .../Json/SapforTasksResults_json.java         | 25 +++++++-
 .../SapforTasksPackageInterface.java          | 61 +++++++++++++------
 .../SapforTasksPackageTree.java               | 23 ++++++-
 .../SapforTasksPackageSupervisor.java         |  2 +-
 .../All/DownloadSapforTasksPackage.java       | 37 ++++++-----
 .../Passes/All/ShowSapforTaskPackage.java     |  7 ++-
 .../UI/Main/SapforPackageFields.java          |  1 +
 .../UI/Main/SapforPackageForm.java            |  3 +
 9 files changed, 121 insertions(+), 43 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 142e049b..997786e4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,7 +10,12 @@
       <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/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.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/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/SapforTestingSystem/Json/SapforTasksResults_json.java b/src/SapforTestingSystem/Json/SapforTasksResults_json.java
index 8ff17a7b..82d2057b 100644
--- a/src/SapforTestingSystem/Json/SapforTasksResults_json.java
+++ b/src/SapforTestingSystem/Json/SapforTasksResults_json.java
@@ -13,7 +13,7 @@ public class SapforTasksResults_json {
     public long EndDate = 0;
     @Expose
     public List<SapforTask> tasks = new Vector<>();
-    public LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> getSortedTasks() {
+    public LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> sortTasksByStatesFlagsAndGroups() {
         LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> res = new LinkedHashMap<>();
         //рассортировать задачи по конфигурациям.
         for (TaskState state : TaskState.values()) {
@@ -42,4 +42,27 @@ public class SapforTasksResults_json {
         }
         return res;
     }
+    //--
+    public LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> sortTasksFlagsAndGroups() {
+        LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> res = new LinkedHashMap<>();
+        //рассортировать задачи по конфигурациям.
+        for (SapforTask task : tasks) {
+            LinkedHashMap<String, Vector<SapforTask>> groups_tasks = null;
+            if (res.containsKey(task.flags)) {
+                groups_tasks = res.get(task.flags);
+            } else {
+                groups_tasks = new LinkedHashMap<>();
+                res.put(task.flags, groups_tasks);
+            }
+            Vector<SapforTask> tasks = null;
+            if (groups_tasks.containsKey(task.group_description)) {
+                tasks = groups_tasks.get(task.group_description);
+            } else {
+                tasks = new Vector<>();
+                groups_tasks.put(task.group_description, tasks);
+            }
+            tasks.add(task);
+        }
+        return res;
+    }
 }
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
index 20f262c5..eae3870c 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
@@ -2,36 +2,61 @@ package SapforTestingSystem.SapforTasksPackage;
 import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
-import SapforTestingSystem.Json.SapforConfiguration_json;
-import SapforTestingSystem.Json.SapforTasksPackage_json;
 import SapforTestingSystem.Json.SapforTasksResults_json;
+import SapforTestingSystem.SapforTask.SapforTask;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import java.io.File;
+import java.nio.file.Paths;
+import java.util.LinkedHashMap;
+import java.util.Vector;
 public class SapforTasksPackageInterface {
     public static File getPackageArchive(SapforTasksPackage package_in) {
         return new File(Global.SapforPackagesDirectory, package_in.id + ".zip");
     }
-    public static DefaultMutableTreeNode getTree(SapforTasksPackage package_in) throws Exception {
-        SapforTasksPackage_json package_json = getJson(package_in);
-        SapforTasksResults_json results = getResults(package_in);
+    public static DefaultMutableTreeNode getTree(SapforTasksPackage package_in) {
+        SapforTasksResults_json results_json = getLocalResults(package_in);
+        //--  флаги                 группы
+        LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> sortedTasks = results_json.sortTasksFlagsAndGroups();
+        //--
         DefaultMutableTreeNode root = new DefaultMutableTreeNode(package_in.id);
-        for (SapforConfiguration_json configuration : package_json.configurations) {
-            DefaultMutableTreeNode node = new DefaultMutableTreeNode(configuration.flags);
-
-
-            root.add(node);
+        for (String flags : sortedTasks.keySet()) {
+            DefaultMutableTreeNode flagsNode = new DefaultMutableTreeNode(flags);
+            //---
+            LinkedHashMap<String, Vector<SapforTask>> tasksByGroups = sortedTasks.get(flags);
+            for (String group : tasksByGroups.keySet()) {
+                DefaultMutableTreeNode groupNode = new DefaultMutableTreeNode(group);
+                //--
+                Vector<SapforTask> tasks = tasksByGroups.get(group);
+                for (SapforTask task : tasks) {
+                    DefaultMutableTreeNode taskNode = new DefaultMutableTreeNode(task.test_description);
+                    groupNode.add(taskNode);
+                }
+                flagsNode.add(groupNode);
+            }
+            //---
+            root.add(flagsNode);
         }
         return root;
     }
-    public static SapforTasksPackage_json getJson(SapforTasksPackage package_in) throws Exception {
-        File json_file = new File(package_in.workspace, Constants.package_json);
-        return (SapforTasksPackage_json) Utils.jsonFromFile(json_file,
-                SapforTasksPackage_json.class);
+    public static File getLocalWorkspace(SapforTasksPackage package_in) {
+        return new File(Global.SapforPackagesDirectory, package_in.id);
     }
-    public static SapforTasksResults_json getResults(SapforTasksPackage package_in) throws Exception {
-        File json_file = new File(package_in.workspace, Constants.results_json);
-        return (SapforTasksResults_json) Utils.jsonFromFile(json_file,
-                SapforTasksResults_json.class);
+    public static SapforTasksResults_json getLocalResults(SapforTasksPackage package_in) {
+        File json_file = new File(getLocalWorkspace(package_in), Constants.results_json);
+        SapforTasksResults_json res = null;
+        try {
+            res = (SapforTasksResults_json) Utils.jsonFromFile(json_file,
+                    SapforTasksResults_json.class);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        return res;
+    }
+    public static File getLoadedSign(SapforTasksPackage package_in) {
+        return Paths.get(Global.SapforPackagesDirectory.getAbsolutePath(), package_in.id, Constants.LOADED).toFile();
+    }
+    public static boolean isLoaded(SapforTasksPackage package_in) {
+        return getLoadedSign(package_in).exists();
     }
 }
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java
index fceaf92b..b30d6381 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java
@@ -1,3 +1,22 @@
 package SapforTestingSystem.SapforTasksPackage;
-public class SapforTasksPackageTree {
-}
+import Common.UI.Trees.DataTree;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.TreePath;
+public class SapforTasksPackageTree extends DataTree {
+    public SapforTasksPackageTree(DefaultMutableTreeNode root_in) {
+        super(root_in);
+        setRootVisible(false);
+        CollapseAll();
+    }
+    @Override
+    protected int getStartLine() {
+        return 1;
+    }
+    @Override
+    public void SelectionAction(TreePath path) {}
+    @Override
+    public void LeftMouseAction2() {
+
+    }
+}
\ No newline at end of file
diff --git a/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java b/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
index a039c9d0..c294dd12 100644
--- a/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
+++ b/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
@@ -180,7 +180,7 @@ public class SapforTasksPackageSupervisor {
         if (results_json_file.exists()) {
             SapforTasksResults_json results_json = (SapforTasksResults_json) Utils.jsonFromFile(results_json_file, SapforTasksResults_json.class);
             summary_lines.add("Всего задач: " + results_json.tasks.size());
-            LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> sortedTasks = results_json.getSortedTasks();
+            LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> sortedTasks = results_json.sortTasksByStatesFlagsAndGroups();
             //--
             for (TaskState state : sortedTasks.keySet()) {
                 LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByFlags = sortedTasks.get(state);
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java b/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java
index 7c1b3a1a..447f87f5 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java
@@ -1,18 +1,17 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Constants;
 import Common.Current;
 import Common.Global;
 import Common.Utils.Utils;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
 import TestingSystem.TasksPackage.TasksPackageState;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.TestingSystemPass;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
-import java.nio.file.Paths;
 import java.util.Date;
 public class DownloadSapforTasksPackage extends TestingSystemPass<SapforTasksPackage> {
     @Override
@@ -24,24 +23,25 @@ public class DownloadSapforTasksPackage extends TestingSystemPass<SapforTasksPac
         return "";
     }
     File tmpArchive = null;
-    File getLoaded() {
-        return Paths.get(Global.SapforPackagesDirectory.getAbsolutePath(), target.id, Constants.LOADED).toFile();
-    }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (Current.Check(Log, Current.SapforTasksPackage)) {
-            target = Current.getSapforTasksPackage();
-            if (!target.state.equals(TasksPackageState.Done)) {
-                Log.Writeln_("Пакет не завершен.");
-                return false;
-            }
-            if (getLoaded().exists()) {
-                System.out.println("Пакет уже загружен");
-                return false;
-            }
-            return true;
+        if (args.length > 0) {
+            target = (SapforTasksPackage) args[0];
+        } else {
+            if (Current.Check(Log, Current.SapforTasksPackage))
+                target = Current.getSapforTasksPackage();
+            else return false;
         }
-        return false;
+        //-
+        if (!target.state.equals(TasksPackageState.Done)) {
+            Log.Writeln_("Пакет не завершен.");
+            return false;
+        }
+        if (SapforTasksPackageInterface.isLoaded(target)) {
+            System.out.println("Пакет уже загружен");
+            return false;
+        }
+        return true;
     }
     @Override
     protected void ServerAction() throws Exception {
@@ -61,8 +61,7 @@ public class DownloadSapforTasksPackage extends TestingSystemPass<SapforTasksPac
                 tmpArchive.getAbsolutePath(),
                 Global.SapforPackagesDirectory.getAbsolutePath(), false
         )) {
-            System.out.println("LOADED=" + Utils.Brackets(getLoaded().getAbsolutePath()));
-            FileUtils.writeStringToFile(getLoaded(), new Date().toString());
+            FileUtils.writeStringToFile(SapforTasksPackageInterface.getLoadedSign(target), new Date().toString());
         }
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java b/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java
index 95e6a46f..f1ab6cbc 100644
--- a/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java
@@ -2,7 +2,9 @@ package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import Common.UI.UI;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
 import TestingSystem.TasksPackage.TasksPackageState;
+import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 public class ShowSapforTaskPackage extends Pass_2021<SapforTasksPackage> {
     @Override
@@ -19,8 +21,9 @@ public class ShowSapforTaskPackage extends Pass_2021<SapforTasksPackage> {
             target = Current.getSapforTasksPackage();
             if (!target.state.equals(TasksPackageState.Done)) {
                 Log.Writeln_("Пакет не завершен!");
-            } else
-                return true;
+                return false;
+            }
+            return SapforTasksPackageInterface.isLoaded(target) || passes.get(PassCode_2021.DownloadSapforTasksPackage).Do(target);
         }
         return false;
     }
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java b/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java
index 3fe1057f..fc8a1c30 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java
@@ -17,6 +17,7 @@ public class SapforPackageFields implements DialogFields, FormWithSplitters {
     public JPanel getContent() {
         return content;
     }
+    public JPanel getTreePanel(){return treePanel;}
     public SapforPackageFields(){
 
     }
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java b/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java
index fcba1235..4d54801b 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java
@@ -4,6 +4,8 @@ import Common.UI.Windows.Dialog.Dialog;
 import Common.UI.Windows.FormType;
 import GlobalData.FormsParams.DBForm;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageTree;
 public class SapforPackageForm extends Dialog<SapforTasksPackage, SapforPackageFields> {
     SapforTasksPackage sapforTasksPackage = null;
 
@@ -22,6 +24,7 @@ public class SapforPackageForm extends Dialog<SapforTasksPackage, SapforPackageF
     public void Init(Object... params) {
         sapforTasksPackage = (SapforTasksPackage) params[0];
         fields.lObjectName.setText(sapforTasksPackage.id);
+        fields.getTreePanel().add(new SapforTasksPackageTree(SapforTasksPackageInterface.getTree(sapforTasksPackage)));
         /*
         if (Global.db.sapforProfiles.size() > 0) {
             for (Object key : Global.db.sapforProfiles.Data.keySet()) {