From 1ae4d1980abc41fe6b55eccdaa1259589b9d6bc8 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 26 Mar 2025 14:00:46 +0300
Subject: [PATCH] =?UTF-8?q?++=20=D1=80=D0=BE=D0=BB=D1=8C=20=D1=81=D1=82?=
 =?UTF-8?q?=D1=83=D0=B4=D0=B5=D0=BD=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                             | 12 ++++++++----
 properties                                      |  2 +-
 .../UserAccount/AccountRole.java                |  3 +++
 .../UserAccount/UI/UserAccountFields.java       |  1 +
 src/_VisualDVM/Constants.java                   |  2 +-
 src/_VisualDVM/MainModule.java                  |  3 +++
 src/_VisualDVM/Visual/Interface/MainWindow.java |  1 +
 src/_VisualDVM/Visual/MainUI.java               | 17 +++++++++++++++++
 src/_VisualDVM/Visual/Windows/MainForm.java     |  4 +++-
 9 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8698deba..ae7bee75 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,11 +7,15 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DropSapforConfigurationEthalon.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/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/AccountRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/AccountRole.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.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/Visual/Interface/MainWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/MainWindow.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/Windows/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 0e490eeb..e6c46692 100644
--- a/properties
+++ b/properties
@@ -34,7 +34,7 @@
   "ErasePackageWorkspace": true,
   "lastMachineId": 28,
   "lastUserId": 36,
-  "lastCompilerId": 110,
+  "lastCompilerId": 109,
   "RegisterOn": false,
   "SpacesOn": false,
   "EmptyLinesOn": false,
diff --git a/src/_VisualDVM/ComponentsServer/UserAccount/AccountRole.java b/src/_VisualDVM/ComponentsServer/UserAccount/AccountRole.java
index 5f8d923f..8041d028 100644
--- a/src/_VisualDVM/ComponentsServer/UserAccount/AccountRole.java
+++ b/src/_VisualDVM/ComponentsServer/UserAccount/AccountRole.java
@@ -3,6 +3,7 @@ import java.io.Serializable;
 public enum AccountRole implements Serializable {
     Undefined,
     User,
+    Student,
     Developer,
     Admin;
     public String getDescription() {
@@ -11,6 +12,8 @@ public enum AccountRole implements Serializable {
                 return "не зарегистрирован";
             case User:
                 return "Пользователь";
+            case Student:
+                return "Студент";
             case Developer:
                 return "Разработчик";
             case Admin:
diff --git a/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.java b/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.java
index b202deda..04061059 100644
--- a/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.java
+++ b/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.java
@@ -17,6 +17,7 @@ public class UserAccountFields implements DialogFields {
         tfAddress = new StyledTextField();
         cbRole = new JComboBox<>();
         cbRole.addItem(AccountRole.User);
+        cbRole.addItem(AccountRole.Student);
         cbRole.addItem(AccountRole.Developer);
         cbRole.addItem(AccountRole.Admin);
     }
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index 4331bb1f..30be86cf 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 = 1229;
+    public static final int version = 1230;
     public static final int planner_version = 24;
     public static final int testingMaxKernels = 64;
     //--
diff --git a/src/_VisualDVM/MainModule.java b/src/_VisualDVM/MainModule.java
index 0dcbcdf5..257b0766 100644
--- a/src/_VisualDVM/MainModule.java
+++ b/src/_VisualDVM/MainModule.java
@@ -148,6 +148,9 @@ public class MainModule extends MainModule_<GlobalDatabase, MainUI> {
         for (PassCode code : accountRoleDependentPasses)
             getPass(code).setControlsVisible(false);
     }
+    public void SetStudentPassesAccess(){
+        SetUserPassesAccess();
+    }
     public void SetDeveloperPassesAccess() {
         SetUserPassesAccess();
         getPass(PassCode.CreateTestsGroupFromSelectedVersions).setControlsVisible(true);
diff --git a/src/_VisualDVM/Visual/Interface/MainWindow.java b/src/_VisualDVM/Visual/Interface/MainWindow.java
index ac30c042..81bdeeda 100644
--- a/src/_VisualDVM/Visual/Interface/MainWindow.java
+++ b/src/_VisualDVM/Visual/Interface/MainWindow.java
@@ -20,6 +20,7 @@ public interface MainWindow {
     void ShowCheckedTestsCount();
     void ShowUndefinedTabs();
     void ShowUserTabs();
+    void ShowStudentTabs();
     void ShowDeveloperTabs();
     void ShowAdminTabs();
 }
diff --git a/src/_VisualDVM/Visual/MainUI.java b/src/_VisualDVM/Visual/MainUI.java
index 51004a87..7215e657 100644
--- a/src/_VisualDVM/Visual/MainUI.java
+++ b/src/_VisualDVM/Visual/MainUI.java
@@ -129,6 +129,20 @@ public class MainUI extends UIModule_ {
         Global.normalProperties.AutoCheckTesting = false;
         Global.normalProperties.Update();
     }
+    void showStudentRights(){
+        Global.mainModule.SetUserPassesAccess();
+        getMainWindow().ShowStudentTabs();
+        getTestingMenuBar().showServerAdminLabel(false);
+        getMainWindow().getCallbackWindow().showAllBugreports();
+        Global.normalProperties.setControlVisible("AutoBugReportsLoad", true);
+        Global.normalProperties.setControlVisible("AutoTestsLoad", false);
+        Global.normalProperties.setControlVisible("CreateEthalonTasks", false);
+        Global.normalProperties.setControlVisible("CompleteCompilationOptions", false);
+        Global.normalProperties.setControlVisible("CompleteRunEnvironments", false);
+        Global.normalProperties.setControlVisible("ErasePackageWorkspace", false);
+        Global.normalProperties.AutoCheckTesting = false;
+        Global.normalProperties.Update();
+    }
     ;
     void showDeveloperRights() {
         Global.mainModule.SetDeveloperPassesAccess();
@@ -164,6 +178,9 @@ public class MainUI extends UIModule_ {
             case User:
                 showUserRights();
                 break;
+            case Student:
+                showStudentRights();
+                break;
             case Developer:
                 showDeveloperRights();
                 break;
diff --git a/src/_VisualDVM/Visual/Windows/MainForm.java b/src/_VisualDVM/Visual/Windows/MainForm.java
index 32eec45a..9a6473a3 100644
--- a/src/_VisualDVM/Visual/Windows/MainForm.java
+++ b/src/_VisualDVM/Visual/Windows/MainForm.java
@@ -268,7 +268,9 @@ public class MainForm extends Form implements MainWindow {
     }
     @Override
     public void ShowUserTabs() {
-        //тоже ничего не делаем.
+    }
+    @Override
+    public void ShowStudentTabs() {
     }
     @Override
     public void ShowDeveloperTabs() {