no message

This commit is contained in:
2023-11-17 21:26:01 +03:00
parent 32166efa68
commit 82a5e9c147
19 changed files with 155 additions and 338 deletions

View File

@@ -1,20 +1,10 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Global;
import TestingSystem.Common.TestingServer;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import Visual_DVM_2021.Passes.DeleteSelectedServerObjects;
import java.util.Vector;
public class DeleteSapforConfiguration extends DeleteSelectedServerObjects {
import Visual_DVM_2021.Passes.Server.DeleteServerObject;
public class DeleteSapforConfiguration extends DeleteServerObject<TestingServer, SapforConfiguration> {
public DeleteSapforConfiguration() {
super(SapforConfiguration.class);
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (Current.Check(Log, Current.SapforConfiguration)){
target= new Vector<>();
target.add(Current.getSapforConfiguration());
return true;
}
return false;
super(Global.testingServer, SapforConfiguration.class);
}
}

View File

@@ -1,20 +1,10 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Global;
import TestingSystem.Common.TestingServer;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import Visual_DVM_2021.Passes.DeleteSelectedServerObjects;
import java.util.Vector;
public class DeleteSapforConfigurationCommand extends DeleteSelectedServerObjects {
import Visual_DVM_2021.Passes.Server.DeleteServerObject;
public class DeleteSapforConfigurationCommand extends DeleteServerObject<TestingServer, SapforConfigurationCommand> {
public DeleteSapforConfigurationCommand() {
super(SapforConfigurationCommand.class);
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (Current.Check(Log, Current.SapforConfigurationCommand)){
target= new Vector<>();
target.add(Current.getSapforConfigurationCommand());
return true;
}
return false;
super(Global.testingServer, SapforConfigurationCommand.class);
}
}

View File

@@ -1,29 +1,10 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Database.Database;
import Common.Global;
import TestingSystem.Common.TestingServer;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import Visual_DVM_2021.Passes.EditObjectPass;
import Visual_DVM_2021.Passes.PassCode_2021;
public class EditSapforConfiguration extends EditObjectPass<SapforConfiguration> {
import Visual_DVM_2021.Passes.Server.EditServerObject;
public class EditSapforConfiguration extends EditServerObject<TestingServer,SapforConfiguration> {
public EditSapforConfiguration() {
super(SapforConfiguration.class);
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (Current.Check(Log, Current.SapforConfiguration)) {
return getTable().ShowEditObjectDialog(target = Current.getSapforConfiguration());
}
return false;
}
@Override
protected void performDone() throws Exception {
super.performDone();
//отправка.
passes.get(PassCode_2021.EditSapforConfigurationOnServer).Do(target);
}
@Override
protected Database getDb() {
return Global.testingServer.db;
super(Global.testingServer, SapforConfiguration.class);
}
}

View File

@@ -1,38 +1,11 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Database.Database;
import Common.Global;
import TestingSystem.Common.TestingServer;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import Visual_DVM_2021.Passes.EditObjectPass;
import Visual_DVM_2021.Passes.PassCode_2021;
public class EditSapforConfigurationCommand extends EditObjectPass<SapforConfigurationCommand> {
import Visual_DVM_2021.Passes.Server.EditServerObject;
public class EditSapforConfigurationCommand extends EditServerObject<TestingServer,SapforConfigurationCommand> {
public EditSapforConfigurationCommand() {
super(SapforConfigurationCommand.class);
}
@Override
public String getIconPath() {
return "/icons/Edit.png";
}
@Override
public String getButtonText() {
return "";
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (Current.Check(Log, Current.SapforConfigurationCommand)) {
return getTable().ShowEditObjectDialog(target = (SapforConfigurationCommand) Current.get(Current.SapforConfigurationCommand));
}
return false;
}
@Override
protected void performDone() throws Exception {
super.performDone();
//отправка.
passes.get(PassCode_2021.EditSapforConfigurationCommandOnServer).Do(target);
}
@Override
protected Database getDb() {
return Global.testingServer.db;
super(Global.testingServer,SapforConfigurationCommand.class);
}
}

View File

@@ -1,16 +0,0 @@
package Visual_DVM_2021.Passes.All;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class EditSapforConfigurationCommandOnServer extends TestingSystemPass<SapforConfigurationCommand> {
@Override
protected boolean canStart(Object... args) throws Exception {
target = (SapforConfigurationCommand) args[0];
return true;
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.EditObject, "", target));
}
}

View File

@@ -1,16 +0,0 @@
package Visual_DVM_2021.Passes.All;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class EditSapforConfigurationOnServer extends TestingSystemPass<SapforConfiguration> {
@Override
protected boolean canStart(Object... args) throws Exception {
target = (SapforConfiguration) args[0];
return true;
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.EditObject, "", target));
}
}

View File

