Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-28 19:55:48 +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