From b445e3e87933ae53a494ccb35c86c9a64da589a3 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 20 Feb 2025 00:49:30 +0300
Subject: [PATCH] =?UTF-8?q?=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B0=D0=B4=D1=80=D0=B5=D1=81=D0=B0=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B2=20=D0=B8=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=82=D0=B5=D0=BB=D1=8F.=D0=B2=D0=BE=D1=81=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                               | 15 +++------------
 .../BugReport/Json/RecipientsJson.java            |  1 -
 .../Recipient/UI/RecipientsForm.java              |  6 ++++++
 .../Passes/All/SaveBugReportExecutor.java         |  9 +++------
 .../Passes/All/SaveBugReportRecipients.java       |  5 +++--
 5 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 65ee5898..2ae46a43 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,19 +7,10 @@
   </component>
   <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/_VisualDVM/ComponentsServer/BugReport/BugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/BugReport.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientsJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientsJson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/Json/RecipientJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/Json/UserAccountJson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/Json/RecipientsJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/Json/UserAccountsJson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/Recipient.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/Recipient.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/RecipientsDataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/RecipientsDataSet.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportField.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeBugReports.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/UI/RecipientsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/UI/RecipientsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportExecutor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportExecutor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientsJson.java b/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientsJson.java
index 06706572..6230a368 100644
--- a/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientsJson.java
+++ b/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientsJson.java
@@ -9,7 +9,6 @@ public class RecipientsJson {
     public List<RecipientJson> array = new Vector<>();
     public RecipientsJson() {
     }
-    //при создании пакета.
     public RecipientsJson(Vector<? extends Recipient> recipients) {
         array = new Vector<>();
         for (Recipient recipient : recipients)
diff --git a/src/_VisualDVM/ComponentsServer/Recipient/UI/RecipientsForm.java b/src/_VisualDVM/ComponentsServer/Recipient/UI/RecipientsForm.java
index 7fee82c6..bbbb0ce5 100644
--- a/src/_VisualDVM/ComponentsServer/Recipient/UI/RecipientsForm.java
+++ b/src/_VisualDVM/ComponentsServer/Recipient/UI/RecipientsForm.java
@@ -1,9 +1,11 @@
 package _VisualDVM.ComponentsServer.Recipient.UI;
 import Common.Database.Tables.DataSet;
 import Common.Visual.DataSetControlForm;
+import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.ColumnInfo;
 import _VisualDVM.ComponentsServer.Recipient.Recipient;
 import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
+import _VisualDVM.Passes.PassCode;
 
 import javax.swing.*;
 public class RecipientsForm extends DataSetControlForm<Recipient> {
@@ -21,4 +23,8 @@ public class RecipientsForm extends DataSetControlForm<Recipient> {
                 }
         );
     }
+    @Override
+    protected DataMenuBar createMenuBar() {
+        return new DataMenuBar(dataSource.getPluralDescription(), PassCode.SaveBugReportExecutor,PassCode.SaveBugReportRecipients);
+    }
 }
diff --git a/src/_VisualDVM/Passes/All/SaveBugReportExecutor.java b/src/_VisualDVM/Passes/All/SaveBugReportExecutor.java
index c6aefc74..31ca629c 100644
--- a/src/_VisualDVM/Passes/All/SaveBugReportExecutor.java
+++ b/src/_VisualDVM/Passes/All/SaveBugReportExecutor.java
@@ -11,12 +11,9 @@ public class SaveBugReportExecutor extends UpdateBugReportField {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        return false;
-        /*
-        return Global.componentsServer.db.subscribers.getUI().CheckCurrent(Log) &&
-                super.canStart("executor", Global.componentsServer.db.subscribers.getUI().getCurrent().name,
-                        "executor_address", Global.componentsServer.db.subscribers.getUI().getCurrent().address
+        return Global.componentsServer.db.recipients.getUI().CheckCurrent(Log) &&
+                super.canStart("executor", Global.componentsServer.db.recipients.getUI().getCurrent().name,
+                        "executor_address", Global.componentsServer.db.recipients.getUI().getCurrent().email
                 );
-         */
     }
 }
diff --git a/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java b/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java
index 002c93a9..ffa1f599 100644
--- a/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java
+++ b/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java
@@ -13,7 +13,8 @@ public class SaveBugReportRecipients extends UpdateBugReportField {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        //return super.canStart("packedRecipientsJson", Utils_.gson.toJson(new RecipientsJson(Global.componentsServer.db.subscribers.getUI().getSelectedItems())));
-        return false;
+        return super.canStart("packedRecipientsJson",
+                Utils_.gson.toJson(new RecipientsJson(Global.componentsServer.db.recipients.getUI().getSelectedItems())));
+
     }
 }