mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git
synced 2026-03-27 19:45:43 +03:00
Отложенная инициализация в Сервере (старт виджета)
This commit is contained in:
@@ -3,7 +3,6 @@
|
|||||||
#include <QtSql>
|
#include <QtSql>
|
||||||
#include <QSqlDatabase>
|
#include <QSqlDatabase>
|
||||||
#include <QSqlDriver>
|
#include <QSqlDriver>
|
||||||
#include <QMessageBox>
|
|
||||||
#include <QDomDocument>
|
#include <QDomDocument>
|
||||||
#include <QProcess>
|
#include <QProcess>
|
||||||
|
|
||||||
@@ -55,7 +54,7 @@ bool DataBaseLMS::createConnection()
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
bool flHas = db->driver()->hasFeature(QSqlDriver::Transactions);
|
bool flHas = db->driver()->hasFeature(QSqlDriver::Transactions);
|
||||||
//qDebug() << "db->driver()->hasFeature(QSqlDriver::Transactions): " << flHas;
|
qDebug() << "db->driver()->hasFeature(QSqlDriver::Transactions): " << flHas;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -93,10 +92,8 @@ DataBaseSettings DataBaseLMS::getDataBaseSettings()
|
|||||||
DataBaseSettings settings;
|
DataBaseSettings settings;
|
||||||
QFile file("config/settings.xml");
|
QFile file("config/settings.xml");
|
||||||
if(!file.open(QIODevice::ReadOnly))
|
if(!file.open(QIODevice::ReadOnly))
|
||||||
{
|
|
||||||
//QMessageBox::critical(ownerWidget, tr("Attention!"), tr("The file could not be opened:") + "config/settings.xml");
|
|
||||||
return settings;
|
return settings;
|
||||||
}
|
|
||||||
QXmlStreamReader xmlReader(&file);
|
QXmlStreamReader xmlReader(&file);
|
||||||
|
|
||||||
while (!xmlReader.atEnd()){
|
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 = "";
|
QString textError = "";
|
||||||
textError = "Error query:\n" + query->lastError().text() + "\n" +
|
textError = "Error query:\n" + query->lastError().text() + "\n" +
|
||||||
"String of query:\n" + queryStr + "\n" +
|
"String of query:\n" + queryStr + "\n" +
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
#include <QtSql>
|
#include <QtSql>
|
||||||
#include <QSqlDatabase>
|
#include <QSqlDatabase>
|
||||||
#include <QSqlDriver>
|
#include <QSqlDriver>
|
||||||
#include <QMessageBox>
|
|
||||||
#include <QDomDocument>
|
#include <QDomDocument>
|
||||||
#include <QProcess>
|
#include <QProcess>
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
#include <QtSql>
|
#include <QtSql>
|
||||||
#include <QSqlDatabase>
|
#include <QSqlDatabase>
|
||||||
#include <QSqlDriver>
|
#include <QSqlDriver>
|
||||||
#include <QMessageBox>
|
|
||||||
|
|
||||||
|
|
||||||
QList<Group> DataBaseLMS::selectAllGroups()
|
QList<Group> DataBaseLMS::selectAllGroups()
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
#include <QtSql>
|
#include <QtSql>
|
||||||
#include <QSqlDatabase>
|
#include <QSqlDatabase>
|
||||||
#include <QSqlDriver>
|
#include <QSqlDriver>
|
||||||
#include <QMessageBox>
|
|
||||||
|
|
||||||
|
|
||||||
QList<Instructor> DataBaseLMS::selectAllInstructors()
|
QList<Instructor> DataBaseLMS::selectAllInstructors()
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
#include <QtSql>
|
#include <QtSql>
|
||||||
#include <QSqlDatabase>
|
#include <QSqlDatabase>
|
||||||
#include <QSqlDriver>
|
#include <QSqlDriver>
|
||||||
#include <QMessageBox>
|
|
||||||
|
|
||||||
int DataBaseLMS::insertTaskAMM(TaskAmmFim task, int id_trainee)
|
int DataBaseLMS::insertTaskAMM(TaskAmmFim task, int id_trainee)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
#include <QtSql>
|
#include <QtSql>
|
||||||
#include <QSqlDatabase>
|
#include <QSqlDatabase>
|
||||||
#include <QSqlDriver>
|
#include <QSqlDriver>
|
||||||
#include <QMessageBox>
|
|
||||||
|
|
||||||
|
|
||||||
QList<Trainee> DataBaseLMS::selectAllTrainees()
|
QList<Trainee> DataBaseLMS::selectAllTrainees()
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
#include <QtSql>
|
#include <QtSql>
|
||||||
#include <QSqlDatabase>
|
#include <QSqlDatabase>
|
||||||
#include <QSqlDriver>
|
#include <QSqlDriver>
|
||||||
#include <QMessageBox>
|
|
||||||
|
|
||||||
int DataBaseLMS::selectUserID(QString type, QString login, QString password)
|
int DataBaseLMS::selectUserID(QString type, QString login, QString password)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
#include <QMessageBox>
|
|
||||||
#include <QCoreApplication>
|
#include <QCoreApplication>
|
||||||
#include <QSqlError>
|
#include <QSqlError>
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
@@ -16,12 +15,10 @@ bool InterfaceDataBaseLMS::connectionToDB()
|
|||||||
{
|
{
|
||||||
if(!createConnection())
|
if(!createConnection())
|
||||||
{
|
{
|
||||||
//QMessageBox::critical(ownerWidget, dbSettings.dbName, tr("Connection error") /*+ db->lastError().text()*/);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
//QMessageBox::information(ownerWidget, dbName, tr("Connection is successful!"));
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -29,7 +26,6 @@ bool InterfaceDataBaseLMS::connectionToDB()
|
|||||||
bool InterfaceDataBaseLMS::disConnectionFromDB()
|
bool InterfaceDataBaseLMS::disConnectionFromDB()
|
||||||
{
|
{
|
||||||
deleteConnection();
|
deleteConnection();
|
||||||
//QMessageBox::information(ownerWidget, dbName, tr("Disconnection is successful!"));
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#include "tasksAmmFim.h"
|
#include "tasksAmmFim.h"
|
||||||
#include <QDomDocument>
|
#include <QDomDocument>
|
||||||
#include <QFile>
|
#include <QFile>
|
||||||
#include <QMessageBox>
|
|
||||||
|
|
||||||
int TaskAmmFim::lastID = 1;
|
int TaskAmmFim::lastID = 1;
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,8 @@
|
|||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
#include <QThread>
|
#include <QThread>
|
||||||
#include "mainwindow.h"
|
#include "mainwindow.h"
|
||||||
#include "./ui_mainwindow.h"
|
#include "ui_mainwindow.h"
|
||||||
|
|
||||||
|
|
||||||
MainWindow::MainWindow(QWidget *parent) :
|
MainWindow::MainWindow(QWidget *parent) :
|
||||||
QMainWindow(parent),
|
QMainWindow(parent),
|
||||||
@@ -66,7 +67,7 @@ MainWindow::MainWindow(QWidget *parent) :
|
|||||||
|
|
||||||
slot_Tray_ShowMessage(tr("Starting the server..."));
|
slot_Tray_ShowMessage(tr("Starting the server..."));
|
||||||
|
|
||||||
QTimer::singleShot(1000,this,&MainWindow::slot_Connect);
|
QTimer::singleShot(1000,this,&MainWindow::slot_LazyInitialization);
|
||||||
}
|
}
|
||||||
|
|
||||||
MainWindow::~MainWindow()
|
MainWindow::~MainWindow()
|
||||||
@@ -141,9 +142,6 @@ void MainWindow::slot_TrayMessageClicked()
|
|||||||
|
|
||||||
void MainWindow::slot_TrayMenu_ShowWindow()
|
void MainWindow::slot_TrayMenu_ShowWindow()
|
||||||
{
|
{
|
||||||
//TODO под вопросом?
|
|
||||||
if(!serverLMSWidget->isEnabledTo(this))
|
|
||||||
return;
|
|
||||||
this->show();
|
this->show();
|
||||||
action_ShowWindow->setEnabled(false);
|
action_ShowWindow->setEnabled(false);
|
||||||
action_HideWindow->setEnabled(true);
|
action_HideWindow->setEnabled(true);
|
||||||
@@ -175,7 +173,7 @@ void MainWindow::slot_Tray_ShowMessage(QString textMsg, QSystemTrayIcon::Message
|
|||||||
icon, 100);
|
icon, 100);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::slot_Connect()
|
void MainWindow::slot_LazyInitialization()
|
||||||
{
|
{
|
||||||
serverLMSWidget->start();
|
serverLMSWidget->start();
|
||||||
|
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ public slots:
|
|||||||
//Слот вывода сообщения из трея
|
//Слот вывода сообщения из трея
|
||||||
void slot_Tray_ShowMessage(QString textMsg, QSystemTrayIcon::MessageIcon iconMsg = QSystemTrayIcon::Information);
|
void slot_Tray_ShowMessage(QString textMsg, QSystemTrayIcon::MessageIcon iconMsg = QSystemTrayIcon::Information);
|
||||||
|
|
||||||
void slot_Connect();
|
void slot_LazyInitialization();
|
||||||
private:
|
private:
|
||||||
void exit();
|
void exit();
|
||||||
void errorCheck();
|
void errorCheck();
|
||||||
|
|||||||
Reference in New Issue
Block a user