v++

src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java

@@ -10,6 +10,8 @@ public class SapforConfiguration_json implements Serializable {
     @Expose
     public int id = Constants.Nan;
     @Expose
+    public String name="";
+    @Expose
     public String flags = "";
     @Expose
     public List<PassCode_2021> codes = new Vector<>();

src/TestingSystem/SAPFOR/Json/SapforPackage_json.java

@@ -168,4 +168,20 @@ public class SapforPackage_json implements Serializable {
             }
         }
     }
+    public Vector<String> getConfigurationsNames() {
+        Vector<String> names = new Vector<>();
+        for (SapforTestingSet_json set: testingSets){
+            for (SapforConfiguration_json configurationJson: set.configurations){
+                if (!names.contains(configurationJson.name))
+                    names.add(configurationJson.name);
+            }
+        }
+        names.sort(new Comparator<String>() {
+            @Override
+            public int compare(String o1, String o2) {
+                return o1.compareTo(o2);
+            }
+        });
+        return names;
+    }
 }

src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java

@@ -14,6 +14,8 @@ import java.util.Vector;
 public class SapforPackage extends TestingPackage<SapforPackage_json> {
     @Description("DEFAULT ''")
     public String testsNames = "";//имена тестов через ; для отображения
+    @Description("DEFAULT ''")
+    public String configurationsNames="";//имена конфигураций для отображения.
     //---
     public int sapforId = Constants.Nan; // так как сапфор на машине.
     public SapforPackage() {

src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java

@@ -33,10 +33,10 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
             protected void AdditionalInitColumns() {
                 //   columns.get(0).setVisible(false);
                 columns.get(4).setMaxWidth(200);
-                columns.get(7).setRenderer(RendererProgress);
-                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);
             }
         };
     }
@@ -46,6 +46,7 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
                 "Автор",
                 "SAPFOR",
                 "Тесты",
+                "Конфигурации",
                 "Задач",
                 "Ядер",
                 "Прогресс",
@@ -64,16 +65,18 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
             case 4:
                 return object.testsNames;
             case 5:
-                return object.tasksCount;
+                return object.configurationsNames;
             case 6:
-                return object.kernels;
+                return object.tasksCount;
             case 7:
-                return object.progress;
+                return object.kernels;
             case 8:
-                return new Date(object.StartDate);
+                return object.progress;
             case 9:
-                return new Date(object.ChangeDate);
+                return new Date(object.StartDate);
             case 10:
+                return new Date(object.ChangeDate);
+            case 11:
                 return object.state;
             default:
                 return null;