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

галочка отображения только активных пакетов

Browse Source
This commit is contained in:
02090095
2024-07-22 20:52:37 +03:00
parent 9dd52b37c2
commit 905e1646e4
7 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.idea/workspace.xml generated
View File

@@ -8,7 +8,12 @@
<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/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" 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/SapforTasksPackage/UI/SapforPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

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

@@ -53,6 +53,7 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
}
@Override
public boolean isVisible() {
return !DVMPackageDBTable.filterMyOnly || Current.getAccount().email.equals(sender_address);
return (!DVMPackageDBTable.filterMyOnly || Current.getAccount().email.equals(sender_address))&&
(!DVMPackageDBTable.filterActive || state.isActive() );
}
}

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

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

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

@@ -39,5 +39,20 @@ public class DVMPackagesBar extends DataMenuBar {
setIcon(Utils.getIcon(DVMPackageDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png"));
}
});
add(new MenuBarButton() {
{
setText("Активные");
setToolTipText("Отображать только активные пакеты тестов");
Mark();
addActionListener(e -> {
DVMPackageDBTable.filterActive = !DVMPackageDBTable.filterActive;
Mark();
Global.testingServer.db.dvmPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils.getIcon(DVMPackageDBTable.filterActive ? "/icons/Pick.png" : "/icons/NotPick.png"));
}
});
}
}

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

@@ -65,6 +65,8 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
}
@Override
public boolean isVisible() {
return !SapforPackageDBTable.filterMyOnly || Current.getAccount().email.equals(sender_address);
return (!SapforPackageDBTable.filterMyOnly ||Current.getAccount().email.equals(sender_address)) &&
(!SapforPackageDBTable.filterActive || state.isActive() )
;
}
}

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

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

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

@@ -40,5 +40,20 @@ public class SapforPackagesBar extends DataMenuBar {
setIcon(Utils.getIcon(SapforPackageDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png"));
}
});
add(new MenuBarButton() {
{
setText("Активные");
setToolTipText("Отображать только активные пакеты тестов");
Mark();
addActionListener(e -> {
SapforPackageDBTable.filterActive = !SapforPackageDBTable.filterActive;
Mark();
Global.testingServer.db.sapforPackages.ShowUI();
});
}
public void Mark() {
setIcon(Utils.getIcon(SapforPackageDBTable.filterActive ? "/icons/Pick.png" : "/icons/NotPick.png"));
}
});
}
}