From 46d5647294e0898310a551898dd2483b25190608 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 29 Oct 2023 01:41:43 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  8 +----
 .../Json/SapforTasksResults_json.java         | 34 ++++++++++++++++++-
 .../SapforTasksPackageSupervisor.java         | 16 ++++-----
 .../All/DownloadSapforTasksPackage.java       |  6 ++++
 4 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 97169be9..c89b3f22 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,14 +8,8 @@
   <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/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/SapforTestingSystem/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.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/Json/SapforTasksResults_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksResults_json.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/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/SapforTestingSystem/Json/SapforTasksResults_json.java b/src/SapforTestingSystem/Json/SapforTasksResults_json.java
index 82d2057b..138e2659 100644
--- a/src/SapforTestingSystem/Json/SapforTasksResults_json.java
+++ b/src/SapforTestingSystem/Json/SapforTasksResults_json.java
@@ -13,6 +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>>>> sortTasksByStatesFlagsAndGroups() {
         LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> res = new LinkedHashMap<>();
         //рассортировать задачи по конфигурациям.
@@ -42,7 +43,7 @@ public class SapforTasksResults_json {
         }
         return res;
     }
-    //--
+    */
     public LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> sortTasksFlagsAndGroups() {
         LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> res = new LinkedHashMap<>();
         //рассортировать задачи по конфигурациям.
@@ -65,4 +66,35 @@ public class SapforTasksResults_json {
         }
         return res;
     }
+    //--
+    public LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> sortTasksByStatesConfigurationsAndGroups() {
+        LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> res = new LinkedHashMap<>();
+        //рассортировать задачи по конфигурациям.
+        for (TaskState state : TaskState.values()) {
+            LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = new LinkedHashMap<>();
+            res.put(state, tasksByConfigurations);
+            //--
+            for (SapforTask task : tasks) {
+                if (task.state.equals(state)) {
+                    LinkedHashMap<String, Vector<SapforTask>> groups_tasks = null;
+                    if (tasksByConfigurations.containsKey(task.sapfor_configuration_id)) {
+                        groups_tasks = tasksByConfigurations.get(task.sapfor_configuration_id);
+                    } else {
+                        groups_tasks = new LinkedHashMap<>();
+                        tasksByConfigurations.put(task.sapfor_configuration_id, 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/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java b/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
index 4c039741..d6acdbcc 100644
--- a/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
+++ b/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
@@ -180,16 +180,16 @@ 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.sortTasksByStatesFlagsAndGroups();
+            LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> sortedTasks = results_json.sortTasksByStatesConfigurationsAndGroups();
             //--
             for (TaskState state : sortedTasks.keySet()) {
-                LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByFlags = sortedTasks.get(state);
-                if (!tasksByFlags.isEmpty()) {
+                LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = sortedTasks.get(state);
+                if (!tasksByConfigurations.isEmpty()) {
                     int count = 0;
                     if (!state.equals(TaskState.Done)) {
                         Vector<String> flagsLines = new Vector<>();
-                        for (String flags : tasksByFlags.keySet()) {
-                            LinkedHashMap<String, Vector<SapforTask>> tasksByGroups = tasksByFlags.get(flags);
+                        for (String configuration_id : tasksByConfigurations.keySet()) {
+                            LinkedHashMap<String, Vector<SapforTask>> tasksByGroups = tasksByConfigurations.get(configuration_id);
                             for (String group : tasksByGroups.keySet()) {
                                 Vector<SapforTask> tasks = tasksByGroups.get(group);
                                 flagsLines.add("Группа " + group + ": " + tasks.size());
@@ -200,7 +200,7 @@ public class SapforTasksPackageSupervisor {
                                             "тест: " +
                                                     Utils.Brackets(task.test_description) + " " +
                                                     "флаги: "
-                                                    + Utils.Brackets(flags) + " " +
+                                                    + Utils.Brackets(task.flags) + " " +
                                                     "версии: " +
                                                     task.versionsDescription
                                                   //  + " " +   "конфигурация " + task.sapfor_configuration_id
@@ -211,8 +211,8 @@ public class SapforTasksPackageSupervisor {
                         summary_lines.add(state.getDescription() + " :" + count);
                         summary_lines.addAll(flagsLines);
                     } else {
-                        for (String flags : tasksByFlags.keySet()) {
-                            LinkedHashMap<String, Vector<SapforTask>> tasksByGroups = tasksByFlags.get(flags);
+                        for (String flags : tasksByConfigurations.keySet()) {
+                            LinkedHashMap<String, Vector<SapforTask>> tasksByGroups = tasksByConfigurations.get(flags);
                             for (String group : tasksByGroups.keySet()) {
                                 Vector<SapforTask> tasks = tasksByGroups.get(group);
                                 for (SapforTask task: tasks)
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java b/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java
index e5cef1a5..89316b58 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java
@@ -1,6 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import Common.Global;
+import Common.UI.UI;
 import Common.Utils.Utils;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
@@ -64,5 +65,10 @@ public class DownloadSapforTasksPackage extends TestingSystemPass<SapforTasksPac
             FileUtils.writeStringToFile(SapforTasksPackageInterface.getLoadedSign(target), new Date().toString());
         }
     }
+    @Override
+    protected void showDone() throws Exception {
+        super.showDone();
+        UI.getMainWindow().getTestingWindow().ShowCurrentSapforTasksPackage();
+    }
 }