From 01468da72e38a96796ec1a132fb3916e166f1e3e Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 8 Dec 2023 21:35:36 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  1 +
 .../Passes/All/ExportTasksPackageToExcel.java | 37 ++++++++++++-------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0e6d8ebb..a52dee8b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,6 +7,7 @@
   </component>
   <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/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java b/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java
index fa883cc9..d02a957e 100644
--- a/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java
+++ b/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java
@@ -3,6 +3,7 @@ import Common.Current;
 import Common.Global;
 import Common.UI.UI;
 import Common.Utils.Files.VDirectoryChooser;
+import Common.Utils.Index;
 import Common.Utils.Utils;
 import GlobalData.Tasks.TaskState;
 import TestingSystem.DVM.Tasks.TestRunTask;
@@ -163,13 +164,7 @@ public class ExportTasksPackageToExcel extends Pass_2021<TasksPackage> {
         }
         return res;
     }
-    @Override
-    protected void body() throws Exception {
-        File file = Utils.getTempFileName("table");
-        //--
-        book = new HSSFWorkbook();
-        sheet = book.createSheet("Результаты тестирования");
-        //--
+    void createStyles(){
         styles = new Vector<>();
         //0 - заголовок
         //1 - черный
@@ -213,8 +208,9 @@ public class ExportTasksPackageToExcel extends Pass_2021<TasksPackage> {
             style.setFont(font);
             styles.add(style);
         }
-        //--
-        Row header = addRow(0, true,
+    }
+    void exportPackage(TasksPackage tasksPackage, Index offset){
+        Row header = addRow(offset.getValue(), true,
                 "Группа",
                 "Тест",
                 "Язык",
@@ -232,7 +228,8 @@ public class ExportTasksPackageToExcel extends Pass_2021<TasksPackage> {
                 "Чистое время (с)",
                 "Прогресс (%)");
         //--
-        int i = 1;
+        offset.Inc();
+        //--
         for (TestRunTask task : tasks) {
             ShowMessage2(task.test_description);
             //---
@@ -245,7 +242,7 @@ public class ExportTasksPackageToExcel extends Pass_2021<TasksPackage> {
             Object num_cudas = (NUM_CUDAS != null) ? NUM_CUDAS : "undef";
             Object total_threads = (NUM_THREADS != null) ? NUM_THREADS * Utils.getMatrixProcessors(task.matrix) : "undef";
             //--
-            Row row = addRow(i, false,
+            Row row = addRow(offset.getValue(), false,
                     task.group_description,
                     task.test_description,
                     task.language.getDescription(),
@@ -263,10 +260,24 @@ public class ExportTasksPackageToExcel extends Pass_2021<TasksPackage> {
                     task.CleanTime,
                     task.progress
             );
-            ++i;
+            offset.Inc();
         }
+
+    }
+
+    @Override
+    protected void body() throws Exception {
+        File file = Utils.getTempFileName("table");
         //--
-        for (i = 0; i < max_columns; ++i)
+        book = new HSSFWorkbook();
+        sheet = book.createSheet("Результаты тестирования");
+        //--
+        createStyles();
+        //--
+        Index offset = new Index();
+        exportPackage(target, offset);
+        //--
+        for (int i = 0; i < max_columns; ++i)
             sheet.autoSizeColumn(i);
         // Записываем всё в файл
         FileOutputStream stream = new FileOutputStream(file);