DocsUpdater рабочая версия

ServerLMS/CMakeLists.txt

@@ -69,6 +69,9 @@ target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/clientha
 target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/multithreadserver)
 target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/providerdblms)
 target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/settings)
+target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Data)
+target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Systems)
+target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Systems/Parsers)
 
 target_include_directories(ServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../DataBaseLMS)
 if(PROJECT_TYPE_DEBUG)

ServerLMS/Systems/docsupdater.cpp

@@ -3,15 +3,23 @@
 #include "tools.h"
 
 
-DocsUpdater::DocsUpdater(UpdateController* updateController):
+DocsUpdater::DocsUpdater(UpdateController* updateController, QWidget *parentWidget):
     updateController(updateController),
+    parentWidget(parentWidget),
     flagStop(false)
 {
 
 }
 
+DocsUpdater::~DocsUpdater()
+{
+
+}
+
 bool DocsUpdater::update()
 {
+    QMutexLocker locker(&mtxAccess);
+
     QString nameDocsFile = tasksAMMfileName;
     QString pathDocsFile = updateController->getPathAdditionalFile(nameDocsFile);
 
@@ -225,7 +233,7 @@ QString DocsUpdater::defineCanplayByScenXML(QString dmCode)
     QString signExam = "-";
     QString signAuto = "-";
 
-    QString nameScenXMLFile = dmCode + ".xml";
+    QString nameScenXMLFile = "/" + dmCode + ".xml";
     QString pathScenXMLFile = updateController->getPathScensFile(nameScenXMLFile);
 
     QDomDocument docScenDOM;

ServerLMS/Systems/docsupdater.h

@@ -8,7 +8,8 @@
 class DocsUpdater
 {
 public:
-    DocsUpdater(UpdateController* updateController);
+    DocsUpdater(UpdateController* updateController, QWidget *parentWidget);
+    ~DocsUpdater();
 
     bool update();
 
@@ -20,6 +21,8 @@ private:
 
 private:
     UpdateController* updateController;
+    QWidget *parentWidget;
+    QMutex mtxAccess;
     bool flagStop;
     QList<Module*> listAllModulesAMM; //?
     QList<TaskAmmFim> listTasksAMM; //?

ServerLMS/serverlmswidget.cpp

@@ -26,6 +26,7 @@ ServerLMSWidget::ServerLMSWidget(QWidget *parent) :
     assetsManager(nullptr),
     commonClientHandler(nullptr),
     chatSystem(nullptr),
+    docsUpdater(nullptr),
     providerDBLMS(nullptr),
     first (true),
     language(languageENG),
@@ -313,6 +314,9 @@ void ServerLMSWidget::startInitialization()
 
     emit sigUpdateController(commonClientHandler,dataParser,assetsManager);
 
+    docsUpdater = new DocsUpdater(updateController, this);
+    docsUpdater->update();
+
     ui->btnStopServer->setEnabled(false);
     ui->btnStartServer->setEnabled(true);
 

ServerLMS/serverlmswidget.h

@@ -26,6 +26,7 @@
 #include <Data/Client.h>
 #include "multithreadserver.h"
 #include "providerdblms.h"
+#include "docsupdater.h"
 
 namespace Ui {
 class ServerLMSWidget;
@@ -41,6 +42,7 @@ class ClientHandler;
 class MultiThreadServer;
 class AssetsManager;
 class ChatSystem;
+class DocsUpdater;
 
 class SERVERLMS_EXPORT ServerLMSWidget : public QWidget
 {
@@ -144,6 +146,7 @@ private:
     CommonClientHandler *commonClientHandler;
     ChatSystem *chatSystem;
 
+    DocsUpdater* docsUpdater;
     ProviderDBLMS* providerDBLMS;
 
     bool first = true; // для тестов Unity

TrayServerLMS/CMakeLists.txt

@@ -27,9 +27,13 @@ target_include_directories(TrayServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../S
 target_include_directories(TrayServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../ServerLMS/clienthandler)
 target_include_directories(TrayServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../ServerLMS/multithreadserver)
 target_include_directories(TrayServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../ServerLMS/providerdblms)
+target_include_directories(TrayServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../ServerLMS/Systems)
 if(PROJECT_TYPE_DEBUG)
     target_link_directories(TrayServerLMS PUBLIC ${REPO_PATH}/BUILDS/Debug64/ServerLMS)
 else()
     target_link_directories(TrayServerLMS PUBLIC ${REPO_PATH}/BUILDS/Release64/ServerLMS)
 endif()
 target_link_libraries(TrayServerLMS PRIVATE libServerLMS.dll)
+
+target_include_directories(TrayServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees)
+target_include_directories(TrayServerLMS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/tasks)