From 2b169392e62c2feb0c1a670d6f3bc5a9e61d63f6 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 9 Dec 2023 02:19:28 +0300
Subject: [PATCH] =?UTF-8?q?v++=20=D0=A0=D0=B0=D0=B7=D0=BE=D0=B1=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BB=D1=81=D1=8F=20=D1=81=20=D1=84=D0=BE=D1=80=D0=BC?=
 =?UTF-8?q?=D0=B0=D1=82=D0=B0=D0=BC=D0=B8=20=D1=8F=D1=87=D0=B5=D0=B5=D0=BA?=
 =?UTF-8?q?.=20=D1=87=D0=B8=D1=81=D0=BB=D0=B0=20=D0=BD=D0=B0=D0=B4=D0=BE?=
 =?UTF-8?q?=20=D0=B1=D1=8B=D0=BB=D0=BE=20=D0=BF=D0=B8=D1=81=D0=B0=D1=82?=
 =?UTF-8?q?=D1=8C=20=D0=BD=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE?=
 =?UTF-8?q?=D0=B4=D1=8F=20=D0=B2=20String,=20=D1=82=D0=BE=D0=B3=D0=B4?=
 =?UTF-8?q?=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20=D0=BD=D0=B5=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BA=D0=B0=D0=B7=D1=8B=D0=B2=D0=B0=D0=B5=D1=82.?=
 =?UTF-8?q?=20=D0=9C=D0=B0=D1=82=D1=80=D0=B8=D1=86=D1=8B=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=BA=D0=B8=D0=BD=D1=83=D0=BB=20=D0=B2=20=D0=BA=D0=B0=D0=B2?=
 =?UTF-8?q?=D1=8B=D1=87=D0=BA=D0=B8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  1 +
 src/Repository/Component/Visualiser.java      |  2 +-
 .../Passes/All/ExportTasksPackageToExcel.java | 63 ++++++++++++-------
 3 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a52dee8b..e561e075 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/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.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/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java
index b6086aa1..4cae836c 100644
--- a/src/Repository/Component/Visualiser.java
+++ b/src/Repository/Component/Visualiser.java
@@ -62,7 +62,7 @@ public class Visualiser extends Component {
     //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
     @Override
     public void GetVersionInfo() {
-        version = 1047;
+        version = 1048;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());
diff --git a/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java b/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java
index 237f0cb8..d11c4e4c 100644
--- a/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java
+++ b/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java
@@ -1,6 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import Common.Global;
+import Common.UI.Themes.FreeFortranSPFTokenMaker;
 import Common.UI.UI;
 import Common.Utils.Files.VDirectoryChooser;
 import Common.Utils.Index;
@@ -32,7 +33,6 @@ public class ExportTasksPackageToExcel extends Pass_2021<Vector<TasksPackage>> {
     Vector<CellStyle> styles;
     //--
     Workbook book = null;
-  //  DataFormat format = null;
     Sheet sheet = null;
     //--
     LinkedHashMap<Long, Vector<TestRunTask>> packages_tasks = null;
@@ -54,7 +54,6 @@ public class ExportTasksPackageToExcel extends Pass_2021<Vector<TasksPackage>> {
         book = null;
         sheet = null;
         styles = null;
-       // format = null;
         packages_tasks = new LinkedHashMap<>();
         target = null;
         //--
@@ -133,14 +132,13 @@ public class ExportTasksPackageToExcel extends Pass_2021<Vector<TasksPackage>> {
         Row row = sheet.createRow(row_num);
         int i = 0;
         for (Object value : values) {
-            String cell_text = value.toString();
+            //   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:
@@ -166,10 +164,24 @@ public class ExportTasksPackageToExcel extends Pass_2021<Vector<TasksPackage>> {
                             style_index = 6;
                             break;
                     }
+                    cell.setCellValue(state.getDescription());
+                    break;
+                case 6:
+                case 7:
+                case 8:
+                case 15:
+                    cell.setCellValue((int)value);
+                    break;
+                case 12:
+                case 13:
+                case 14:
+                    cell.setCellValue((double) value);
+                    break;
+                default:
+                    cell.setCellValue(value.toString());
                     break;
             }
             cell.setCellStyle(styles.get(style_index));
-            cell.setCellValue(cell_text);
             //--
             ++i;
         }
@@ -205,6 +217,9 @@ public class ExportTasksPackageToExcel extends Pass_2021<Vector<TasksPackage>> {
         }
         return res;
     }
+    String formatMatrix(String matrix){
+        return  Utils.DQuotes(matrix.trim());
+    }
     void createStyles() {
         styles = new Vector<>();
         //0 - заголовок
@@ -216,7 +231,7 @@ public class ExportTasksPackageToExcel extends Pass_2021<Vector<TasksPackage>> {
         //6 - серый
         for (int i = 0; i < 6; ++i) {
             CellStyle style = book.createCellStyle();
-          //  style.setDataFormat(format.getFormat("@"));
+            style.setAlignment(CellStyle.ALIGN_LEFT);
             Font font = book.createFont();
             switch (i) {
                 case 0:
@@ -279,7 +294,7 @@ public class ExportTasksPackageToExcel extends Pass_2021<Vector<TasksPackage>> {
             ShowMessage2(task.test_description);
             //---
             Integer NUM_THREADS = extractIntegerEnvironmentValue(task.environments, "DVMH_NUM_THREADS");
-            if (NUM_THREADS !=null && NUM_THREADS ==0) NUM_THREADS = 1;
+            if (NUM_THREADS != null && NUM_THREADS == 0) NUM_THREADS = 1;
             Integer NUM_CUDAS = extractIntegerEnvironmentValue(task.environments, "DVMH_NUM_CUDAS");
             //--
             Object num_threads = (NUM_THREADS != null) ? NUM_THREADS : "undef";
@@ -287,22 +302,22 @@ public class ExportTasksPackageToExcel extends Pass_2021<Vector<TasksPackage>> {
             Object total_threads = (NUM_THREADS != null) ? NUM_THREADS * Utils.getMatrixProcessors(task.matrix) : "undef";
             //--
             addTaskRow(offset.getValue(),
-                    task.group_description,
-                    task.test_description,
-                    task.language.getDescription(),
-                    task.flags,
-                    task.compilation_state,
-                    task.state,
-                    num_threads,
-                    num_cudas,
-                    total_threads,
-                    task.matrix,
-                    task.environments,
-                    task.usr_par,
-                    task.compilation_time,
-                    task.Time,
-                    task.CleanTime,
-                    task.progress
+                    task.group_description, //0
+                    task.test_description,//1
+                    task.language.getDescription(), //2
+                    task.flags, //3
+                    task.compilation_state, //4
+                    task.state, //5
+                    num_threads, //6
+                    num_cudas, //7
+                    total_threads, //8
+                    formatMatrix(task.matrix), //9
+                    task.environments, //10
+                    task.usr_par, //11
+                    task.compilation_time, //12
+                    task.Time,//13
+                    task.CleanTime, //14
+                    task.progress //15
             );
             offset.Inc();
         }
@@ -320,7 +335,7 @@ public class ExportTasksPackageToExcel extends Pass_2021<Vector<TasksPackage>> {
         Index offset = new Index();
         for (TasksPackage tasksPackage : target) {
             exportPackage(tasksPackage, offset);
-           // UI.Info(String.valueOf(tasksPackage.id));
+            // UI.Info(String.valueOf(tasksPackage.id));
         }
         //--
         for (int i = 0; i < max_columns; ++i)