From fc42dc0723eac58df0c5091084013032f63202b3 Mon Sep 17 00:00:00 2001
From: krivoshein <krivoshein@msk.constanta-design.ru>
Date: Tue, 7 Oct 2025 17:41:49 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D1=8B=20=D0=91?=
 =?UTF-8?q?=D0=94=20=D0=B2=20=D0=A1=D0=B5=D1=80=D0=B2=D0=B5=D1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DataBaseLMS/databaselms.h     |   7 +-
 ServerLMS/providerdblms.cpp   |   5 ++
 ServerLMS/providerdblms.h     |   1 +
 ServerLMS/serverlmswidget.cpp |   8 +++
 ServerLMS/serverlmswidget.ui  | 132 ++++++++++++++++++++--------------
 5 files changed, 96 insertions(+), 57 deletions(-)

diff --git a/DataBaseLMS/databaselms.h b/DataBaseLMS/databaselms.h
index 74c431a..cbd9b98 100644
--- a/DataBaseLMS/databaselms.h
+++ b/DataBaseLMS/databaselms.h
@@ -12,7 +12,7 @@
 #include "tasksAmmFim.h"
 #include "timingoftrainee.h"
 
-class DataBaseSettings
+class DATABASELMS_EXPORT DataBaseSettings
 {
 public:
     QString dbName = "";
@@ -24,7 +24,7 @@ public:
     int dbPort = 0;
 };
 
-class DataBaseLMS : public QObject
+class DATABASELMS_EXPORT DataBaseLMS : public QObject
 {
     Q_OBJECT
 
@@ -105,8 +105,9 @@ protected:
     //int insertReportFIMforTask(TaskAmmFim task);
     int updateReportFIMforTask(TaskAmmFim task);
 
-private:
+public:
     DataBaseSettings getDataBaseSettings();
+private:    
     int queryExecInt(QString queryStr);
     QString queryExecString(QString queryStr);
     bool queryExecBool(QString queryStr);
diff --git a/ServerLMS/providerdblms.cpp b/ServerLMS/providerdblms.cpp
index 02ff9aa..9ec5ca2 100644
--- a/ServerLMS/providerdblms.cpp
+++ b/ServerLMS/providerdblms.cpp
@@ -41,6 +41,11 @@ void ProviderDBLMS::DisConnectionFromDB()
     mtxAccess.unlock();
 }
 
