From 7030e132382cfee1608b4612f4d2bac33e890541 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 26 Dec 2023 19:41:11 +0300
Subject: [PATCH] =?UTF-8?q?=D0=95=D1=81=D0=BB=D0=B8=20=D0=B2=D1=81=D0=B5?=
 =?UTF-8?q?=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D1=8B=20=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D1=8B,=20=D0=BE=D0=BD?=
 =?UTF-8?q?=D0=B8=20=D0=BD=D0=B5=20=D1=83=D1=87=D0=B8=D1=82=D1=8B=D0=B2?=
 =?UTF-8?q?=D0=B0=D1=8E=D1=82=D1=81=D1=8F.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                     |  3 ---
 src/Common/Database/DBObjectFilter.java |  3 +++
 src/Common/Database/DataSet.java        |  1 -
 src/Common/Database/DataSetFilter.java  | 24 +++++++++++++++++-------
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4f18841b..d8f10bf1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -11,9 +11,6 @@
       <change beforePath="$PROJECT_DIR$/src/Common/Database/DBObjectFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/DBObjectFilter.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/Database/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/DataSet.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/Database/DataSetFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/DataSetFilter.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Database/DBObjectFilter.java b/src/Common/Database/DBObjectFilter.java
index 1e4c57ef..f6b71563 100644
--- a/src/Common/Database/DBObjectFilter.java
+++ b/src/Common/Database/DBObjectFilter.java
@@ -53,5 +53,8 @@ public abstract class DBObjectFilter<D extends DBObject> {
     public void Refresh() {
         menuItem.setText(description + " " + Utils.RBrackets(count));
     }
+    public boolean isActive() {
+        return active;
+    }
     //--
 }
diff --git a/src/Common/Database/DataSet.java b/src/Common/Database/DataSet.java
index 8211b3d5..0e585fff 100644
--- a/src/Common/Database/DataSet.java
+++ b/src/Common/Database/DataSet.java
@@ -274,7 +274,6 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
             filter.Refresh();
     }
     public boolean applyFilters(D object) {
-        //todo добавить ситуацию когда все фильтры отменены
         for (DataSetFilter<D> filter : filters) {
             if (!filter.Validate(object))
                 return false;
diff --git a/src/Common/Database/DataSetFilter.java b/src/Common/Database/DataSetFilter.java
index 53714366..c23b0bf5 100644
--- a/src/Common/Database/DataSetFilter.java
+++ b/src/Common/Database/DataSetFilter.java
@@ -25,13 +25,6 @@ public abstract class DataSetFilter<D extends DBObject> {
         for (DBObjectFilter filter : filters)
             filter.setActive(flag);
     }
-    public boolean Validate(D object) {
-        boolean res = false;
-        for (DBObjectFilter<D> filter : filters)
-            if (filter.Validate(object))
-                res |= true;
-        return res;
-    }
     public abstract void fill();
     public void Drop() {
         for (DBObjectFilter<D> filter : filters)
@@ -41,4 +34,21 @@ public abstract class DataSetFilter<D extends DBObject> {
         for (DBObjectFilter<D> filter : filters)
             filter.Refresh();
     }
+    public boolean isActive(){
+        for (DBObjectFilter<D> filter: filters){
+            if (filter.isActive())
+                return true;
+        }
+        return false;
+    }
+    public boolean Validate(D object) {
+        if (!isActive()){
+            return true;
+        }
+        boolean res = false;
+        for (DBObjectFilter<D> filter : filters)
+            if (filter.Validate(object))
+                res |= true;
+        return res;
+    }
 }