From 61d86704160b5f8043ce130eb0bcef986a1771d0 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 28 Feb 2025 17:46:57 +0300
Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=B8?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84?=
 =?UTF-8?q?=D0=B5=D0=B9=D1=81=D0=B0=20=D0=BF=D1=80=D0=B8=20=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B8=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BB=D0=BD=D0=BE=D0=BC=D0=BE=D1=87=D0=B8=D0=B9=20=D1=80?=
 =?UTF-8?q?=D0=BE=D0=BB=D0=B8=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B0=D1=82=D0=B5=D0=BB=D1=8F.=20=D0=B2=D0=B2=D0=BE=D0=B4=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8=20=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BC=D0=B5=D0=BD=D1=8F=D1=8E=D1=89=D0=B5=D0=B9=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B8=D0=B3=D0=BB=D0=B0=D1=88=D0=B5=D0=BD=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=86=D0=B8?=
 =?UTF-8?q?=D0=B8=20=D0=BF=D1=80=D0=B8=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81?=
 =?UTF-8?q?=D0=BA=D0=B5=20=D0=BF=D1=80=D0=B8=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  8 +++
 properties                                    |  5 +-
 src/_VisualDVM/Global.java                    | 21 ++++----
 src/_VisualDVM/NormalProperties.java          |  4 ++
 src/_VisualDVM/Passes/All/CheckAccount.java   |  2 +-
 .../Passes/All/SynchronizeBugReports.java     |  3 +-
 .../Visual/Interface/CallbackWindow.java      | 11 +++--
 src/_VisualDVM/Visual/MainUI.java             | 49 ++++++++++++++++++-
 .../SynchronizationSettingsMenu.java          |  1 +
 .../Visual/Windows/CallbackForm.java          | 47 +++---------------
 src/_VisualDVM/Visual/Windows/MainForm.java   |  1 +
 11 files changed, 90 insertions(+), 62 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 38592ea1..29dbee26 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,7 +7,15 @@
   </component>
   <component name="ChangeListManager">
     <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/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/NormalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/NormalProperties.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/Visual/Interface/CallbackWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/CallbackWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/SynchronizationSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/SynchronizationSettingsMenu.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" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/properties b/properties
