From ca941814ec61f78cb9e2a34a9fbe7bf827e17c7c Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 7 Dec 2023 23:32:11 +0300
Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B4=D0=B2=D0=B8=D0=B3=20=D0=B2=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BC=D0=B5=D0=BD=D0=B8=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=B8?=
 =?UTF-8?q?=D0=BB=D1=8F=D1=86=D0=B8=D0=B8=20=D0=BA=20=D0=B2=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B8=20=D0=B2=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F,=20=D0=B2=20=D1=8D=D0=BA=D1=81=D0=B5?=
 =?UTF-8?q?=D0=BB=D0=B5=20=D0=B8=20=D0=B2=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8?=
 =?UTF-8?q?=D1=86=D0=B5.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  1 +
 .../DVM/Tasks/TestRunTasksDBTable.java        | 38 +++++++---------
 .../Passes/All/ExportTasksPackageToExcel.java | 45 +------------------
 3 files changed, 20 insertions(+), 64 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a52dee8b..08ba5268 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,6 +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/TestingSystem/DVM/Tasks/TestRunTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Tasks/TestRunTasksDBTable.java" 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/TestingSystem/DVM/Tasks/TestRunTasksDBTable.java b/src/TestingSystem/DVM/Tasks/TestRunTasksDBTable.java
index 229eef2f..6b3a18b3 100644
--- a/src/TestingSystem/DVM/Tasks/TestRunTasksDBTable.java
+++ b/src/TestingSystem/DVM/Tasks/TestRunTasksDBTable.java
@@ -95,10 +95,9 @@ public class TestRunTasksDBTable extends DBTable<Long, TestRunTask> {
             }
             @Override
             protected void AdditionalInitColumns() {
-                columns.get(2).setVisible(false);
+                columns.get(5).setRenderer(RendererStatusEnum);
                 columns.get(6).setRenderer(RendererStatusEnum);
-                columns.get(7).setRenderer(RendererStatusEnum);
-                columns.get(14).setRenderer(RendererProgress);
+                columns.get(13).setRenderer(RendererProgress);
             }
         };
     }
@@ -127,17 +126,16 @@ public class TestRunTasksDBTable extends DBTable<Long, TestRunTask> {
     @Override
     public String[] getUIColumnNames() {
         return new String[]{
-                "Группа",
                 "Тест",
                 "Язык",
                 "Флаги",
-                "Сборка",
+                "Компиляция",
                 "Запуск",
-                "Время компиляции (с)",
                 "Матрица",
                 "Окружение",
                 "usr.par",
-                "Время выполнения (с)",
+                "Время компиляции (с)",
+                "Время запуска (с)",
                 "Чистое время (с)",
                 "Прогресс",
         };
@@ -146,30 +144,28 @@ public class TestRunTasksDBTable extends DBTable<Long, TestRunTask> {
     public Object getFieldAt(TestRunTask object, int columnIndex) {
         switch (columnIndex) {
             case 2:
-                return object.group_description;
-            case 3:
                 return object.test_description;
-            case 4:
+            case 3:
                 return object.language;
-            case 5:
+            case 4:
                 return object.flags;
-            case 6:
+            case 5:
                 return object.compilation_state;
-            case 7:
+            case 6:
                 return object.state;
-            case 8:
-                return object.compilation_time;
-            case 9:
+            case 7:
                 return object.matrix;
-            case 10:
+            case 8:
                 return object.getEnvironments();
-            case 11:
+            case 9:
                 return object.getUsrPar();
-            case 12:
+            case 10:
+                return object.compilation_time;
+            case 11:
                 return object.Time;
-            case 13:
+            case 12:
                 return object.CleanTime;
-            case 14:
+            case 13:
                 return object.progress;
             default:
                 return null;
diff --git a/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java b/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java
index c5612013..5b96bd4d 100644
--- a/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java
+++ b/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java
@@ -196,10 +196,10 @@ public class ExportTasksPackageToExcel extends Pass_2021<TasksPackage> {
                 "Флаги",
                 "Сборка",
                 "Запуск",
-                "Время компиляции (с)",
                 "Матрица",
                 "Окружение",
                 "usr.par",
+                "Время компиляции (с)",
                 "Время выполнения (с)",
                 "Чистое время (с)",
                 "Прогресс (%)");
@@ -214,10 +214,10 @@ public class ExportTasksPackageToExcel extends Pass_2021<TasksPackage> {
                     task.flags,
                     task.compilation_state,
                     task.state,
-                    task.compilation_time,
                     task.matrix,
                     task.environments,
                     task.usr_par,
+                    task.compilation_time,
                     task.Time,
                     task.CleanTime,
                     task.progress
@@ -248,45 +248,4 @@ public class ExportTasksPackageToExcel extends Pass_2021<TasksPackage> {
             }
         }
     }
-       /*
-                short color = HSSFColor.BLACK.index;
-                String cell_value = null;
-                switch (i) {
-                    case 4:
-                    case 5:
-                        TaskState state = (TaskState) value;
-                        switch (state) {
-                            case FailedToQueue:
-                            case NoSuchTask:
-                            case AbortedByUser:
-                            case AbortedByTimeout:
-                            case DoneWithErrors:
-                            case WrongTestFormat:
-                            case InternalError:
-                            case Canceled:
-                                color = HSSFColor.RED.index;
-                                break;
-                            case Queued:
-                            case Running:
-                                color = HSSFColor.ORANGE.index;
-                                break;
-                            case Done:
-                                color = HSSFColor.GREEN.index;
-                                break;
-                            case Crushed:
-                                color = HSSFColor.DARK_RED.index;
-                                break;
-                            case Finished:
-                                color = HSSFColor.GREY_40_PERCENT.index;
-                                break;
-                        }
-                        cell_value = state.getDescription();
-                        break;
-                    default:
-                        cell_value = value.toString();
-                        break;
-                }
-                font.setColor(color);
-                regular_style.setFont(font);
-                 */
 }