Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-27 19:45:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Убрал старые Task

Browse Source
This commit is contained in:
krivoshein
2025-03-19 13:02:49 +03:00
parent 5a722383d1
commit 50d1a2cf9e
17 changed files with 1 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DataBaseLMS/CMakeLists.txt
View File

@@ -20,8 +20,6 @@ add_library(DataBaseLMS SHARED
group.h
computer.cpp
computer.h
task.cpp
task.h
classroom.cpp
classroom.h
tasksAmmFim.cpp

38
DataBaseLMS/databaselms.cpp
View File

@@ -181,8 +181,6 @@ QList<Trainee> 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<Trainee> 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<Task> DataBaseLMS::selectTasksOfTrainee(int trainee_id)
{
QList<Task> 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);

2
DataBaseLMS/databaselms.h
View File

@@ -82,8 +82,6 @@ protected:
int deleteTrainee(int id_trainee);
int updateTrainee(Trainee trainee);
QList<Task> selectTasksOfTrainee(int trainee_id);
private:
int queryExecInt(QString queryStr);
QString queryExecString(QString queryStr);

5
DataBaseLMS/interfacedatabaselms.cpp
View File

@@ -213,11 +213,6 @@ bool InterfaceDataBaseLMS::deAuthorizationAllTrainees()
return updateAllTraineesLoggedIn(false);
}
QList<Task> InterfaceDataBaseLMS::getTasksTrainee(int id)
{
return selectTasksOfTrainee(id);
}
QString InterfaceDataBaseLMS::getNameTraineeOnComputer(QString computer_name)
{
return selectTraineeNameOnComputer(computer_name);

1
DataBaseLMS/interfacedatabaselms.h
View File

@@ -51,7 +51,6 @@ public:
bool deAuthorizationAllTrainees();
//void setTasks(QString login, QStringList tasks);
QList<Task> getTasksTrainee(int id);
QString getNameTraineeOnComputer(QString computer_name);
Trainee getTraineeOnComputer(QString computer_name);

7
DataBaseLMS/task.cpp
View File

@@ -1,7 +0,0 @@
#include "task.h"
Task::Task():
BasicEntity()
{
}

12
DataBaseLMS/task.h
View File

@@ -1,12 +0,0 @@
#ifndef TASK_H
#define TASK_H
#include "basicentity.h"
class DATABASELMS_EXPORT Task: public BasicEntity
{
public:
Task();
};
#endif // TASK_H

3
DataBaseLMS/trainee.cpp
View File

@@ -3,8 +3,7 @@
Trainee::Trainee():
User(),
group(),
computer(),
tasks()
computer()
{
}

5
DataBaseLMS/trainee.h
View File

@@ -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<Task> tasks){this->tasks = tasks;}
QList<Task> getTasks(){return tasks;}
private:
Group group;
Computer computer;
QList<Task> tasks;
};
#endif // TRAINEE_H

21
InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp
View File

@@ -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<Task> 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<TaskAmmFim> listTasks;

1
InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h
View File

@@ -48,7 +48,6 @@ signals:
void sigAnswerQueryToDB_ListTrainees(QList<Trainee> listTrainees);
void sigAnswerQueryToDB_ListComputers(QList<Computer> listComputers);
void sigAnswerQueryToDB_ListClassrooms(QList<Classroom> listClassrooms);
void sigAnswerQueryToDB_ListTasks(QList<Task> listTasks);
void sigAnswerQueryToDB_ListTasksAMMforTrainee(QList<TaskAmmFim>listTasks, int trainee_id);
void sigAnswerQueryToDB_ListTasksFIMforTrainee(QList<TaskAmmFim>listTasks, int trainee_id);
void sigAnswerQueryTasksXML_FIM(QByteArray array);

1
InstructorsAndTrainees/connectorToServer/Core/tools.h
View File

@@ -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,

12
InstructorsAndTrainees/connectorToServer/connectortoserver.cpp
View File

@@ -143,11 +143,6 @@ QList<Classroom> ConnectorToServer::getListClassrooms()
return listClassrooms;
}
QList<Task> ConnectorToServer::getListTasks()
{
return listTasks;
}
QList<TaskAmmFim> ConnectorToServer::getListTasksAMMforTrainee(int trainee_id)
{
if(mapTasksAMM.contains(trainee_id))
@@ -323,12 +318,6 @@ void ConnectorToServer::slot_AnswerQueryToDB_ListClassrooms(QList<Classroom> lis
//emit signal_UpdateDB(false, true);
}
void ConnectorToServer::slot_AnswerQueryToDB_ListTasks(QList<Task> listTasks)
{
this->listTasks = listTasks;
//emit signal_UpdateDB(false, true);
}
void ConnectorToServer::slot_AnswerQueryToDB_ListTasksAMMforTrainee(QList<TaskAmmFim> 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);

4
InstructorsAndTrainees/connectorToServer/connectortoserver.h
View File

@@ -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<Group> getListGroups();
QList<Computer> getListComputers();
QList<Classroom> getListClassrooms();
QList<Task> getListTasks();
QList<TaskAmmFim> getListTasksAMMforTrainee(int trainee_id);
QList<TaskAmmFim> getListTasksFIMforTrainee(int trainee_id);
@@ -74,7 +72,6 @@ public slots:
void slot_AnswerQueryToDB_ListTrainees(QList<Trainee> listTrainees);
void slot_AnswerQueryToDB_ListComputers(QList<Computer> listComputers);
void slot_AnswerQueryToDB_ListClassrooms(QList<Classroom> listClassrooms);
void slot_AnswerQueryToDB_ListTasks(QList<Task> listTasks);
void slot_AnswerQueryToDB_ListTasksAMMforTrainee(QList<TaskAmmFim> listTasks, int trainee_id);
void slot_AnswerQueryToDB_ListTasksFIMforTrainee(QList<TaskAmmFim> listTasks, int trainee_id);
@@ -133,7 +130,6 @@ private:
QList<Trainee> listTrainees;
QList<Computer> listComputers;
QList<Classroom> listClassrooms;
QList<Task> listTasks;
QMap<int, QList<TaskAmmFim>> mapTasksAMM;
QMap<int, QList<TaskAmmFim>> mapTasksFIM;

1
ServerLMS/Data/PacketType.h
View File

@@ -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,

6
ServerLMS/Systems/Parsers/dbanswerparser.cpp
View File

@@ -102,12 +102,6 @@ QByteArray DBAnswerParser::listClassrooms(bool result, QList<Classroom> *listCla
return QByteArray();
}
QByteArray DBAnswerParser::listTasks(bool result, QList<Task> *listTasks)
{
//TODO
return QByteArray();
}
QByteArray DBAnswerParser::listTasksAMMofTrainee(bool result, QList<TaskAmmFim> *listTasks, int trainee_id)
{
QDomDocument commonDOM;

1
ServerLMS/Systems/Parsers/dbanswerparser.h
View File

@@ -18,7 +18,6 @@ public:
QByteArray listTrainees(bool result, QList<Trainee> *listTrainees);
QByteArray listComputers(bool result, QList<Computer> *listComputers);
QByteArray listClassrooms(bool result, QList<Classroom> *listClassrooms);
QByteArray listTasks(bool result, QList<Task> *listTasks);
QByteArray listTasksAMMofTrainee(bool result, QList<TaskAmmFim> *listTasks, int trainee_id);
QByteArray listTasksFIMofTrainee(bool result, QList<TaskAmmFim> *listTasks, int trainee_id);