From c83cfd9eff0f96204c620653b29ece2dda551af9 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 22 Feb 2025 16:10:21 +0300
Subject: [PATCH] =?UTF-8?q?fix=20=D0=A3=D1=81=D1=82=D1=80=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BF=D1=80=D0=BE=D0=BF=D1=83=D1=89=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D0=B5=20=D1=83=D1=8F=D0=B7=D0=B2=D0=B8=D0=BC?=
 =?UTF-8?q?=D0=BE=D1=81=D1=82=D0=B8=20=D0=B2=20=D0=BD=D0=B5=D0=BA=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BE=D1=80=D1=8B=D1=85=20=D0=BF=D1=80=D0=BE=D1=85=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=B0=D1=85=20v++?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                             | 17 +++++++----------
 properties                                      |  6 +++---
 src/Common/Database/Database.java               |  8 ++++++++
 src/_VisualDVM/Constants.java                   |  2 +-
 src/_VisualDVM/MainModule.java                  |  3 ++-
 src/_VisualDVM/Passes/All/CheckAccount.java     |  4 ----
 .../Passes/All/ReplaceTestsFromFiles.java       |  4 ++--
 .../Passes/Testing/AbortTestingPackage.java     |  2 +-
 src/_VisualDVM/Visual/Windows/CallbackForm.java |  1 -
 9 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c6b0ccc9..f1ebc127 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,16 +9,13 @@
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <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/Common/Database/Objects/riDBObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/riDBObject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromProject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DetectSelectedTestsMinMaDim.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DetectSelectedTestsMinMaDim.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestProject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Database/Database.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Database.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckAccount.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 48c1f17c..1fcb6f95 100644
--- a/properties
+++ b/properties
@@ -1,9 +1,9 @@
 {
-  "Email": "nataliku2@yandex.ru",
-  "Name": "Test",
+  "Email": "vmk-post@yandex.ru",
+  "Name": "M",
   "ServerUserPassword": "mprit_2011",
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\Tests\\Downloads",
+  "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\236",
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
   "Visualizer_2Path": "C:\\Users\\misha\\Documents",
diff --git a/src/Common/Database/Database.java b/src/Common/Database/Database.java
index 91ebd853..a5fb1638 100644
--- a/src/Common/Database/Database.java
+++ b/src/Common/Database/Database.java
@@ -300,6 +300,14 @@ public abstract class Database {
         }
         return log.isEmpty();
     }
