From f52a062e86de258cd063d06c84100c90ed8dffc6 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 10 Mar 2024 00:42:29 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BF=D1=80=D0=B0=D0=B2=D0=B0=20=D0=B4?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=B3=D0=B0?=
 =?UTF-8?q?=D0=BB=D0=BE=D1=87=D0=BA=D0=B0=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82?=
 =?UTF-8?q?=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B2=20=D1=82=D0=B5=D1=81=D1=82=D0=B8=D1=80=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F,=20=D0=BF=D0=BE=D0=B7=D0=B2=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=8F=D1=8E=D1=89=D0=B0=D1=8F=20=D0=BF=D0=BE=D0=BA=D0=B0?=
 =?UTF-8?q?=D0=B7=D0=B0=D1=82=D1=8C=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE?=
 =?UTF-8?q?=20=D1=81=D0=B2=D0=BE=D0=B8=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82?=
 =?UTF-8?q?=D1=8B.=20v++?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  5 ++++
 src/Repository/Component/Visualiser.java      |  2 +-
 .../DVM/DVMPackage/DVMPackage.java            |  6 +++++
 .../DVM/DVMPackage/DVMPackageDBTable.java     |  1 +
 .../DVM/DVMPackage/DVMPackagesBar.java        | 22 ++++++++++++++++++
 .../SAPFOR/SapforPackage/SapforPackage.java   |  6 +++++
 .../SapforPackage/SapforPackageDBTable.java   |  1 +
 .../UI/SapforPackagesBar.java                 | 23 +++++++++++++++++++
 8 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bc21d482..25be087a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,7 +8,12 @@
   <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/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java
index 7f688533..046eddcd 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 = 1075;
+        version = 1076;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackage.java b/src/TestingSystem/DVM/DVMPackage/DVMPackage.java
index b32b46a5..4118de25 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackage.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackage.java
@@ -1,10 +1,12 @@
 package TestingSystem.DVM.DVMPackage;
+import Common.Current;
 import Common.Database.DBObject;
 import Common.Global;
 import GlobalData.Machine.Machine;
 import GlobalData.Machine.MachineType;
 import GlobalData.User.User;
 import TestingSystem.Common.TestingPackage.TestingPackage;
+import TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
 
 import java.io.File;
 public class DVMPackage extends TestingPackage<DVMPackage_json> {
@@ -49,4 +51,8 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
     public User getUser() {
         return new User(user_name, user_password, user_workspace);
     }
+    @Override
+    public boolean isVisible() {
+        return !DVMPackageDBTable.filterMyOnly || Current.getAccount().email.equals(sender_address);
+    }
 }
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java b/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
index 79df0dff..25922ffe 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
@@ -9,6 +9,7 @@ import java.util.Date;
 
 import static Common.UI.Tables.TableRenderers.*;
 public class DVMPackageDBTable extends iDBTable<DVMPackage> {
+    public static boolean filterMyOnly = false;
     public DVMPackageDBTable() {
         super(DVMPackage.class);
     }
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java b/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
index 9742b2b6..275606da 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
@@ -1,6 +1,12 @@
 package TestingSystem.DVM.DVMPackage;
+import Common.Global;
 import Common.UI.Menus_2023.DataMenuBar;
+import Common.UI.Menus_2023.MenuBarButton;
+import Common.Utils.Utils;
+import TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
 import Visual_DVM_2021.Passes.PassCode_2021;
+
+import javax.swing.*;
 public class DVMPackagesBar extends DataMenuBar {
     public DVMPackagesBar() {
         super("пакеты задач DVM",
@@ -14,5 +20,21 @@ public class DVMPackagesBar extends DataMenuBar {
                 PassCode_2021.DeleteDVMPackage,
                 PassCode_2021.ExportDVMPackageToExcel
         );
+        add(new JSeparator());
+        add(new MenuBarButton() {
+            {
+                setText("Свои");
+                setToolTipText("Отображать только пакеты тестов авторства пользователя");
+                Mark();
+                addActionListener(e -> {
+                    DVMPackageDBTable.filterMyOnly = ! DVMPackageDBTable.filterMyOnly;
+                    Mark();
+                    Global.testingServer.db.dvmPackages.ShowUI();
+                });
+            }
+            public void Mark() {
+                setIcon(Utils.getIcon( DVMPackageDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png"));
+            }
+        });
     }
 }
diff --git a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
index b0d87d16..36e94cab 100644
--- a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
+++ b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
@@ -1,8 +1,10 @@
 package TestingSystem.SAPFOR.SapforPackage;
 import Common.Constants;
+import Common.Current;
 import Common.Database.DBObject;
 import Common.Global;
 import Common.Utils.Utils;
+import TestingSystem.Common.Group.GroupsDBTable;
 import TestingSystem.Common.TestingPackage.TestingPackage;
 import TestingSystem.SAPFOR.Json.SapforPackage_json;
 import TestingSystem.SAPFOR.Json.SapforTestingSet_json;
@@ -61,4 +63,8 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
         }
         return new_tasks;
     }
+    @Override
+    public boolean isVisible() {
+        return !SapforPackageDBTable.filterMyOnly || Current.getAccount().email.equals(sender_address);
+    }
 }
diff --git a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
index 15a5f01b..82b66abb 100644
--- a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
@@ -7,6 +7,7 @@ import java.util.Date;
 
 import static Common.UI.Tables.TableRenderers.*;
 public class SapforPackageDBTable extends iDBTable<SapforPackage> {
+    public static boolean filterMyOnly = false;
     @Override
     public Current CurrentName() {
         return Current.SapforPackage;
diff --git a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
index 6cdb6f97..951106a8 100644
--- a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
@@ -1,6 +1,13 @@
 package TestingSystem.SAPFOR.SapforTasksPackage.UI;
+import Common.Global;
 import Common.UI.Menus_2023.DataMenuBar;
+import Common.UI.Menus_2023.MenuBarButton;
+import Common.Utils.Utils;
+import TestingSystem.Common.Group.GroupsDBTable;
+import TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
 import Visual_DVM_2021.Passes.PassCode_2021;
+
+import javax.swing.*;
 public class SapforPackagesBar extends DataMenuBar {
     public SapforPackagesBar() {
         super("пакеты задач SAPFOR",
@@ -13,5 +20,21 @@ public class SapforPackagesBar extends DataMenuBar {
                 PassCode_2021.AbortSapforPackage,
                 PassCode_2021.DeleteSapforPackage
         );
+        add(new JSeparator());
+        add(new MenuBarButton() {
+            {
+                setText("Свои");
+                setToolTipText("Отображать только пакеты тестов авторства пользователя");
+                Mark();
+                addActionListener(e -> {
+                    SapforPackageDBTable.filterMyOnly = !SapforPackageDBTable.filterMyOnly;
+                    Mark();
+                    Global.testingServer.db.sapforPackages.ShowUI();
+                });
+            }
+            public void Mark() {
+                setIcon(Utils.getIcon(SapforPackageDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png"));
+            }
+        });
     }
 }