From 540c041408861e420fb0489ceea8b08f5db2f102 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 7 Dec 2023 00:09:10 +0300
Subject: [PATCH] =?UTF-8?q?=D0=AD=D0=BA=D1=81=D0=BF=D0=BE=D1=80=D1=82=20?=
 =?UTF-8?q?=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=B0=20=D0=B2=20excel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  14 +-
 kek.xls                                       | Bin 4096 -> 0 bytes
 .../Menus_2023/MainMenuBar/MainMenuBar.java   |   3 +-
 .../TasksPackagesMenuBar.java                 |   5 +-
 .../DVM/Tasks/TestRunTasksDBTable.java        |   2 +-
 .../Passes/All/ExportTasksPackageToExcel.java | 150 ++++++++++++++++++
 src/Visual_DVM_2021/Passes/All/TestPass.java  |  14 +-
 src/Visual_DVM_2021/Passes/PassCode_2021.java |   3 +
 src/icons/Excel.png                           | Bin 0 -> 1320 bytes
 9 files changed, 182 insertions(+), 9 deletions(-)
 delete mode 100644 kek.xls
 create mode 100644 src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java
 create mode 100644 src/icons/Excel.png

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 04a642e1..6eefe5e4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,9 +7,15 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/artifacts/VisualSapfor_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/artifacts/VisualSapfor_jar.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/icons/Excel.png" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Visual_DVM_2020.iml" beforeDir="false" afterPath="$PROJECT_DIR$/Visual_DVM_2020.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/kek.xls" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TasksPackagesMenuBar/TasksPackagesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TasksPackagesMenuBar/TasksPackagesMenuBar.java" 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/TestPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/TestPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -87,7 +93,7 @@
     <property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.SHOW" value="true" />
     <property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.WIDTH" value="509" />
     <property name="extract.method.default.visibility" value="public" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/libs/xmlbeans-2.6.0.jar" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/icons" />
     <property name="project.structure.last.edited" value="Modules" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
@@ -100,8 +106,8 @@
       <recent name="controls.Trees" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
-      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\libs" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
+      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\libs" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\versions" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\Transformations" />
       <recent name="C:\Users\misha\Documents\visual_dvm_2020\src\icons" />
