приведение способа задания ядер к единому, для двм и сапфора.

This commit is contained in:
2023-10-15 23:53:25 +03:00
parent f372d29a94
commit e574851b35
14 changed files with 41 additions and 125 deletions

View File

@@ -3,11 +3,8 @@ import Common.Current;
import Common.Database.*;
import Common.UI.DataSetControlForm;
import Common.UI.UI;
import Common.Utils.Utils;
import TestingSystem.Tasks.TestRunTask;
import TestingSystem.TestingServer;
import javax.swing.*;
import java.util.Date;
import java.util.LinkedHashMap;
@@ -39,9 +36,9 @@ public class TasksPackageDBTable extends DBTable<String, TasksPackage> {
}
@Override
protected void AdditionalInitColumns() {
columns.get(6).setRenderer(RendererDate);
columns.get(7).setRenderer(RendererDate);
columns.get(8).setRenderer(RendererStatusEnum);
columns.get(8).setRenderer(RendererDate);
columns.get(9).setRenderer(RendererStatusEnum);
}
@Override
public void ShowCurrentObject() throws Exception {
@@ -63,6 +60,8 @@ public class TasksPackageDBTable extends DBTable<String, TasksPackage> {
"Пользователь",
"DVM",
"Задач",
"Ядер",
"Начало",
"Изменено",
"Статус"
@@ -80,10 +79,12 @@ public class TasksPackageDBTable extends DBTable<String, TasksPackage> {
case 5:
return object.runTasksCount;
case 6:
return new Date(object.StartDate);
return object.kernels;
case 7:
return new Date(object.ChangeDate);
return new Date(object.StartDate);
case 8:
return new Date(object.ChangeDate);
case 9:
return object.state;
default:
return null;