From c0214211180ee0073fc094dc5d2b8eadcfef743a Mon Sep 17 00:00:00 2001 From: krivoshein Date: Thu, 6 Nov 2025 21:49:15 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=82=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D0=B8=D0=BD=D0=B8=D1=86=D0=B8=D0=B0=D0=BB?= =?UTF-8?q?=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B2=20=D0=A1=D0=B5?= =?UTF-8?q?=D1=80=D0=B2=D0=B5=D1=80=D0=B5=20(=D1=81=D1=82=D0=B0=D1=80?= =?UTF-8?q?=D1=82=20=D0=B2=D0=B8=D0=B4=D0=B6=D0=B5=D1=82=D0=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBaseLMS/databaselms.cpp | 17 ++--------------- DataBaseLMS/databaselms_Postgresql.cpp | 1 - DataBaseLMS/databaselms_groups.cpp | 1 - DataBaseLMS/databaselms_instructors.cpp | 1 - DataBaseLMS/databaselms_tasks.cpp | 1 - DataBaseLMS/databaselms_trainees.cpp | 1 - DataBaseLMS/databaselms_users.cpp | 2 +- DataBaseLMS/interfacedatabaselms.cpp | 4 ---- DataBaseLMS/tasksAmmFim.cpp | 2 +- TrayServerLMS/mainwindow.cpp | 10 ++++------ TrayServerLMS/mainwindow.h | 2 +- 11 files changed, 9 insertions(+), 33 deletions(-) diff --git a/DataBaseLMS/databaselms.cpp b/DataBaseLMS/databaselms.cpp index 900ddf3..76e54af 100644 --- a/DataBaseLMS/databaselms.cpp +++ b/DataBaseLMS/databaselms.cpp @@ -3,7 +3,6 @@ #include #include #include -#include #include #include @@ -55,7 +54,7 @@ bool DataBaseLMS::createConnection() else { bool flHas = db->driver()->hasFeature(QSqlDriver::Transactions); - //qDebug() << "db->driver()->hasFeature(QSqlDriver::Transactions): " << flHas; + qDebug() << "db->driver()->hasFeature(QSqlDriver::Transactions): " << flHas; return true; } } @@ -93,10 +92,8 @@ DataBaseSettings DataBaseLMS::getDataBaseSettings() DataBaseSettings settings; QFile file("config/settings.xml"); if(!file.open(QIODevice::ReadOnly)) - { - //QMessageBox::critical(ownerWidget, tr("Attention!"), tr("The file could not be opened:") + "config/settings.xml"); return settings; - } + QXmlStreamReader xmlReader(&file); while (!xmlReader.atEnd()){ @@ -232,17 +229,7 @@ void DataBaseLMS::messageWarningErrorQuery(QString queryStr, QSqlQuery* query) } } - //Сообщение об ошибке - /* - QWidget* owner = ownerWidget; - QMessageBox::critical(ownerWidget, tr("Error PostgreSQL!"), - //dbSettings.dbName - "Error query:\n" + query->lastError().text() + "\n" + - "String of query:\n" + queryStr + "\n" + - "Executed query:\n" + query->executedQuery()); - */ - QString textError = ""; textError = "Error query:\n" + query->lastError().text() + "\n" + "String of query:\n" + queryStr + "\n" + diff --git a/DataBaseLMS/databaselms_Postgresql.cpp b/DataBaseLMS/databaselms_Postgresql.cpp index f8fdb83..5241df0 100644 --- a/DataBaseLMS/databaselms_Postgresql.cpp +++ b/DataBaseLMS/databaselms_Postgresql.cpp @@ -3,7 +3,6 @@ #include #include #include -#include #include #include diff --git a/DataBaseLMS/databaselms_groups.cpp b/DataBaseLMS/databaselms_groups.cpp index 6d7f1e0..6a90e83 100644 --- a/DataBaseLMS/databaselms_groups.cpp +++ b/DataBaseLMS/databaselms_groups.cpp @@ -3,7 +3,6 @@ #include #include #include -#include QList DataBaseLMS::selectAllGroups() diff --git a/DataBaseLMS/databaselms_instructors.cpp b/DataBaseLMS/databaselms_instructors.cpp index d05c7d6..c164f53 100644 --- a/DataBaseLMS/databaselms_instructors.cpp +++ b/DataBaseLMS/databaselms_instructors.cpp @@ -3,7 +3,6 @@ #include #include #include -#include QList DataBaseLMS::selectAllInstructors() diff --git a/DataBaseLMS/databaselms_tasks.cpp b/DataBaseLMS/databaselms_tasks.cpp index 7d4cb8c..3123609 100644 --- a/DataBaseLMS/databaselms_tasks.cpp +++ b/DataBaseLMS/databaselms_tasks.cpp @@ -3,7 +3,6 @@ #include #include #include -#include int DataBaseLMS::insertTaskAMM(TaskAmmFim task, int id_trainee) { diff --git a/DataBaseLMS/databaselms_trainees.cpp b/DataBaseLMS/databaselms_trainees.cpp index 6a1500f..4227828 100644 --- a/DataBaseLMS/databaselms_trainees.cpp +++ b/DataBaseLMS/databaselms_trainees.cpp @@ -3,7 +3,6 @@ #include #include #include -#include QList DataBaseLMS::selectAllTrainees() diff --git a/DataBaseLMS/databaselms_users.cpp b/DataBaseLMS/databaselms_users.cpp index aa1641c..c645afb 100644 --- a/DataBaseLMS/databaselms_users.cpp +++ b/DataBaseLMS/databaselms_users.cpp @@ -3,7 +3,7 @@ #include #include #include -#include + int DataBaseLMS::selectUserID(QString type, QString login, QString password) { diff --git a/DataBaseLMS/interfacedatabaselms.cpp b/DataBaseLMS/interfacedatabaselms.cpp index 8ad5e21..6c8c0eb 100644 --- a/DataBaseLMS/interfacedatabaselms.cpp +++ b/DataBaseLMS/interfacedatabaselms.cpp @@ -1,4 +1,3 @@ -#include #include #include #include @@ -16,12 +15,10 @@ bool InterfaceDataBaseLMS::connectionToDB() { if(!createConnection()) { - //QMessageBox::critical(ownerWidget, dbSettings.dbName, tr("Connection error") /*+ db->lastError().text()*/); return false; } else { - //QMessageBox::information(ownerWidget, dbName, tr("Connection is successful!")); return true; } } @@ -29,7 +26,6 @@ bool InterfaceDataBaseLMS::connectionToDB() bool InterfaceDataBaseLMS::disConnectionFromDB() { deleteConnection(); - //QMessageBox::information(ownerWidget, dbName, tr("Disconnection is successful!")); return true; } diff --git a/DataBaseLMS/tasksAmmFim.cpp b/DataBaseLMS/tasksAmmFim.cpp index 05d42c3..526d038 100644 --- a/DataBaseLMS/tasksAmmFim.cpp +++ b/DataBaseLMS/tasksAmmFim.cpp @@ -1,7 +1,7 @@ #include "tasksAmmFim.h" #include #include -#include + int TaskAmmFim::lastID = 1; diff --git a/TrayServerLMS/mainwindow.cpp b/TrayServerLMS/mainwindow.cpp index 1ffaaa5..a91dca1 100644 --- a/TrayServerLMS/mainwindow.cpp +++ b/TrayServerLMS/mainwindow.cpp @@ -2,7 +2,8 @@ #include #include #include "mainwindow.h" -#include "./ui_mainwindow.h" +#include "ui_mainwindow.h" + MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), @@ -66,7 +67,7 @@ MainWindow::MainWindow(QWidget *parent) : slot_Tray_ShowMessage(tr("Starting the server...")); - QTimer::singleShot(1000,this,&MainWindow::slot_Connect); + QTimer::singleShot(1000,this,&MainWindow::slot_LazyInitialization); } MainWindow::~MainWindow() @@ -141,9 +142,6 @@ void MainWindow::slot_TrayMessageClicked() void MainWindow::slot_TrayMenu_ShowWindow() { - //TODO под вопросом? - if(!serverLMSWidget->isEnabledTo(this)) - return; this->show(); action_ShowWindow->setEnabled(false); action_HideWindow->setEnabled(true); @@ -175,7 +173,7 @@ void MainWindow::slot_Tray_ShowMessage(QString textMsg, QSystemTrayIcon::Message icon, 100); } -void MainWindow::slot_Connect() +void MainWindow::slot_LazyInitialization() { serverLMSWidget->start(); diff --git a/TrayServerLMS/mainwindow.h b/TrayServerLMS/mainwindow.h index 11a1635..4ad9af4 100644 --- a/TrayServerLMS/mainwindow.h +++ b/TrayServerLMS/mainwindow.h @@ -53,7 +53,7 @@ public slots: //Слот вывода сообщения из трея void slot_Tray_ShowMessage(QString textMsg, QSystemTrayIcon::MessageIcon iconMsg = QSystemTrayIcon::Information); - void slot_Connect(); + void slot_LazyInitialization(); private: void exit(); void errorCheck();