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

приведение фильтров к объекту интерфейса таблицы

Browse Source
This commit is contained in:
02090095
2024-10-17 21:49:18 +03:00
parent 452c023f1d
commit c9c8519a10
9 changed files with 97 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/_VisualDVM/TestingSystem/Common/Group/Group.java
View File

@@ -72,7 +72,7 @@ public class Group extends riDBObject {
@Override
public boolean isVisible() {
return (!GroupsDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(sender_address)) &&
Global.testingServer.db.groups.applyFilters(this);
Global.testingServer.db.groups.getUI().ApplyFilters(this);
}
public String getSummary() {
return description + " " + language.getDescription();

58
src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
View File

@@ -9,7 +9,7 @@ import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DBObjectFilter;
import Common.Visual.DataSetControlForm;
import Common.Visual.DataSetFilter;
import Common.Visual.DataSetFiltersMenu;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
@@ -33,34 +33,6 @@ public class GroupsDBTable extends iDBTable<Group> {
}
//------------------------------------------------>>>
@Override
protected void createFilters() {
filters.add(new Common.Visual.DataSetFilter<Group>("Тип", this) {
@Override
public void fill() {
for (TestType type : TestType.values())
field_filters.add(new Common.Visual.DBObjectFilter<Group>(dataSet, type.getDescription()) {
@Override
protected boolean validate(Group object) {
return object.type.equals(type);
}
});
}
});
filters.add(new DataSetFilter<Group>("Язык", this) {
@Override
public void fill() {
for (LanguageName languageName : LanguageName.values()) {
field_filters.add(new DBObjectFilter<Group>(dataSet, languageName.getDescription()) {
@Override
protected boolean validate(Group object) {
return object.language.equals(languageName);
}
});
}
}
});
}
@Override
public String getSingleDescription() {
return "группа тестов";
}
@@ -108,6 +80,34 @@ public class GroupsDBTable extends iDBTable<Group> {
}
};
}
@Override
protected void createFilters() {
filters.add(new DataSetFiltersMenu<Group>("Тип", dataSource) {
@Override
public void fill() {
for (TestType type : TestType.values())
field_filters.add(new Common.Visual.DBObjectFilter<Group>(dataSet, type.getDescription()) {
@Override
protected boolean validate(Group object) {
return object.type.equals(type);
}
});
}
});
filters.add(new DataSetFiltersMenu<Group>("Язык", dataSource) {
@Override
public void fill() {
for (LanguageName languageName : LanguageName.values()) {
field_filters.add(new DBObjectFilter<Group>(dataSet, languageName.getDescription()) {
@Override
protected boolean validate(Group object) {
return object.language.equals(languageName);
}
});
}
}
});
}
};
}
@Override

2
src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTask.java
View File

@@ -113,7 +113,7 @@ public class DVMRunTask extends DVMTask {
}
@Override
public boolean isVisible() {
return Global.testingServer.db.dvmRunTasks.applyFilters(this);
return Global.testingServer.db.dvmRunTasks.getUI().ApplyFilters(this);
}
public File getCompilationTaskWorkspace() {
return Paths.get(

68
src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
View File

@@ -2,7 +2,7 @@ package _VisualDVM.TestingSystem.DVM.DVMTasks;
import Common.Database.Tables.DataSet;
import Common.Visual.DBObjectFilter;
import Common.Visual.DataSetControlForm;
import Common.Visual.DataSetFilter;
import Common.Visual.DataSetFiltersMenu;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum;
@@ -20,39 +20,6 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
super(Integer.class, DVMRunTask.class);
}
@Override
protected void createFilters() {
filters.add(new DataSetFilter<DVMRunTask>("Компиляция", this) {
@Override
public void fill() {
for (TaskState state : TaskState.values()) {
if (state.isVisible()) {
field_filters.add(new DBObjectFilter<DVMRunTask>(dataSet, state.getDescription()) {
@Override
protected boolean validate(DVMRunTask object) {
return object.compilation_state.equals(state);
}
});
}
}
}
});
filters.add(new DataSetFilter<DVMRunTask>("Запуск", this) {
@Override
public void fill() {
for (TaskState state : TaskState.values()) {
if (state.isVisible()) {
field_filters.add(new DBObjectFilter<DVMRunTask>(dataSet, state.getDescription()) {
@Override
protected boolean validate(DVMRunTask object) {
return object.state.equals(state);
}
});
}
}
}
});
}
@Override
public String getSingleDescription() {
return "задача";
}
@@ -77,6 +44,39 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.CompareDVMRunTasks, PassCode.DownloadTaskTest);
}
@Override
protected void createFilters() {
filters.add(new DataSetFiltersMenu<DVMRunTask>("Компиляция", dataSource) {
@Override
public void fill() {
for (TaskState state : TaskState.values()) {
if (state.isVisible()) {
field_filters.add(new DBObjectFilter<DVMRunTask>(dataSet, state.getDescription()) {
@Override
protected boolean validate(DVMRunTask object) {
return object.compilation_state.equals(state);
}
});
}
}
}
});
filters.add(new DataSetFiltersMenu<DVMRunTask>("Запуск", dataSource) {
@Override
public void fill() {
for (TaskState state : TaskState.values()) {
if (state.isVisible()) {
field_filters.add(new DBObjectFilter<DVMRunTask>(dataSet, state.getDescription()) {
@Override
protected boolean validate(DVMRunTask object) {
return object.state.equals(state);
}
});
}
}
}
});
}
};
}
@Override