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 @@
0
0
- 574
- 817
+ 800
+ 800
@@ -22,40 +22,14 @@
-
-
-
+
-
Server LMS
-
-
-
-
-
- 0
- 0
-
-
-
- Logger
-
-
-
-
-
-
-
-
-
- true
-
-
-
-
-
-
-
-
-
-
+
List of clients
@@ -83,13 +57,32 @@
- -
-
+
-
+
+
-
+
+
+
+ 40
+ 40
+
+
+
+
+
+
+ :/resources/icons/switchOff.png
+
+
+ true
+
+
+
-
- 80
+ 50
20
@@ -117,7 +110,7 @@
- 80
+ 50
20
@@ -141,25 +134,6 @@
- -
-
-
-
- 40
- 40
-
-
-
-
-
-
- :/resources/icons/switchOff.png
-
-
- true
-
-
-
-
@@ -174,7 +148,7 @@
-
-
+
-
@@ -217,6 +191,56 @@
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Logger
+
+
+
-
+
+
-
+
+
+ true
+
+
+
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Data base:
+
+
+
+ -
+
+
+ ...
+
+
+
+
+