From b21e25e9327ba64c10e5c00dd6d19a8472baddb3 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 26 Dec 2023 20:23:09 +0300
Subject: [PATCH] fix

---
 .idea/workspace.xml                           |  3 +-
 src/Common/Database/DataSetFilter.java        | 35 +++++++++++++++++--
 .../Common/Group/GroupsDBTable.java           | 24 +++++++------
 3 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d8f10bf1..0b6bacab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,9 +8,8 @@
   <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/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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Database/DataSetFilter.java b/src/Common/Database/DataSetFilter.java
index c23b0bf5..460d161e 100644
--- a/src/Common/Database/DataSetFilter.java
+++ b/src/Common/Database/DataSetFilter.java
@@ -1,6 +1,10 @@
 package Common.Database;
+import Common.UI.Menus.VisualiserMenuItem;
+import Common.UI.Menus_2023.StableMenuItem;
 import Common.UI.Menus_2023.VisualiserMenu;
 
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.util.Vector;
 public abstract class DataSetFilter<D extends DBObject> {
     public VisualiserMenu menu;
@@ -20,6 +24,28 @@ public abstract class DataSetFilter<D extends DBObject> {
         for (DBObjectFilter<D> filter : filters)
             menu.add(filter.menuItem);
         menu.addSeparator();
+        menu.add(new StableMenuItem("Выбрать всё", "/icons/SelectAll.png") {
+            {
+                addActionListener(new ActionListener() {
+                    @Override
+                    public void actionPerformed(ActionEvent e) {
+                        selectAll(true);
+                        dataSet.ShowUI();
+                    }
+                });
+            }
+        });
+        menu.add(new StableMenuItem("Отменить всё", "/icons/UnselectAll.png") {
+            {
+                addActionListener(new ActionListener() {
+                    @Override
+                    public void actionPerformed(ActionEvent e) {
+                        selectAll(false);
+                        dataSet.ShowUI();
+                    }
+                });
+            }
+        });
     }
     void selectAll(boolean flag) {
         for (DBObjectFilter filter : filters)
@@ -34,15 +60,18 @@ public abstract class DataSetFilter<D extends DBObject> {
         for (DBObjectFilter<D> filter : filters)
             filter.Refresh();
     }
-    public boolean isActive(){
-        for (DBObjectFilter<D> filter: filters){
+    public boolean isActive() {
+        for (DBObjectFilter<D> filter : filters) {
             if (filter.isActive())
                 return true;
         }
         return false;
     }
     public boolean Validate(D object) {
-        if (!isActive()){
+        if (!isActive()) {
+            //считаем без учета результатов
+            for (DBObjectFilter<D> filter : filters)
+                filter.Validate(object);
             return true;
         }
         boolean res = false;
diff --git a/src/TestingSystem/Common/Group/GroupsDBTable.java b/src/TestingSystem/Common/Group/GroupsDBTable.java
index 35af008b..bdecbd95 100644
--- a/src/TestingSystem/Common/Group/GroupsDBTable.java
+++ b/src/TestingSystem/Common/Group/GroupsDBTable.java
@@ -34,17 +34,21 @@ public class GroupsDBTable extends iDBTable<Group> {
                     });
             }
         });
+        filters.add(new DataSetFilter<Group>("Язык", this) {
+            @Override
+            public void fill() {
+                for (LanguageName languageName : LanguageName.values()) {
+                    filters.add(new DBObjectFilter<Group>(dataSet, languageName.getDescription()) {
+                        @Override
+                        protected boolean validate(Group object) {
+                            return object.language.equals(languageName);
+                        }
+                    });
+                }
+            }
+        });
     }
-    /*
-    for (LanguageName languageName : LanguageName.values()) {
-              languageFilters.add(new DBObjectFilter<Group>(this, languageName.getDescription()) {
-                  @Override
-                  protected boolean validate(Group object) {
-                      return object.language.equals(languageName);
-                  }
-              });
-          }
-  */
+
     @Override
     public String getSingleDescription() {
         return "группа тестов";