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

отображение списка задач текущего пакета SAPFOR

Browse Source
This commit is contained in:
02090095
2023-10-25 20:46:17 +03:00
parent 2eb77faf31
commit 743368308d
8 changed files with 42 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.idea/workspace.xml generated
View File

@@ -7,20 +7,14 @@
</component> </component>
<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 afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforTasksBar/SapforTasksMenuBar.java" afterDir="false" />
<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/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforVersion_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TasksDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TasksDatabase.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.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" />

7
src/Common/UI/Menus_2023/SapforTasksBar/SapforTasksMenuBar.java Normal file
View File

@@ -0,0 +1,7 @@
package Common.UI.Menus_2023.SapforTasksBar;
import Common.UI.Menus_2023.DataMenuBar;
public class SapforTasksMenuBar extends DataMenuBar {
public SapforTasksMenuBar() {
super("задачи");
}
}

3
src/Common/UI/UI.java
View File

@@ -18,6 +18,7 @@ import Common.UI.Menus_2023.ModulesMenuBar.ModulesMenuBar;
import Common.UI.Menus_2023.RunConfigurationsMenuBar.RunConfigurationsMenuBar; import Common.UI.Menus_2023.RunConfigurationsMenuBar.RunConfigurationsMenuBar;
import Common.UI.Menus_2023.SapforConfigurationCommandsMenuBar.SapforConfigurationCommandsMenuBar; import Common.UI.Menus_2023.SapforConfigurationCommandsMenuBar.SapforConfigurationCommandsMenuBar;
import Common.UI.Menus_2023.SapforConfigurationsMenuBar.SapforConfigurationsMenuBar; import Common.UI.Menus_2023.SapforConfigurationsMenuBar.SapforConfigurationsMenuBar;
import Common.UI.Menus_2023.SapforTasksBar.SapforTasksMenuBar;
import Common.UI.Menus_2023.SapforTasksPackagesBar.SapforTasksPackagesBar; import Common.UI.Menus_2023.SapforTasksPackagesBar.SapforTasksPackagesBar;
import Common.UI.Menus_2023.ServerSapforsBar.ServerSapforsBar; import Common.UI.Menus_2023.ServerSapforsBar.ServerSapforsBar;
import Common.UI.Menus_2023.SubscribersMenuBar.SubscribersMenuBar; import Common.UI.Menus_2023.SubscribersMenuBar.SubscribersMenuBar;
@@ -70,6 +71,7 @@ import Repository.Component.UI.ComponentsForm;
import Repository.Subscribes.SubsribersDBTable; import Repository.Subscribes.SubsribersDBTable;
import SapforTestingSystem.SapforConfiguration.SapforConfigurationDBTable; import SapforTestingSystem.SapforConfiguration.SapforConfigurationDBTable;
import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommandsDBTable; import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
import SapforTestingSystem.SapforTask.SapforTasksDBTable;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable; import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable;
import SapforTestingSystem.ServerSapfor.ServerSapforsDBTable; import SapforTestingSystem.ServerSapfor.ServerSapforsDBTable;
import TestingSystem.Configuration.UI.ConfigurationDBTable; import TestingSystem.Configuration.UI.ConfigurationDBTable;
@@ -248,6 +250,7 @@ public class UI {
menuBars.put(SubsribersDBTable.class, new SubscribersMenuBar()); menuBars.put(SubsribersDBTable.class, new SubscribersMenuBar());
menuBars.put(SapforProfilesDBTable.class, new DataMenuBar("профили", PassCode_2021.SaveProfile, PassCode_2021.EditProfile, PassCode_2021.ApplyProfile,PassCode_2021.DeleteProfile)); menuBars.put(SapforProfilesDBTable.class, new DataMenuBar("профили", PassCode_2021.SaveProfile, PassCode_2021.EditProfile, PassCode_2021.ApplyProfile,PassCode_2021.DeleteProfile));
menuBars.put(ServerSapforsDBTable.class, new ServerSapforsBar()); menuBars.put(ServerSapforsDBTable.class, new ServerSapforsBar());
menuBars.put(SapforTasksDBTable.class, new SapforTasksMenuBar());
//---->> //---->>
} }
public static void CreateWindows() { public static void CreateWindows() {

5
src/SapforTestingSystem/SapforTask/SapforTask.java
View File

@@ -1,5 +1,6 @@
package SapforTestingSystem.SapforTask; package SapforTestingSystem.SapforTask;
import Common.Constants; import Common.Constants;
import Common.Current;
import Common.Database.DBObject; import Common.Database.DBObject;
import Common.Utils.Utils; import Common.Utils.Utils;
import GlobalData.Tasks.TaskState; import GlobalData.Tasks.TaskState;
@@ -143,4 +144,8 @@ public class SapforTask extends DBObject {
} }
return false; return false;
} }
@Override
public boolean isVisible() {
return Current.HasSapforTasksPackage()&&Current.getSapforTasksPackage().id.equals(this.sapfortaskspackage_id);
}
} }

