From dbd0fd0ef55cc211978210fca73d8ffd05aceefa Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 14 Nov 2023 17:35:59 +0300
Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=BF=D0=B8=D1=81=D1=8C=20=D0=B4?=
 =?UTF-8?q?=D0=B0=D1=82=20=D0=BD=D0=B0=D1=87=D0=B0=D0=BB=D0=B0=20=D0=B8=20?=
 =?UTF-8?q?=D0=BE=D0=BA=D0=BE=D0=BD=D1=87=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=B4=D0=B0=D1=87.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  6 ++----
 properties                                    |  2 +-
 .../PerformSapforTask.java                    |  3 +++
 .../SapforTask/SapforTask.java                | 11 +++++++++++
 .../SapforTask/SapforTasksDBTable.java        | 19 +++++++++----------
 5 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 530131a0..1c8ab8dc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,13 +7,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/TaskThread.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/ThreadTask/ThreadTask.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/ThreadsPlanner/ThreadsPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/ThreadsPlanner/ThreadsPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index b154867e..a1358058 100644
--- a/properties
+++ b/properties
@@ -25,7 +25,7 @@
   "InstructionPath": "",
   "PerformanceAnalyzerPath": "",
   "ComponentsBackUpsCount": 10,
-  "TestingKernels": 28,
+  "TestingKernels": 16,
   "AutoCheckTesting": false,
   "CheckTestingIntervalSeconds": 15,
   "EmailOnTestingProgress": true
diff --git a/src/SapforTestingSystem/PerformSapforTask.java b/src/SapforTestingSystem/PerformSapforTask.java
index 2835fd4d..956c7960 100644
--- a/src/SapforTestingSystem/PerformSapforTask.java
+++ b/src/SapforTestingSystem/PerformSapforTask.java
@@ -16,6 +16,7 @@ import java.nio.charset.Charset;
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.Vector;
 
 import static java.lang.Character.isDigit;
@@ -349,6 +350,7 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
     //-------------------------------------------------->>
     @Override
     protected void body() throws Exception {
+        target.StartDate = new Date().getTime();
         target.versions.add(new SapforVersion_json(target.test_description, "исходная"));
         for (PassCode_2021 code : sapforConfiguration_json.codes) {
             if (parse()) {
@@ -359,5 +361,6 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
             } else
                 break;
         }
+        target.ChangeDate = new Date().getTime();
     }
 }
diff --git a/src/SapforTestingSystem/SapforTask/SapforTask.java b/src/SapforTestingSystem/SapforTask/SapforTask.java
index d4998b76..6fd64376 100644
--- a/src/SapforTestingSystem/SapforTask/SapforTask.java
+++ b/src/SapforTestingSystem/SapforTask/SapforTask.java
@@ -12,6 +12,7 @@ import com.sun.org.glassfish.gmbal.Description;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import java.io.File;
+import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Vector;
 public class SapforTask extends DBObject {
@@ -40,6 +41,10 @@ public class SapforTask extends DBObject {
     public String codes = "";
     @Expose
     public TaskState state = TaskState.Inactive;
+    @Expose
+    public long StartDate = 0; //дата начала выполнения
+    @Expose
+    public long ChangeDate = 0;//дата окончания выполнения
     //в json не выносить. это только для БД.
     @Description("DEFAULT ''")
     public String versionsDescription = "";
@@ -182,4 +187,10 @@ public class SapforTask extends DBObject {
             task2.match = MatchState.Match;
         }
     }
+    public Date getStartDate(){
+        return new Date(StartDate);
+    }
+    public Date getChangeDate(){
+        return new Date(ChangeDate);
+    }
 }
diff --git a/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java b/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java
index e5b220d0..48c7392a 100644
--- a/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java
+++ b/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java
@@ -3,6 +3,7 @@ import Common.Current;
 import Common.Database.DBTable;
 import Common.UI.DataSetControlForm;
 
+import static Common.UI.Tables.TableRenderers.RendererDate;
 import static Common.UI.Tables.TableRenderers.RendererStatusEnum;
 public class SapforTasksDBTable extends DBTable<Long, SapforTask> {
     public SapforTasksDBTable() {
@@ -26,17 +27,9 @@ public class SapforTasksDBTable extends DBTable<Long, SapforTask> {
             @Override
             protected void AdditionalInitColumns() {
                 columns.get(4).setRenderer(RendererStatusEnum);
+                columns.get(5).setRenderer(RendererDate);
+                columns.get(6).setRenderer(RendererDate);
             }
-            @Override
-            public void MouseAction2() throws Exception {
-              //  Pass_2021.passes.get(PassCode_2021.OpenSapforTest).Do();
-            }
-            /*
-            @Override
-            public boolean hasCheckBox() {
-                return true;
-            }
-             */
         };
     }
     @Override
@@ -46,6 +39,8 @@ public class SapforTasksDBTable extends DBTable<Long, SapforTask> {
                 "Тест",
                 "Флаги",
                 "Статус",
+                "Начало",
+                "Окончание",
                 "Версии"
         };
     }
@@ -61,6 +56,10 @@ public class SapforTasksDBTable extends DBTable<Long, SapforTask> {
             case 4:
                 return object.state;
             case 5:
+                return object.getStartDate();
+            case 6:
+                return object.getChangeDate();
+            case 7:
                 return object.versionsDescription;
             default:
                 return null;