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

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

View File

@@ -15,13 +15,13 @@
class DataBaseSettings class DataBaseSettings
{ {
public: public:
QString dbName = "DataBaseLMS"; QString dbName = "";
QString dbType = "QPSQL"; QString dbType = "";
QString connectionName = "Connection"; QString connectionName = "";
QString dbUserName = "postgres"; QString dbUserName = "";
QString dbPassword = "12345678"; QString dbPassword = "";
QString dbHostName = ""; QString dbHostName = "";
int dbPort = 5432; int dbPort = 0;
}; };
class DataBaseLMS : public QObject class DataBaseLMS : public QObject

View File

@@ -6,7 +6,6 @@
#include "interfacedatabaselms.h" #include "interfacedatabaselms.h"
InterfaceDataBaseLMS::InterfaceDataBaseLMS(QWidget *ownerWidget, QObject *parent): InterfaceDataBaseLMS::InterfaceDataBaseLMS(QWidget *ownerWidget, QObject *parent):
//QObject(parent),
DataBaseLMS(ownerWidget, parent), DataBaseLMS(ownerWidget, parent),
ownerWidget(ownerWidget) ownerWidget(ownerWidget)
{ {
@@ -15,7 +14,6 @@ InterfaceDataBaseLMS::InterfaceDataBaseLMS(QWidget *ownerWidget, QObject *parent
bool InterfaceDataBaseLMS::connectionToDB() bool InterfaceDataBaseLMS::connectionToDB()
{ {
//QMutexLocker mtxLocker(&mtxAccess);
if(!createConnection()) if(!createConnection())
{ {
QMessageBox::critical(ownerWidget, dbSettings.dbName, tr("Connection error") /*+ db->lastError().text()*/); QMessageBox::critical(ownerWidget, dbSettings.dbName, tr("Connection error") /*+ db->lastError().text()*/);
@@ -30,7 +28,6 @@ bool InterfaceDataBaseLMS::connectionToDB()
bool InterfaceDataBaseLMS::disConnectionFromDB() bool InterfaceDataBaseLMS::disConnectionFromDB()
{ {
//QMutexLocker mtxLocker(&mtxAccess);
deleteConnection(); deleteConnection();
//QMessageBox::information(ownerWidget, dbName, tr("Disconnection is successful!")); //QMessageBox::information(ownerWidget, dbName, tr("Disconnection is successful!"));
return true; return true;
@@ -38,7 +35,6 @@ bool InterfaceDataBaseLMS::disConnectionFromDB()
bool InterfaceDataBaseLMS::DBisConnected() bool InterfaceDataBaseLMS::DBisConnected()
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return isConnected(); return isConnected();
} }
@@ -47,8 +43,6 @@ bool InterfaceDataBaseLMS::DBisConnected()
bool InterfaceDataBaseLMS::authorizationInstructor(QString login, QString password) bool InterfaceDataBaseLMS::authorizationInstructor(QString login, QString password)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
if(int id = selectUserID(DataBaseLMS::TypeUserDBInstructor, login, password)) if(int id = selectUserID(DataBaseLMS::TypeUserDBInstructor, login, password))
{ {
if(selectUserArchived(DataBaseLMS::TypeUserDBInstructor, id) || selectUserLoggedIn(DataBaseLMS::TypeUserDBInstructor, id)) if(selectUserArchived(DataBaseLMS::TypeUserDBInstructor, id) || selectUserLoggedIn(DataBaseLMS::TypeUserDBInstructor, id))
@@ -62,8 +56,6 @@ bool InterfaceDataBaseLMS::authorizationInstructor(QString login, QString passwo
bool InterfaceDataBaseLMS::deAuthorizationInstructor(QString login) bool InterfaceDataBaseLMS::deAuthorizationInstructor(QString login)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
if(int id = selectUserID(DataBaseLMS::TypeUserDBInstructor, login)) if(int id = selectUserID(DataBaseLMS::TypeUserDBInstructor, login))
{ {
if(updateUserLoggedIn(DataBaseLMS::TypeUserDBInstructor, id, false)) if(updateUserLoggedIn(DataBaseLMS::TypeUserDBInstructor, id, false))
@@ -74,67 +66,56 @@ bool InterfaceDataBaseLMS::deAuthorizationInstructor(QString login)
bool InterfaceDataBaseLMS::deAuthorizationAllInstructors() bool InterfaceDataBaseLMS::deAuthorizationAllInstructors()
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return updateAllUsersLoggedIn(DataBaseLMS::TypeUserDBInstructor, false); return updateAllUsersLoggedIn(DataBaseLMS::TypeUserDBInstructor, false);
} }
QString InterfaceDataBaseLMS::getNameInstructorByLogin(QString login) QString InterfaceDataBaseLMS::getNameInstructorByLogin(QString login)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return selectUserNameByLogin(DataBaseLMS::TypeUserDBInstructor, login); return selectUserNameByLogin(DataBaseLMS::TypeUserDBInstructor, login);
} }
int InterfaceDataBaseLMS::getIdInstructorByLogin(QString login) int InterfaceDataBaseLMS::getIdInstructorByLogin(QString login)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return selectUserID(DataBaseLMS::TypeUserDBInstructor, login); return selectUserID(DataBaseLMS::TypeUserDBInstructor, login);
} }
QList<Instructor> InterfaceDataBaseLMS::getListInstructors() QList<Instructor> InterfaceDataBaseLMS::getListInstructors()
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return selectAllInstructors(); return selectAllInstructors();
} }
Instructor InterfaceDataBaseLMS::getInstructor(int id) Instructor InterfaceDataBaseLMS::getInstructor(int id)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return selectInstructor(id); return selectInstructor(id);
} }
int InterfaceDataBaseLMS::newInstructor() int InterfaceDataBaseLMS::newInstructor()
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return insertInstructor(); return insertInstructor();
} }
int InterfaceDataBaseLMS::delInstructor(int id) int InterfaceDataBaseLMS::delInstructor(int id)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return deleteInstructor(id); return deleteInstructor(id);
} }
int InterfaceDataBaseLMS::editInstructor(Instructor instructor) int InterfaceDataBaseLMS::editInstructor(Instructor instructor)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return updateInstructor(instructor); return updateInstructor(instructor);
} }
bool InterfaceDataBaseLMS::isAdminInstructor(int id) bool InterfaceDataBaseLMS::isAdminInstructor(int id)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return selectInstructorIsAdmin(id); return selectInstructorIsAdmin(id);
} }
bool InterfaceDataBaseLMS::isArchivedInstructor(int id) bool InterfaceDataBaseLMS::isArchivedInstructor(int id)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return selectUserArchived(DataBaseLMS::TypeUserDBInstructor, id); return selectUserArchived(DataBaseLMS::TypeUserDBInstructor, id);
} }
bool InterfaceDataBaseLMS::isLoggedInInstructor(int id) bool InterfaceDataBaseLMS::isLoggedInInstructor(int id)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return selectUserLoggedIn(DataBaseLMS::TypeUserDBInstructor, id); return selectUserLoggedIn(DataBaseLMS::TypeUserDBInstructor, id);
} }
@@ -143,8 +124,6 @@ bool InterfaceDataBaseLMS::isLoggedInInstructor(int id)
bool InterfaceDataBaseLMS::authorizationTrainee(QString login, QString password, QString classroom_name, QString computer_name) bool InterfaceDataBaseLMS::authorizationTrainee(QString login, QString password, QString classroom_name, QString computer_name)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
if(int id = selectUserID(DataBaseLMS::TypeUserDBTrainee, login, password)) if(int id = selectUserID(DataBaseLMS::TypeUserDBTrainee, login, password))
{ {
if(selectUserArchived(DataBaseLMS::TypeUserDBTrainee, id) || selectUserLoggedIn(DataBaseLMS::TypeUserDBTrainee, id)) if(selectUserArchived(DataBaseLMS::TypeUserDBTrainee, id) || selectUserLoggedIn(DataBaseLMS::TypeUserDBTrainee, id))
@@ -158,8 +137,6 @@ bool InterfaceDataBaseLMS::authorizationTrainee(QString login, QString password,
bool InterfaceDataBaseLMS::deAuthorizationTrainee(QString login) bool InterfaceDataBaseLMS::deAuthorizationTrainee(QString login)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
if(int id = selectUserID(DataBaseLMS::TypeUserDBTrainee, login)) if(int id = selectUserID(DataBaseLMS::TypeUserDBTrainee, login))
{ {
if(updateUserLoggedIn(DataBaseLMS::TypeUserDBTrainee, id, false)) if(updateUserLoggedIn(DataBaseLMS::TypeUserDBTrainee, id, false))
@@ -170,14 +147,11 @@ bool InterfaceDataBaseLMS::deAuthorizationTrainee(QString login)
bool InterfaceDataBaseLMS::deAuthorizationAllTrainees() bool InterfaceDataBaseLMS::deAuthorizationAllTrainees()
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return updateAllUsersLoggedIn(DataBaseLMS::TypeUserDBTrainee, false); return updateAllUsersLoggedIn(DataBaseLMS::TypeUserDBTrainee, false);
} }
int InterfaceDataBaseLMS::entryTraineeOnSimulator(int id_trainee) int InterfaceDataBaseLMS::entryTraineeOnSimulator(int id_trainee)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
TimingOfTrainee timing(id_trainee); TimingOfTrainee timing(id_trainee);
timing = selectTimingTrainee(id_trainee); timing = selectTimingTrainee(id_trainee);
@@ -198,8 +172,6 @@ int InterfaceDataBaseLMS::entryTraineeOnSimulator(int id_trainee)
int InterfaceDataBaseLMS::exitTraineeFromSimulator(int id_trainee) int InterfaceDataBaseLMS::exitTraineeFromSimulator(int id_trainee)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
TimingOfTrainee timing(id_trainee); TimingOfTrainee timing(id_trainee);
timing = selectTimingTrainee(id_trainee); timing = selectTimingTrainee(id_trainee);
@@ -220,180 +192,150 @@ int InterfaceDataBaseLMS::exitTraineeFromSimulator(int id_trainee)
QString InterfaceDataBaseLMS::getNameTraineeOnComputer(QString computer_name) QString InterfaceDataBaseLMS::getNameTraineeOnComputer(QString computer_name)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return selectTraineeNameOnComputer(computer_name); return selectTraineeNameOnComputer(computer_name);
} }
Trainee InterfaceDataBaseLMS::getTraineeOnComputer(QString computer_name) Trainee InterfaceDataBaseLMS::getTraineeOnComputer(QString computer_name)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return selectTraineeOnComputer(computer_name); return selectTraineeOnComputer(computer_name);
} }
QString InterfaceDataBaseLMS::getNameTraineeByLogin(QString login) QString InterfaceDataBaseLMS::getNameTraineeByLogin(QString login)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return selectUserNameByLogin(DataBaseLMS::TypeUserDBTrainee, login); return selectUserNameByLogin(DataBaseLMS::TypeUserDBTrainee, login);
} }
int InterfaceDataBaseLMS::getIdTraineeByLogin(QString login) int InterfaceDataBaseLMS::getIdTraineeByLogin(QString login)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return selectUserID(DataBaseLMS::TypeUserDBTrainee, login); return selectUserID(DataBaseLMS::TypeUserDBTrainee, login);
} }
QList<Trainee> InterfaceDataBaseLMS::getListTraineesInGroup(int id) QList<Trainee> InterfaceDataBaseLMS::getListTraineesInGroup(int id)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return selectAllTraineesInGroup(id); return selectAllTraineesInGroup(id);
} }
QList<Group> InterfaceDataBaseLMS::getListGroups() QList<Group> InterfaceDataBaseLMS::getListGroups()
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return selectAllGroups(); return selectAllGroups();
} }
QList<Trainee> InterfaceDataBaseLMS::getListTrainees() QList<Trainee> InterfaceDataBaseLMS::getListTrainees()
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return selectAllTrainees(); return selectAllTrainees();
} }
Trainee InterfaceDataBaseLMS::getTrainee(int id) Trainee InterfaceDataBaseLMS::getTrainee(int id)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return selectTrainee(id); return selectTrainee(id);
} }
Group InterfaceDataBaseLMS::getGroup(int id) Group InterfaceDataBaseLMS::getGroup(int id)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return selectGroup(id); return selectGroup(id);
} }
int InterfaceDataBaseLMS::newGroup() int InterfaceDataBaseLMS::newGroup()
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return insertGroup(); return insertGroup();
} }
int InterfaceDataBaseLMS::delGroup(int id) int InterfaceDataBaseLMS::delGroup(int id)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return deleteGroup(id); return deleteGroup(id);
} }
int InterfaceDataBaseLMS::editGroup(Group group) int InterfaceDataBaseLMS::editGroup(Group group)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return updateGroup(group); return updateGroup(group);
} }
int InterfaceDataBaseLMS::newTaskAMM(TaskAmmFim task, int id_trainee) int InterfaceDataBaseLMS::newTaskAMM(TaskAmmFim task, int id_trainee)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return insertTaskAMM(task, id_trainee); return insertTaskAMM(task, id_trainee);
} }
int InterfaceDataBaseLMS::delTaskAMM(int id) int InterfaceDataBaseLMS::delTaskAMM(int id)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return deleteTaskAMM(id); return deleteTaskAMM(id);
} }
int InterfaceDataBaseLMS::editTaskAMM(TaskAmmFim task) int InterfaceDataBaseLMS::editTaskAMM(TaskAmmFim task)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return updateTaskAMM(task); return updateTaskAMM(task);
} }
QList<TaskAmmFim> InterfaceDataBaseLMS::getListTasksAMMofTrainee(int id_trainee) QList<TaskAmmFim> InterfaceDataBaseLMS::getListTasksAMMofTrainee(int id_trainee)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return selectTasksAMMofTrainee(id_trainee); return selectTasksAMMofTrainee(id_trainee);
} }
QList<TaskAmmFim> InterfaceDataBaseLMS::getListTasksFIMofTrainee(int id_trainee) QList<TaskAmmFim> InterfaceDataBaseLMS::getListTasksFIMofTrainee(int id_trainee)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return selectTasksFIMofTrainee(id_trainee); return selectTasksFIMofTrainee(id_trainee);
} }
TaskAmmFim InterfaceDataBaseLMS::getTaskAMMbyID(int id_task) TaskAmmFim InterfaceDataBaseLMS::getTaskAMMbyID(int id_task)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return selectTaskAMMbyID(id_task); return selectTaskAMMbyID(id_task);
} }
TaskAmmFim InterfaceDataBaseLMS::getTaskFIMbyID(int id_task) TaskAmmFim InterfaceDataBaseLMS::getTaskFIMbyID(int id_task)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return selectTaskFIMbyID(id_task); return selectTaskFIMbyID(id_task);
} }
int InterfaceDataBaseLMS::newTaskFIM(TaskAmmFim task, int id_trainee) int InterfaceDataBaseLMS::newTaskFIM(TaskAmmFim task, int id_trainee)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return insertTaskFIM(task, id_trainee); return insertTaskFIM(task, id_trainee);
} }
int InterfaceDataBaseLMS::delTaskFIM(int id) int InterfaceDataBaseLMS::delTaskFIM(int id)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return deleteTaskFIM(id); return deleteTaskFIM(id);
} }
int InterfaceDataBaseLMS::editTaskFIM(TaskAmmFim task) int InterfaceDataBaseLMS::editTaskFIM(TaskAmmFim task)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return updateTaskFIM(task); return updateTaskFIM(task);
} }
int InterfaceDataBaseLMS::replaceReportFIM(TaskAmmFim task) int InterfaceDataBaseLMS::replaceReportFIM(TaskAmmFim task)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return updateReportFIMforTask(task); return updateReportFIMforTask(task);
} }
int InterfaceDataBaseLMS::changeStatusTaskFIM(int id_task, QString status) int InterfaceDataBaseLMS::changeStatusTaskFIM(int id_task, QString status)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return updateStatusTaskFIM(id_task, status); return updateStatusTaskFIM(id_task, status);
} }
int InterfaceDataBaseLMS::changeStatusTaskAMM(int id_task, QString status) int InterfaceDataBaseLMS::changeStatusTaskAMM(int id_task, QString status)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return updateStatusTaskAMM(id_task, status); return updateStatusTaskAMM(id_task, status);
} }
int InterfaceDataBaseLMS::newTrainee(int id_group) int InterfaceDataBaseLMS::newTrainee(int id_group)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return insertTrainee(id_group); return insertTrainee(id_group);
} }
int InterfaceDataBaseLMS::delTrainee(int id) int InterfaceDataBaseLMS::delTrainee(int id)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return deleteTrainee(id); return deleteTrainee(id);
} }
int InterfaceDataBaseLMS::editTrainee(Trainee trainee) int InterfaceDataBaseLMS::editTrainee(Trainee trainee)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return updateTrainee(trainee); return updateTrainee(trainee);
} }
bool InterfaceDataBaseLMS::isArchivedTrainee(int id) bool InterfaceDataBaseLMS::isArchivedTrainee(int id)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return selectUserArchived(DataBaseLMS::TypeUserDBTrainee, id); return selectUserArchived(DataBaseLMS::TypeUserDBTrainee, id);
} }
bool InterfaceDataBaseLMS::isLoggedInTrainee(int id) bool InterfaceDataBaseLMS::isLoggedInTrainee(int id)
{ {
//QMutexLocker mtxLocker(&mtxAccess);
return selectUserLoggedIn(DataBaseLMS::TypeUserDBTrainee, id); return selectUserLoggedIn(DataBaseLMS::TypeUserDBTrainee, id);
} }