+DataBaseSettings ProviderDBLMS::getDBSettings()
+{
+    return dbLMS->getDataBaseSettings();
+}
+
 QString ProviderDBLMS::getMainInstructorName()
 {
     mtxAccess.lock();
diff --git a/ServerLMS/providerdblms.h b/ServerLMS/providerdblms.h
index b5e9f7b..ee58aaf 100644
--- a/ServerLMS/providerdblms.h
+++ b/ServerLMS/providerdblms.h
@@ -77,6 +77,7 @@ Q_SIGNALS:
 public:
     void ConnectionToDB();
     void DisConnectionFromDB();
+    DataBaseSettings getDBSettings();
 
 private:
     InterfaceDataBaseLMS* dbLMS;
diff --git a/ServerLMS/serverlmswidget.cpp b/ServerLMS/serverlmswidget.cpp
index f0a5aa9..5ca6e5b 100644
--- a/ServerLMS/serverlmswidget.cpp
+++ b/ServerLMS/serverlmswidget.cpp
@@ -41,6 +41,14 @@ ServerLMSWidget::ServerLMSWidget(QWidget *parent) :
     providerDBLMS->ConnectionToDB();
     providerDBLMS->deAuthorizationAll();
 
+    //Настройки БД
+    DataBaseSettings dbSettings = providerDBLMS->getDBSettings();
+    QString strDBsettings = QString("%1 (%2) %3 : %4").arg(dbSettings.dbName,
+                                                           dbSettings.dbType,
+                                                           dbSettings.dbHostName,
+                                                           QString::number(dbSettings.dbPort));
+    ui->lblDBsettings->setText(strDBsettings);
+
     chatSystem = new ChatSystem();
 
     connect(providerDBLMS, &ProviderDBLMS::signal_BlockAutorization, this, &ServerLMSWidget::slot_BlockAutorization);
diff --git a/ServerLMS/serverlmswidget.ui b/ServerLMS/serverlmswidget.ui
index 21d10be..5462b22 100644
--- a/ServerLMS/serverlmswidget.ui
+++ b/ServerLMS/serverlmswidget.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>574</width>
-    <height>817</height>
+    <width>800</width>
+    <height>800</height>
    </rect>
   </property>
   <property name="font">
@@ -22,40 +22,14 @@
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0">
     <layout class="QGridLayout" name="gridLayout">
-     <item row="0" column="0">
+     <item row="1" column="0">
       <widget class="QGroupBox" name="groupBox_2">
        <property name="title">
         <string>Server LMS</string>
        </property>
        <layout class="QGridLayout" name="gridLayout_7">
-        <item row="3" column="0">
-         <widget class="QGroupBox" name="groupBox">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="title">
-           <string>Logger</string>
-          </property>
-          <layout class="QGridLayout" name="gridLayout_3">
-           <item row="0" column="0">
-            <layout class="QVBoxLayout" name="verticalLayout">
-             <item>
-              <widget class="QPlainTextEdit" name="loggerTextField">
-               <property name="readOnly">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-          </layout>
-         </widget>
-        </item>
         <item row="2" column="0">
-         <widget class="QGroupBox" name="groupBox_3">
+         <widget class="QGroupBox" name="groupBox_Clients">
           <property name="title">
            <string>List of clients</string>
           </property>
@@ -83,13 +57,32 @@
           </layout>
          </widget>
         </item>
-        <item row="4" column="0">
-         <layout class="QHBoxLayout" name="horizontalLayout">
+        <item row="5" column="0">
+         <layout class="QHBoxLayout" name="horizontalLayout_State">
+          <item>
+           <widget class="QLabel" name="lblOnOff">
+            <property name="maximumSize">
+             <size>
+              <width>40</width>
+              <height>40</height>
+             </size>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+            <property name="pixmap">
+             <pixmap resource="resources.qrc">:/resources/icons/switchOff.png</pixmap>
+            </property>
+            <property name="scaledContents">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
           <item>
            <widget class="QToolButton" name="btnStartServer">
             <property name="minimumSize">
              <size>
-              <width>80</width>
+              <width>50</width>
               <height>20</height>
              </size>
             </property>
@@ -117,7 +110,7 @@
            <widget class="QToolButton" name="btnStopServer">
             <property name="minimumSize">
              <size>
-              <width>80</width>
+              <width>50</width>
               <height>20</height>
              </size>
             </property>
@@ -141,25 +134,6 @@
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QLabel" name="lblOnOff">
-            <property name="maximumSize">
-             <size>
-              <width>40</width>
-              <height>40</height>
-             </size>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-            <property name="pixmap">
-             <pixmap resource="resources.qrc">:/resources/icons/switchOff.png</pixmap>
-            </property>
-            <property name="scaledContents">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
           <item>
            <spacer name="horizontalSpacer">
             <property name="orientation">
@@ -174,7 +148,7 @@
            </spacer>
           </item>
           <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_2">
+           <layout class="QHBoxLayout" name="horizontalLayout_Block">
             <item>
              <widget class="QLabel" name="label">
               <property name="text">
@@ -217,6 +191,56 @@
           </item>
          </layout>
         </item>
+        <item row="4" column="0">
+         <widget class="QGroupBox" name="groupBox_Logger">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="title">
+           <string>Logger</string>
+          </property>
+          <layout class="QGridLayout" name="gridLayout_3">
+           <item row="0" column="0">
+            <layout class="QVBoxLayout" name="verticalLayout">
+             <item>
+              <widget class="QPlainTextEdit" name="loggerTextField">
+               <property name="readOnly">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item row="6" column="0">
+         <layout class="QHBoxLayout" name="horizontalLayout_DBsettings">
+          <item>
+           <widget class="QLabel" name="label_DataBase">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Data base: </string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="lblDBsettings">
+            <property name="text">
+             <string>...</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
        </layout>
       </widget>
      </item>