no message

This commit is contained in:
2024-05-06 00:47:29 +03:00
parent 15a2f83275
commit b39de4ad14
7 changed files with 64 additions and 10 deletions

13
.idea/workspace.xml generated
View File

@@ -7,12 +7,13 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompileServerSapfor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/files/RunTask.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/RunTask.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.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>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -34,8 +35,8 @@
<list>
<option value="FxmlFile" />
<option value="Interface" />
<option value="Class" />
<option value="Enum" />
<option value="Class" />
</list>
</option>
</component>

View File

@@ -17,6 +17,8 @@ public class ServerSapfor extends riDBObject {
public String call_command = ""; //полная команда вызова.
public String version = "?";
public long buildDate = 0;
@Description("DEFAULT 'Done'")
public ServerSapforState state = ServerSapforState.Done;
public Date getBuildDate() {
return new Date(buildDate);
}

View File

@@ -1,7 +1,26 @@
package TestingSystem.SAPFOR.ServerSapfor;
public enum ServerSapforState {
import Common.UI.StatusEnum;
public enum ServerSapforState implements StatusEnum {
Queued,
RepositorySynchronization,
Compilation,
Done,
DoneWithErrors
DoneWithErrors;
@Override
public String getDescription() {
switch (this) {
case Queued:
return "в очереди";
case RepositorySynchronization:
return "синхронизация репозитория";
case Compilation:
return "сборка";
case Done:
return "сборка успешно";
case DoneWithErrors:
return "сборка с ошибками";
default:
return StatusEnum.super.getDescription();
}
}
}

View File

@@ -3,6 +3,9 @@ import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class ServerSapforsBar extends DataMenuBar {
public ServerSapforsBar() {
super("версии SAPFOR", PassCode_2021.InstallServerSapfor, PassCode_2021.DeleteServerSapfor);
super("версии SAPFOR",
PassCode_2021.CompileServerSapfor
// PassCode_2021.InstallServerSapfor, PassCode_2021.DeleteServerSapfor
);
}
}

View File

@@ -22,7 +22,7 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
}
@Override
public String[] getUIColumnNames() {
return new String[]{"версия", "дата сборки"};
return new String[]{"версия", "дата сборки", "статус"};
}
@Override
public Object getFieldAt(ServerSapfor object, int columnIndex) {
@@ -31,6 +31,8 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
return object.version;
case 2:
return object.getBuildDate();
case 3:
return object.state;
}
return null;
}
@@ -41,6 +43,7 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
protected void AdditionalInitColumns() {
// columns.get(0).setVisible(false);
columns.get(2).setRenderer(TableRenderers.RendererDate);
columns.get(3).setRenderer(TableRenderers.RendererStatusEnum);
}
@Override
public void ShowCurrentObject() throws Exception {

View File

@@ -0,0 +1,23 @@
package Visual_DVM_2021.Passes.All;
import Common.Global;
import ProjectData.LanguageName;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.TestingServer;
import TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import TestingSystem.SAPFOR.ServerSapfor.ServerSapforState;
import Visual_DVM_2021.Passes.Server.PublishServerObject;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
import java.util.Date;
public class CompileServerSapfor extends PublishServerObject<TestingServer, ServerSapfor> {
public CompileServerSapfor() {
super(Global.testingServer, ServerSapfor.class);
}
@Override
public boolean fillObjectFields() throws Exception {
target.state= ServerSapforState.Queued;
return true;
}
}

View File

@@ -334,12 +334,15 @@ public enum PassCode_2021 {
PublishComponentsServer,
//---
SPF_InsertImplicitNone,
CompileServerSapfor,
;
public String getDescription() {
switch (this) {
case Undefined:
return "?";
//--
case CompileServerSapfor:
return "Собрать версию Sapfor";
case PublishComponentsServer:
return "Опубликовать сервер компонент и отчётов об ошибках";
case PingComponentsServer: