From 827981a591dbc93fe2fbf84f8767200635c91629 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 8 Dec 2023 23:39:01 +0300
Subject: [PATCH] =?UTF-8?q?=D1=88=D0=B0=D0=BF=D0=BA=D0=B0=20=D0=BF=D0=B0?=
 =?UTF-8?q?=D0=BA=D0=B5=D1=82=D0=B0=20=D1=81=20=D0=B8=D0=BD=D1=84=D0=BE?=
 =?UTF-8?q?=D1=80=D0=BC=D0=B0=D1=86=D0=B8=D0=B5=D0=B9=20=D0=B2=20=D1=8D?=
 =?UTF-8?q?=D0=BA=D1=81=D0=B5=D0=BB=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |   1 -
 .../Passes/All/ExportTasksPackageToExcel.java | 127 +++++++++++-------
 2 files changed, 82 insertions(+), 46 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a52dee8b..0e6d8ebb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,7 +7,6 @@
   </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 d02a957e..5f02d66d 100644
--- a/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java
+++ b/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java
@@ -15,6 +15,7 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.ss.usermodel.Font;
 import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
 
 import java.awt.*;
 import java.io.File;
@@ -82,56 +83,91 @@ public class ExportTasksPackageToExcel extends Pass_2021<TasksPackage> {
         }
         return false;
     }
-    protected Row addRow(int row_num, boolean isHeader, Object... values) {
+    //---
+    static String getPackageInfo(TasksPackage object) {
+        Vector<String> lines = new Vector<>();
+        lines.add("задач " + object.runTasksCount);
+        lines.add("машина " + object.machine_address + ":" + object.machine_port);
+        lines.add("ядер " + object.kernels);
+        lines.add("DVM-система " + object.dvm_version);
+        long seconds = (object.ChangeDate - object.StartDate) / 1000;
+        long hours = seconds / 3600;
+        seconds = seconds - hours * 3600;
+        long minutes = (seconds) / 60;
+        seconds = seconds - minutes * 60;
+        lines.add("время выполнения " + hours + " часов, " + minutes + " минут, " + seconds + " секунд");
+        return String.join("; ", lines);
+    }
+    //---
+    protected void addInfoRow(int row_num, String value) {
+        Row row = sheet.createRow(row_num);
+        String cell_text = value.toString();
+        Cell cell = row.createCell(0);
+        cell.setCellValue(cell_text);
+        cell.setCellStyle(styles.get(0));
+        //https://translated.turbopages.org/proxy_u/en-ru.ru.f85b6508-657377d3-df23bc2d-74722d776562/https/stackoverflow.com/questions/23533381/creating-the-border-for-the-merged-cells-in-poi
+        sheet.addMergedRegion(new CellRangeAddress(row_num, row_num, 0, max_columns - 1));
+        for (int i=1; i< max_columns;++i){
+            Cell blankCell = row.createCell(i);
+            blankCell.setCellStyle(styles.get(0));
+        }
+    }
+    protected void addHeaderRow(int row_num, Object... values) {
         Row row = sheet.createRow(row_num);
         int i = 0;
         for (Object value : values) {
             String cell_text = value.toString();
             Cell cell = row.createCell(i);
-            int style_index = 0;
-            if (!isHeader) {
-                switch (i) {
-                    case 4:
-                    case 5:
-                        TaskState state = (TaskState) value;
-                        cell_text = state.getDescription();
-                        switch (state) {
-                            case FailedToQueue:
-                            case NoSuchTask:
-                            case AbortedByUser:
-                            case AbortedByTimeout:
-                            case DoneWithErrors:
-                            case WrongTestFormat:
-                            case InternalError:
-                            case Canceled:
-                                style_index = 3;
-                                break;
-                            case Queued:
-                            case Running:
-                                style_index = 5;
-                                break;
-                            case Done:
-                                style_index = 2;
-                                break;
-                            case Crushed:
-                                style_index = 4;
-                                break;
-                            case Finished:
-                                style_index = 6;
-                                break;
-                        }
-                        break;
-                    default:
-                        style_index = 1;
-                        break;
-                }
+            cell.setCellStyle(styles.get(0));
+            cell.setCellValue(cell_text);
+            //--
+            ++i;
+        }
+    }
+    protected void addTaskRow(int row_num, Object... values) {
+        Row row = sheet.createRow(row_num);
+        int i = 0;
+        for (Object value : values) {
+            String cell_text = value.toString();
+            Cell cell = row.createCell(i);
+            int style_index = 1;
+            switch (i) {
+                case 4:
+                case 5:
+                    TaskState state = (TaskState) value;
+                    cell_text = state.getDescription();
+                    switch (state) {
+                        case FailedToQueue:
+                        case NoSuchTask:
+                        case AbortedByUser:
+                        case AbortedByTimeout:
+                        case DoneWithErrors:
+                        case WrongTestFormat:
+                        case InternalError:
+                        case Canceled:
+                            style_index = 3;
+                            break;
+                        case Queued:
+                        case Running:
+                            style_index = 5;
+                            break;
+                        case Done:
+                            style_index = 2;
+                            break;
+                        case Crushed:
+                            style_index = 4;
+                            break;
+                        case Finished:
+                            style_index = 6;
+                            break;
+                    }
+                    break;
             }
             cell.setCellStyle(styles.get(style_index));
             cell.setCellValue(cell_text);
             //--
             ++i;
         }
-        return row;
     }
     protected void setBorder(CellStyle style, short border) {
         style.setBorderBottom(border);
@@ -164,7 +200,7 @@ public class ExportTasksPackageToExcel extends Pass_2021<TasksPackage> {
         }
         return res;
     }
-    void createStyles(){
+    void createStyles() {
         styles = new Vector<>();
         //0 - заголовок
         //1 - черный
@@ -209,8 +245,10 @@ public class ExportTasksPackageToExcel extends Pass_2021<TasksPackage> {
             styles.add(style);
         }
     }
-    void exportPackage(TasksPackage tasksPackage, Index offset){
-        Row header = addRow(offset.getValue(), true,
+    void exportPackage(TasksPackage tasksPackage, Index offset) {
+        addInfoRow(offset.getValue(), getPackageInfo(tasksPackage));
+        offset.Inc();
+        addHeaderRow(offset.getValue(),
                 "Группа",
                 "Тест",
                 "Язык",
@@ -242,7 +280,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(offset.getValue(), false,
+            addTaskRow(offset.getValue(),
                     task.group_description,
                     task.test_description,
                     task.language.getDescription(),
@@ -262,9 +300,7 @@ public class ExportTasksPackageToExcel extends Pass_2021<TasksPackage> {
             );
             offset.Inc();
         }
-
     }
-
     @Override
     protected void body() throws Exception {
         File file = Utils.getTempFileName("table");
@@ -276,6 +312,7 @@ public class ExportTasksPackageToExcel extends Pass_2021<TasksPackage> {
         //--
         Index offset = new Index();
         exportPackage(target, offset);
+        // exportPackage(target, offset);
         //--
         for (int i = 0; i < max_columns; ++i)
             sheet.autoSizeColumn(i);