From d19307ac2b2f27f39a5b94992c7e1e7481a8e5d0 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 17 Oct 2023 22:53:38 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BE=D0=BF=D0=BE=D0=B2=D0=B5=D1=89=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=20=D0=BF=D0=BE=D1=87=D1=82?=
 =?UTF-8?q?=D0=B5=20=D0=BE=20=D1=82=D0=B5=D1=81=D1=82=D0=B8=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B8=20=D1=81=D0=B0=D0=BF=D1=84=D0=BE?=
 =?UTF-8?q?=D1=80.=20=D0=BF=D0=BE=D0=BA=D0=B0=20=D0=BF=D1=80=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D0=BE=20=D0=B8=D0=B4=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82?=
 =?UTF-8?q?=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                                  | 12 +++---------
 .../SapforTasksPackage/SapforTasksPackage.java       | 10 ++++++----
 src/TestingSystem/TestingPlanner.java                |  9 +++++++++
 src/Visual_DVM_2021/Passes/All/StartSapforTests.java |  1 +
 src/Visual_DVM_2021/UI/Main/CallbackForm.java        |  1 -
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c266eb73..2ada9877 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,15 +8,9 @@
   <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/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestingBar/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestingBar/TestingBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Messages/Message.java" 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/TestingSystem/Configuration/UI/ConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Configuration/UI/ConfigurationDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CheckAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CheckAccount.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartTests.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
index 034fda17..9bc45173 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
@@ -11,17 +11,18 @@ public class SapforTasksPackage extends nDBObject {
     public int sapforId = Constants.Nan;
     public String sapfor_version = "?"; //тестируемая версия SAPFOR
     public long sapfor_build_date = 0;
-    public String sapfor_drv="";
-    public String sapfor_process_name="";
+    public String sapfor_drv = "";
+    public String sapfor_process_name = "";
     //---
     public String workspace = ""; //домашняя папка
     //---
     public int tasksCount = 0; //Общее число задач
     //---
+    public int needsEmail = 0;
     public long StartDate = 0; //дата начала выполнения
     public long ChangeDate = 0;//дата окончания выполнения
     //-
-    public int kernels=1; //количество потоков.
+    public int kernels = 1; //количество потоков.
     @Description("DEFAULT 'TestsSynchronize'")
     public TasksPackageState state = TasksPackageState.TestsSynchronize;
     @Description("DEFAULT ''")
@@ -41,7 +42,7 @@ public class SapforTasksPackage extends nDBObject {
         sapforId = p.sapforId;
         testsNames = p.testsNames;
         sapfor_version = p.sapfor_version;
-        sapfor_build_date =p.sapfor_build_date;
+        sapfor_build_date = p.sapfor_build_date;
         workspace = p.workspace;
         tasksCount = p.tasksCount;
         StartDate = p.StartDate;
@@ -49,5 +50,6 @@ public class SapforTasksPackage extends nDBObject {
         kernels = p.kernels;
         sapfor_process_name = p.sapfor_process_name;
         state = p.state;
+        needsEmail = p.needsEmail;
     }
 }
diff --git a/src/TestingSystem/TestingPlanner.java b/src/TestingSystem/TestingPlanner.java
index 6124a408..b4c58b7b 100644
--- a/src/TestingSystem/TestingPlanner.java
+++ b/src/TestingSystem/TestingPlanner.java
@@ -209,5 +209,14 @@ public class TestingPlanner {
     public void UpdateSapforPackage(SapforTasksPackage package_in) throws Exception {
         package_in.ChangeDate = new Date().getTime();
         ServerCommand(ServerCode.EditAccountObject, package_in);
+        if ((package_in.needsEmail == 1) &&
+                (package_in.state.equals(TasksPackageState.RunningExecution) ||
+                        (package_in.state.equals(TasksPackageState.Done)))) {
+            EmailMessage message = new EmailMessage();
+            message.subject = "Состояние пакета задач SAPFOR" + Utils.Brackets(package_in.id) + " изменилось на " + Utils.Brackets(package_in.state.getDescription());
+           // message.text = package_in.summary;
+            message.targets.add(email);
+            ServerCommand(ServerCode.Email, message);
+        }
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
index 4dc3bfe3..8e701d83 100644
--- a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
+++ b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
@@ -225,6 +225,7 @@ public class StartSapforTests extends TestingSystemPass<SapforTasksPackage> {
         target.StartDate = new Date().getTime();
         target.kernels = TestingServer.kernels;
         target.state = TasksPackageState.Queued;
+        target.needsEmail = TestingServer.email ? 1 : 0;
         //---
         Vector<SapforTasksPackage> packages = new Vector<>();
         packages.add(target);
diff --git a/src/Visual_DVM_2021/UI/Main/CallbackForm.java b/src/Visual_DVM_2021/UI/Main/CallbackForm.java
index 465cd84c..298b9a3e 100644
--- a/src/Visual_DVM_2021/UI/Main/CallbackForm.java
+++ b/src/Visual_DVM_2021/UI/Main/CallbackForm.java
@@ -166,7 +166,6 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
         //-
         if (!Pass_2021.passes.get(PassCode_2021.CheckAccount).isDone()) {
             accountTools.add(Pass_2021.passes.get(PassCode_2021.CheckAccount).createButton());
-            UI.Info("+");
         }
         //--
         BugReportsKeyFilter.getDocument().addDocumentListener(new DocumentListener() {