@@ -1,42 +1,10 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import Common.Global;
import TestingSystem.Common.TestingServer;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class PublishSapforConfiguration extends TestingSystemPass<SapforConfiguration> {
@Override
public String getIconPath() {
return "/icons/RedAdd.png";
}
@Override
public String getButtonText() {
return "";
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (Current.getAccount().CheckRegistered(Log)) {
target = new SapforConfiguration();
target.genName();
target.sender_name = Current.getAccount().name;
target.sender_address = Current.getAccount().email;
return server.db.sapforConfigurations.ShowAddObjectDialog(target);
}
return false;
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.PublishObject, "", target));
}
@Override
protected void performFinish() throws Exception {
super.performFinish();
passes.get(PassCode_2021.SynchronizeTests).Do();
}
@Override
protected void showDone() throws Exception {
super.showDone();
server.db.sapforConfigurations.ui_.Show(target.getPK());
import Visual_DVM_2021.Passes.Server.PublishServerObject;
public class PublishSapforConfiguration extends PublishServerObject<TestingServer, SapforConfiguration> {
public PublishSapforConfiguration() {
super(Global.testingServer, SapforConfiguration.class);
}
}

View File

@@ -1,43 +1,16 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import Common.Global;
import TestingSystem.Common.TestingServer;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class PublishSapforConfigurationCommand extends TestingSystemPass<SapforConfigurationCommand> {
@Override
public String getIconPath() {
return "/icons/RedAdd.png";
import Visual_DVM_2021.Passes.Server.PublishServerObject;
public class PublishSapforConfigurationCommand extends PublishServerObject<TestingServer, SapforConfigurationCommand> {
public PublishSapforConfigurationCommand() {
super(Global.testingServer, SapforConfigurationCommand.class);
}
@Override
public String getButtonText() {
return "";
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (Current.getAccount().CheckRegistered(Log)&& Current.Check(Log, Current.SapforConfiguration)) {
target = new SapforConfigurationCommand();
target.genName();
target.sender_name = Current.getAccount().name;
target.sender_address = Current.getAccount().email;
target.sapforconfiguration_id=Current.getSapforConfiguration().id;
return server.db.sapforConfigurationCommands.ShowAddObjectDialog(target);
}
return false;
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.PublishObject, "", target));
}
@Override
protected void performFinish() throws Exception {
super.performFinish();
passes.get(PassCode_2021.SynchronizeTests).Do();
}
@Override
protected void showDone() throws Exception {
super.showDone();
server.db.sapforConfigurationCommands.ui_.Show(target.getPK());
public boolean fillObjectFields() throws Exception {
target.sapforconfiguration_id=Current.getSapforConfiguration().id;
return super.fillObjectFields();
}
}

View File

@@ -111,7 +111,7 @@ public class StartSapforTests extends TestingSystemPass<SapforTasksPackage> {
terminalCodesCount.put(code, new Index());
//--
for (SapforConfigurationCommand command : Global.testingServer.db.sapforConfigurationCommands.Data.values()) {
if (command.sapforconfiguration_id.equals(sapforConfiguration.id)) {
if (command.sapforconfiguration_id==sapforConfiguration.id) {
codes.add(command.passCode);
//---
for (PassCode_2021 t_code : Constants.terminalSapforTestingCodes) {
@@ -209,7 +209,7 @@ public class StartSapforTests extends TestingSystemPass<SapforTasksPackage> {
testsIds.add(String.valueOf(test.id));
//--
for (SapforConfiguration configuration : Global.testingServer.db.sapforConfigurations.getCheckedItems())
configurationsIds.add(configuration.id);
configurationsIds.add(String.valueOf(configuration.id));
//--
target.tasksCount = allTasksCount;
target.testsIds = String.join("\n", testsIds);

View File

@@ -289,12 +289,10 @@ public enum PassCode_2021 {
//--
PublishSapforConfiguration,
EditSapforConfiguration,
EditSapforConfigurationOnServer,
DeleteSapforConfiguration,
//-
PublishSapforConfigurationCommand,
EditSapforConfigurationCommand,
EditSapforConfigurationCommandOnServer,
DeleteSapforConfigurationCommand,
//->
DownloadSapforTasksPackage,
@@ -389,9 +387,7 @@ public enum PassCode_2021 {
case DeleteDownloadedBugReports:
return "Удалить загруженные отчёты об ошибках";
case DeleteSapforConfigurationCommand:
return "Удалить выбранные команды конфигурации тестирования Sapfor на сервере";
case EditSapforConfigurationCommandOnServer:
return "Редактировать команду конфигурации тестирования Sapfor на сервере";
return "Удалить команду конфигурации тестирования Sapfor";
case EditSapforConfigurationCommand:
return "Редактировать команду конфигурации тестирования Sapfor";
case PublishSapforConfigurationCommand:
@@ -400,10 +396,8 @@ public enum PassCode_2021 {
return "Опубликовать конфигурацию тестирования SAPFOR";
case EditSapforConfiguration:
return "Редактировать конфигурацию тестирования SAPFOR";
case EditSapforConfigurationOnServer:
return "Редактировать конфигурацию тестирования SAPFOR на сервере";
case DeleteSapforConfiguration:
return "Удалить выбранные конфигурации тестирования SAPFOR на сервере";
return "Удалить конфигурацию тестирования SAPFOR";
case ExcludeSelectedFiles:
return "Исключить из рассмотрения отмеченные файлы";
case IncludeSelectedFiles: