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

Справа добавлена галочка фильтрации пакетов тестирования, позволяющая показать только свои пакеты.

Browse Source 
v++
This commit is contained in:
02090095
2024-03-10 00:42:29 +03:00
parent eeaf4d7217
commit f52a062e86
8 changed files with 65 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Repository/Component/Visualiser.java
View File

@@ -62,7 +62,7 @@ public class Visualiser extends Component {
//http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
@Override
public void GetVersionInfo() {
version = 1075;
version = 1076;
String pattern = "MMM dd yyyy HH:mm:ss";
DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
date_text = df.format(getClassBuildTime());

6
src/TestingSystem/DVM/DVMPackage/DVMPackage.java
View File

@@ -1,10 +1,12 @@
package TestingSystem.DVM.DVMPackage;
import Common.Current;
import Common.Database.DBObject;
import Common.Global;
import GlobalData.Machine.Machine;
import GlobalData.Machine.MachineType;
import GlobalData.User.User;
import TestingSystem.Common.TestingPackage.TestingPackage;
import TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
import java.io.File;
public class DVMPackage extends TestingPackage<DVMPackage_json> {
@@ -49,4 +51,8 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
public User getUser() {
return new User(user_name, user_password, user_workspace);
}
@Override
public boolean isVisible() {
return !DVMPackageDBTable.filterMyOnly || Current.getAccount().email.equals(sender_address);
}
}

1
src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
View File

@@ -9,6 +9,7 @@ import java.util.Date;
import static Common.UI.Tables.TableRenderers.*;
public class DVMPackageDBTable extends iDBTable<DVMPackage> {
public static boolean filterMyOnly = false;
public DVMPackageDBTable() {
super(DVMPackage.class);
}

22
src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
View File

@@ -1,6 +1,12 @@
package TestingSystem.DVM.DVMPackage;
import Common.Global;
import Common.UI.Menus_2023.DataMenuBar;
import Common.UI.Menus_2023.MenuBarButton;
import Common.Utils.Utils;
import TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.*;
public class DVMPackagesBar extends DataMenuBar {
public DVMPackagesBar() {
super("пакеты задач DVM",
@@ -14,5 +20,21 @@ public class DVMPackagesBar extends DataMenuBar {
PassCode_2021.DeleteDVMPackage,
PassCode_2021.ExportDVMPackageToExcel
);
add(new JSeparator());
add(new MenuBarButton() {
{
setText("Свои");
setToolTipText("Отображать только пакеты тестов авторства пользователя");
Mark();
addActionListener(e -> {
DVMPackageDBTable.filterMyOnly = ! DVMPackageDBTable.filterMyOnly;
Mark();
Global.testingServer.db.dvmPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils.getIcon( DVMPackageDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png"));
}
});
}
}

6
src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
View File

@@ -1,8 +1,10 @@
package TestingSystem.SAPFOR.SapforPackage;
import Common.Constants;
import Common.Current;
import Common.Database.DBObject;
import Common.Global;
import Common.Utils.Utils;
import TestingSystem.Common.Group.GroupsDBTable;
import TestingSystem.Common.TestingPackage.TestingPackage;
import TestingSystem.SAPFOR.Json.SapforPackage_json;
import TestingSystem.SAPFOR.Json.SapforTestingSet_json;
@@ -61,4 +63,8 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
}
return new_tasks;
}
@Override
public boolean isVisible() {
return !SapforPackageDBTable.filterMyOnly || Current.getAccount().email.equals(sender_address);
}
}

1
src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
View File

@@ -7,6 +7,7 @@ import java.util.Date;
import static Common.UI.Tables.TableRenderers.*;
public class SapforPackageDBTable extends iDBTable<SapforPackage> {
public static boolean filterMyOnly = false;
@Override
public Current CurrentName() {
return Current.SapforPackage;

23
src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
View File

@@ -1,6 +1,13 @@
package TestingSystem.SAPFOR.SapforTasksPackage.UI;
import Common.Global;
import Common.UI.Menus_2023.DataMenuBar;
import Common.UI.Menus_2023.MenuBarButton;
import Common.Utils.Utils;
import TestingSystem.Common.Group.GroupsDBTable;
import TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.*;
public class SapforPackagesBar extends DataMenuBar {
public SapforPackagesBar() {
super("пакеты задач SAPFOR",
@@ -13,5 +20,21 @@ public class SapforPackagesBar extends DataMenuBar {
PassCode_2021.AbortSapforPackage,
PassCode_2021.DeleteSapforPackage
);
add(new JSeparator());
add(new MenuBarButton() {
{
setText("Свои");
setToolTipText("Отображать только пакеты тестов авторства пользователя");
Mark();
addActionListener(e -> {
SapforPackageDBTable.filterMyOnly = !SapforPackageDBTable.filterMyOnly;
Mark();
Global.testingServer.db.sapforPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils.getIcon(SapforPackageDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png"));
}
});
}
}