Справа добавлена галочка фильтрации пакетов тестирования, позволяющая показать только свои пакеты.
v++
This commit is contained in:
5
.idea/workspace.xml
generated
5
.idea/workspace.xml
generated
@@ -8,7 +8,12 @@
|
|||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
<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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.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" />
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ public class Visualiser extends Component {
|
|||||||
//http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
|
//http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
|
||||||
@Override
|
@Override
|
||||||
public void GetVersionInfo() {
|
public void GetVersionInfo() {
|
||||||
version = 1075;
|
version = 1076;
|
||||||
String pattern = "MMM dd yyyy HH:mm:ss";
|
String pattern = "MMM dd yyyy HH:mm:ss";
|
||||||
DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
|
DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
|
||||||
date_text = df.format(getClassBuildTime());
|
date_text = df.format(getClassBuildTime());
|
||||||
|
|||||||
@@ -1,10 +1,12 @@
|
|||||||
package TestingSystem.DVM.DVMPackage;
|
package TestingSystem.DVM.DVMPackage;
|
||||||
|
import Common.Current;
|
||||||
import Common.Database.DBObject;
|
import Common.Database.DBObject;
|
||||||
import Common.Global;
|
import Common.Global;
|
||||||
import GlobalData.Machine.Machine;
|
import GlobalData.Machine.Machine;
|
||||||
import GlobalData.Machine.MachineType;
|
import GlobalData.Machine.MachineType;
|
||||||
import GlobalData.User.User;
|
import GlobalData.User.User;
|
||||||
import TestingSystem.Common.TestingPackage.TestingPackage;
|
import TestingSystem.Common.TestingPackage.TestingPackage;
|
||||||
|
import TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
public class DVMPackage extends TestingPackage<DVMPackage_json> {
|
public class DVMPackage extends TestingPackage<DVMPackage_json> {
|
||||||
@@ -49,4 +51,8 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
|
|||||||
public User getUser() {
|
public User getUser() {
|
||||||
return new User(user_name, user_password, user_workspace);
|
return new User(user_name, user_password, user_workspace);
|
||||||
}
|
}
|
||||||
|
@Override
|
||||||
|
public boolean isVisible() {
|
||||||
|
return !DVMPackageDBTable.filterMyOnly || Current.getAccount().email.equals(sender_address);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import java.util.Date;
|
|||||||
|
|
||||||
import static Common.UI.Tables.TableRenderers.*;
|
import static Common.UI.Tables.TableRenderers.*;
|
||||||
public class DVMPackageDBTable extends iDBTable<DVMPackage> {
|
public class DVMPackageDBTable extends iDBTable<DVMPackage> {
|
||||||
|
public static boolean filterMyOnly = false;
|
||||||
public DVMPackageDBTable() {
|
public DVMPackageDBTable() {
|
||||||
super(DVMPackage.class);
|
super(DVMPackage.class);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,12 @@
|
|||||||
package TestingSystem.DVM.DVMPackage;
|
package TestingSystem.DVM.DVMPackage;
|
||||||
|
import Common.Global;
|
||||||
import Common.UI.Menus_2023.DataMenuBar;
|
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 Visual_DVM_2021.Passes.PassCode_2021;
|
||||||
|
|
||||||
|
import javax.swing.*;
|
||||||
public class DVMPackagesBar extends DataMenuBar {
|
public class DVMPackagesBar extends DataMenuBar {
|
||||||
public DVMPackagesBar() {
|
public DVMPackagesBar() {
|
||||||
super("пакеты задач DVM",
|
super("пакеты задач DVM",
|
||||||
@@ -14,5 +20,21 @@ public class DVMPackagesBar extends DataMenuBar {
|
|||||||
PassCode_2021.DeleteDVMPackage,
|
PassCode_2021.DeleteDVMPackage,
|
||||||
PassCode_2021.ExportDVMPackageToExcel
|
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"));
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
package TestingSystem.SAPFOR.SapforPackage;
|
package TestingSystem.SAPFOR.SapforPackage;
|
||||||
import Common.Constants;
|
import Common.Constants;
|
||||||
|
import Common.Current;
|
||||||
import Common.Database.DBObject;
|
import Common.Database.DBObject;
|
||||||
import Common.Global;
|
import Common.Global;
|
||||||
import Common.Utils.Utils;
|
import Common.Utils.Utils;
|
||||||
|
import TestingSystem.Common.Group.GroupsDBTable;
|
||||||
import TestingSystem.Common.TestingPackage.TestingPackage;
|
import TestingSystem.Common.TestingPackage.TestingPackage;
|
||||||
import TestingSystem.SAPFOR.Json.SapforPackage_json;
|
import TestingSystem.SAPFOR.Json.SapforPackage_json;
|
||||||
import TestingSystem.SAPFOR.Json.SapforTestingSet_json;
|
import TestingSystem.SAPFOR.Json.SapforTestingSet_json;
|
||||||
@@ -61,4 +63,8 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
|
|||||||
}
|
}
|
||||||
return new_tasks;
|
return new_tasks;
|
||||||
}
|
}
|
||||||
|
@Override
|
||||||
|
public boolean isVisible() {
|
||||||
|
return !SapforPackageDBTable.filterMyOnly || Current.getAccount().email.equals(sender_address);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import java.util.Date;
|
|||||||
|
|
||||||
import static Common.UI.Tables.TableRenderers.*;
|
import static Common.UI.Tables.TableRenderers.*;
|
||||||
public class SapforPackageDBTable extends iDBTable<SapforPackage> {
|
public class SapforPackageDBTable extends iDBTable<SapforPackage> {
|
||||||
|
public static boolean filterMyOnly = false;
|
||||||
@Override
|
@Override
|
||||||
public Current CurrentName() {
|
public Current CurrentName() {
|
||||||
return Current.SapforPackage;
|
return Current.SapforPackage;
|
||||||
|
|||||||
@@ -1,6 +1,13 @@
|
|||||||
package TestingSystem.SAPFOR.SapforTasksPackage.UI;
|
package TestingSystem.SAPFOR.SapforTasksPackage.UI;
|
||||||
|
import Common.Global;
|
||||||
import Common.UI.Menus_2023.DataMenuBar;
|
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 Visual_DVM_2021.Passes.PassCode_2021;
|
||||||
|
|
||||||
|
import javax.swing.*;
|
||||||
public class SapforPackagesBar extends DataMenuBar {
|
public class SapforPackagesBar extends DataMenuBar {
|
||||||
public SapforPackagesBar() {
|
public SapforPackagesBar() {
|
||||||
super("пакеты задач SAPFOR",
|
super("пакеты задач SAPFOR",
|
||||||
@@ -13,5 +20,21 @@ public class SapforPackagesBar extends DataMenuBar {
|
|||||||
PassCode_2021.AbortSapforPackage,
|
PassCode_2021.AbortSapforPackage,
|
||||||
PassCode_2021.DeleteSapforPackage
|
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"));
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user