diff --git a/kek.xls b/kek.xls
deleted file mode 100644
index db46e2a702c8b9431d5cd6529bcc86a97dc1dce3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4096
zcmeHK%S%*Y6#w1p9cQLeXU57hvSCb`(a8)7BB?Q<O%Oy71wAHZ0>#uA-MEOR*Qx>`
z+O>(=wCS;_MG?9PT1Z7L0#{mpK~T`by#3C(bDcXfBT1nYe#7}5zw`XgckXxZynh#-
zy7#nx8uMB^DllsYQR%@A&m1AZ$F*RywrvYbWI0`F|4;^wVvxUKL~#%U9J3gaqx|i*
z9zMg}Zc%-durPY(>-977NkirQj=*tx&!P|A8b@CVt%aco%sKxO$HLMD?xeS{3-F?6
zCN<psFUJ3(9hFh|Q~$vLALL3OK87az2k1l6G7S??ta0|hXVNKLkY~NWcc`Z;x<sv0
zW9Tv@hJD)KB~p!z8Wm5Sc&+x2mHX0>L<BuXwQ*|itHwQ)ko)O`*`ac`w2x_D&ECLs
z)tOXeC)VK&<?TzO`7-w5K(@E*{9j}=SoO@~Iv}<+)|hN;Y)dEF<L*4sU~OUc>x;N2
zkDkk%_KHN|$EJcvYg>^GE@`F-0YvA^6kBoxlW4{^ARTXxy5Yz?u8Tyw%wyYQ3^E<>
zNYn6cB+w@EjM=NA%Yv3Jixl@E2_A=6(TO~dIJy!PUAgM1RKfEuv|xuPQdipzHm|Dj
zdi84X0IPsZrnSGnb%bpSYkA1PcbgfSYhzKt<=hqj<}wz>r36dKm&3(sDf#~yH>48h
znw!rSCl5bdhKnc4;K?$0a~V8X5(kUHjVE9QEMP2p+q4kMRoF6ybCo(qa+Z#@Ilqp`
zLC3W@pM6%ZjOz&FhJ5`Xh|b>Za8IUdWauU=n)l<8A){f{@iEL_C73~t&Sg!%hX#8F
zY!+q!Sz1{`kVOjTDh}aA)r5bXYq^S7n@+uQI%n)Y8C80Ltzn;`X}Qe8dX0r>bLQdK
z4~M&tq|%BvE8e306-9ECaa$Aj%}WoL$r-oA7q2H=Rq1Qm-$RVnGbH($NE*rfuBK9s
zm8q10W8?&Ik$VxTx2q&3J_lyCiZ}}LTm($MZrDuv)MnJ+r|uryhqMaSF*FV!_xel6
zCuU-o^7fk%Jku9<hpwG&Gc_xmX+APF=zS}%%*$m!GA0Kj36xThs+J7P=b4mAkR-*q
znk0o<MUq36!;+&6lOm*Al3PCOIj<vaAZ;Y^ohC0W{hv@Sjum`)G9drmyyq`#mzF1@
J6|YN~fnSKTsxANk

diff --git a/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java b/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java
index 85274b3b..5bd562fc 100644
--- a/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java
+++ b/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java
@@ -52,7 +52,7 @@ public class MainMenuBar extends VisualiserMenuBar {
         //-
         setPreferredSize(new Dimension(0, 30));
         //---
-
+/*
         add(new MenuBarButton() {
             {
                 setIcon("/icons/Apply.png");
@@ -62,6 +62,7 @@ public class MainMenuBar extends VisualiserMenuBar {
                 });
             }
         });
+ */
         //---
         ShowProject(false);
     }
diff --git a/src/Common/UI/Menus_2023/TasksPackagesMenuBar/TasksPackagesMenuBar.java b/src/Common/UI/Menus_2023/TasksPackagesMenuBar/TasksPackagesMenuBar.java
index c12477ae..86bfcc68 100644
--- a/src/Common/UI/Menus_2023/TasksPackagesMenuBar/TasksPackagesMenuBar.java
+++ b/src/Common/UI/Menus_2023/TasksPackagesMenuBar/TasksPackagesMenuBar.java
@@ -3,6 +3,9 @@ import Common.UI.Menus_2023.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class TasksPackagesMenuBar extends DataMenuBar {
     public TasksPackagesMenuBar() {
-        super("пакеты задач", PassCode_2021.AbortTaskPackage, PassCode_2021.DeleteTasksPackage);
+        super("пакеты задач",
+                PassCode_2021.ExportTasksPackageToExcel,
+                PassCode_2021.AbortTaskPackage,
+                PassCode_2021.DeleteTasksPackage);
     }
 }
diff --git a/src/TestingSystem/DVM/Tasks/TestRunTasksDBTable.java b/src/TestingSystem/DVM/Tasks/TestRunTasksDBTable.java
index 4b123e01..ba6d1f83 100644
--- a/src/TestingSystem/DVM/Tasks/TestRunTasksDBTable.java
+++ b/src/TestingSystem/DVM/Tasks/TestRunTasksDBTable.java
@@ -123,7 +123,7 @@ public class TestRunTasksDBTable extends DBTable<Long, TestRunTask> {
                 "Флаги",
                 "Сборка",
                 "Запуск",
-                "Время компиляции(с)",
+                "Время компиляции (с)",
                 "Матрица",
                 "Окружение",
                 "usr.par",
diff --git a/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java b/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java
new file mode 100644
index 00000000..bdab8a11
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java
@@ -0,0 +1,150 @@
+package Visual_DVM_2021.Passes.All;
+import Common.Current;
+import Common.Global;
+import Common.Utils.Files.VDirectoryChooser;
+import Common.Utils.Utils;
+import TestingSystem.DVM.Tasks.TestRunTask;
+import TestingSystem.DVM.TasksPackage.TasksPackage;
+import TestingSystem.DVM.TasksPackage.TasksPackageState;
+import Visual_DVM_2021.Passes.Pass_2021;
+import org.apache.commons.io.FileUtils;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.*;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.Vector;
+public class ExportTasksPackageToExcel extends Pass_2021<TasksPackage> {
+    //https://tproger.ru/translations/how-to-read-write-excel-file-java-poi-example
+    File dir;
+    File res;
+    VDirectoryChooser directoryChooser = new VDirectoryChooser("Выбор папки для сохранения таблицы Excel");
+    //---
+    final int max_columns = 13;
+    CellStyle header_style;
+    CellStyle regular_style;
+    Workbook book = null;
+    Sheet sheet = null;
+    //---
+    @Override
+    public String getIconPath() {
+        return "/icons/Excel.png";
+    }
+    @Override
+    public String getButtonText() {
+        return "";
+    }
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        book= null;
+        sheet = null;
+        header_style=null;
+        regular_style=null;
+        //--
+        if (Current.Check(Log, Current.TasksPackage)) {
+            target = Current.getTasksPackage();
+            if (!target.state.equals(TasksPackageState.Done)) {
+                Log.Writeln_("Можно получить таблицу только завершенного пакета.");
+                return false;
+            } else {
+                dir = directoryChooser.ShowDialog();
+                if (dir == null) {
+                    Log.Writeln_("Папка не выбрана.");
+                    return false;
+                }
+                res = new File(dir, Utils.getDateName("package_" + target.id) + ".xls");
+                return true;
+            }
+        }
+        return false;
+    }
+    protected Row addRow(int row_num, boolean isHeader, Object... values) {
+        Row row = sheet.createRow(row_num);
+        int i = 0;
+        for (Object value : values) {
+            Cell cell = row.createCell(i);
+            cell.setCellValue(value.toString());
+            cell.setCellStyle(isHeader? header_style:regular_style);
+            //--
+            ++i;
+        }
+        return row;
+    }
+    @Override
+    protected void body() throws Exception {
+        File file = Utils.getTempFileName("table");
+        //--
+        book = new HSSFWorkbook();
+        sheet = book.createSheet("Результаты тестирования");
+        header_style = book.createCellStyle();
+        //---
+        Font font = book.createFont();//Create font
+        font.setBold(true);
+        header_style.setFont(font);
+        //--
+        header_style.setBorderBottom(CellStyle.BORDER_THICK);
+        header_style.setBorderLeft(CellStyle.BORDER_THICK);
+        header_style.setBorderRight(CellStyle.BORDER_THICK);
+        header_style.setBorderTop(CellStyle.BORDER_THICK);
+        //--
+        regular_style=book.createCellStyle();
+        regular_style.setBorderBottom(CellStyle.BORDER_THIN);
+        regular_style.setBorderLeft(CellStyle.BORDER_THIN);
+        regular_style.setBorderRight(CellStyle.BORDER_THIN);
+        regular_style.setBorderTop(CellStyle.BORDER_THIN);
+        //--
+        Row header = addRow(0, true,
+                "Группа",
+                "Тест",
+                "Язык",
+                "Флаги",
+                "Сборка",
+                "Запуск",
+                "Время компиляции (с)",
+                "Матрица",
+                "Окружение",
+                "usr.par",
+                "Время выполнения (с)",
+                "Чистое время (с)",
+                "Прогресс (%)");
+        //--
+        Vector<TestRunTask> tasks = new Vector<>();
+        for (TestRunTask task : Global.testingServer.account_db.testRunTasks.Data.values()) {
+            if ((task.taskspackage_id == target.id) && (task.isVisible()))
+                tasks.add(task);
+        }
+        //--
+        int i = 1;
+        for (TestRunTask task : tasks) {
+            Row row = addRow(i, false,
+                    task.group_description,
+                    task.test_description,
+                    task.language.getDescription(),
+                    task.flags,
+                    task.compilation_state.getDescription(),
+                    task.state.getDescription(),
+                    task.compilation_time,
+                    task.matrix,
+                    task.environments,
+                    task.usr_par,
+                    task.Time,
+                    task.CleanTime,
+                    task.progress
+            );
+            ++i;
+        }
+        //--
+        for (i = 0; i < max_columns; ++i)
+            sheet.autoSizeColumn(i);
+        // Записываем всё в файл
+        FileOutputStream stream = new FileOutputStream(file);
+        book.write(stream);
+        book.close();
+        stream.close();
+        ///--
+        FileUtils.copyFile(file, res);
+        book = null;
+        stream = null;
+        file = null;
+    }
+}
diff --git a/src/Visual_DVM_2021/Passes/All/TestPass.java b/src/Visual_DVM_2021/Passes/All/TestPass.java
index 4dd1100c..6a7f949e 100644
--- a/src/Visual_DVM_2021/Passes/All/TestPass.java
+++ b/src/Visual_DVM_2021/Passes/All/TestPass.java
@@ -1,5 +1,7 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.Utils;
 import Visual_DVM_2021.Passes.Pass_2021;
+import org.apache.commons.io.FileUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.*;
 
@@ -13,7 +15,7 @@ public class TestPass extends Pass_2021 {
     }
     @Override
     protected void body() throws Exception {
-        File file = new File("kek.xls");
+        File file = Utils.getTempFileName("table");
     //--
         Workbook book = new HSSFWorkbook();
         Sheet sheet = book.createSheet("Birthdays");
@@ -42,7 +44,15 @@ public class TestPass extends Pass_2021 {
         sheet.autoSizeColumn(1);
 
         // Записываем всё в файл
-        book.write(new FileOutputStream(file));
+        FileOutputStream stream = new FileOutputStream(file);
+        book.write(stream);
         book.close();
+        stream.close();
+        ///--
+        File res = new File("kek.xls");
+        FileUtils.copyFile(file, res);
+        book= null;
+        stream = null;
+        file = null;
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index 3bf1ca69..8d0f7dd2 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -305,12 +305,15 @@ public enum PassCode_2021 {
     CreateGroupFromFiles,
     DeleteTasksPackage,
     DeleteSubscriberWorkspace,
+    ExportTasksPackageToExcel,
     //->
     TestPass;
     public String getDescription() {
         switch (this) {
             case Undefined:
                 return "?";
+            case ExportTasksPackageToExcel:
+                return "Экспорт пакета задач в Excel";
             case DeleteSubscriberWorkspace:
                 return "Удалить рабочее пространство пользователя";
             case DeleteTasksPackage:
diff --git a/src/icons/Excel.png b/src/icons/Excel.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7103d50fb4b3eba346c5fd00b002080c4907baf
GIT binary patch
literal 1320
zcmV+@1=sqCP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00009a7bBm000tn
z000tn0p4aGcmMzZAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ=u1Q2eRCwBymR)R=MHGgg`M%k2ccIX2%eGzG-TrO2tr%%RO|*XqK|yE%6EBPi
z0X3)>L}EfH;H@DcF)>C35`s`r#2ASoQV4~j7lddRj3Bfrg@P1XVTG1%_pdu%EZy?a
zmezAQCv)ESyz|bS5ihTw-ywuZ<FQacJU&EhC`N23hCpDq+L_^Sk~%e&+kx9W80<$A
z8WY675<w<{X#mk!gy>KVr4$xv!I9!%rZb1494{sAQoOlda-6wLu}xv?t_Dt@Yr$@{
zkE$vVXj&57B7x{|!jqj(fvXUo+lS9nf;-ED)8QPGo+HIUW?CjT!)7ioAQ%cVFgP#_
z6qSh%qU2=e^7)1@Ntu!|s-RM8)Y`I|6;zkkqHB60FA_u*3Qg#IdT=|vfgYqTk;9v$
zCb1gUaf_Pd5Q05Nc5}*qlC)`Qgd!nOiFKtE>sGvvC)2~NJKbgwg(4o0Guc@D!V(H+
zdimvi3k#or1*^qMFf>48(_X@nu!*RA5?fRPTnJ(6P$@-Cc`Y^NwRGHUXVv1>$$f`T
z9we^JWaX1}Nq9LJ3ep$sBP%T{N#L8~`|-E?>AH25k9TcG*Cml?gis`eE_73wF-;zd
zgxL7SNBn%|2to+9?rdPsk=@CT0J1Y&6u1hp88-4=1r+5Jk>|=o6B-JIny3@I)sEC9
zO=pfW+grgO9p~Bh!FH3|=FeTg{J9J0>bb_-b?+u~hfn|bP_9Xw$?}@l*w*+72aY$A
zmz__AZ;t7__BZXr-|pvnPZwKuY(m#{qOmBU@F3b`<N_!!u3&~^20#6Jn7XQZq%KX4
z$<1`*bNjGc?RecjO7hAm%JHIU+GApk(}_|F!(x!{D&Ty(pAt{$sQkP+FEMY<OLTU3
zvS!KJ<Td!A<$Kg*+$DtI-h+Ew?7Tqw^bA_go#Ls2S!TJ8?Ze-ekZbdfO~_$)g+r5<
ztNHg6NL{jW(Q1yLZQ?<&-{dZLriT(wDR!%!5>E+b`DGM)ipP{|OptIi%%KzC@@(mI
zEUl~~&=;V&wb>+BZN)s+Eq@PJhKtp&uHlV^Z?bmDI~W#Ya&ip}4p2F}nx&O>I8q!e
zt*qnHwZEvZsz*GWAB{)9rnRk=zk6@6>8p)MO(znI5(+0SqnHRJeR?|UU;i-4dgICl
zBGE`f1eJJZ@?C|5qfr8V0cI6EjbSku3<YVu{M$ph#Ki7;JQ6aDyj|7hHB^_^(0=1G
zZ!KDtT>q~5|Gr)0fC?cvaI6u3TPvO2SJ<+%0jcXmq7nLo{Ro7~Bqoqa%<E)y-|437
z_BGO`rPFomYT~s<ke8i@GtJ4xs~1Lt#8sRjHG~C=iN#o*D5a>cTE>gdR3SCZq(8v@
zf%{y!*@4vM2#A!De*(R1_-s8zIbM8jAKu(za-6xOrlgJn1!z3Bmlpr2M?MlF2^AZP
zA*Dpu^dyKyAc(6tZC#hR*!d?4uo*Ver>Eo2%EO!MrPNbK;mks^Gh7%J16}B7LL2#&
zsF4|DXvU*_EE4D){;?PqD~4rc&fmR%m!3cmXD^&V(=<}-DP(83NS&I>_1^2)4BH5Q
eG5){nzX1T<`^8KX0TA{80000<MNUMnLSTa9X>FDO

literal 0
HcmV?d00001