Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-28 19:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Модуль DataBaseLMS рефакторинг

Browse Source
This commit is contained in:
Кривошеин Андрей
2025-08-19 18:05:48 +03:00
parent 194b5129b8
commit 86aa07e89f
4 changed files with 120 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
ServerLMS/providerdblms.cpp
View File

@@ -9,7 +9,6 @@ ProviderDBLMS::ProviderDBLMS(QWidget *parentWidget, QObject *parent) :
parentWidget(parentWidget)
{
dbLMS = new InterfaceDataBaseLMS(parentWidget);
//ConnectionToDB();
}
ProviderDBLMS::~ProviderDBLMS()
@@ -25,7 +24,6 @@ void ProviderDBLMS::ConnectionToDB()
if(dbLMS->connectionToDB())
{
Q_EMIT signal_BlockAutorization(false);
//Q_EMIT signal_NeedUpdateUI(true, true);
}
}
mtxAccess.unlock();
@@ -39,8 +37,6 @@ void ProviderDBLMS::DisConnectionFromDB()
Q_EMIT signal_BlockAutorization(true);
dbLMS->disConnectionFromDB();
//Q_EMIT signal_NeedUpdateUI(true, true);
}
mtxAccess.unlock();
}
@@ -54,11 +50,7 @@ QString ProviderDBLMS::getMainInstructorName()
mtxAccess.unlock();
return QStringLiteral("");
}
//QString res = dbLMS->getNameInstructorByLogin(loginInstructorLoggedInLocal);
mtxAccess.unlock();
//return res;
return QStringLiteral("");
}
@@ -78,9 +70,6 @@ bool ProviderDBLMS::authorizationTrainee(QString login, QString password, QStrin
Q_EMIT signal_BlockAutorization(false);
//if(res)
//Q_EMIT signal_NeedUpdateUI(false, true);
mtxAccess.unlock();
return res;
}
@@ -101,9 +90,6 @@ bool ProviderDBLMS::deAuthorizationTrainee(QString login)
Q_EMIT signal_BlockAutorization(false);
//if(res)
//Q_EMIT signal_NeedUpdateUI(false, true);
mtxAccess.unlock();
return res;
}
@@ -140,9 +126,6 @@ bool ProviderDBLMS::authorizationInstructor(QString login, QString password)
Q_EMIT signal_BlockAutorization(false);
//if(res)
//Q_EMIT signal_NeedUpdateUI(true, false);
mtxAccess.unlock();
return res;
}
@@ -163,26 +146,6 @@ bool ProviderDBLMS::deAuthorizationInstructor(QString login)
Q_EMIT signal_BlockAutorization(false);
/*
if(res)
{
if(loginInstructorLoggedInLocal == login)
{
loginInstructorLoggedInLocal = QStringLiteral("");
adminMode = false;
viewerInstructors->setAdminMode(adminMode);
viewerTrainees->setAdminMode(adminMode);
viewerInstructors->setAuthComplited(false);
viewerTrainees->setAuthComplited(false);
Q_EMIT signal_NeedUpdateUI(true, false);
}
else
Q_EMIT signal_NeedUpdateUI(true, false);
}*/
mtxAccess.unlock();
return res;
}
@@ -227,6 +190,13 @@ bool ProviderDBLMS::deAuthorizationAll()
bool ProviderDBLMS::entryTraineeOnSimulator(int id_trainee)
{
mtxAccess.lock();
if(! dbLMS->DBisConnected())
{
mtxAccess.unlock();
return false;
}
if(dbLMS->entryTraineeOnSimulator(id_trainee))
{
mtxAccess.unlock();
@@ -242,6 +212,13 @@ bool ProviderDBLMS::entryTraineeOnSimulator(int id_trainee)
bool ProviderDBLMS::exitTraineeFromSimulator(int id_trainee)
{
mtxAccess.lock();
if(! dbLMS->DBisConnected())
{
mtxAccess.unlock();
return false;
}
if(dbLMS->exitTraineeFromSimulator(id_trainee))
{
mtxAccess.unlock();
@@ -257,7 +234,7 @@ bool ProviderDBLMS::exitTraineeFromSimulator(int id_trainee)
int ProviderDBLMS::getIdTraineeByLogin(QString login)
{
int id_trainee = 0;
qDebug() << "ProviderDBLMS " << QThread::currentThreadId();
mtxAccess.lock();
if(! dbLMS->DBisConnected())
@@ -275,7 +252,7 @@ int ProviderDBLMS::getIdTraineeByLogin(QString login)
int ProviderDBLMS::getIdInstructorByLogin(QString login)
{
int id_instructor = 0;
qDebug() << "ProviderDBLMS " << QThread::currentThreadId();
mtxAccess.lock();
if(! dbLMS->DBisConnected())
@@ -293,7 +270,7 @@ int ProviderDBLMS::getIdInstructorByLogin(QString login)
QString ProviderDBLMS::getLoginTraineeById(int id_trainee)
{
QString login = "";
qDebug() << "ProviderDBLMS " << QThread::currentThreadId();
mtxAccess.lock();
if(! dbLMS->DBisConnected())
@@ -311,7 +288,7 @@ QString ProviderDBLMS::getLoginTraineeById(int id_trainee)
QList<Instructor> ProviderDBLMS::GetListAllInstructors()
{
QList<Instructor> listInstructors;
qDebug() << "ProviderDBLMS " << QThread::currentThreadId();
mtxAccess.lock();
if(! dbLMS->DBisConnected())
@@ -366,6 +343,11 @@ int ProviderDBLMS::newInstructor()
{
int res = 0;
mtxAccess.lock();
if(! dbLMS->DBisConnected())
{
mtxAccess.unlock();
return res;
}
res = dbLMS->newInstructor();
mtxAccess.unlock();
return res;
@@ -375,6 +357,11 @@ int ProviderDBLMS::delInstructor(int id)
{
int res = 0;
mtxAccess.lock();
if(! dbLMS->DBisConnected())
{
mtxAccess.unlock();
return res;
}
res = dbLMS->delInstructor(id);
mtxAccess.unlock();
return res;
@@ -384,6 +371,11 @@ int ProviderDBLMS::editInstructor(Instructor instructor)
{
int res = 0;
mtxAccess.lock();
if(! dbLMS->DBisConnected())
{
mtxAccess.unlock();
return res;
}
res = dbLMS->editInstructor(instructor);
mtxAccess.unlock();
return res;
@@ -393,6 +385,11 @@ int ProviderDBLMS::newTrainee(int id_group)
{
int res = 0;
mtxAccess.lock();
if(! dbLMS->DBisConnected())
{
mtxAccess.unlock();
return res;
}
res = dbLMS->newTrainee(id_group);
mtxAccess.unlock();
return res;
@@ -402,6 +399,11 @@ int ProviderDBLMS::delTrainee(int id)
{
int res = 0;
mtxAccess.lock();
if(! dbLMS->DBisConnected())
{
mtxAccess.unlock();
return res;
}
res = dbLMS->delTrainee(id);
mtxAccess.unlock();
return res;
@@ -411,6 +413,11 @@ int ProviderDBLMS::editTrainee(Trainee trainee)
{
int res = 0;
mtxAccess.lock();
if(! dbLMS->DBisConnected())
{
mtxAccess.unlock();
return res;
}
res = dbLMS->editTrainee(trainee);
mtxAccess.unlock();
return res;
@@ -420,6 +427,11 @@ int ProviderDBLMS::newGroup()
{
int res = 0;
mtxAccess.lock();
if(! dbLMS->DBisConnected())
{
mtxAccess.unlock();
return res;
}
res = dbLMS->newGroup();
mtxAccess.unlock();
return res;
@@ -429,6 +441,11 @@ int ProviderDBLMS::delGroup(int id)
{
int res = 0;
mtxAccess.lock();
if(! dbLMS->DBisConnected())
{
mtxAccess.unlock();
return res;
}
res = dbLMS->delGroup(id);
mtxAccess.unlock();
return res;
@@ -438,6 +455,11 @@ int ProviderDBLMS::editGroup(Group group)
{
int res = 0;
mtxAccess.lock();
if(! dbLMS->DBisConnected())
{
mtxAccess.unlock();
return res;
}
res = dbLMS->editGroup(group);
mtxAccess.unlock();
return res;
@@ -447,6 +469,11 @@ int ProviderDBLMS::newTaskAMM(TaskAmmFim task, int id_trainee)
{
int res = 0;
mtxAccess.lock();
if(! dbLMS->DBisConnected())
{
mtxAccess.unlock();
return res;
}
res = dbLMS->newTaskAMM(task, id_trainee);
mtxAccess.unlock();
return res;
@@ -456,6 +483,11 @@ int ProviderDBLMS::delTaskAMM(int id)
{
int res = 0;
mtxAccess.lock();
if(! dbLMS->DBisConnected())
{
mtxAccess.unlock();
return res;
}
res = dbLMS->delTaskAMM(id);
mtxAccess.unlock();
return res;
@@ -465,6 +497,11 @@ int ProviderDBLMS::editTaskAMM(TaskAmmFim task)
{
int res = 0;
mtxAccess.lock();
if(! dbLMS->DBisConnected())
{
mtxAccess.unlock();
return res;
}
res = dbLMS->editTaskAMM(task);
mtxAccess.unlock();
return res;
@@ -474,6 +511,11 @@ int ProviderDBLMS::newTaskFIM(TaskAmmFim task, int id_trainee)
{
int res = 0;
mtxAccess.lock();
if(! dbLMS->DBisConnected())
{
mtxAccess.unlock();
return res;
}
res = dbLMS->newTaskFIM(task, id_trainee);
mtxAccess.unlock();
return res;
@@ -483,6 +525,11 @@ int ProviderDBLMS::delTaskFIM(int id)
{
int res = 0;
mtxAccess.lock();
if(! dbLMS->DBisConnected())
{
mtxAccess.unlock();
return res;
}
res = dbLMS->delTaskFIM(id);
mtxAccess.unlock();
return res;
@@ -492,6 +539,11 @@ int ProviderDBLMS::editTaskFIM(TaskAmmFim task)
{
int res = 0;
mtxAccess.lock();
if(! dbLMS->DBisConnected())
{
mtxAccess.unlock();
return res;
}
res = dbLMS->editTaskFIM(task);
mtxAccess.unlock();
return res;
@@ -501,6 +553,11 @@ int ProviderDBLMS::replaceReportFIM(TaskAmmFim task)
{
int res = 0;
mtxAccess.lock();
if(! dbLMS->DBisConnected())
{
mtxAccess.unlock();
return res;
}
res = dbLMS->replaceReportFIM(task);
mtxAccess.unlock();
return res;
@@ -510,6 +567,11 @@ int ProviderDBLMS::changeStatusTaskFIM(int id_task, QString status)
{
int res = 0;
mtxAccess.lock();
if(! dbLMS->DBisConnected())
{
mtxAccess.unlock();
return res;
}
res = dbLMS->changeStatusTaskFIM(id_task, status);
mtxAccess.unlock();
return res;
@@ -519,6 +581,11 @@ int ProviderDBLMS::changeStatusTaskAMM(int id_task, QString status)
{
int res = 0;
mtxAccess.lock();
if(! dbLMS->DBisConnected())
{
mtxAccess.unlock();
return res;
}
res = dbLMS->changeStatusTaskAMM(id_task, status);
mtxAccess.unlock();
return res;