From 311577ebc422ee82808c8df151b6818e992ab42c Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 16 Nov 2023 21:19:26 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BE=D0=B1=D0=BE=D0=B1=D1=89=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=BD=D1=8B=D0=B9=20=D0=BF=D1=80=D0=BE=D1=85=D0=BE=D0=B4=20?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B2=20=D0=BD=D0=B0=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B5.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  6 +--
 src/TestingSystem/Group/GroupsDBTable.java    |  2 +-
 src/Visual_DVM_2021/Passes/All/EditGroup.java | 44 +++----------------
 .../Passes/All/EditGroupOnServer.java         | 16 -------
 src/Visual_DVM_2021/Passes/PassCode_2021.java |  3 --
 .../Passes/Server/EditServerObject.java       | 27 ++++++++++++
 6 files changed, 36 insertions(+), 62 deletions(-)
 delete mode 100644 src/Visual_DVM_2021/Passes/All/EditGroupOnServer.java
 create mode 100644 src/Visual_DVM_2021/Passes/Server/EditServerObject.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 03763d2e..36bbb258 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,11 +7,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/EditServerObject.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/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Group/GroupsDBTable.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/TestingSystem/Group/GroupsDBTable.java b/src/TestingSystem/Group/GroupsDBTable.java
index 3016a98d..2f86e571 100644
--- a/src/TestingSystem/Group/GroupsDBTable.java
+++ b/src/TestingSystem/Group/GroupsDBTable.java
@@ -122,7 +122,7 @@ public class GroupsDBTable extends iDBTable<Group> {
             }
             @Override
             protected void AdditionalInitColumns() {
-                columns.get(0).setVisible(false);
+                //columns.get(0).setVisible(false);
             }
         };
     }
diff --git a/src/Visual_DVM_2021/Passes/All/EditGroup.java b/src/Visual_DVM_2021/Passes/All/EditGroup.java
index ebe7eb2e..c8229636 100644
--- a/src/Visual_DVM_2021/Passes/All/EditGroup.java
+++ b/src/Visual_DVM_2021/Passes/All/EditGroup.java
@@ -1,42 +1,10 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Global;
 import TestingSystem.Group.Group;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
-public class EditGroup extends TestingSystemPass<Group> {
-    @Override
-    public String getIconPath() {
-        return "/icons/RedAdd.png";
+import TestingSystem.TestingServer;
+import Visual_DVM_2021.Passes.Server.EditServerObject;
+public class EditGroup extends EditServerObject<TestingServer, Group> {
+    public EditGroup() {
+        super(Global.testingServer, Group.class);
     }
-    @Override
-    public String getButtonText() {
-        return "";
-    }
-    @Override
-    protected void ServerAction() throws Exception {
-    }
-    /*
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        if (Current.Check(Log, Current.Group)){
-            target = Current.getGroup();
-            if (!Current.getAccount().CheckAccessRights(target.sender_address, Log)){
-                return false;
-            }
-            return getTable().ShowEditObjectDialog(target);
-        }
-        return false;
-    }
-    @Override
-    protected Database getDb() {
-        return Global.testingServer.db;
-    }
-    @Override
-    protected void performDone() throws Exception {
-        super.performDone();
-        //отправка.
-        passes.get(PassCode_2021.EditGroupOnServer).Do(target);
-    }
-    @Override
-    protected void ServerAction() throws Exception {
-    }
-     */
 }
diff --git a/src/Visual_DVM_2021/Passes/All/EditGroupOnServer.java b/src/Visual_DVM_2021/Passes/All/EditGroupOnServer.java
deleted file mode 100644
index 9bb10bc3..00000000
--- a/src/Visual_DVM_2021/Passes/All/EditGroupOnServer.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package Visual_DVM_2021.Passes.All;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.Group.Group;
-import Visual_DVM_2021.Passes.Server.TestingSystemPass;
-public class EditGroupOnServer extends TestingSystemPass<Group> {
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        target = (Group) args[0];
-        return true;
-    }
-    @Override
-    protected void ServerAction() throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.EditObject, "", target));
-    }
-}
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index 0409e95c..9a658313 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -209,7 +209,6 @@ public enum PassCode_2021 {
     //-
     EditGroup,
     PublishGroup,
-    EditGroupOnServer,
     //-
     DownloadAllBugReportsArchives,
     ShowInstruction,
@@ -481,8 +480,6 @@ public enum PassCode_2021 {
                 return "Получить связи между массивами";
             case SynchronizeTestsTasks:
                 return "Синхронизация базы данных тестовых задач.";
-            case EditGroupOnServer:
-                return "Обновить группу на сервере";
             case SaveBugReportExecutor:
                 return "Назначить исполнителя отчёта об ошибке";
             case SaveBugReportRecipients:
diff --git a/src/Visual_DVM_2021/Passes/Server/EditServerObject.java b/src/Visual_DVM_2021/Passes/Server/EditServerObject.java
new file mode 100644
index 00000000..33877541
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/Server/EditServerObject.java
@@ -0,0 +1,27 @@
+package Visual_DVM_2021.Passes.Server;
+import Common.Database.riDBObject;
+import Repository.RepositoryServer;
+import Repository.Server.ServerCode;
+import Repository.Server.ServerExchangeUnit_2021;
+public class EditServerObject<S extends RepositoryServer, D extends riDBObject> extends ServerObjectPass<S, D> {
+    //--
+    @Override
+    public String getIconPath() {
+        return "/icons/Edit.png";
+    }
+    //--
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        target = (D) getDb().tables.get(d).getCurrent();
+        return getDb().tables.get(d).CheckCurrent(Log) && getDb().tables.get(d).ShowEditObjectDialog(target);
+    }
+    //--
+    public EditServerObject(S server_in, Class<D> d_in) {
+        super(server_in, d_in);
+    }
+    //--
+    @Override
+    protected void ServerAction() throws Exception {
+        Command(new ServerExchangeUnit_2021(ServerCode.EditObject, "", target));
+    }
+}