Merge branch 'work17' into DEV

ServerLMS/Systems/processingsystem.cpp

@@ -1,4 +1,5 @@
 #include "processingsystem.h"
+#include "providerdblms.h"
 
 #include <clienthandler.h>
 

ServerLMS/providerdblms.cpp

@@ -6,7 +6,7 @@ ProviderDBLMS::ProviderDBLMS(QWidget *parentWidget, QObject *parent) :
     QObject(parent),
     dbLMS(nullptr)
 {
-    dbLMS = new InterfaceDataBaseLMS(parentWidget);
+    dbLMS = new InterfaceDataBaseLMS(/*parentWidget*/nullptr);
     //ConnectionToDB();
 }
 
@@ -17,10 +17,10 @@ ProviderDBLMS::~ProviderDBLMS()
 
 void ProviderDBLMS::ConnectionToDB()
 {
-    mtxAccess.lock();
+   mtxAccess.lock();
    if(! dbLMS->DBisConnected())
    {
-       if(dbLMS->ConnectionToDB())
+       if(dbLMS->connectionToDB())
        {
            Q_EMIT signal_BlockAutorization(false);
            //Q_EMIT signal_NeedUpdateUI(true, true);
@@ -31,12 +31,12 @@ void ProviderDBLMS::ConnectionToDB()
 
 void ProviderDBLMS::DisConnectionFromDB()
 {
-     mtxAccess.lock();
+    mtxAccess.lock();
     if(dbLMS->DBisConnected())
     {
         Q_EMIT signal_BlockAutorization(true);
 
-        dbLMS->DisConnectionFromDB();
+        dbLMS->disConnectionFromDB();
 
         //Q_EMIT signal_NeedUpdateUI(true, true);
     }
@@ -72,7 +72,7 @@ bool ProviderDBLMS::authorizationTrainee(QString login, QString password, QStrin
 
     Q_EMIT signal_BlockAutorization(true);
 
-    bool res = dbLMS->AuthorizationTrainee(login, password, classroom_name, computer_name);
+    bool res = dbLMS->authorizationTrainee(login, password, classroom_name, computer_name);
 
     Q_EMIT signal_BlockAutorization(false);
 
@@ -134,7 +134,7 @@ bool ProviderDBLMS::authorizationInstructor(QString login, QString password)
 
     Q_EMIT signal_BlockAutorization(true);
 
-    bool res = dbLMS->AuthorizationInstructor(login, password);
+    bool res = dbLMS->authorizationInstructor(login, password);
 
     Q_EMIT signal_BlockAutorization(false);
 
@@ -224,18 +224,32 @@ bool ProviderDBLMS::deAuthorizationAll()
 
 bool ProviderDBLMS::entryTraineeOnSimulator(int id_trainee)
 {
+    mtxAccess.lock();
     if(dbLMS->entryTraineeOnSimulator(id_trainee))
+    {
+        mtxAccess.unlock();
         return true;
+    }
     else
+    {
+        mtxAccess.unlock();
         return false;
+    }
 }
 
 bool ProviderDBLMS::exitTraineeFromSimulator(int id_trainee)
 {
+    mtxAccess.lock();
     if(dbLMS->exitTraineeFromSimulator(id_trainee))
+    {
+        mtxAccess.unlock();
         return true;
+    }
     else
+    {
+        mtxAccess.unlock();
         return false;
+    }
 }
 
 int ProviderDBLMS::getIdTraineeByLogin(QString login)
@@ -348,92 +362,164 @@ QList<Group> ProviderDBLMS::GetListAllGroups()
 
 int ProviderDBLMS::newInstructor()
 {
-    return dbLMS->newInstructor();
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->newInstructor();
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::delInstructor(int id)
 {
-    return dbLMS->delInstructor(id);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->delInstructor(id);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::editInstructor(Instructor instructor)
 {
-    return dbLMS->editInstructor(instructor);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->editInstructor(instructor);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::newTrainee(int id_group)
 {
-    return dbLMS->newTrainee(id_group);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->newTrainee(id_group);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::delTrainee(int id)
 {
-    return dbLMS->delTrainee(id);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->delTrainee(id);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::editTrainee(Trainee trainee)
 {
-    return dbLMS->editTrainee(trainee);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->editTrainee(trainee);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::newGroup()
 {
-    return dbLMS->newGroup();
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->newGroup();
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::delGroup(int id)
 {
-    return dbLMS->delGroup(id);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->delGroup(id);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::editGroup(Group group)
 {
-    return dbLMS->editGroup(group);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->editGroup(group);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::newTaskAMM(TaskAmmFim task, int id_trainee)
 {
-    return dbLMS->newTaskAMM(task, id_trainee);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->newTaskAMM(task, id_trainee);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::delTaskAMM(int id)
 {
-    return dbLMS->delTaskAMM(id);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->delTaskAMM(id);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::editTaskAMM(TaskAmmFim task)
 {
-    return dbLMS->editTaskAMM(task);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->editTaskAMM(task);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::newTaskFIM(TaskAmmFim task, int id_trainee)
 {
-    return dbLMS->newTaskFIM(task, id_trainee);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->newTaskFIM(task, id_trainee);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::delTaskFIM(int id)
 {
-    return dbLMS->delTaskFIM(id);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->delTaskFIM(id);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::editTaskFIM(TaskAmmFim task)
 {
-    return dbLMS->editTaskFIM(task);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->editTaskFIM(task);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::replaceReportFIM(TaskAmmFim task)
 {
-    return dbLMS->replaceReportFIM(task);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->replaceReportFIM(task);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::changeStatusTaskFIM(int id_task, QString status)
 {
-    return dbLMS->changeStatusTaskFIM(id_task, status);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->changeStatusTaskFIM(id_task, status);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::changeStatusTaskAMM(int id_task, QString status)
 {
-    return dbLMS->changeStatusTaskAMM(id_task, status);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->changeStatusTaskAMM(id_task, status);
+    mtxAccess.unlock();
+    return res;
 }
 
 QList<TaskAmmFim> ProviderDBLMS::GetListTasksAMMofTrainee(int id_trainee)

ServerLMS/serverlmswidget.cpp

@@ -52,7 +52,7 @@ ServerLMSWidget::ServerLMSWidget(QWidget *parent) :
     updateController->moveToThread(updateThread);
 
     processingSystem = new ProcessingSystem(providerDBLMS, updateController);
-    processingSystem->moveToThread(updateThread);
+    //processingSystem->moveToThread(updateThread);
 
     dataParser = new DataParser(assetsManager,processingSystem);