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

отображение машины и ползователя на вкладке тестирования.

Browse Source
This commit is contained in:
02090095
2023-12-11 18:29:15 +03:00
parent cb74d629b7
commit 12e963ca1b
20 changed files with 208 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/TestingSystem/Common/TestingPackage/TestingPackage.java
View File

@@ -16,7 +16,8 @@ public class TestingPackage extends rDBObject {
public String version = ""; //версия тестируемого объекта
public String drv = ""; //пусть к исполняемому файлы тестируемого объекта
//--
public TasksPackageState state = TasksPackageState.Queued;
public int progress = 0; //прогресс выполнения
public TasksPackageState state = TasksPackageState.Draft;
//--
@Override
public Object getPK() {
@@ -34,6 +35,7 @@ public class TestingPackage extends rDBObject {
version = tasksPackage.version;
drv = tasksPackage.drv;
kernels = tasksPackage.kernels;
progress = tasksPackage.progress;
state = tasksPackage.state;
}
}

4
src/TestingSystem/Common/TestsDatabase.java
View File

@@ -20,7 +20,7 @@ public class TestsDatabase extends SQLiteDatabase {
public ConfigurationDBTable configurations;
public TestDBTable tests;
public GroupsDBTable groups;
public DVMPackageDBTable dvm_packages;
public DVMPackageDBTable dvmPackages;
//--
public SapforConfigurationDBTable sapforConfigurations;
public SapforConfigurationCommandsDBTable sapforConfigurationCommands;
@@ -34,7 +34,7 @@ public class TestsDatabase extends SQLiteDatabase {
addTable(configurations = new ConfigurationDBTable());
addTable(groups = new GroupsDBTable());
addTable(tests = new TestDBTable());
addTable(dvm_packages = new DVMPackageDBTable());
addTable(dvmPackages = new DVMPackageDBTable());
addTable(settings = new TSettingsDBTable());
//-
addTable(sapforConfigurations = new SapforConfigurationDBTable());

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

@@ -9,8 +9,7 @@ import TestingSystem.DVM.TasksPackage.TasksPackage;
import java.util.Date;
import java.util.LinkedHashMap;
import static Common.UI.Tables.TableRenderers.RendererDate;
import static Common.UI.Tables.TableRenderers.RendererStatusEnum;
import static Common.UI.Tables.TableRenderers.*;
public class DVMPackageDBTable extends DBTable<Long, DVMPackage> {
public DVMPackageDBTable() {
super(Long.class, DVMPackage.class);
@@ -36,10 +35,10 @@ public class DVMPackageDBTable extends DBTable<Long, DVMPackage> {
}
@Override
protected void AdditionalInitColumns() {
// columns.get(0).setVisible(false);
columns.get(8).setRenderer(RendererDate);
columns.get(8).setRenderer(RendererProgress);
columns.get(9).setRenderer(RendererDate);
columns.get(10).setRenderer(RendererStatusEnum);
columns.get(10).setRenderer(RendererDate);
columns.get(11).setRenderer(RendererStatusEnum);
}
@Override
public void ShowCurrentObject() throws Exception {
@@ -65,6 +64,7 @@ public class DVMPackageDBTable extends DBTable<Long, DVMPackage> {
"Задач",
"Ядер",
"Прогресс",
"Начало",
"Изменено",
"Статус"
@@ -86,10 +86,12 @@ public class DVMPackageDBTable extends DBTable<Long, DVMPackage> {
case 7:
return object.kernels;
case 8:
return new Date(object.date);
return object.progress;
case 9:
return new Date(object.change_date);
return new Date(object.date);
case 10:
return new Date(object.change_date);
case 11:
return object.state;
default:
return null;

6
src/TestingSystem/DVM/TasksPackage/TasksPackageState.java
View File

@@ -8,6 +8,8 @@ import java.util.Arrays;
import java.util.Vector;
import java.util.stream.Collectors;
public enum TasksPackageState implements StatusEnum {
Draft,
//--
Queued,
//--
TestsSynchronize, //оставить.
@@ -31,6 +33,7 @@ public enum TasksPackageState implements StatusEnum {
switch (this) {
case Done:
case Aborted:
case Draft:
return false;
default:
return true;
@@ -41,6 +44,7 @@ public enum TasksPackageState implements StatusEnum {
switch (this) {
case TestsSynchronize:
case Analysis:
case Draft:
return Current.getTheme().Fonts.get(VisualiserFonts.BlueState);
case CompilationExecution:
case RunningExecution:
@@ -54,6 +58,8 @@ public enum TasksPackageState implements StatusEnum {
//-
public String getDescription() {
switch (this) {
case Draft:
return "Подготовка к публикации";
case Aborted:
return "Прерван";
case Queued: