diff --git a/InstructorsAndTrainees/commonview.h b/InstructorsAndTrainees/commonview.h index edcc235..5c2a269 100644 --- a/InstructorsAndTrainees/commonview.h +++ b/InstructorsAndTrainees/commonview.h @@ -6,6 +6,7 @@ #include #include "instructorsAndTrainees_global.h" #include "connectortoserver.h" +#include "waitanimationwidget.h" //Родительский класс представления БД Инструкторов/Обучаемых (самого верхнего уровня) diff --git a/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp b/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp index e0ae822..ff5ea24 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp +++ b/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp @@ -158,6 +158,13 @@ void SendSystem::sendCopyVersion(QString versionName) stream << versionName; } +void SendSystem::sendGetVersion() +{ + QDataStream stream(socket); + stream.setVersion(QDataStream::Qt_DefaultCompiledVersion); + stream << PacketType::GET_VERSION; +} + void SendSystem::sendPacketType(PacketType packetType) { QDataStream stream(socket); diff --git a/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h b/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h index 4ecb9f3..37875fe 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h +++ b/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h @@ -21,11 +21,14 @@ public: void sendQTConnect(); void sendXMLAnswer(QByteArray array); ~SendSystem(); - void sendFinish(); + void sendFinish(); + +public slots: + void sendPacketType(PacketType packetType); void sendChangeVersion(StreamingVersionData *streamingVersion); void sendDeleteVersion(StreamingVersionData *streamingVersion); void sendCopyVersion(QString versionName); - void sendPacketType(PacketType packetType); + void sendGetVersion(); signals: void sigSend(); QByteArray sigGetXmlAnswer(QString); diff --git a/InstructorsAndTrainees/connectorToServer/Core/tools.h b/InstructorsAndTrainees/connectorToServer/Core/tools.h index c8b5904..622badb 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/tools.h +++ b/InstructorsAndTrainees/connectorToServer/Core/tools.h @@ -62,6 +62,7 @@ enum PacketType{ TYPE_XMLANSWER_QUERY_LIST_SUB_PROC_AMM = 133, + GET_VERSION = 149, HASH_READY = 150, CHANGE_DATA_VERSION = 151, COPY_VERSION = 152, diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp index 775e287..00c962e 100644 --- a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp +++ b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp @@ -9,10 +9,9 @@ ConnectorToServer::ConnectorToServer(QWidget* parentWidget, QObject *parent) : dataParser(nullptr), sendSystem(nullptr), recognizeSystem(nullptr), - versionSelectWidget(nullptr), - versionContainer(nullptr), notifyController(nullptr), - fl_GetedOfflineMessages(false) + fl_GetedOfflineMessages(false), + nameInstructorLoggedInLocal("") { initialize(); } @@ -20,9 +19,7 @@ ConnectorToServer::ConnectorToServer(QWidget* parentWidget, QObject *parent) : ConnectorToServer::~ConnectorToServer() { delete client; - delete versionSelectWidget; delete notifyController; - delete versionContainer; delete recognizeSystem; delete sendSystem; delete dataParser; @@ -57,7 +54,13 @@ void ConnectorToServer::StopConnectToServer() void ConnectorToServer::setLoginName(QString name) { - versionSelectWidget->setAuthor(name); + //versionSelectWidget->setAuthor(name); + nameInstructorLoggedInLocal = name; +} + +QString ConnectorToServer::getLoginName() +{ + return nameInstructorLoggedInLocal; } void ConnectorToServer::slot_sendMessage(ClientMessage clientMessage) @@ -67,7 +70,8 @@ void ConnectorToServer::slot_sendMessage(ClientMessage clientMessage) void ConnectorToServer::slot_showServerList(QList *serverList) { - versionSelectWidget->fillView(serverList); + //versionSelectWidget->fillView(serverList); + emit signal_showServerList(serverList); } void ConnectorToServer::slot_HashReady() @@ -81,6 +85,26 @@ void ConnectorToServer::slot_Auth(ServerAuthorization *serverAuth) emit sigLoginResult(serverAuth); } +void ConnectorToServer::slot_SendDeleteVersion(StreamingVersionData *streaming) +{ + emit signal_SendDeleteVersion(streaming); +} + +void ConnectorToServer::slot_SendSwitchVersion(StreamingVersionData *selectVersion) +{ + emit signal_SendSwitchVersion(selectVersion); +} + +void ConnectorToServer::slot_SendCopyVersion(QString versionPair) +{ + emit signal_SendCopyVersion(versionPair); +} + +void ConnectorToServer::slot_getVersion() +{ + emit signal_SendGetVersion(); +} + void ConnectorToServer::initialize() { createObjects(); @@ -104,7 +128,6 @@ void ConnectorToServer::bindConnection() connect(recognizeSystem,&RecognizeSystem::sigDeAuth,this,&ConnectorToServer::sigDeLoginResult); connect(recognizeSystem,&RecognizeSystem::signal_ReceiveMessage,this,&ConnectorToServer::signal_receiveMessage,Qt::AutoConnection); connect(recognizeSystem,&RecognizeSystem::sigShowServerDataList,this,&ConnectorToServer::slot_showServerList); - connect (recognizeSystem,&RecognizeSystem::sigSetVersion,versionContainer,&VersionContainer::setServerVersionData); connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListInstructors,this,&ConnectorToServer::slot_AnswerQueryToDB_ListInstructors); connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListGroups,this,&ConnectorToServer::slot_AnswerQueryToDB_ListGroups); @@ -127,6 +150,15 @@ void ConnectorToServer::bindConnection() connect(recognizeSystem,&RecognizeSystem::sigHashReady,this,&ConnectorToServer::slot_HashReady); connect(recognizeSystem,&RecognizeSystem::signal_AnswerDocsChanged,this,&ConnectorToServer::slot_AnswerDocsChanged); + + connect(recognizeSystem, &RecognizeSystem::sigSetVersion, this, &ConnectorToServer::signal_SetVersion); + connect(recognizeSystem, &RecognizeSystem::sigAnimationActivated, this, &ConnectorToServer::signal_AnimationActivated); + + connect(this, &ConnectorToServer::signal_SendCopyVersion, sendSystem, &SendSystem::sendCopyVersion); + connect(this, &ConnectorToServer::signal_SendDeleteVersion, sendSystem, &SendSystem::sendDeleteVersion); + connect(this, &ConnectorToServer::signal_SendSwitchVersion, sendSystem, &SendSystem::sendChangeVersion); + + connect(this, &ConnectorToServer::signal_SendGetVersion, sendSystem, &SendSystem::sendGetVersion); } void ConnectorToServer::createObjects() @@ -145,9 +177,6 @@ void ConnectorToServer::createObjects() recognizeSystem->moveToThread(connectionThread); notifyController = new NotifyController(parentWidget); - versionContainer = new VersionContainer; - versionSelectWidget = new VersionSelectWidget(parentWidget); - versionSelectWidget->initialize(sendSystem,versionContainer,notifyController, recognizeSystem); connectionThread->start(); connectionThread->setPriority(QThread::HighestPriority); diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver.h b/InstructorsAndTrainees/connectorToServer/connectortoserver.h index 8c12202..7b16c0c 100644 --- a/InstructorsAndTrainees/connectorToServer/connectortoserver.h +++ b/InstructorsAndTrainees/connectorToServer/connectortoserver.h @@ -4,7 +4,6 @@ #include #include #include -#include #include "Core\tcpclient.h" #include "Core\dataparser.h" #include "Core\sendsystem.h" @@ -14,8 +13,9 @@ #include "group.h" #include "computer.h" #include "classroom.h" -#include "streamingversiondata.h" #include "Datas.h" +#include "notifycontroller.h" +#include "streamingversiondata.h" class ConnectorToServer : public QObject { @@ -36,6 +36,7 @@ public: void StopConnectToServer(); void setLoginName(QString name); + QString getLoginName(); public: //Send @@ -107,6 +108,12 @@ public slots: void slot_HashReady(); void slot_Auth(ServerAuthorization * serverAuth); + void slot_SendDeleteVersion(StreamingVersionData *streaming); + void slot_SendSwitchVersion(StreamingVersionData *selectVersion); + void slot_SendCopyVersion(QString versionPair); + + void slot_getVersion(); + signals: void sigSetConnect(ServerSettings* serverSettings,QThread *thread); void sigStopConnect(); @@ -136,6 +143,16 @@ signals: void signal_AnswerDocsChanged(); + void signal_SetVersion(StreamingVersionData* serverVersion); + void signal_AnimationActivated(bool flag); + + void signal_SendDeleteVersion(StreamingVersionData *streaming); + void signal_SendSwitchVersion(StreamingVersionData *selectVersion); + void signal_SendCopyVersion(QString versionPair); + + void signal_showServerList(QList *serverList); + void signal_SendGetVersion(); + private: void initialize(); void bindConnection(); @@ -148,8 +165,6 @@ private: DataParser *dataParser; SendSystem *sendSystem; RecognizeSystem *recognizeSystem; - VersionSelectWidget *versionSelectWidget; - VersionContainer *versionContainer; NotifyController *notifyController; //Списочная модель БД СУО @@ -170,6 +185,8 @@ private: ServerAuthorization serverAuth; bool fl_GetedOfflineMessages; + + QString nameInstructorLoggedInLocal; }; #endif // CONNECTORTOSERVER_H diff --git a/InstructorsAndTrainees/settings/dialogsettings.cpp b/InstructorsAndTrainees/settings/dialogsettings.cpp index 9b9ec4a..e4c972e 100644 --- a/InstructorsAndTrainees/settings/dialogsettings.cpp +++ b/InstructorsAndTrainees/settings/dialogsettings.cpp @@ -4,6 +4,7 @@ #include #include #include +#include "versionselectwidget.h" DialogSettings::DialogSettings(ConnectorToServer* connectorToServer, bool instructorIsLogged, QWidget *parent) : QDialog(parent), @@ -197,9 +198,21 @@ void DialogSettings::on_btnSave_clicked() void DialogSettings::on_btnSetVersion_clicked() { + /* if(connectorToServer) if(connectorToServer->getIsConnected()) connectorToServer->sendShowVersionSelect(); + */ + + if(connectorToServer) + if(connectorToServer->getIsConnected()) + { + VersionSelectWidget *versionSelectWidget = new VersionSelectWidget(connectorToServer, this); + versionSelectWidget->setAuthor(connectorToServer->getLoginName()); + versionSelectWidget->initialize(); + versionSelectWidget->exec(); + delete versionSelectWidget; + } } void DialogSettings::on_cmbLanguage_currentIndexChanged(int index) diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.h b/InstructorsAndTrainees/tasks/ammtaskswidget.h index dcc6566..900a4e9 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.h +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.h @@ -9,6 +9,7 @@ #include "tasktreepreparation.h" #include "dialogchekertask.h" #include "dialoglistsubproc.h" +#include "waitanimationwidget.h" namespace Ui { class AMMtasksWidget; diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.h b/InstructorsAndTrainees/tasks/fimtaskswidget.h index 70ab675..34450a3 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.h +++ b/InstructorsAndTrainees/tasks/fimtaskswidget.h @@ -7,6 +7,7 @@ #include "connectortoserver.h" #include "tasktreepreparation.h" #include "dialogchekertask.h" +#include "waitanimationwidget.h" namespace Ui { class FIMtasksWidget; diff --git a/InstructorsAndTrainees/widgets/versionselectwidget.cpp b/InstructorsAndTrainees/widgets/versionselectwidget.cpp index 7491497..dcd9087 100644 --- a/InstructorsAndTrainees/widgets/versionselectwidget.cpp +++ b/InstructorsAndTrainees/widgets/versionselectwidget.cpp @@ -1,59 +1,87 @@ -#include "versionselectwidget.h" -#include "ui_versionselectwidget.h" -#include "ui_versionselectwidget.h" - -#include #include -VersionSelectWidget::VersionSelectWidget(QWidget *parent) : - QWidget(parent), +#include "versionselectwidget.h" +#include "specialmessagebox.h" +#include "ui_versionselectwidget.h" + + +VersionSelectWidget::VersionSelectWidget(ConnectorToServer* connectorToServer, QWidget *parent) : + QDialog(parent), ui(new Ui::VersionSelectWidget), + connectorToServer(connectorToServer), + versionContainer(nullptr), + serverDataList(nullptr), selectedVersion(nullptr), waitAnimationWidget(nullptr), - recognizeSystem(nullptr) + authorName(""), + flGetVersion(false) { - ui->setupUi(this); - setWindowFlags(Qt::Dialog | Qt::MSWindowsFixedSizeDialogHint); - setAttribute(Qt::WA_ShowModal,true); -} + ui->setupUi(this); -void VersionSelectWidget::initialize(SendSystem *sendSystem,VersionContainer *versionContainer,NotifyController *notifyController, RecognizeSystem *recognizeSystem) -{ - this->recognizeSystem = recognizeSystem; + setMinimumSize(500, 300); + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + setWindowTitle(tr("Version control")); + + versionContainer = new VersionContainer; waitAnimationWidget = new WaitAnimationWidget; QMovie *movie = new QMovie(":/resources/icons/762.gif"); waitAnimationWidget->setParent(this); waitAnimationWidget->initialize(movie,this); +} - connect(this,&VersionSelectWidget::sigSendSwitchVersion,sendSystem,&SendSystem::sendChangeVersion,Qt::AutoConnection); - connect(this,&VersionSelectWidget::sigSendCopyVersion,sendSystem,&SendSystem::sendCopyVersion,Qt::AutoConnection); - connect(this,&VersionSelectWidget::sigSendDeleteVersion,sendSystem,&SendSystem::sendDeleteVersion,Qt::AutoConnection); - connect(this,&VersionSelectWidget::sigSendNotify,notifyController,&NotifyController::showWarning,Qt::AutoConnection); +VersionSelectWidget::~VersionSelectWidget() +{ + waitAnimationWidget->hideWithStop(); - connect(recognizeSystem,&RecognizeSystem::sigAnimationActivated,this,&VersionSelectWidget::slot_activateLoadAnimation,Qt::AutoConnection); + delete versionContainer; - this->versionContainer = versionContainer; - hide(); - setWindowTitle(tr("Version control")); + delete waitAnimationWidget; + + delete ui; +} + +void VersionSelectWidget::initialize() +{ + connect (connectorToServer, &ConnectorToServer::signal_SetVersion, this, &VersionSelectWidget::slot_SetVersion); + connect(connectorToServer, &ConnectorToServer::signal_AnimationActivated, this, &VersionSelectWidget::slot_activateLoadAnimation); + + connect(connectorToServer, &ConnectorToServer::signal_showServerList, this, &VersionSelectWidget::slot_showServerList); + + connect(this, &VersionSelectWidget::sigSendSwitchVersion, connectorToServer, &ConnectorToServer::slot_SendSwitchVersion); + connect(this, &VersionSelectWidget::sigSendCopyVersion, connectorToServer, &ConnectorToServer::slot_SendCopyVersion); + connect(this, &VersionSelectWidget::sigSendDeleteVersion, connectorToServer, &ConnectorToServer::slot_SendDeleteVersion); + + connect(this, &VersionSelectWidget::signal_getVersion, connectorToServer, &ConnectorToServer::slot_getVersion); + + emit signal_getVersion(); + //connectorToServer->sendShowVersionSelect(); } void VersionSelectWidget::fillView(QList *serverData) { - show(); ui->verListView->clear(); serverDataList = serverData; ui->verValue->setText(versionContainer->getServerVersionData()->getViewName()); - foreach(StreamingVersionData *data,*serverData) + for(StreamingVersionData *data : *serverData) { ui->verListView->addItem(data->getViewName()); } + + ui->verListView->setCurrentRow(0); + ui->verListView->itemClicked(ui->verListView->item(0)); +} + +QString VersionSelectWidget::changableText(bool flag) +{ + if(flag) return tr("Yes"); + else return tr("No"); } void VersionSelectWidget::on_verListView_itemClicked(QListWidgetItem *item) { - foreach(StreamingVersionData *data,*serverDataList) + for(StreamingVersionData *data : *serverDataList) { if(data->getViewName() == item->text()) { @@ -67,47 +95,42 @@ void VersionSelectWidget::on_verListView_itemClicked(QListWidgetItem *item) } } -QString VersionSelectWidget::changableText(bool flag) -{ - if(flag) return tr("Yes"); - else return tr("No"); -} - - -void VersionSelectWidget::on_createDuplicateButton_clicked() -{ - - if (selectedVersion == nullptr) - { - emit sigSendNotify(tr("Version not selected"), this); - return; - } - - DialogNewVersion *dlgNewVersion = new DialogNewVersion(this); - dlgNewVersion->initialize(this,selectedVersion->getViewName()); - dlgNewVersion->exec(); - delete dlgNewVersion; -} - void VersionSelectWidget::sendCopyEmit(QString newName) { QString result = selectedVersion->getViewName() + ";" + newName + ";" + authorName; if (selectedVersion == nullptr) { - emit sigSendNotify(tr("Version not selected"), this); + QString text = tr("Version not selected"); + SpecialMessageBox(this, SpecialMessageBox::TypeSpecMsgBox::warningClose, text).exec(); return; } - //versionContainer->setLocalVersionData(selectedVersion); + versionContainer->setLocalVersionData(selectedVersion); emit sigSendCopyVersion(result); } -void VersionSelectWidget::on_DeleteVersionButton_clicked() +void VersionSelectWidget::on_createDuplicateButton_clicked() { if (selectedVersion == nullptr) { - emit sigSendNotify(tr("Version not selected"), this); + QString text = tr("Version not selected"); + SpecialMessageBox(this, SpecialMessageBox::TypeSpecMsgBox::warningClose, text).exec(); + return; + } + + DialogNewVersion *dlgNewVersion = new DialogNewVersion(this); + dlgNewVersion->initialize(this, selectedVersion->getViewName()); + dlgNewVersion->exec(); + delete dlgNewVersion; +} + +void VersionSelectWidget::on_deleteVersionButton_clicked() +{ + if (selectedVersion == nullptr) + { + QString text = tr("Version not selected"); + SpecialMessageBox(this, SpecialMessageBox::TypeSpecMsgBox::warningClose, text).exec(); return; } @@ -118,7 +141,8 @@ void VersionSelectWidget::on_switchServerVersionButton_clicked() { if (selectedVersion == nullptr) { - emit sigSendNotify(tr("Version not selected"), this); + QString text = tr("Version not selected"); + SpecialMessageBox(this, SpecialMessageBox::TypeSpecMsgBox::warningClose, text).exec(); return; } @@ -139,6 +163,21 @@ void VersionSelectWidget::slot_activateLoadAnimation(bool flag) } } +void VersionSelectWidget::slot_showServerList(QList *serverList) +{ + fillView(serverList); +} + +void VersionSelectWidget::slot_SetVersion(StreamingVersionData *serverVersion) +{ + versionContainer->setServerVersionData(serverVersion); + + if(!flGetVersion) + connectorToServer->sendShowVersionSelect(); + + flGetVersion = true; +} + void VersionSelectWidget::setAuthor(QString name) { authorName = name; @@ -149,15 +188,3 @@ void VersionSelectWidget::resizeEvent(QResizeEvent *event) QSize size = event->size(); waitAnimationWidget->resize(size); } - -VersionSelectWidget::~VersionSelectWidget() -{ - waitAnimationWidget->hideWithStop(); - - delete waitAnimationWidget; - - delete ui; -} - - - diff --git a/InstructorsAndTrainees/widgets/versionselectwidget.h b/InstructorsAndTrainees/widgets/versionselectwidget.h index cee6e9a..21a4e52 100644 --- a/InstructorsAndTrainees/widgets/versionselectwidget.h +++ b/InstructorsAndTrainees/widgets/versionselectwidget.h @@ -3,30 +3,28 @@ #include #include +#include -#include -#include -#include -#include -#include -#include - -#include "recognizesystem.h" +#include "versioncontainer.h" +#include "streamingversiondata.h" +#include "dialognewversion.h" +#include "waitanimationwidget.h" +#include "connectortoserver.h" +#include "versioncontainer.h" namespace Ui { class VersionSelectWidget; } -class VersionSelectWidget : public QWidget +class VersionSelectWidget : public QDialog { Q_OBJECT public: - explicit VersionSelectWidget(QWidget *parent = nullptr); + explicit VersionSelectWidget(ConnectorToServer* connectorToServer, QWidget *parent = nullptr); ~VersionSelectWidget(); - void initialize(SendSystem *sendSystem,VersionContainer *versionContainer,NotifyController *notifyController, RecognizeSystem *recognizeSystem); - void fillView(QList *serverData); + void initialize(); void sendCopyEmit(QString newName); void setAuthor(QString name); @@ -35,30 +33,44 @@ public: private slots: void on_createDuplicateButton_clicked(); - void on_DeleteVersionButton_clicked(); + void on_deleteVersionButton_clicked(); void on_switchServerVersionButton_clicked(); + void on_verListView_itemClicked(QListWidgetItem *item); + +private slots: void slot_activateLoadAnimation(bool flag); + void slot_showServerList(QList *serverList); + void slot_SetVersion(StreamingVersionData* serverVersion); signals: void sigSendDeleteVersion(StreamingVersionData *streaming); void sigSendSwitchVersion(StreamingVersionData *selectVersion); void sigSendCopyVersion(QString versionPair); - void sigSendNotify(QString message, QWidget *parentWidget = nullptr); + + void signal_getVersion(); + +private: + QString changableText(bool flag); + void fillView(QList *serverData); private: Ui::VersionSelectWidget *ui; - SendSystem *sendSystem; - QList *serverDataList; + + ConnectorToServer* connectorToServer; + VersionContainer *versionContainer; - NotifyController *notifyController; + + QList *serverDataList; + StreamingVersionData *selectedVersion; + WaitAnimationWidget *waitAnimationWidget; - RecognizeSystem *recognizeSystem; QString authorName; - QString changableText(bool flag); + + bool flGetVersion; }; #endif // VERSIONSELECTWIDGET_H diff --git a/InstructorsAndTrainees/widgets/versionselectwidget.ui b/InstructorsAndTrainees/widgets/versionselectwidget.ui index 93ab51c..669c0c5 100644 --- a/InstructorsAndTrainees/widgets/versionselectwidget.ui +++ b/InstructorsAndTrainees/widgets/versionselectwidget.ui @@ -156,7 +156,7 @@ - + 0 diff --git a/ServerLMS/Data/PacketType.h b/ServerLMS/Data/PacketType.h index 42c0241..2b0445c 100644 --- a/ServerLMS/Data/PacketType.h +++ b/ServerLMS/Data/PacketType.h @@ -45,6 +45,7 @@ enum PacketType TYPE_XMLANSWER_QUERY_LIST_SUB_PROC_AMM = 133, //ответы по обновлениям + GET_VERSION = 149, HASH_READY = 150, CHANGE_DATA_VERSION = 151, COPY_VERSION = 152, @@ -91,6 +92,7 @@ inline QString enumToString(PacketType value) { case PacketType::TYPE_XMLANSWER_QUERY_TASKS_XML_AMM: return "TYPE_XMLANSWER_QUERY_TASKS_XML_AMM"; case PacketType::TYPE_XMLANSWER_DOCS_CHANGED: return "TYPE_XMLANSWER_DOCS_CHANGED"; case PacketType::TYPE_XMLANSWER_QUERY_LIST_SUB_PROC_AMM: return "TYPE_XMLANSWER_QUERY_LIST_SUB_PROC_AMM"; + case PacketType::GET_VERSION: return "GET_VERSION"; case PacketType::HASH_READY: return "HASH_READY"; case PacketType::CHANGE_DATA_VERSION: return "CHANGE_DATA_VERSION"; case PacketType::COPY_VERSION: return "COPY_VERSION"; diff --git a/ServerLMS/Systems/recognizesystem.cpp b/ServerLMS/Systems/recognizesystem.cpp index 09762bb..1b65e5f 100644 --- a/ServerLMS/Systems/recognizesystem.cpp +++ b/ServerLMS/Systems/recognizesystem.cpp @@ -372,6 +372,11 @@ void RecognizeSystem::recognize() continue; } + if(packetType == PacketType::GET_VERSION) + { + clientHandler->sendVersion(); + } + if(packetType == PacketType::CHANGE_DATA_VERSION) { stream.startTransaction();