View File

@@ -8,10 +8,8 @@
#include "DataBaseLMS_global.h" #include "DataBaseLMS_global.h"
#include "databaselms.h" #include "databaselms.h"
class DATABASELMS_EXPORT InterfaceDataBaseLMS : public /*QObject,*/ DataBaseLMS class DATABASELMS_EXPORT InterfaceDataBaseLMS : public DataBaseLMS
{ {
//Q_OBJECT
public: public:
InterfaceDataBaseLMS(QWidget *ownerWidget, QObject *parent = nullptr); InterfaceDataBaseLMS(QWidget *ownerWidget, QObject *parent = nullptr);
@@ -47,11 +45,7 @@ public:
bool authorizationTrainee(QString login, QString password, QString classroom_name, QString computer_name); bool authorizationTrainee(QString login, QString password, QString classroom_name, QString computer_name);
bool deAuthorizationTrainee(QString login); bool deAuthorizationTrainee(QString login);
bool deAuthorizationAllTrainees(); bool deAuthorizationAllTrainees();
//Регистрация тайминга Обучаемого
int entryTraineeOnSimulator(int id_trainee);
int exitTraineeFromSimulator(int id_trainee);
QString getNameTraineeOnComputer(QString computer_name); QString getNameTraineeOnComputer(QString computer_name);
Trainee getTraineeOnComputer(QString computer_name); Trainee getTraineeOnComputer(QString computer_name);
@@ -71,6 +65,10 @@ public:
bool isArchivedTrainee(int id); bool isArchivedTrainee(int id);
bool isLoggedInTrainee(int id); bool isLoggedInTrainee(int id);
//Регистрация тайминга Обучаемого
int entryTraineeOnSimulator(int id_trainee);
int exitTraineeFromSimulator(int id_trainee);
//Группы //Группы
@@ -101,7 +99,6 @@ public:
private: private:
QWidget* ownerWidget; QWidget* ownerWidget;
//QMutex mtxAccess;
}; };
#endif // INTERFACEDATABASELMS_H #endif // INTERFACEDATABASELMS_H

View File

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