+    public boolean canModifyCurrent(TextLog log, Class... tablesClasses) {
+        for (Class tableClass : tablesClasses) {
+            DBTable table = getTable(tableClass);
+            if (table.getUI() != null)
+                table.getUI().canModifyCurrent(log);
+        }
+        return log.isEmpty();
+    }
     public abstract PassCode_ getSynchronizePassCode(); //если бд есть на сервере.
     //--
     public void ReplaceFileAndReconnect(File file_in) throws Exception{
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index 2e715244..c4dc0234 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1181;
+    public static final int version = 1182;
     public static final int planner_version = 10;
     public static final int testingMaxKernels = 64; //вообще говоря, это параметр машины.
     //--
diff --git a/src/_VisualDVM/MainModule.java b/src/_VisualDVM/MainModule.java
index 797e0e5f..17c39347 100644
--- a/src/_VisualDVM/MainModule.java
+++ b/src/_VisualDVM/MainModule.java
@@ -33,7 +33,8 @@ public class MainModule extends MainModule_<GlobalDatabase, MainUI> {
             PassCode.StartTestingServer,
             PassCode.PublishTestingServer,
             PassCode.CreateTestsGroupFromSelectedVersions,
-            PassCode.RefreshDVMPackageResults
+            PassCode.RefreshDVMPackageResults,
+            PassCode.ConvertCorrectnessTests
     );
     public MainModule() throws Exception {
         super(GlobalDatabase.class, MainUI.class);
diff --git a/src/_VisualDVM/Passes/All/CheckAccount.java b/src/_VisualDVM/Passes/All/CheckAccount.java
index 7c079b61..2fc33558 100644
--- a/src/_VisualDVM/Passes/All/CheckAccount.java
+++ b/src/_VisualDVM/Passes/All/CheckAccount.java
@@ -40,14 +40,11 @@ public class CheckAccount extends ComponentsServerPass {
         if (keyFile.exists()) {
             //ключ есть. проверить его актуальность.
             String key =  FileUtils.readFileToString(keyFile);
-            System.out.println("ключ найден.");
             if (SendRequest(ServerCode.GetUserAccountByKey,key)){
                 if (request.server_response.object!=null){
                     //ключ актуальный.
-                    System.out.println("ключ совпал");
                     Global.mainModule.setAccount((UserAccount) request.server_response.object);
                 }else {
-                    System.out.println("ключ не совпал!");
                     //ключ неактуальный. регистрируемся по новой.
                     UI.Error("Текущий ключ неверен. Он будет удален.");
                     Utils_.forceDeleteWithCheck(keyFile);
@@ -55,7 +52,6 @@ public class CheckAccount extends ComponentsServerPass {
                 }
             }
         }else {
-            System.out.println("ключ не найден!");
             confirmEmail();
         }
         return !Global.mainModule.getAccount().role.equals(AccountRole.Undefined);
diff --git a/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java b/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java
index e69fbac0..61e1ae03 100644
--- a/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java
+++ b/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java
@@ -36,10 +36,10 @@ public class ReplaceTestsFromFiles extends TestingServerPass<Vector<Test>> {
         //--->>>
         Utils.RestoreSelectedDirectory(fileChooser);
         Vector<File> files = fileChooser.ShowMultiDialog();
-        //---------------------------------------------------------------
+        //----------------ROLE is-----------------------------------------------
         //--
         File dir = fileChooser.getCurrentDirectory();
-        Global.mainModule.getPass(PassCode.UpdateProperty).Do("ProjectsSearchDirectory", dir);
+        Global.mainModule.getPass(PassCode.UpdateProperty).Do("ProjectsSearchDirectory", dir.getAbsolutePath());
         //---------------
         if (dir.getName().equals(Constants.data)) {
             Log.Writeln_(Utils_.Brackets(dir) + "\nявляется служебной папкой визуализатора!");
diff --git a/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java b/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java
index 3e2ebf97..ea8d23e5 100644
--- a/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java
+++ b/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java
@@ -14,7 +14,7 @@ public abstract class AbortTestingPackage extends TestingServerPass<TestingPacka
     @Override
     protected boolean canStart(Object... args) throws Exception {
         packageToKill = null;
-        if (getServer().db.CheckCurrent(Log, currentClass())) {
+        if (getServer().db.canModifyCurrent(Log, currentClass())) {
             target = (TestingPackage) getServer().db.getTable(currentClass()).getUI().getCurrent();
             switch (target.state) {
                 case Done:
diff --git a/src/_VisualDVM/Visual/Windows/CallbackForm.java b/src/_VisualDVM/Visual/Windows/CallbackForm.java
index dfef6450..dc24b32b 100644
--- a/src/_VisualDVM/Visual/Windows/CallbackForm.java
+++ b/src/_VisualDVM/Visual/Windows/CallbackForm.java
@@ -407,7 +407,6 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
         lAccountName.setText(Utils_.Brackets(Global.mainModule.getAccount().name));
         lAccountMail.setText(Utils_.Brackets(Global.mainModule.getAccount().email));
         lAccountRole.setText(Utils_.Brackets(Global.mainModule.getAccount().role.getDescription()));
-        System.out.println("ROLE IS "+Global.mainModule.getAccount().role.getDescription());
         switch (Global.mainModule.getAccount().role) {
             case Undefined:
                 setUdefinedRights();