From e95ca3e1791caf83c213f1963f14e503615c8de6 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 6 Oct 2023 01:03:55 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                               |  9 ++++++++-
 src/GlobalData/GlobalDatabase.java                | 15 ++++++---------
 .../SapforConfigurationDBTable.java               |  5 ++---
 .../SapforScenario/SapforScenariosDBTable.java    |  6 +++---
 .../Passes/All/StartSapforTests.java              |  7 +++++--
 .../Passes/All/StartSapforTestsOnServer.java      |  2 +-
 .../Passes/All/SynchronizeTests.java              |  1 +
 src/Visual_DVM_2021/UI/Main/TestingForm.java      |  6 +++---
 8 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c0de05c0..aba7b94e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,7 +7,14 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/GlobalDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforScenario/SapforScenariosDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforScenario/SapforScenariosDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTestsOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTestsOnServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/GlobalData/GlobalDatabase.java b/src/GlobalData/GlobalDatabase.java
index c2b80f3d..efb03022 100644
--- a/src/GlobalData/GlobalDatabase.java
+++ b/src/GlobalData/GlobalDatabase.java
@@ -33,11 +33,8 @@ import GlobalData.Tasks.CompilationTask.CompilationTasksDBTable;
 import GlobalData.Tasks.RunTask.RunTasksDBTable;
 import GlobalData.User.UsersDBTable;
 import Repository.Component.ComponentType;
-import SapforTestingSystem.SapforScenario.SapforScenariosDBTable;
 import SapforTestingSystem.SapforTask.SapforTaskResult;
-import SapforTestingSystem.SapforTask.SapforTasksDBTable;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable;
 import TestingSystem.TaskKey.TaskKeysDBTable;
 import Visual_DVM_2021.PassStats.PassStatsDBTable;
 import Visual_DVM_2021.Passes.PassCode_2021;
@@ -74,9 +71,9 @@ public class GlobalDatabase extends SQLiteDatabase {
     //-
     public TaskKeysDBTable tasksKeys;
     //---------
-    public SapforScenariosDBTable sapforScenarios;
-    public SapforTasksPackagesDBTable sapforTasksPackages;
-    public SapforTasksDBTable sapforTasks = null;
+  //  public SapforScenariosDBTable sapforScenarios;
+  //  public SapforTasksPackagesDBTable sapforTasksPackages;
+  //  public SapforTasksDBTable sapforTasks = null;
     public SapforProfilesDBTable sapforProfiles = null;
     //---------
     public SapforProfileSettingsDBTable sapforProfilesSettings = null;
@@ -108,9 +105,9 @@ public class GlobalDatabase extends SQLiteDatabase {
         addTable(grids = new GridsDBTable());
         addTable(tasksKeys = new TaskKeysDBTable());
         //--
-        addTable(sapforScenarios = new SapforScenariosDBTable());
-        addTable(sapforTasksPackages = new SapforTasksPackagesDBTable());
-        addTable(sapforTasks = new SapforTasksDBTable());
+       // addTable(sapforScenarios = new SapforScenariosDBTable());
+       // addTable(sapforTasksPackages = new SapforTasksPackagesDBTable());
+       // addTable(sapforTasks = new SapforTasksDBTable());
         //--
         addTable(sapforProfiles = new SapforProfilesDBTable());
         addTable(sapforProfilesSettings = new SapforProfileSettingsDBTable());
diff --git a/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java b/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java
index 34b76322..0600f8f4 100644
--- a/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java
+++ b/src/SapforTestingSystem/SapforConfiguration/SapforConfigurationDBTable.java
@@ -1,7 +1,6 @@
 package SapforTestingSystem.SapforConfiguration;
 import Common.Current;
 import Common.Database.*;
-import Common.Global;
 import Common.UI.DataSetControlForm;
 import Common.UI.Windows.Dialog.DBObjectDialog;
 import Common.Utils.Utils;
@@ -35,12 +34,12 @@ public class SapforConfigurationDBTable extends DBTable<String, SapforConfigurat
             @Override
             public void ShowCurrentObject() throws Exception {
                 super.ShowCurrentObject();
-                Global.db.sapforTasksPackages.ShowUI();
+               // Global.db.sapforTasksPackages.ShowUI();
             }
             @Override
             public void ShowNoCurrentObject() throws Exception {
                 super.ShowNoCurrentObject();
-                Global.db.sapforTasksPackages.ClearUI();
+              //  Global.db.sapforTasksPackages.ClearUI();
             }
         };
     }
diff --git a/src/SapforTestingSystem/SapforScenario/SapforScenariosDBTable.java b/src/SapforTestingSystem/SapforScenario/SapforScenariosDBTable.java
index d08753ad..81a454bc 100644
--- a/src/SapforTestingSystem/SapforScenario/SapforScenariosDBTable.java
+++ b/src/SapforTestingSystem/SapforScenario/SapforScenariosDBTable.java
@@ -1,11 +1,9 @@
 package SapforTestingSystem.SapforScenario;
 import Common.Current;
