From 905e1646e467b4f1900f31a0164809b95e05685b Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 22 Jul 2024 20:52:37 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B3=D0=B0=D0=BB=D0=BE=D1=87=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=B0=D0=BA?=
 =?UTF-8?q?=D1=82=D0=B8=D0=B2=D0=BD=D1=8B=D1=85=20=D0=BF=D0=B0=D0=BA=D0=B5?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                               |  7 ++++++-
 src/TestingSystem/DVM/DVMPackage/DVMPackage.java  |  3 ++-
 .../DVM/DVMPackage/DVMPackageDBTable.java         |  1 +
 .../DVM/DVMPackage/DVMPackagesBar.java            | 15 +++++++++++++++
 .../SAPFOR/SapforPackage/SapforPackage.java       |  4 +++-
 .../SapforPackage/SapforPackageDBTable.java       |  1 +
 .../SapforTasksPackage/UI/SapforPackagesBar.java  | 15 +++++++++++++++
 7 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7bceb5f0..bf5838dd 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/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" 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/TestingSystem/DVM/DVMPackage/DVMPackage.java b/src/TestingSystem/DVM/DVMPackage/DVMPackage.java
index 4118de25..0cdaf076 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackage.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackage.java
@@ -53,6 +53,7 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
     }
     @Override
     public boolean isVisible() {
-        return !DVMPackageDBTable.filterMyOnly || Current.getAccount().email.equals(sender_address);
+        return (!DVMPackageDBTable.filterMyOnly || Current.getAccount().email.equals(sender_address))&&
+                (!DVMPackageDBTable.filterActive || state.isActive() );
     }
 }
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java b/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
index 4d952fbf..4923da47 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
@@ -12,6 +12,7 @@ import java.util.Date;
 import static Common.UI.Tables.TableRenderers.*;
 public class DVMPackageDBTable extends iDBTable<DVMPackage> {
     public static boolean filterMyOnly = false;
+    public static boolean filterActive = false;
     public DVMPackageDBTable() {
         super(DVMPackage.class);
     }
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java b/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
index bd6b095b..c5dad590 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
@@ -39,5 +39,20 @@ public class DVMPackagesBar extends DataMenuBar {
                 setIcon(Utils.getIcon(DVMPackageDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png"));
             }
         });
+        add(new MenuBarButton() {
+            {
+                setText("Активные");
+                setToolTipText("Отображать только активные пакеты тестов");
+                Mark();
+                addActionListener(e -> {
+                    DVMPackageDBTable.filterActive = !DVMPackageDBTable.filterActive;
+                    Mark();
+                    Global.testingServer.db.dvmPackages.ShowUI();
+                });
+            }
+            public void Mark() {
+                setIcon(Utils.getIcon(DVMPackageDBTable.filterActive ? "/icons/Pick.png" : "/icons/NotPick.png"));
+            }
+        });
     }
 }
diff --git a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
index 36e94cab..1a7a91a2 100644
--- a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
+++ b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
@@ -65,6 +65,8 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
     }
     @Override
     public boolean isVisible() {
-        return !SapforPackageDBTable.filterMyOnly || Current.getAccount().email.equals(sender_address);
+        return (!SapforPackageDBTable.filterMyOnly ||Current.getAccount().email.equals(sender_address)) &&
+                (!SapforPackageDBTable.filterActive || state.isActive() )
+                ;
     }
 }
diff --git a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
index 7507b595..bbd6906d 100644
--- a/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
@@ -13,6 +13,7 @@ import java.util.Vector;
 import static Common.UI.Tables.TableRenderers.*;
 public class SapforPackageDBTable extends iDBTable<SapforPackage> {
     public static boolean filterMyOnly = false;
+    public static boolean filterActive = 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 4a5de777..a6cd1ed3 100644
--- a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
@@ -40,5 +40,20 @@ public class SapforPackagesBar extends DataMenuBar {
                 setIcon(Utils.getIcon(SapforPackageDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png"));
             }
         });
+        add(new MenuBarButton() {
+            {
+                setText("Активные");
+                setToolTipText("Отображать только активные пакеты тестов");
+                Mark();
+                addActionListener(e -> {
+                    SapforPackageDBTable.filterActive = !SapforPackageDBTable.filterActive;
+                    Mark();
+                    Global.testingServer.db.sapforPackages.ShowUI();
+                });
+            }
+            public void Mark() {
+                setIcon(Utils.getIcon(SapforPackageDBTable.filterActive ? "/icons/Pick.png" : "/icons/NotPick.png"));
+            }
+        });
     }
 }