M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Если все фильтры отключены, они не учитываются.

Browse Source
This commit is contained in:
02090095
2023-12-26 19:41:11 +03:00
parent ce31d5dae2
commit 7030e13238
4 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/workspace.xml generated
View File

@@ -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/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/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/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> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

3
src/Common/Database/DBObjectFilter.java
View File

@@ -53,5 +53,8 @@ public abstract class DBObjectFilter<D extends DBObject> {
public void Refresh() { public void Refresh() {
menuItem.setText(description + " " + Utils.RBrackets(count)); menuItem.setText(description + " " + Utils.RBrackets(count));
} }
public boolean isActive() {
return active;
}
//-- //--
} }

1
src/Common/Database/DataSet.java
View File

@@ -274,7 +274,6 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
filter.Refresh(); filter.Refresh();
} }
public boolean applyFilters(D object) { public boolean applyFilters(D object) {
//todo добавить ситуацию когда все фильтры отменены
for (DataSetFilter<D> filter : filters) { for (DataSetFilter<D> filter : filters) {
if (!filter.Validate(object)) if (!filter.Validate(object))
return false; return false;

24
src/Common/Database/DataSetFilter.java
View File

@@ -25,13 +25,6 @@ public abstract class DataSetFilter<D extends DBObject> {
for (DBObjectFilter filter : filters) for (DBObjectFilter filter : filters)
filter.setActive(flag); 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 abstract void fill();
public void Drop() { public void Drop() {
for (DBObjectFilter<D> filter : filters) for (DBObjectFilter<D> filter : filters)
@@ -41,4 +34,21 @@ public abstract class DataSetFilter<D extends DBObject> {
for (DBObjectFilter<D> filter : filters) for (DBObjectFilter<D> filter : filters)
filter.Refresh(); 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;
}
} }