-import Common.Database.*;
+import Common.Database.iDBTable;
 import Common.UI.DataSetControlForm;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
 
 import java.util.Date;
-import java.util.LinkedHashMap;
 
 import static Common.UI.Tables.TableRenderers.RendererDate;
 import static Common.UI.Tables.TableRenderers.RendererStatusEnum;
@@ -76,10 +74,12 @@ public class SapforScenariosDBTable extends iDBTable<SapforScenario> {
                 return null;
         }
     }
+    /*
     @Override
     public LinkedHashMap<Class<? extends DBObject>, FKBehaviour> getFKDependencies() {
         LinkedHashMap<Class<? extends DBObject>, FKBehaviour> res = new LinkedHashMap<>();
         res.put(SapforTasksPackage.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
         return res;
     }
+     */
 }
diff --git a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
index be6f0a94..8cf717d1 100644
--- a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
+++ b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
@@ -28,6 +28,8 @@ import java.nio.file.Paths;
 import java.util.LinkedHashMap;
 import java.util.Vector;
 import java.util.stream.Collectors;
+
+//НЕАКТУАЛЬНО, ВСЕ НА СЕРВЕРЕ
 public class StartSapforTests extends Pass_2021<SapforScenario> {
     protected int allTasksCount = 0;
     //--
@@ -285,10 +287,11 @@ public class StartSapforTests extends Pass_2021<SapforScenario> {
     }
     @Override
     protected void showFinish() throws Exception {
-        Global.db.sapforScenarios.ShowUI(target.getPK());
+        Pass_2021.passes.get(PassCode_2021.SynchronizeTests).Do();
+      //  Global.testingServer.db.sapforScenarios.ShowUI(target.getPK());
     }
     @Override
     protected void showDone() throws Exception {
-        Global.db.sapforScenarios.ShowUI();
+      //  Global.db.sapforScenarios.ShowUI();
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/StartSapforTestsOnServer.java b/src/Visual_DVM_2021/Passes/All/StartSapforTestsOnServer.java
index 59f303bc..2a7be2c1 100644
--- a/src/Visual_DVM_2021/Passes/All/StartSapforTestsOnServer.java
+++ b/src/Visual_DVM_2021/Passes/All/StartSapforTestsOnServer.java
@@ -184,6 +184,6 @@ public class StartSapforTestsOnServer extends TestingSystemPass<SapforServerScen
     @Override
     protected void performFinish() throws Exception {
         super.performFinish();
-       // passes.get(PassCode_2021.SynchronizeTests).Do();
+        passes.get(PassCode_2021.SynchronizeTests).Do();
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java b/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java
index 27569d49..f5a0e7c0 100644
--- a/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java
+++ b/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java
@@ -52,6 +52,7 @@ public class SynchronizeTests extends TestingSystemPass<Object> {
             server.db.configurations.ShowUI();
             server.db.groups.ShowUI();
             server.db.sapforConfigurations.ShowUI();
+            server.db.sapforScenarios.ShowUI();
             server.db.RestoreLastSelections();
             UI.getMainWindow().getTestingWindow().ShowCheckedTestsCount();
             //для отображения числа ядер.
diff --git a/src/Visual_DVM_2021/UI/Main/TestingForm.java b/src/Visual_DVM_2021/UI/Main/TestingForm.java
index b944b074..55476f76 100644
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.java
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.java
@@ -153,8 +153,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         Global.testingServer.db.sapforConfigurations.mountUI(sapforConfigurationsPanel);
         Global.testingServer.db.sapforConfigurationCommands.mountUI(sapforConfigurationCommandsPanel);
         Global.testingServer.db.serverSapfors.mountUI(serverSapforsPanel);
-        Global.db.sapforScenarios.mountUI(sapforScenariosPanel);
-        Global.db.sapforTasksPackages.mountUI(sapforPackagesPanel);
+        Global.testingServer.db.sapforScenarios.mountUI(sapforScenariosPanel);
+        Global.testingServer.db.sapforTasksPackages.mountUI(sapforPackagesPanel);
 
         //Global.db.sapforTasks.mountUI(sapforTasksPanel);
         // Global.testingServer.account_db.sapforTasksPackages.mountUI(sapforPackagesPanel);
@@ -191,7 +191,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         Global.testingServer.account_db.packages.ShowUI();
         Global.testingServer.db.serverSapfors.ShowUI();
         Global.testingServer.db.sapforConfigurations.ShowUI();
-        Global.db.sapforScenarios.ShowUI();
+        Global.testingServer.db.sapforScenarios.ShowUI();
     }
     //-
     @Override