15
src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java
View File

@@ -25,7 +25,7 @@ public class SapforTasksDBTable extends DBTable<Long, SapforTask> {
return new DataSetControlForm(this) { return new DataSetControlForm(this) {
@Override @Override
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
columns.get(2).setRenderer(RendererStatusEnum); columns.get(4).setRenderer(RendererStatusEnum);
} }
@Override @Override
public void MouseAction2() throws Exception { public void MouseAction2() throws Exception {
@@ -36,17 +36,26 @@ public class SapforTasksDBTable extends DBTable<Long, SapforTask> {
@Override @Override
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
return new String[]{ return new String[]{
"Группа",
"Тест", "Тест",
"Статус" "Флаги",
"Статус",
"Версии"
}; };
} }
@Override @Override
public Object getFieldAt(SapforTask object, int columnIndex) { public Object getFieldAt(SapforTask object, int columnIndex) {
switch (columnIndex) { switch (columnIndex) {
case 1: case 1:
return object.test_description; return object.group_description;
case 2: case 2:
return object.test_description;
case 3:
return object.flags;
case 4:
return object.state; return object.state;
case 5:
return object.versionsDescription;
default: default:
return null; return null;
} }

1
src/Visual_DVM_2021/UI/Interface/TestingWindow.java
View File

@@ -6,7 +6,6 @@ public interface TestingWindow extends VisualizerForm {
void DropTestRunTasksComparison(); void DropTestRunTasksComparison();
void ShowCurrentTestRunTask(); void ShowCurrentTestRunTask();
void ShowNoTestRunTask(); void ShowNoTestRunTask();
void DropSapforTasksComparison();
//- //-
void RefreshTabsNames(); void RefreshTabsNames();
void FocusTestingSystem(); void FocusTestingSystem();

11
src/Visual_DVM_2021/UI/Main/TestingForm.form
View File

@@ -135,10 +135,9 @@
</properties> </properties>
<border type="none"/> <border type="none"/>
<children> <children>
<splitpane id="6ef86" binding="SC50"> <splitpane id="f24" binding="SC50">
<constraints border-constraint="Center"/> <constraints border-constraint="Center"/>
<properties> <properties>
<dividerLocation value="300"/>
<dividerSize value="3"/> <dividerSize value="3"/>
</properties> </properties>
<border type="none"/> <border type="none"/>
@@ -207,14 +206,12 @@
<properties/> <properties/>
<border type="none"/> <border type="none"/>
<children> <children>
<splitpane id="ff9dc" binding="SC57"> <grid id="8a833" binding="sapforTasksPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/> <constraints border-constraint="Center"/>
<properties> <properties/>
<dividerSize value="3"/>
</properties>
<border type="none"/> <border type="none"/>
<children/> <children/>
</splitpane> </grid>
</children> </children>
</grid> </grid>
<grid id="7718" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> <grid id="7718" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">

20
src/Visual_DVM_2021/UI/Main/TestingForm.java
View File

@@ -19,7 +19,6 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
public JSplitPane SC46; public JSplitPane SC46;
public JSplitPane SC53; public JSplitPane SC53;
public JSplitPane SC56; public JSplitPane SC56;
public JSplitPane SC57;
public JSplitPane SC63; public JSplitPane SC63;
public JSplitPane SC59; public JSplitPane SC59;
//- //-
@@ -42,6 +41,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
private JPanel sapforScenariosPanel; private JPanel sapforScenariosPanel;
private JPanel serverSapforsPanel; private JPanel serverSapforsPanel;
private JPanel sapforTasksPackagesPanel; private JPanel sapforTasksPackagesPanel;
private JPanel sapforTasksPanel;
private JPanel testsRunTasksBackground; private JPanel testsRunTasksBackground;
private JCheckBox filterFinished; private JCheckBox filterFinished;
private JButton bTest; private JButton bTest;
@@ -57,10 +57,6 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
private TestRunTasksComparisonForm dvmTestingRunMaster; //сравнение тестов двм системы. private TestRunTasksComparisonForm dvmTestingRunMaster; //сравнение тестов двм системы.
private TestRunTasksComparisonForm dvmTestingRunSlave; private TestRunTasksComparisonForm dvmTestingRunSlave;
//- //-
//сравнение версий полученных в результате выполнения пакета.
public SapforPackagesComparisonForm sapforTestingMaster;
public SapforPackagesComparisonForm sapforTestingSlave;
//-
public TestingForm() { public TestingForm() {
content.add(UI.testingBar, BorderLayout.NORTH); content.add(UI.testingBar, BorderLayout.NORTH);
LoadSplitters(); LoadSplitters();
@@ -80,10 +76,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
Global.testingServer.db.sapforConfigurationCommands.mountUI(sapforConfigurationCommandsPanel); Global.testingServer.db.sapforConfigurationCommands.mountUI(sapforConfigurationCommandsPanel);
Global.testingServer.db.serverSapfors.mountUI(serverSapforsPanel); Global.testingServer.db.serverSapfors.mountUI(serverSapforsPanel);
Global.testingServer.account_db.sapforTasksPackages.mountUI(sapforTasksPackagesPanel); Global.testingServer.account_db.sapforTasksPackages.mountUI(sapforTasksPackagesPanel);
//--------------------------------------------------------------------->>>> //---
sapforTestingMaster = new SapforPackagesComparisonForm(sapforTestingSlave = new SapforPackagesComparisonForm(null)); Global.testingServer.account_db.sapforTasks.mountUI(sapforTasksPanel);
SC57.setLeftComponent(sapforTestingMaster.getContent());
SC57.setRightComponent(sapforTestingSlave.getContent());
} }
//- //-
@Override @Override
@@ -138,15 +132,11 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
UI.Clear(packagesPanel); UI.Clear(packagesPanel);
UI.Clear(testsRunTasksPanel); UI.Clear(testsRunTasksPanel);
UI.Clear(sapforTasksPackagesPanel); UI.Clear(sapforTasksPackagesPanel);
UI.Clear(sapforTasksPanel);
//-->> //-->>
Global.testingServer.account_db.packages.mountUI(packagesPanel); Global.testingServer.account_db.packages.mountUI(packagesPanel);
Global.testingServer.account_db.testRunTasks.mountUI(testsRunTasksPanel); Global.testingServer.account_db.testRunTasks.mountUI(testsRunTasksPanel);
Global.testingServer.account_db.sapforTasksPackages.mountUI(sapforTasksPackagesPanel); Global.testingServer.account_db.sapforTasksPackages.mountUI(sapforTasksPackagesPanel);
} Global.testingServer.account_db.sapforTasksPackages.mountUI(sapforTasksPanel);
//--->>>
@Override
public void DropSapforTasksComparison() {
sapforTestingMaster.RemoveObject();
sapforTestingSlave.RemoveObject();
} }
} }