index 2ccb7725..97c9e15b 100644
--- a/properties
+++ b/properties
@@ -1,7 +1,8 @@
 {
-  "Email": "nataliku2@yandex.ru",
-  "Name": "Test",
+  "Email": "vmk-post@yandex.ru",
+  "Name": "M",
   "ServerUserPassword": "mprit_2011",
+  "OfferRegistrationOnStart": false,
   "Workspace": "E:\\Tests",
   "ProjectsSearchDirectory": "E:\\Tests",
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
diff --git a/src/_VisualDVM/Global.java b/src/_VisualDVM/Global.java
index f3acbbc0..9f0e8ff0 100644
--- a/src/_VisualDVM/Global.java
+++ b/src/_VisualDVM/Global.java
@@ -13,19 +13,18 @@ import _VisualDVM.ProjectData.ProjectView;
 import _VisualDVM.TestingSystem.Common.TestingServer;
 import _VisualDVM.TestingSystem.DVM.RemoteDVMTestingPlanner;
 import _VisualDVM.TestingSystem.SAPFOR.PackageModeSupervisor;
-import org.apache.commons.io.FileUtils;
 import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
 import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
 
 import java.io.File;
 import java.nio.file.Paths;
 public class Global {
-    //todo свести большинство к содержимому mainModule, сделать различные типы properties, переместить туда глобальный журнал (?)
+    //todo свести большинство к содержимому mainModule
     public static MainModule mainModule = null;
     //Режим
     public static Mode mode = Mode.Undefined;
     //setAdminRights-------------
-    public static VisualDVMProperties properties= null;
+    public static VisualDVMProperties properties = null;
     public static NormalProperties normalProperties = null;
     public static ComponentsServerProperties componentsServerProperties = null;
     public static TestingServerProperties testingServerProperties = null;
@@ -79,8 +78,7 @@ public class Global {
         Utils_.CheckDirectory(KeysDirectory = new File(Utils_.getHomeDirectory(), Constants.KeyDirectoryName));
         try {
             Utils_.forceDeleteWithCheck(new File(DataDirectory, "credentials.sqlite"));
-        }
-        catch (Exception ex){
+        } catch (Exception ex) {
             ex.printStackTrace();
         }
     }
@@ -136,7 +134,7 @@ public class Global {
             mainModule.DeactivateDB();
             if (componentsServer.db != null)
                 componentsServer.db.Disconnect();
-            if (componentsServer.credentials_db!=null)
+            if (componentsServer.credentials_db != null)
                 componentsServer.credentials_db.Disconnect();
             if (testingServer.db != null)
                 testingServer.db.Disconnect();
@@ -203,8 +201,9 @@ public class Global {
         //  FoldParserManager.get().addFoldParserMapping("text/FortranSPF", new FortranFolder()); блоки кода. todo
         //light_editor.xml-------->>
         mainModule.ActivateDB();
-     //   https://habr.com/ru/articles/446888/ сертификат?
-        mainModule.getPass(PassCode.CheckAccount).Do();
+        //   https://habr.com/ru/articles/446888/ сертификат?
+        if (Global.normalProperties.OfferRegistrationOnStart)
+            mainModule.getPass(PassCode.CheckAccount).Do();
         //---------------
         componentsServer.ActivateDB();
         testingServer.ActivateDB();
@@ -251,17 +250,17 @@ public class Global {
         File propertiesFile = new File(System.getProperty("user.dir"), "properties");
         if (!propertiesFile.exists()) {
             mode = Mode.Normal;
-            properties=normalProperties = Utils_.SynschronizeProperties(propertiesFile, NormalProperties.class);
+            properties = normalProperties = Utils_.SynschronizeProperties(propertiesFile, NormalProperties.class);
         } else {
             properties = Utils_.jsonFromFile(propertiesFile, VisualDVMProperties.class);
             mode = properties.Mode;
             //--->>
-            switch (mode){
+            switch (mode) {
                 case Normal:
                     normalProperties = Utils_.SynschronizeProperties(propertiesFile, NormalProperties.class);
                     break;
                 case Server:
-                    componentsServerProperties =  Utils_.SynschronizeProperties(propertiesFile, ComponentsServerProperties.class);
+                    componentsServerProperties = Utils_.SynschronizeProperties(propertiesFile, ComponentsServerProperties.class);
                     break;
                 case Testing:
                     testingServerProperties = Utils_.SynschronizeProperties(propertiesFile, TestingServerProperties.class);
diff --git a/src/_VisualDVM/NormalProperties.java b/src/_VisualDVM/NormalProperties.java
index 3c093125..34a7c90a 100644
--- a/src/_VisualDVM/NormalProperties.java
+++ b/src/_VisualDVM/NormalProperties.java
@@ -15,6 +15,8 @@ public class NormalProperties extends VisualDVMProperties {
     public String Name = "";
     @Expose
     public String ServerUserPassword="";
+    @Expose
+    public boolean OfferRegistrationOnStart=true;
     //--->
     @Expose
     public String Workspace = "";
@@ -112,6 +114,8 @@ public class NormalProperties extends VisualDVMProperties {
     @Override
     public String getFieldDescription(String fieldName) {
         switch (fieldName) {
+            case "OfferRegistrationOnStart":
+                return "Предложение регистрации при запуске";
             case "Email":
                 return "Адрес электронной почты";
             case "Kernels":
diff --git a/src/_VisualDVM/Passes/All/CheckAccount.java b/src/_VisualDVM/Passes/All/CheckAccount.java
index 2fc33558..2ac58df9 100644
--- a/src/_VisualDVM/Passes/All/CheckAccount.java
+++ b/src/_VisualDVM/Passes/All/CheckAccount.java
@@ -63,7 +63,7 @@ public class CheckAccount extends ComponentsServerPass {
     @Override
     protected void showDone() throws Exception {
         if (Global.mainModule.getUI().hasMainWindow()) {
-            Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowAccount();
+            Global.mainModule.getUI().ShowAccount();
             if (Global.componentsServer.db.bugReports.getUI().getCurrent() != null)
                 Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
         }
diff --git a/src/_VisualDVM/Passes/All/SynchronizeBugReports.java b/src/_VisualDVM/Passes/All/SynchronizeBugReports.java
index c3737562..8ac07da9 100644
--- a/src/_VisualDVM/Passes/All/SynchronizeBugReports.java
+++ b/src/_VisualDVM/Passes/All/SynchronizeBugReports.java
@@ -1,4 +1,5 @@
 package _VisualDVM.Passes.All;
+import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.ComponentsServerPass;
 import _VisualDVM.Repository.Server.ServerCode;
@@ -13,7 +14,7 @@ public class SynchronizeBugReports extends ComponentsServerPass<Object> {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        return Global.mainModule.getAccount().CheckRegistered(Log) && SendRequest(ServerCode.ReceiveBugReportsDatabase);
+        return !Global.mainModule.getAccount().role.equals(AccountRole.Undefined) && SendRequest(ServerCode.ReceiveBugReportsDatabase);
     }
     @Override
     protected void showPreparation() throws Exception {
diff --git a/src/_VisualDVM/Visual/Interface/CallbackWindow.java b/src/_VisualDVM/Visual/Interface/CallbackWindow.java
index b93d7d2e..21f47965 100644
--- a/src/_VisualDVM/Visual/Interface/CallbackWindow.java
+++ b/src/_VisualDVM/Visual/Interface/CallbackWindow.java
@@ -1,7 +1,7 @@
 package _VisualDVM.Visual.Interface;
 import Common.Visual.VisualizerForm;
 public interface CallbackWindow extends VisualizerForm {
-    void ShowAccount();
+    void ShowAccountInfo(); //отображение в шапке окна обратной связи имени и прав. возможно убрать если нет регистрации вовсе.
     void ShowBugReports();
     void ShowNoBugReports();
     void ShowCurrentBugReport();
@@ -9,7 +9,7 @@ public interface CallbackWindow extends VisualizerForm {
     void ShowSubscription();
     //-
     default void ShowAll() {
-        ShowAccount();
+        ShowAccountInfo();
         ShowSubscription();
         ShowBugReports();
     }
@@ -21,7 +21,8 @@ public interface CallbackWindow extends VisualizerForm {
     void ClearBugReportCommentAdditionText();
     void FocusRecipients();
     void SwitchScreen(boolean small);
-    void setUndefinedRights();
-    void setUserRights();
-    void setAdminRights();
+    void showNoBugReports();
+    void showMyOnlyBugReports();
+    void showAllBugreports();
+    void showAllBugReportsAdmin();
 }
diff --git a/src/_VisualDVM/Visual/MainUI.java b/src/_VisualDVM/Visual/MainUI.java
index 151027a1..477ffc7a 100644
--- a/src/_VisualDVM/Visual/MainUI.java
+++ b/src/_VisualDVM/Visual/MainUI.java
@@ -100,6 +100,51 @@ public class MainUI extends UIModule_ {
         return profilesWindow;
     }
     //---
-
-    
+    void showUndefinedRights(){
+        Global.mainModule.SetUserPassesAccess();
+        getMainWindow().SwitchTestingTabs(false);
+        getMainWindow().SwitchAdministrationTab(false);
+        getTestingMenuBar().showServerAdminLabel(false);
+        getMainWindow().getCallbackWindow().showNoBugReports();
+    };
+    void showUserRights(){
+        Global.mainModule.SetUserPassesAccess();
+        getMainWindow().SwitchTestingTabs(false);
+        getMainWindow().SwitchAdministrationTab(false);
+        getTestingMenuBar().showServerAdminLabel(false);
+        getMainWindow().getCallbackWindow().showMyOnlyBugReports();
+    };
+    void showDeveloperRights(){
+        Global.mainModule.SetDeveloperPassesAccess();
+        getMainWindow().SwitchTestingTabs(true);
+        getMainWindow().SwitchAdministrationTab(false);
+        getTestingMenuBar().showServerAdminLabel(false);
+        getMainWindow().getCallbackWindow().showAllBugreports();
+    }
+    void showAdminRights(){
+        Global.mainModule.SetAdminPassesAccess();
+        getMainWindow().SwitchTestingTabs(true);
+        getMainWindow().SwitchAdministrationTab(true);
+        getTestingMenuBar().showServerAdminLabel(true);
+        getMainWindow().getCallbackWindow().showAllBugReportsAdmin(); //метод избыточный. возможно.
+    };
+    public void ShowAccount(){
+        getMainWindow().getCallbackWindow().ShowAccountInfo();
+        switch (Global.mainModule.getAccount().role) {
+            case Undefined:
+                showUndefinedRights();
+                break;
+            case User:
+                showUserRights();
+                break;
+            case Developer:
+                showDeveloperRights();
+                break;
+            case Admin:
+                showAdminRights();
+                break;
+            default:
+                break;
+        }
+    }
 }
diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/SynchronizationSettingsMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/SynchronizationSettingsMenu.java
index 0af36893..00141f2f 100644
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/SynchronizationSettingsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/SynchronizationSettingsMenu.java
@@ -5,6 +5,7 @@ public class SynchronizationSettingsMenu extends PropertiesSubmenu {
     public SynchronizationSettingsMenu() {
         super("Синхронизация", null,
                 Global.normalProperties,
+                "OfferRegistrationOnStart",
                 "AutoBugReportsLoad",
                 "AutoTestsLoad");
     }
diff --git a/src/_VisualDVM/Visual/Windows/CallbackForm.java b/src/_VisualDVM/Visual/Windows/CallbackForm.java
index 9eac5600..eae6565a 100644
--- a/src/_VisualDVM/Visual/Windows/CallbackForm.java
+++ b/src/_VisualDVM/Visual/Windows/CallbackForm.java
@@ -363,67 +363,34 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
         accountPanel.add(SC10);
     }
     @Override
-    public void setUndefinedRights(){
-        Global.mainModule.SetUserPassesAccess();
+    public void showNoBugReports(){
         UI.Clear(accountPanel);
         accountPanel.add(new CallbackWelcomeForm().content);
-        Global.mainModule.getUI().getMainWindow().SwitchTestingTabs(false);
-        Global.mainModule.getUI().getMainWindow().SwitchAdministrationTab(false);
-        Global.mainModule.getUI().getTestingMenuBar().showServerAdminLabel(false);
         adminLabel.setVisible(false);
     }
     @Override
-    public void setUserRights() {
+    public void showMyOnlyBugReports() {
         EnableBugreports();
         LockMyOnly();
-        Global.mainModule.SetUserPassesAccess();
-        Global.mainModule.getUI().getMainWindow().SwitchTestingTabs(false);
-        Global.mainModule.getUI().getMainWindow().SwitchAdministrationTab(false);
-        Global.mainModule.getUI().getTestingMenuBar().showServerAdminLabel(false);
         adminLabel.setVisible(false);
     }
-    private void setDeveloperRights() {
+    //возможно перезапуск серверов перетащить во вкладку администрирование? вместе с бекапами. надо подумать.
+    @Override
+    public void showAllBugreports() {
         EnableBugreports();
         UnlockMyOnly();
-        Global.mainModule.SetDeveloperPassesAccess();
-        Global.mainModule.getUI().getMainWindow().SwitchTestingTabs(true);
-        Global.mainModule.getUI().getMainWindow().SwitchAdministrationTab(false);
-        Global.mainModule.getUI().getTestingMenuBar().showServerAdminLabel(false);
         adminLabel.setVisible(false);
     }
     @Override
-    public void setAdminRights() {
+    public void showAllBugReportsAdmin() {
         EnableBugreports();
         UnlockMyOnly();
-        Global.mainModule.SetAdminPassesAccess();
-        //--
-        Global.mainModule.getUI().getMainWindow().SwitchTestingTabs(true);
-        Global.mainModule.getUI().getMainWindow().SwitchAdministrationTab(true);
-        Global.mainModule.getUI().getTestingMenuBar().showServerAdminLabel(true);
         adminLabel.setVisible(true);
     }
-    @Override
-    public void ShowAccount() {
+    public void ShowAccountInfo() {
         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()));
-        switch (Global.mainModule.getAccount().role) {
-            case Undefined:
-                setUndefinedRights();
-                break;
-            case User:
-                //видит только свои баги.
-                setUserRights();
-                break;
-            case Developer:
-                setDeveloperRights();
-                break;
-            case Admin:
-                setAdminRights();
-                break;
-            default:
-                break;
-        }
     }
     @Override
     public void ShowBugReports() {
diff --git a/src/_VisualDVM/Visual/Windows/MainForm.java b/src/_VisualDVM/Visual/Windows/MainForm.java
index 89feaedb..13c40317 100644
--- a/src/_VisualDVM/Visual/Windows/MainForm.java
+++ b/src/_VisualDVM/Visual/Windows/MainForm.java
@@ -238,6 +238,7 @@ public class MainForm extends Form implements MainWindow {
     public void Show() {
         //приходится идти на это только ПОСЛЕ создания главного окна.
         // иначе ссылка на главное окно в методах пустая.
+        Global.mainModule.getUI().ShowAccount();
         getCallbackWindow().ShowAll();
         getTestsWindow().ShowAll();
         getCredentialsWindow().ShowAll();