создание 3 кнопок синхронизации бд тестов - в тестах. и в соответствующих конфигурациях.

This commit is contained in:
2023-12-21 17:42:20 +03:00
parent 0adb5337d5
commit dbc05900ba
9 changed files with 29 additions and 11 deletions

11
.idea/workspace.xml generated
View File

@@ -7,8 +7,15 @@
</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 beforePath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromSelectedFiles.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/UI/ConfigurationFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/UI/ConfigurationFields.form" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestingBar/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingBar.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/TestingSystem/Common/Group/GroupsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsMenuBar.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/SapforPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.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" />

View File

@@ -24,7 +24,7 @@ import TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationsMenuBar;
import TestingSystem.SAPFOR.ServerSapfor.ServerSapforsBar; import TestingSystem.SAPFOR.ServerSapfor.ServerSapforsBar;
import Repository.SubscriberWorkspace.SubscriberWorkspacesMenuBar; import Repository.SubscriberWorkspace.SubscriberWorkspacesMenuBar;
import Repository.Subscribes.SubscribersMenuBar; import Repository.Subscribes.SubscribersMenuBar;
import Common.UI.Menus_2023.TestingBar.TestingBar; import TestingSystem.Common.TestingBar;
import TestingSystem.Common.Test.TestsMenuBar; import TestingSystem.Common.Test.TestsMenuBar;
import GlobalData.User.UsersMenuBar; import GlobalData.User.UsersMenuBar;
import Common.UI.Menus_2023.VariantsMenuBar.VariantsMenuBar; import Common.UI.Menus_2023.VariantsMenuBar.VariantsMenuBar;

View File

@@ -10,6 +10,7 @@ import javax.swing.*;
public class GroupsMenuBar extends DataMenuBar { public class GroupsMenuBar extends DataMenuBar {
public GroupsMenuBar() { public GroupsMenuBar() {
super("группы", super("группы",
PassCode_2021.SynchronizeTests,
PassCode_2021.ConvertCorrectnessTests, PassCode_2021.ConvertCorrectnessTests,
PassCode_2021.PublishGroup, PassCode_2021.PublishGroup,
PassCode_2021.CreateGroupFromDirectory, PassCode_2021.CreateGroupFromDirectory,

View File

@@ -1,4 +1,4 @@
package Common.UI.Menus_2023.TestingBar; package TestingSystem.Common;
import Common.Current; import Common.Current;
import Common.Global; import Common.Global;
import Common.UI.Menus_2023.MenuBarButton; import Common.UI.Menus_2023.MenuBarButton;
@@ -14,18 +14,12 @@ import java.awt.*;
public class TestingBar extends VisualiserMenuBar { public class TestingBar extends VisualiserMenuBar {
public MenuBarButton MachineButton; public MenuBarButton MachineButton;
public MenuBarButton UserButton; public MenuBarButton UserButton;
// public JLabel MachineLabel;
// public JLabel UserLabel;
public JLabel KernelsLabel; public JLabel KernelsLabel;
public JButton autorefreshButton; public JButton autorefreshButton;
JSpinner sCheckTime; JSpinner sCheckTime;
JSpinner sKernels; JSpinner sKernels;
public TestingBar() { public TestingBar() {
addPasses(PassCode_2021.SynchronizeTests);
//--
// AddLabel("машина: ", "/icons/Machine.png");
add(MachineButton = new MenuBarButton() { add(MachineButton = new MenuBarButton() {
{ {
setIcon("/icons/Machine.png"); setIcon("/icons/Machine.png");

View File

@@ -3,7 +3,9 @@ import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
public class DVMPackagesBar extends DataMenuBar { public class DVMPackagesBar extends DataMenuBar {
public DVMPackagesBar() { public DVMPackagesBar() {
super("пакеты задач DVM", PassCode_2021.AddDVMPackage, super("пакеты задач DVM",
PassCode_2021.SynchronizeTests,
PassCode_2021.AddDVMPackage,
PassCode_2021.AddTasksToDVMPackage, PassCode_2021.AddTasksToDVMPackage,
PassCode_2021.StartDVMPackage, PassCode_2021.StartDVMPackage,
PassCode_2021.DownloadDVMPackage, PassCode_2021.DownloadDVMPackage,

View File

@@ -4,6 +4,7 @@ import Visual_DVM_2021.Passes.PassCode_2021;
public class SapforPackagesBar extends DataMenuBar { public class SapforPackagesBar extends DataMenuBar {
public SapforPackagesBar() { public SapforPackagesBar() {
super("пакеты задач SAPFOR", super("пакеты задач SAPFOR",
PassCode_2021.SynchronizeTests,
PassCode_2021.AddSapforPackage, PassCode_2021.AddSapforPackage,
PassCode_2021.StartSapforPackage, PassCode_2021.StartSapforPackage,
PassCode_2021.AbortSapforPackage, PassCode_2021.AbortSapforPackage,

View File

@@ -0,0 +1,4 @@
package Visual_DVM_2021.Passes.All;
import Visual_DVM_2021.Passes.Pass_2021;
public class CreateTestFromSelectedFiles extends Pass_2021 {
}

View File

@@ -1,5 +1,6 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Current; import Common.Current;
import Common.UI.Menus_2023.PassButton;
import Common.UI.UI; import Common.UI.UI;
import Common.Utils.Utils; import Common.Utils.Utils;
import Repository.Server.ServerCode; import Repository.Server.ServerCode;
@@ -7,6 +8,7 @@ import Repository.Server.ServerExchangeUnit_2021;
import Visual_DVM_2021.Passes.Server.TestingSystemPass; import Visual_DVM_2021.Passes.Server.TestingSystemPass;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import javax.swing.*;
import java.io.File; import java.io.File;
public class SynchronizeTests extends TestingSystemPass<Object> { public class SynchronizeTests extends TestingSystemPass<Object> {
File new_db_file; File new_db_file;
@@ -23,6 +25,10 @@ public class SynchronizeTests extends TestingSystemPass<Object> {
return ""; return "";
} }
@Override @Override
public JButton createButton() {
return new PassButton(this);
}
@Override
protected void showPreparation() throws Exception { protected void showPreparation() throws Exception {
server.db.SaveLastSelections(); server.db.SaveLastSelections();
server.db.configurations.ClearUI(); server.db.configurations.ClearUI();

View File

@@ -284,6 +284,7 @@ public enum PassCode_2021 {
//-- //--
CreateGroupFromDirectory, CreateGroupFromDirectory,
CreateTestFromDirectory, CreateTestFromDirectory,
CreateTestFromSelectedFiles, //NEW
CreateTestFromProject, CreateTestFromProject,
SPF_RemoveComments, SPF_RemoveComments,
CreateTestFromFile, CreateTestFromFile,
@@ -315,6 +316,8 @@ public enum PassCode_2021 {
switch (this) { switch (this) {
case Undefined: case Undefined:
return "?"; return "?";
case CreateTestFromSelectedFiles:
return "Создать тест из выделенных файлов";
case DownloadSapforPackage: case DownloadSapforPackage:
return "Синхронизация пакета SAPFOR"; return "Синхронизация пакета SAPFOR";
case DownloadDVMPackages: case DownloadDVMPackages: