From 3e95be4447fc35dab20ad2b23d18603b40628729 Mon Sep 17 00:00:00 2001 From: semenov Date: Tue, 21 Jan 2025 11:33:51 +0300 Subject: [PATCH] feat: add versionChanger for GUI --- DOCS/Алексей/Board.md | 1 + InstructorsAndTrainees/CMakeLists.txt | 15 ++ .../connectorToServer/Core/dataparser.cpp | 4 +- .../Core/notifycontroller.cpp | 16 ++ .../connectorToServer/Core/notifycontroller.h | 18 ++ .../Core/recognizesystem.cpp | 94 +++++++ .../connectorToServer/Core/recognizesystem.h | 6 +- .../connectorToServer/Core/sendsystem.cpp | 37 +++ .../connectorToServer/Core/sendsystem.h | 7 + .../connectorToServer/Core/tools.h | 12 +- .../Core/versioncontainer.cpp | 42 +++ .../connectorToServer/Core/versioncontainer.h | 30 +++ .../connectorToServer/connectortoserver.cpp | 55 +++- .../connectorToServer/connectortoserver.h | 11 + .../connectorToServer/streamingversiondata.h | 74 ++++++ .../instructorsandtraineeswidget.cpp | 12 +- .../instructorsandtraineeswidget.h | 2 + .../instructorsandtraineeswidget.ui | 13 + InstructorsAndTrainees/resources.qrc | 1 + .../resources/icons/762.gif | Bin 0 -> 9842 bytes .../widgets/newversionwidget.cpp | 37 +++ .../widgets/newversionwidget.h | 31 +++ .../widgets/newversionwidget.ui | 219 ++++++++++++++++ .../widgets/versionselectwidget.cpp | 107 ++++++++ .../widgets/versionselectwidget.h | 50 ++++ .../widgets/versionselectwidget.ui | 239 ++++++++++++++++++ .../widgets/waitanimationwidget.cpp | 35 +++ .../widgets/waitanimationwidget.h | 27 ++ .../widgets/waitanimationwidget.ui | 73 ++++++ 29 files changed, 1259 insertions(+), 9 deletions(-) create mode 100644 InstructorsAndTrainees/connectorToServer/Core/notifycontroller.cpp create mode 100644 InstructorsAndTrainees/connectorToServer/Core/notifycontroller.h create mode 100644 InstructorsAndTrainees/connectorToServer/Core/versioncontainer.cpp create mode 100644 InstructorsAndTrainees/connectorToServer/Core/versioncontainer.h create mode 100644 InstructorsAndTrainees/connectorToServer/streamingversiondata.h create mode 100644 InstructorsAndTrainees/resources/icons/762.gif create mode 100644 InstructorsAndTrainees/widgets/newversionwidget.cpp create mode 100644 InstructorsAndTrainees/widgets/newversionwidget.h create mode 100644 InstructorsAndTrainees/widgets/newversionwidget.ui create mode 100644 InstructorsAndTrainees/widgets/versionselectwidget.cpp create mode 100644 InstructorsAndTrainees/widgets/versionselectwidget.h create mode 100644 InstructorsAndTrainees/widgets/versionselectwidget.ui create mode 100644 InstructorsAndTrainees/widgets/waitanimationwidget.cpp create mode 100644 InstructorsAndTrainees/widgets/waitanimationwidget.h create mode 100644 InstructorsAndTrainees/widgets/waitanimationwidget.ui diff --git a/DOCS/Алексей/Board.md b/DOCS/Алексей/Board.md index 5507615..59fe3b9 100644 --- a/DOCS/Алексей/Board.md +++ b/DOCS/Алексей/Board.md @@ -13,6 +13,7 @@ kanban-plugin: board ## bugs - [ ] При старт стопе не сканится шэред дата +- [ ] GUI server: при неподключенном сервере, отключать попытку изменить версию ## feature client Unity diff --git a/InstructorsAndTrainees/CMakeLists.txt b/InstructorsAndTrainees/CMakeLists.txt index 8e13872..bb9f9f3 100644 --- a/InstructorsAndTrainees/CMakeLists.txt +++ b/InstructorsAndTrainees/CMakeLists.txt @@ -60,7 +60,12 @@ add_library(InstructorsAndTrainees SHARED connectorToServer/Core/tools.cpp connectorToServer/Core/tools.h connectorToServer/Core/FileData.h + connectorToServer/Core/notifycontroller.cpp + connectorToServer/Core/notifycontroller.h + connectorToServer/Core/versioncontainer.cpp + connectorToServer/Core/versioncontainer.h connectorToServer/Datas.h + connectorToServer/streamingversiondata.h messanger/messangerwidget.cpp messanger/messangerwidget.h messanger/messangerwidget.ui @@ -74,6 +79,16 @@ add_library(InstructorsAndTrainees SHARED docTasks/fimtaskswidget.ui docTasks/tasksAmmFim.cpp docTasks/tasksAmmFim.h + widgets/newversionwidget.cpp + widgets/newversionwidget.h + widgets/newversionwidget.ui + widgets/versionselectwidget.cpp + widgets/versionselectwidget.h + widgets/versionselectwidget.ui + widgets/waitanimationwidget.cpp + widgets/waitanimationwidget.h + widgets/waitanimationwidget.ui + resources.qrc ) diff --git a/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp b/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp index 1a1a735..82ebfbf 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp +++ b/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp @@ -6,6 +6,7 @@ #include "instructor.h" #include "trainee.h" #include "group.h" +#include "streamingversiondata.h" #include @@ -327,7 +328,8 @@ ServerSettings *DataParser::getServerSettings() if(xmlReader.isStartElement()){ - if(xmlReader.name() == "ServerSettings"){ + if(xmlReader.name() == "ServerSettings") + { foreach(const QXmlStreamAttribute &attr, xmlReader.attributes()){ QString name = attr.name().toString(); diff --git a/InstructorsAndTrainees/connectorToServer/Core/notifycontroller.cpp b/InstructorsAndTrainees/connectorToServer/Core/notifycontroller.cpp new file mode 100644 index 0000000..7c09e24 --- /dev/null +++ b/InstructorsAndTrainees/connectorToServer/Core/notifycontroller.cpp @@ -0,0 +1,16 @@ +#include "notifycontroller.h" + +NotifyController::NotifyController(QObject *parent) : QObject(parent) +{ + +} + +void NotifyController::showWarning(QString text) +{ + QMessageBox warning; + warning.setText(text); + + warning.setIcon(QMessageBox::Warning); + warning.setWindowTitle(tr("Ошибка")); + warning.exec(); +} diff --git a/InstructorsAndTrainees/connectorToServer/Core/notifycontroller.h b/InstructorsAndTrainees/connectorToServer/Core/notifycontroller.h new file mode 100644 index 0000000..1b08ef9 --- /dev/null +++ b/InstructorsAndTrainees/connectorToServer/Core/notifycontroller.h @@ -0,0 +1,18 @@ +#ifndef NOTIFYCONTROLLER_H +#define NOTIFYCONTROLLER_H + +#include +#include + +class NotifyController : public QObject +{ + Q_OBJECT +public: + explicit NotifyController(QObject *parent = nullptr); + + void showWarning(QString text); +signals: + +}; + +#endif // NOTIFYCONTROLLER_H diff --git a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp index 05adfa5..4764af1 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp +++ b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp @@ -254,6 +254,17 @@ void RecognizeSystem::recognize(QTcpSocket *socket) packetType = PacketType::TYPE_NONE; } + + if(packetType == PacketType::BUSY) + { + emit sigAnimationActivated(true); + } + + if(packetType == PacketType::FREE) + { + emit sigAnimationActivated(false); + } + //xml-ответы на запросы к БД switch(packetType) { @@ -337,6 +348,21 @@ void RecognizeSystem::xmlParser(QByteArray array) { emit sigStartCompare(); } + + if (value == "BASEDELETETRY") + { + emit sigNotify(tr("Нельзя удалять базовую версию")); + } + + if (value == "TRYACTIVEDELETE") + { + emit sigNotify(tr("Нельзя удалять активную версию")); + } + + if (value == "DUPLICATEVERNAME") + { + emit sigNotify(tr("Такое имя уже существет")); + } } } } @@ -414,6 +440,74 @@ void RecognizeSystem::xmlParser(QByteArray array) } emit sigDeAuth(serverDeAuth); + + } + + + if(xmlReader.name() == "VersionList") + { + QList *serverStreamingVersionDataList = new QList; + xmlReader.readNext(); + + while (!xmlReader.atEnd()) + { + if(xmlReader.isStartElement()) + { + if(xmlReader.name() == "VersionData") + { + StreamingVersionData *data = new StreamingVersionData; + + foreach(const QXmlStreamAttribute &attr,xmlReader.attributes()) + { + QString name = attr.name().toString(); + QString value = attr.value().toString(); + + if(name == "Version") + data->setName(value); + else if(name == "Created") + data->setCreateData(QDateTime::fromString(value)); + else if(name == "isChangeable") + { + data->setIsChangeable(value.toInt()); + } + } + + serverStreamingVersionDataList->append(data); + } + } + + xmlReader.readNext(); + } + + emit sigShowServerDataList(serverStreamingVersionDataList); + } + + if(xmlReader.name() == "VersionData") + { + StreamingVersionData *serverVersion = new StreamingVersionData; + foreach(const QXmlStreamAttribute &attr,xmlReader.attributes()) + { + QString name = attr.name().toString(); + QString value = attr.value().toString(); + + if (name == "Version") + { + serverVersion->setName(value); + } + + if (name == "Created") + { + serverVersion->setCreateData(QDateTime::fromString(value)); + } + + if (name == "isChangeable") + { + serverVersion->setIsChangeable(value.toInt()); + } + + } + + emit sigSetVersion(serverVersion); } xmlReader.readNext(); diff --git a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h index a01e22d..961f334 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h +++ b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h @@ -4,6 +4,7 @@ #include #include #include +#include //#include #include #include "dataparser.h" @@ -48,9 +49,12 @@ signals: void sigAnswerQueryToDB_ListComputers(QList listComputers); void sigAnswerQueryToDB_ListClassrooms(QList listClassrooms); void sigAnswerQueryToDB_ListTasks(QList listTasks); - void sigAnswerQueryTasksXML_FIM(QList listTaskFim); void sigAnswerQueryTasksXML_AMM(QList listTaskAmm); + void sigShowServerDataList(QList *versions); + void sigSetVersion(StreamingVersionData* serverVersion); + void sigNotify(QString text); + void sigAnimationActivated(bool flag); private: QList *folderList; diff --git a/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp b/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp index 051dbf2..dadaaf7 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp +++ b/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp @@ -129,6 +129,43 @@ void SendSystem::sendFinish() socket->waitForReadyRead(100); } +void SendSystem::sendChangeVersion(StreamingVersionData *streamingVersion) +{ + QDataStream stream(socket); + stream.setVersion(QDataStream::Qt_DefaultCompiledVersion); + stream << PacketType::CHANGE_DATA_VERSION; + stream << streamingVersion->getViewName(); + + socket->waitForReadyRead(100); +} + +void SendSystem::sendDeleteVersion(StreamingVersionData *streamingVersion) +{ + QDataStream stream(socket); + stream.setVersion(QDataStream::Qt_DefaultCompiledVersion); + stream << PacketType::DELETE_DATA_VERSION; + stream << streamingVersion->getViewName(); + + socket->waitForReadyRead(100); +} + +void SendSystem::sendCopyVersion(QString versionName) +{ + QDataStream stream(socket); + stream.setVersion(QDataStream::Qt_DefaultCompiledVersion); + stream << PacketType::COPY_VERSION; + + stream << versionName; +} + +void SendSystem::sendPacketType(PacketType packetType) +{ + QDataStream stream(socket); + QByteArray data; + stream.setVersion(QDataStream::Qt_DefaultCompiledVersion); + + stream << packetType; +} SendSystem::~SendSystem() { diff --git a/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h b/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h index b260776..1e22eef 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h +++ b/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h @@ -5,6 +5,9 @@ #include #include +#include +#include "Core/tools.h" + class SendSystem :public QObject { Q_OBJECT @@ -19,6 +22,10 @@ public: void sendXMLAnswer(QByteArray array); ~SendSystem(); void sendFinish(); + void sendChangeVersion(StreamingVersionData *streamingVersion); + void sendDeleteVersion(StreamingVersionData *streamingVersion); + void sendCopyVersion(QString versionName); + void sendPacketType(PacketType packetType); signals: void sigSend(); diff --git a/InstructorsAndTrainees/connectorToServer/Core/tools.h b/InstructorsAndTrainees/connectorToServer/Core/tools.h index d64b155..cb040f0 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/tools.h +++ b/InstructorsAndTrainees/connectorToServer/Core/tools.h @@ -19,6 +19,8 @@ static QString displayTemp = staticDataFolderName + "/displayData.xml"; static QString streamingHashFilename = staticDataFolderName + "/streamingHash.xml"; static QString serverHash = staticDataFolderName + "/serverHash.xml"; +static QString cmd_CheckVersionList = "CHECKVERSIONLIST"; + enum PacketType{ TYPE_NONE = 0, TYPE_UNITY = 1, @@ -31,6 +33,7 @@ enum PacketType{ TYPE_XMLANSWER = 8, TYPE_QT = 9, TYPE_DISABLE = 11, + TYPE_CHECKVERSION = 13, TYPE_XMLANSWER_MESSAGE_FOR_GUI = 90, @@ -44,7 +47,14 @@ enum PacketType{ //xml-ответы на запросы AdditionalFiles TYPE_XMLANSWER_QUERY_TASKS_XML_FIM = 130, - TYPE_XMLANSWER_QUERY_TASKS_XML_AMM = 131 + TYPE_XMLANSWER_QUERY_TASKS_XML_AMM = 131, + + HASH_READY = 150, + CHANGE_DATA_VERSION = 151, + COPY_VERSION = 152, + DELETE_DATA_VERSION = 153, + BUSY = 154, + FREE = 155 }; Q_DECLARE_METATYPE(PacketType) diff --git a/InstructorsAndTrainees/connectorToServer/Core/versioncontainer.cpp b/InstructorsAndTrainees/connectorToServer/Core/versioncontainer.cpp new file mode 100644 index 0000000..1c8bd1c --- /dev/null +++ b/InstructorsAndTrainees/connectorToServer/Core/versioncontainer.cpp @@ -0,0 +1,42 @@ +#include "versioncontainer.h" + +VersionContainer::VersionContainer(QObject *parent) : + QObject(parent) +{ + +} + +VersionContainer::~VersionContainer() +{ + +} + +QString VersionContainer::getServerVersion() const +{ + return serverVersionData->getViewName(); +} + +QString VersionContainer::getLocalVersion() const +{ + return localVersionData->getViewName(); +} + +StreamingVersionData *VersionContainer::getLocalVersionData() const +{ + return localVersionData; +} + +void VersionContainer::setLocalVersionData(StreamingVersionData *value) +{ + localVersionData = value; +} + +StreamingVersionData *VersionContainer::getServerVersionData() const +{ + return serverVersionData; +} + +void VersionContainer::setServerVersionData(StreamingVersionData *value) +{ + serverVersionData = value; +} diff --git a/InstructorsAndTrainees/connectorToServer/Core/versioncontainer.h b/InstructorsAndTrainees/connectorToServer/Core/versioncontainer.h new file mode 100644 index 0000000..8b12c77 --- /dev/null +++ b/InstructorsAndTrainees/connectorToServer/Core/versioncontainer.h @@ -0,0 +1,30 @@ +#ifndef VERSIONCONTAINER_H +#define VERSIONCONTAINER_H + +#include +#include "connectorToServer/streamingversiondata.h" + +class VersionContainer : public QObject +{ + Q_OBJECT +public: + explicit VersionContainer(QObject *parent = nullptr); + ~VersionContainer(); + + QString getServerVersion() const; + QString getLocalVersion() const; + + + StreamingVersionData *getLocalVersionData() const; + void setLocalVersionData(StreamingVersionData *value); + + StreamingVersionData *getServerVersionData() const; + void setServerVersionData(StreamingVersionData *value); + +private: + StreamingVersionData *localVersionData; + StreamingVersionData *serverVersionData; + +}; + +#endif // VERSIONCONTAINER_H diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp index de0f798..7742ca5 100644 --- a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp +++ b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp @@ -7,7 +7,11 @@ ConnectorToServer::ConnectorToServer(QObject *parent) : client(nullptr), dataParser(nullptr), sendSystem(nullptr), - recognizeSystem(nullptr) + recognizeSystem(nullptr), + versionSelectWidget(nullptr), + versionContainer(nullptr), + notifyController(nullptr), + waitAnimationWidget(nullptr) { initialize(); } @@ -96,6 +100,7 @@ bool ConnectorToServer::sendQueryTasksXML(QString type) void ConnectorToServer::SetConnectToServer() { emit sigSetConnect(dataParser->getServerSettings(),connectionThread); + } QList ConnectorToServer::getListTaskFim() @@ -249,6 +254,12 @@ int ConnectorToServer::getIdTraineeByLogin(QString login) return 0; } +void ConnectorToServer::showVersionSelect() +{ + QByteArray answer = dataParser->xmlAnswer_notify(cmd_CheckVersionList); + emit sigSendAnswerToServer(answer); +} + /* void ConnectorToServer::slot_AnswerQueryToDB(QList* listInstructors, QList* listTrainees, @@ -316,6 +327,11 @@ void ConnectorToServer::slot_msgToClientReady(QString login, QString text) sendMessageForClient(id, login, text); } +void ConnectorToServer::showServerList(QList *serverList) +{ + versionSelectWidget->fillView(serverList); +} + void ConnectorToServer::initialize() { createObjects(); @@ -325,6 +341,22 @@ void ConnectorToServer::initialize() emit sigInitializeClient(recognizeSystem,sendSystem,connectionThread); emit sigSetConnect(dataParser->getServerSettings(),connectionThread); + +// QByteArray answer = dataParser->xmlAnswer_notify() +// sendSystem->sendXMLAnswer() + +} + +void ConnectorToServer::activateLoadAnimation(bool flag) +{ + if (flag) + { + waitAnimationWidget->showWithPlay(); + } + else + { + waitAnimationWidget->hideWithStop(); + } } void ConnectorToServer::bindConnection() @@ -332,10 +364,13 @@ void ConnectorToServer::bindConnection() connect(this,&ConnectorToServer::sigInitializeClient,client,&TCPClient::initialize,Qt::AutoConnection); connect(this,&ConnectorToServer::sigSetConnect,client,&TCPClient::setConnect,Qt::AutoConnection); connect(this,&ConnectorToServer::signal_sendXMLmsgGUItoServer,sendSystem,&SendSystem::sendXMLmsgGUItoServer); + connect(this,&ConnectorToServer::sigSendAnswerToServer,sendSystem,&SendSystem::sendXMLAnswer,Qt::AutoConnection); connect(recognizeSystem,&RecognizeSystem::sigAuth,this,&ConnectorToServer::sigLoginResult); connect(recognizeSystem,&RecognizeSystem::sigDeAuth,this,&ConnectorToServer::sigDeLoginResult); connect(recognizeSystem,&RecognizeSystem::signal_MessageForGUI,this,&ConnectorToServer::signal_msgFromClientReady); + connect(recognizeSystem,&RecognizeSystem::sigShowServerDataList,this,&ConnectorToServer::showServerList); + connect (recognizeSystem,&RecognizeSystem::sigSetVersion,versionContainer,&VersionContainer::setServerVersionData); //connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB,this,&ConnectorToServer::slot_AnswerQueryToDB); connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListInstructors,this,&ConnectorToServer::slot_AnswerQueryToDB_ListInstructors); @@ -347,8 +382,11 @@ void ConnectorToServer::bindConnection() connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryTasksXML_FIM,this,&ConnectorToServer::slot_AnswerQueryTasksXML_FIM); connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryTasksXML_AMM,this,&ConnectorToServer::slot_AnswerQueryTasksXML_AMM); + connect(recognizeSystem,&RecognizeSystem::sigAnimationActivated,this,&ConnectorToServer::activateLoadAnimation,Qt::AutoConnection); - connect(client,&TCPClient::signal_ConnectedToServer,this,&ConnectorToServer::signal_ConnectedToServer); + connect(client,&TCPClient::signal_ConnectedToServer,this,&ConnectorToServer::signal_ConnectedToServer,Qt::AutoConnection); + + connect(recognizeSystem,&RecognizeSystem::sigNotify,notifyController,&NotifyController::showWarning,Qt::AutoConnection); } void ConnectorToServer::createObjects() @@ -360,12 +398,25 @@ void ConnectorToServer::createObjects() dataParser = new DataParser; + waitAnimationWidget = new WaitAnimationWidget; + sendSystem = new SendSystem; sendSystem->moveToThread(connectionThread); recognizeSystem = new RecognizeSystem; recognizeSystem->moveToThread(connectionThread); + notifyController = new NotifyController; + versionContainer = new VersionContainer; + versionSelectWidget = new VersionSelectWidget; + versionSelectWidget->initialize(sendSystem,versionContainer,notifyController); + + QMovie *movie = new QMovie(":/resources/icons/762.gif"); + + waitAnimationWidget->setParent(versionSelectWidget); + waitAnimationWidget->initialize(movie,versionSelectWidget); + waitAnimationWidget->moveToThread(connectionThread); + connectionThread->start(); connectionThread->setPriority(QThread::HighestPriority); } diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver.h b/InstructorsAndTrainees/connectorToServer/connectortoserver.h index 9f158c7..5167542 100644 --- a/InstructorsAndTrainees/connectorToServer/connectortoserver.h +++ b/InstructorsAndTrainees/connectorToServer/connectortoserver.h @@ -2,6 +2,8 @@ #define CONNECTORTOSERVER_H #include +#include +#include #include "Core\tcpclient.h" #include "Core\dataparser.h" #include "Core\sendsystem.h" @@ -12,6 +14,7 @@ #include "computer.h" #include "classroom.h" #include "task.h" +#include "streamingversiondata.h" class ConnectorToServer : public QObject { @@ -54,7 +57,9 @@ public: Group getGroup(int id); int getIdTraineeByLogin(QString login); + void showVersionSelect(); + void activateLoadAnimation(bool flag); public slots: /*void slot_AnswerQueryToDB(QList* listInstructors, QList* listTrainees, @@ -71,6 +76,7 @@ public slots: void slot_AnswerQueryTasksXML_AMM(QList listTaskAmm); void slot_msgToClientReady(QString login, QString text); + void showServerList(QList *serverList); signals: void sigSetConnect(ServerSettings* serverSettings,QThread *thread); @@ -93,6 +99,7 @@ signals: void signal_InitMessanger(QList listTrainees); void signal_msgFromClientReady(QString login, QString text); + void sigSendAnswerToServer(QByteArray array); private: @@ -106,6 +113,10 @@ private: DataParser *dataParser; SendSystem *sendSystem; RecognizeSystem *recognizeSystem; + VersionSelectWidget *versionSelectWidget; + VersionContainer *versionContainer; + NotifyController *notifyController; + WaitAnimationWidget *waitAnimationWidget; //Списочная модель БД СУО QList listInstructors; diff --git a/InstructorsAndTrainees/connectorToServer/streamingversiondata.h b/InstructorsAndTrainees/connectorToServer/streamingversiondata.h new file mode 100644 index 0000000..d190385 --- /dev/null +++ b/InstructorsAndTrainees/connectorToServer/streamingversiondata.h @@ -0,0 +1,74 @@ +#ifndef STREAMINGVERSIONDATA_H +#define STREAMINGVERSIONDATA_H + +#include +#include + +class StreamingVersionData +{ +public: + + StreamingVersionData(){} + + StreamingVersionData(QString absoltePath,QString viewName,QDateTime data,qint32 size) + { + this->absolutePath = absoltePath; + this->viewName = viewName; + this->createData = data; + this->size = size; + } + + void setName(QString viewName) + { + this->viewName = viewName; + } + + void setCreateData(QDateTime data) + { + this->createData = data; + } + + ~StreamingVersionData(); + + QString getAbsolutPath() const + { + return absolutePath; + } + + QString getViewName() const + { + return viewName; + } + + QDateTime getCreateData() const + { + return createData; + } + + qint32 getSize() const + { + return size; + } + + bool getIsChangeable() const + { + return isChangeable; + } + void setIsChangeable(bool value) + { + isChangeable = value; + } + + +private: + QString absolutePath; + QString viewName; + QDateTime createData; + bool isChangeable; + qint32 size; +}; + +#endif // STREAMINGVERSIONDATA_H + + + diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp index d849704..42bda85 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -68,7 +68,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : ui->verticalLayout_1->addWidget(viewerInstructors); ui->verticalLayout_2->addWidget(docTasksWidget); ui->verticalLayout_2->addWidget(fIMtasksWidget); - + ui->btnSetVersion->hide(); viewerTrainees->setMinimumHeight(800); viewerInstructors->setMinimumSize(1800, 300); messangerWidget->setMinimumSize(500, 600); @@ -170,7 +170,7 @@ void InstructorsAndTraineesWidget::checkLoginResult(ServerAuthorization *serverA viewerTrainees->setAuthComplited(true); Q_EMIT signal_NeedUpdateUI(true, true); - + ui->btnSetVersion->show(); ui->btnAuthorizationInstructor->setText(tr("Deauthorization Instructor")); updateLabelLoggedInInstructor(serverAuth->Login, serverAuth->ClientName); @@ -200,7 +200,6 @@ void InstructorsAndTraineesWidget::checkDeLoginResult(ServerDeAuthorization *ser Q_EMIT signal_NeedUpdateUI(true, false); ui->btnAuthorizationInstructor->setText(tr("Authorization Instructor")); - updateLabelLoggedInInstructor("",""); QMessageBox::information(this, tr("Instructor deauthorization"), tr("Successfully!")); @@ -225,7 +224,7 @@ void InstructorsAndTraineesWidget::slot_ConnectedToServer(bool state) {//Сервер отключен ui->btnConnectionToServer->setEnabled(true); ui->btnAuthorizationInstructor->setEnabled(false); - + ui->btnSetVersion->hide(); ui->lblDBisConnected->setPixmap(QPixmap(QStringLiteral(":/resources/icons/circleGray.png"))); } } @@ -325,3 +324,8 @@ void InstructorsAndTraineesWidget::on_btnUpdateStyleSheet_clicked() { updateMyStyleSheet(); } + +void InstructorsAndTraineesWidget::on_btnSetVersion_clicked() +{ + connectorToServer->showVersionSelect(); +} diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.h b/InstructorsAndTrainees/instructorsandtraineeswidget.h index 5f0beaa..29e524d 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.h +++ b/InstructorsAndTrainees/instructorsandtraineeswidget.h @@ -63,6 +63,8 @@ private Q_SLOTS: void on_btnAuthorizationInstructor_clicked(); void on_btnUpdateStyleSheet_clicked(); + void on_btnSetVersion_clicked(); + private: //Авторизация инструктора локальная bool authorizationInstructorDialog(QWidget* parent = nullptr); diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.ui b/InstructorsAndTrainees/instructorsandtraineeswidget.ui index 164f714..7b72e42 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.ui +++ b/InstructorsAndTrainees/instructorsandtraineeswidget.ui @@ -203,6 +203,19 @@ + + + + + 58 + 58 + + + + ChangeVersion + + + diff --git a/InstructorsAndTrainees/resources.qrc b/InstructorsAndTrainees/resources.qrc index 56c11bf..d15df9e 100644 --- a/InstructorsAndTrainees/resources.qrc +++ b/InstructorsAndTrainees/resources.qrc @@ -40,5 +40,6 @@ resources/icons/task.png resources/icons/procedure.png resources/icons/malfunction.png + resources/icons/762.gif diff --git a/InstructorsAndTrainees/resources/icons/762.gif b/InstructorsAndTrainees/resources/icons/762.gif new file mode 100644 index 0000000000000000000000000000000000000000..d1a1bca8b7856ad73866ccb7f064d5ce0d1a9eed GIT binary patch literal 9842 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 Jl48`K{XgQexzGRr literal 0 HcmV?d00001 diff --git a/InstructorsAndTrainees/widgets/newversionwidget.cpp b/InstructorsAndTrainees/widgets/newversionwidget.cpp new file mode 100644 index 0000000..980781e --- /dev/null +++ b/InstructorsAndTrainees/widgets/newversionwidget.cpp @@ -0,0 +1,37 @@ +#include "newversionwidget.h" +#include "ui_newversionwidget.h" + +NewVersionWidget::NewVersionWidget(QWidget *parent) : + QWidget(parent), + ui(new Ui::NewVersionWidget) +{ + ui->setupUi(this); + setWindowFlags(Qt::SubWindow); + setAttribute(Qt::WA_ShowModal,true); +} + +void NewVersionWidget::initialize(VersionSelectWidget *versionSelectWidget, QString prevName) +{ + this->versionSelectWidget = versionSelectWidget; + ui->prevVerValue->setText(prevName); +} + + +void NewVersionWidget::on_createButton_clicked() +{ + if(ui->lineEdit->text() != "") + { + versionSelectWidget->sendCopyEmit(ui->lineEdit->text()); + hide(); + } +} + +void NewVersionWidget::on_cancelButton_clicked() +{ + hide(); +} + +NewVersionWidget::~NewVersionWidget() +{ + delete ui; +} diff --git a/InstructorsAndTrainees/widgets/newversionwidget.h b/InstructorsAndTrainees/widgets/newversionwidget.h new file mode 100644 index 0000000..dbc62e5 --- /dev/null +++ b/InstructorsAndTrainees/widgets/newversionwidget.h @@ -0,0 +1,31 @@ +#ifndef NEWVERSIONWIDGET_H +#define NEWVERSIONWIDGET_H + +#include +#include + +namespace Ui { +class NewVersionWidget; +} + +class VersionSelectWidget; +class NewVersionWidget : public QWidget +{ + Q_OBJECT + +public: + explicit NewVersionWidget(QWidget *parent = nullptr); + void initialize(VersionSelectWidget *versionSelectWidget,QString prevName); + ~NewVersionWidget(); + +private slots: + void on_createButton_clicked(); + + void on_cancelButton_clicked(); + +private: + Ui::NewVersionWidget *ui; + VersionSelectWidget *versionSelectWidget; +}; + +#endif // NEWVERSIONWIDGET_H diff --git a/InstructorsAndTrainees/widgets/newversionwidget.ui b/InstructorsAndTrainees/widgets/newversionwidget.ui new file mode 100644 index 0000000..9ba102e --- /dev/null +++ b/InstructorsAndTrainees/widgets/newversionwidget.ui @@ -0,0 +1,219 @@ + + + NewVersionWidget + + + + 0 + 0 + 325 + 200 + + + + + 0 + 0 + + + + Создать копию... + + + true + + + + + + + + + true + + + + 0 + 0 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + 5 + + + 5 + + + 5 + + + 5 + + + + + + 0 + 0 + + + + Базовая версия: + + + + + + + TextLabel + + + + + + + + + 6 + + + 5 + + + 5 + + + 20 + + + 5 + + + + + Новое название: + + + + + + + + 0 + 0 + + + + + 150 + 30 + + + + + 60 + 30 + + + + + + + + + + 6 + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + Создать + + + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + Отмена + + + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 40 + 20 + + + + + + + + + + + + + + diff --git a/InstructorsAndTrainees/widgets/versionselectwidget.cpp b/InstructorsAndTrainees/widgets/versionselectwidget.cpp new file mode 100644 index 0000000..2f76f3c --- /dev/null +++ b/InstructorsAndTrainees/widgets/versionselectwidget.cpp @@ -0,0 +1,107 @@ +#include "versionselectwidget.h" +#include "ui_versionselectwidget.h" +#include "ui_versionselectwidget.h" + +#include + +VersionSelectWidget::VersionSelectWidget(QWidget *parent) : + QWidget(parent), + ui(new Ui::VersionSelectWidget), + selectedVersion(nullptr) +{ + ui->setupUi(this); + setWindowFlags(Qt::Dialog | Qt::MSWindowsFixedSizeDialogHint); + setAttribute(Qt::WA_ShowModal,true); +} + +void VersionSelectWidget::initialize(SendSystem *sendSystem,VersionContainer *versionContainer,NotifyController *notifyController) +{ + 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); + this->versionContainer = versionContainer; + hide(); + setWindowTitle(tr("Управление версиями")); +} + +void VersionSelectWidget::fillView(QList *serverData) +{ + show(); + ui->verListView->clear(); + serverDataList = serverData; + ui->verValue->setText(versionContainer->getServerVersionData()->getViewName()); + + foreach(StreamingVersionData *data,*serverData) + { + ui->verListView->addItem(data->getViewName()); + } +} + +void VersionSelectWidget::on_verListView_itemDoubleClicked(QListWidgetItem *item) +{ + foreach(StreamingVersionData *data,*serverDataList) + { + if(data->getViewName() == item->text()) + { + QString info = "Имя версии: " + data->getViewName() + "\n"; + info.append("Создан: " + data->getCreateData().toString()); + ui->infoValue->setText(info); + selectedVersion = data; + } + } +} + + +void VersionSelectWidget::on_createDuplicateButton_clicked() +{ + NewVersionWidget *newVersionWidget = new NewVersionWidget; + newVersionWidget->initialize(this,selectedVersion->getViewName()); + newVersionWidget->show(); +} + +void VersionSelectWidget::sendCopyEmit(QString newName) +{ + QString result = selectedVersion->getViewName() + ";" + newName; + + if (selectedVersion == nullptr) + { + sigSendNotify(tr("Версия не выбрана")); + return; + } + + //versionContainer->setLocalVersionData(selectedVersion); + emit sigSendCopyVersion(result); +} + +void VersionSelectWidget::on_DeleteVersionButton_clicked() +{ + if (selectedVersion == nullptr) + { + sigSendNotify(tr("Версия не выбрана")); + return; + } + + emit sigSendDeleteVersion(selectedVersion); +} + +void VersionSelectWidget::on_switchServerVersionButton_clicked() +{ + if (selectedVersion == nullptr) + { + sigSendNotify(tr("Версия не выбрана")); + return; + } + + versionContainer->setServerVersionData(selectedVersion); + ui->verValue->setText(selectedVersion->getViewName()); + emit sigSendSwitchVersion(selectedVersion); +} + + + +VersionSelectWidget::~VersionSelectWidget() +{ + delete ui; +} + diff --git a/InstructorsAndTrainees/widgets/versionselectwidget.h b/InstructorsAndTrainees/widgets/versionselectwidget.h new file mode 100644 index 0000000..b2dedb7 --- /dev/null +++ b/InstructorsAndTrainees/widgets/versionselectwidget.h @@ -0,0 +1,50 @@ +#ifndef VERSIONSELECTWIDGET_H +#define VERSIONSELECTWIDGET_H + +#include +#include + +#include +#include +#include +#include +#include + +namespace Ui { +class VersionSelectWidget; +} + +class VersionSelectWidget : public QWidget +{ + Q_OBJECT + +public: + explicit VersionSelectWidget(QWidget *parent = nullptr); + + void initialize(SendSystem *sendSystem,VersionContainer *versionContainer,NotifyController *notifyController); + void fillView(QList *serverData); + void sendCopyEmit(QString newName); + + ~VersionSelectWidget(); +private slots: + void on_verListView_itemDoubleClicked(QListWidgetItem *item); + void on_createDuplicateButton_clicked(); + void on_DeleteVersionButton_clicked(); + void on_switchServerVersionButton_clicked(); + +signals: + void sigSendDeleteVersion(StreamingVersionData *streaming); + void sigSendSwitchVersion(StreamingVersionData *selectVersion); + void sigSendCopyVersion(QString versionPair); + void sigSendNotify(QString message); + +private: + Ui::VersionSelectWidget *ui; + SendSystem *sendSystem; + QList *serverDataList; + VersionContainer *versionContainer; + NotifyController *notifyController; + StreamingVersionData *selectedVersion; +}; + +#endif // VERSIONSELECTWIDGET_H diff --git a/InstructorsAndTrainees/widgets/versionselectwidget.ui b/InstructorsAndTrainees/widgets/versionselectwidget.ui new file mode 100644 index 0000000..6dbca69 --- /dev/null +++ b/InstructorsAndTrainees/widgets/versionselectwidget.ui @@ -0,0 +1,239 @@ + + + VersionSelectWidget + + + + 0 + 0 + 606 + 229 + + + + + 0 + 0 + + + + Form + + + false + + + + + 0 + 0 + 301 + 171 + + + + + 5 + + + 5 + + + 5 + + + 5 + + + + + + Calibri + 12 + + + + Qt::PreventContextMenu + + + Доступные версии на сервере + + + + + + + + + + + + 0 + 180 + 601 + 41 + + + + + 6 + + + + + QLayout::SetMinimumSize + + + 5 + + + 0 + + + + + + 0 + 0 + + + + + 9 + + + + Создать копию + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9 + + + + Удалить + + + + + + + + + + 0 + 0 + + + + + 9 + + + + Переключить версию сервера + + + + + + + + + 310 + 0 + 291 + 131 + + + + + QLayout::SetDefaultConstraint + + + + + + 0 + 0 + + + + Информация: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + Тут будет информация о версии... + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + 310 + 140 + 291 + 31 + + + + + + + Текущая версия сервера: + + + + + + + none + + + + + + + + + diff --git a/InstructorsAndTrainees/widgets/waitanimationwidget.cpp b/InstructorsAndTrainees/widgets/waitanimationwidget.cpp new file mode 100644 index 0000000..547a79f --- /dev/null +++ b/InstructorsAndTrainees/widgets/waitanimationwidget.cpp @@ -0,0 +1,35 @@ +#include "waitanimationwidget.h" +#include "ui_waitanimationwidget.h" + +WaitAnimationWidget::WaitAnimationWidget(QWidget *parent) : + QWidget(parent), + ui(new Ui::WaitAnimationWidget), + loadingMovie(nullptr) +{ + ui->setupUi(this); +} + +void WaitAnimationWidget::initialize(QMovie *movie,QWidget *parent) +{ + ui->MovieLabel->setMovie(movie); + loadingMovie = movie; + setFixedSize(parent->width(),parent->height()); + hide(); +} + +void WaitAnimationWidget::showWithPlay() +{ + show(); + loadingMovie->start(); +} + +void WaitAnimationWidget::hideWithStop() +{ + hide(); + loadingMovie->stop(); +} + +WaitAnimationWidget::~WaitAnimationWidget() +{ + delete ui; +} diff --git a/InstructorsAndTrainees/widgets/waitanimationwidget.h b/InstructorsAndTrainees/widgets/waitanimationwidget.h new file mode 100644 index 0000000..e9ea6a9 --- /dev/null +++ b/InstructorsAndTrainees/widgets/waitanimationwidget.h @@ -0,0 +1,27 @@ +#ifndef WAITANIMATIONWIDGET_H +#define WAITANIMATIONWIDGET_H + +#include +#include + +namespace Ui { +class WaitAnimationWidget; +} + +class WaitAnimationWidget : public QWidget +{ + Q_OBJECT + +public: + explicit WaitAnimationWidget(QWidget *parent = nullptr); + void initialize(QMovie *movie,QWidget *parent); + void showWithPlay(); + void hideWithStop(); + ~WaitAnimationWidget(); + +private: + Ui::WaitAnimationWidget *ui; + QMovie *loadingMovie; +}; + +#endif // WAITANIMATIONWIDGET_H diff --git a/InstructorsAndTrainees/widgets/waitanimationwidget.ui b/InstructorsAndTrainees/widgets/waitanimationwidget.ui new file mode 100644 index 0000000..4819a89 --- /dev/null +++ b/InstructorsAndTrainees/widgets/waitanimationwidget.ui @@ -0,0 +1,73 @@ + + + WaitAnimationWidget + + + + 0 + 0 + 635 + 293 + + + + + 0 + 0 + + + + Form + + + false + + + background-color:rgba(0,0,0,50%); + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + 0 + 0 + + + + background-color:rgba(0,0,0,50%) + + + + + + :/resources/icons/762.gif + + + Qt::AlignCenter + + + + + + + + + + + +