From 50d1a2cf9ec1c5a2a63c25be6be93981cf7e7162 Mon Sep 17 00:00:00 2001 From: krivoshein Date: Wed, 19 Mar 2025 13:02:49 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D1=81=D1=82?= =?UTF-8?q?=D0=B0=D1=80=D1=8B=D0=B5=20Task?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBaseLMS/CMakeLists.txt | 2 - DataBaseLMS/databaselms.cpp | 38 ------------------- DataBaseLMS/databaselms.h | 2 - DataBaseLMS/interfacedatabaselms.cpp | 5 --- DataBaseLMS/interfacedatabaselms.h | 1 - DataBaseLMS/task.cpp | 7 ---- DataBaseLMS/task.h | 12 ------ DataBaseLMS/trainee.cpp | 3 +- DataBaseLMS/trainee.h | 5 --- .../Core/recognizesystem.cpp | 21 ---------- .../connectorToServer/Core/recognizesystem.h | 1 - .../connectorToServer/Core/tools.h | 1 - .../connectorToServer/connectortoserver.cpp | 12 ------ .../connectorToServer/connectortoserver.h | 4 -- ServerLMS/Data/PacketType.h | 1 - ServerLMS/Systems/Parsers/dbanswerparser.cpp | 6 --- ServerLMS/Systems/Parsers/dbanswerparser.h | 1 - 17 files changed, 1 insertion(+), 121 deletions(-) delete mode 100644 DataBaseLMS/task.cpp delete mode 100644 DataBaseLMS/task.h diff --git a/DataBaseLMS/CMakeLists.txt b/DataBaseLMS/CMakeLists.txt index b9aafce..a74f588 100644 --- a/DataBaseLMS/CMakeLists.txt +++ b/DataBaseLMS/CMakeLists.txt @@ -20,8 +20,6 @@ add_library(DataBaseLMS SHARED group.h computer.cpp computer.h - task.cpp - task.h classroom.cpp classroom.h tasksAmmFim.cpp diff --git a/DataBaseLMS/databaselms.cpp b/DataBaseLMS/databaselms.cpp index 693d2f2..257886f 100644 --- a/DataBaseLMS/databaselms.cpp +++ b/DataBaseLMS/databaselms.cpp @@ -181,8 +181,6 @@ QList DataBaseLMS::selectAllTrainees() Computer computer = Computer(query.value(8).toInt(), query.value(9).toString(), query.value(10).toString(), classroom); trainee.setComputer(computer); - trainee.setTasks(selectTasksOfTrainee(trainee.getID())); - listTrainees.append(trainee); } } @@ -690,8 +688,6 @@ Trainee DataBaseLMS::selectTrainee(int id_trainee) Classroom classroom = Classroom(query.value(11).toInt(), query.value(12).toString()); Computer computer = Computer(query.value(8).toInt(), query.value(9).toString(), query.value(10).toString(), classroom); trainee.setComputer(computer); - - trainee.setTasks(selectTasksOfTrainee(trainee.getID())); } } @@ -735,8 +731,6 @@ QList DataBaseLMS::selectAllTraineesInGroup(int id_group) Computer computer = Computer(query.value(8).toInt(), query.value(9).toString(), query.value(10).toString(), classroom); trainee.setComputer(computer); - trainee.setTasks(selectTasksOfTrainee(trainee.getID())); - listTrainees.append(trainee); } } @@ -820,8 +814,6 @@ Trainee DataBaseLMS::selectTraineeOnComputer(QString computer_name) Classroom classroom = Classroom(query.value(11).toInt(), query.value(12).toString()); Computer computer = Computer(query.value(8).toInt(), query.value(9).toString(), query.value(10).toString(), classroom); trainee.setComputer(computer); - - trainee.setTasks(selectTasksOfTrainee(trainee.getID())); } } @@ -1015,36 +1007,6 @@ int DataBaseLMS::updateTrainee(Trainee trainee) return queryExecInt(queryStr); } -QList DataBaseLMS::selectTasksOfTrainee(int trainee_id) -{ - QList tasks; - - /* - QString queryStr = QString("SELECT tasks.task_id, tasks.name " - "FROM public.trainees " - "JOIN public.trainees_tasks ON trainees_tasks.trainee_id = trainees.trainee_id " - "JOIN public.tasks ON tasks.task_id = trainees_tasks.task_id " - "WHERE trainees.trainee_id = %1 " - "ORDER BY tasks.name ASC").arg( - trainee_id); - - QSqlQuery query = QSqlQuery(*db); - - if(queryExec(queryStr, &query)) - { - while (query.next()) - {//Задача - Task task; - task.setID(query.value(0).toInt()); - task.setName(query.value(1).toString()); - tasks.append(task); - } - } - */ - - return tasks; -} - int DataBaseLMS::queryExecInt(QString queryStr) { QSqlQuery query = QSqlQuery(*db); diff --git a/DataBaseLMS/databaselms.h b/DataBaseLMS/databaselms.h index 79572a2..29a2371 100644 --- a/DataBaseLMS/databaselms.h +++ b/DataBaseLMS/databaselms.h @@ -82,8 +82,6 @@ protected: int deleteTrainee(int id_trainee); int updateTrainee(Trainee trainee); - QList selectTasksOfTrainee(int trainee_id); - private: int queryExecInt(QString queryStr); QString queryExecString(QString queryStr); diff --git a/DataBaseLMS/interfacedatabaselms.cpp b/DataBaseLMS/interfacedatabaselms.cpp index 03c1b4f..0ed724b 100644 --- a/DataBaseLMS/interfacedatabaselms.cpp +++ b/DataBaseLMS/interfacedatabaselms.cpp @@ -213,11 +213,6 @@ bool InterfaceDataBaseLMS::deAuthorizationAllTrainees() return updateAllTraineesLoggedIn(false); } -QList InterfaceDataBaseLMS::getTasksTrainee(int id) -{ - return selectTasksOfTrainee(id); -} - QString InterfaceDataBaseLMS::getNameTraineeOnComputer(QString computer_name) { return selectTraineeNameOnComputer(computer_name); diff --git a/DataBaseLMS/interfacedatabaselms.h b/DataBaseLMS/interfacedatabaselms.h index 3ba2233..6fce95c 100644 --- a/DataBaseLMS/interfacedatabaselms.h +++ b/DataBaseLMS/interfacedatabaselms.h @@ -51,7 +51,6 @@ public: bool deAuthorizationAllTrainees(); //void setTasks(QString login, QStringList tasks); - QList getTasksTrainee(int id); QString getNameTraineeOnComputer(QString computer_name); Trainee getTraineeOnComputer(QString computer_name); diff --git a/DataBaseLMS/task.cpp b/DataBaseLMS/task.cpp deleted file mode 100644 index d99ae8e..0000000 --- a/DataBaseLMS/task.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "task.h" - -Task::Task(): - BasicEntity() -{ - -} diff --git a/DataBaseLMS/task.h b/DataBaseLMS/task.h deleted file mode 100644 index bc5889d..0000000 --- a/DataBaseLMS/task.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef TASK_H -#define TASK_H - -#include "basicentity.h" - -class DATABASELMS_EXPORT Task: public BasicEntity -{ -public: - Task(); -}; - -#endif // TASK_H diff --git a/DataBaseLMS/trainee.cpp b/DataBaseLMS/trainee.cpp index 32ecb02..0182f4d 100644 --- a/DataBaseLMS/trainee.cpp +++ b/DataBaseLMS/trainee.cpp @@ -3,8 +3,7 @@ Trainee::Trainee(): User(), group(), - computer(), - tasks() + computer() { } diff --git a/DataBaseLMS/trainee.h b/DataBaseLMS/trainee.h index 15d42de..7dad41a 100644 --- a/DataBaseLMS/trainee.h +++ b/DataBaseLMS/trainee.h @@ -6,7 +6,6 @@ #include "user.h" #include "group.h" #include "computer.h" -#include "task.h" class DATABASELMS_EXPORT Trainee: public User { @@ -19,13 +18,9 @@ public: void setComputer(Computer computer){this->computer = computer;} Computer getComputer(){return computer;} - void setTasks(QList tasks){this->tasks = tasks;} - QList getTasks(){return tasks;} - private: Group group; Computer computer; - QList tasks; }; #endif // TRAINEE_H diff --git a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp index 93b7d82..be3d0c3 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp +++ b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp @@ -273,7 +273,6 @@ void RecognizeSystem::recognize(QTcpSocket *socket) case TYPE_XMLANSWER_QUERY_DB__LIST_TRAINEES: case TYPE_XMLANSWER_QUERY_DB__LIST_COMPUTERS: case TYPE_XMLANSWER_QUERY_DB__LIST_CLASSROOMS: - case TYPE_XMLANSWER_QUERY_DB__LIST_TASKS: case TYPE_XMLANSWER_QUERY_TASKS_AMM_FOR_TRAINEE: case TYPE_XMLANSWER_QUERY_TASKS_FIM_FOR_TRAINEE: { @@ -652,26 +651,6 @@ void RecognizeSystem::xmlParserQueryToDB(PacketType packetType, QByteArray array emit sigAnswerQueryToDB_ListClassrooms(listClassrooms); } break; - case TYPE_XMLANSWER_QUERY_DB__LIST_TASKS: - { - QList listTasks; - QDomNode listNode = commonDOM.namedItem("ListTasks"); - - for(int i = 0; i < listNode.childNodes().count(); i++) - { - QDomNode taskNode = listNode.childNodes().at(i); - if(taskNode.nodeName() == "Task") - {//Задача - Task task; - task.setID(taskNode.toElement().attribute("task_id").toInt()); - task.setName(taskNode.toElement().attribute("name")); - - listTasks.append(task); - } - } - emit sigAnswerQueryToDB_ListTasks(listTasks); - } - break; case TYPE_XMLANSWER_QUERY_TASKS_AMM_FOR_TRAINEE: { QList listTasks; diff --git a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h index de47193..55d910a 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h +++ b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h @@ -48,7 +48,6 @@ signals: void sigAnswerQueryToDB_ListTrainees(QList listTrainees); void sigAnswerQueryToDB_ListComputers(QList listComputers); void sigAnswerQueryToDB_ListClassrooms(QList listClassrooms); - void sigAnswerQueryToDB_ListTasks(QList listTasks); void sigAnswerQueryToDB_ListTasksAMMforTrainee(QListlistTasks, int trainee_id); void sigAnswerQueryToDB_ListTasksFIMforTrainee(QListlistTasks, int trainee_id); void sigAnswerQueryTasksXML_FIM(QByteArray array); diff --git a/InstructorsAndTrainees/connectorToServer/Core/tools.h b/InstructorsAndTrainees/connectorToServer/Core/tools.h index 7657c32..30ef3b3 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/tools.h +++ b/InstructorsAndTrainees/connectorToServer/Core/tools.h @@ -44,7 +44,6 @@ enum PacketType{ TYPE_XMLANSWER_QUERY_DB__LIST_TRAINEES = 102, TYPE_XMLANSWER_QUERY_DB__LIST_COMPUTERS = 103, TYPE_XMLANSWER_QUERY_DB__LIST_CLASSROOMS = 104, - TYPE_XMLANSWER_QUERY_DB__LIST_TASKS = 105, TYPE_XMLANSWER_QUERY_TASKS_AMM_FOR_TRAINEE = 106, TYPE_XMLANSWER_QUERY_TASKS_FIM_FOR_TRAINEE = 107, diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp index 0982b27..301e84b 100644 --- a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp +++ b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp @@ -143,11 +143,6 @@ QList ConnectorToServer::getListClassrooms() return listClassrooms; } -QList ConnectorToServer::getListTasks() -{ - return listTasks; -} - QList ConnectorToServer::getListTasksAMMforTrainee(int trainee_id) { if(mapTasksAMM.contains(trainee_id)) @@ -323,12 +318,6 @@ void ConnectorToServer::slot_AnswerQueryToDB_ListClassrooms(QList lis //emit signal_UpdateDB(false, true); } -void ConnectorToServer::slot_AnswerQueryToDB_ListTasks(QList listTasks) -{ - this->listTasks = listTasks; - //emit signal_UpdateDB(false, true); -} - void ConnectorToServer::slot_AnswerQueryToDB_ListTasksAMMforTrainee(QList listTasks, int trainee_id) { //Удаляем старые задачи этого обучаемого @@ -422,7 +411,6 @@ void ConnectorToServer::bindConnection() connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListTrainees,this,&ConnectorToServer::slot_AnswerQueryToDB_ListTrainees); connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListComputers,this,&ConnectorToServer::slot_AnswerQueryToDB_ListComputers); connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListClassrooms,this,&ConnectorToServer::slot_AnswerQueryToDB_ListClassrooms); - connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListTasks,this,&ConnectorToServer::slot_AnswerQueryToDB_ListTasks); connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListTasksAMMforTrainee,this,&ConnectorToServer::slot_AnswerQueryToDB_ListTasksAMMforTrainee); connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListTasksFIMforTrainee,this,&ConnectorToServer::slot_AnswerQueryToDB_ListTasksFIMforTrainee); diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver.h b/InstructorsAndTrainees/connectorToServer/connectortoserver.h index b7dee66..c235ddf 100644 --- a/InstructorsAndTrainees/connectorToServer/connectortoserver.h +++ b/InstructorsAndTrainees/connectorToServer/connectortoserver.h @@ -14,7 +14,6 @@ #include "group.h" #include "computer.h" #include "classroom.h" -#include "task.h" #include "streamingversiondata.h" class ConnectorToServer : public QObject @@ -44,7 +43,6 @@ public: QList getListGroups(); QList getListComputers(); QList getListClassrooms(); - QList getListTasks(); QList getListTasksAMMforTrainee(int trainee_id); QList getListTasksFIMforTrainee(int trainee_id); @@ -74,7 +72,6 @@ public slots: void slot_AnswerQueryToDB_ListTrainees(QList listTrainees); void slot_AnswerQueryToDB_ListComputers(QList listComputers); void slot_AnswerQueryToDB_ListClassrooms(QList listClassrooms); - void slot_AnswerQueryToDB_ListTasks(QList listTasks); void slot_AnswerQueryToDB_ListTasksAMMforTrainee(QList listTasks, int trainee_id); void slot_AnswerQueryToDB_ListTasksFIMforTrainee(QList listTasks, int trainee_id); @@ -133,7 +130,6 @@ private: QList listTrainees; QList listComputers; QList listClassrooms; - QList listTasks; QMap> mapTasksAMM; QMap> mapTasksFIM; diff --git a/ServerLMS/Data/PacketType.h b/ServerLMS/Data/PacketType.h index 0816fc5..67f64c3 100644 --- a/ServerLMS/Data/PacketType.h +++ b/ServerLMS/Data/PacketType.h @@ -26,7 +26,6 @@ enum PacketType TYPE_XMLANSWER_QUERY_DB__LIST_TRAINEES = 102, TYPE_XMLANSWER_QUERY_DB__LIST_COMPUTERS = 103, TYPE_XMLANSWER_QUERY_DB__LIST_CLASSROOMS = 104, - TYPE_XMLANSWER_QUERY_DB__LIST_TASKS = 105, TYPE_XMLANSWER_QUERY_TASKS_AMM_FOR_TRAINEE = 106, TYPE_XMLANSWER_QUERY_TASKS_FIM_FOR_TRAINEE = 107, diff --git a/ServerLMS/Systems/Parsers/dbanswerparser.cpp b/ServerLMS/Systems/Parsers/dbanswerparser.cpp index f652862..cfce748 100644 --- a/ServerLMS/Systems/Parsers/dbanswerparser.cpp +++ b/ServerLMS/Systems/Parsers/dbanswerparser.cpp @@ -102,12 +102,6 @@ QByteArray DBAnswerParser::listClassrooms(bool result, QList *listCla return QByteArray(); } -QByteArray DBAnswerParser::listTasks(bool result, QList *listTasks) -{ - //TODO - return QByteArray(); -} - QByteArray DBAnswerParser::listTasksAMMofTrainee(bool result, QList *listTasks, int trainee_id) { QDomDocument commonDOM; diff --git a/ServerLMS/Systems/Parsers/dbanswerparser.h b/ServerLMS/Systems/Parsers/dbanswerparser.h index c3c0ca9..64c53e5 100644 --- a/ServerLMS/Systems/Parsers/dbanswerparser.h +++ b/ServerLMS/Systems/Parsers/dbanswerparser.h @@ -18,7 +18,6 @@ public: QByteArray listTrainees(bool result, QList *listTrainees); QByteArray listComputers(bool result, QList *listComputers); QByteArray listClassrooms(bool result, QList *listClassrooms); - QByteArray listTasks(bool result, QList *listTasks); QByteArray listTasksAMMofTrainee(bool result, QList *listTasks, int trainee_id); QByteArray listTasksFIMofTrainee(bool result, QList *listTasks, int trainee_id);