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

Переименована таблица БД tasks_amm

Browse Source
This commit is contained in:
krivoshein
2025-01-22 17:32:06 +03:00
parent 559d1862d1
commit 3155bf43ed
9 changed files with 101 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
DataBaseLMS/databaselms.cpp
View File

@@ -447,6 +447,27 @@ int DataBaseLMS::updateGroup(Group group)
return queryExecInt(queryStr);
}
int DataBaseLMS::insertTaskAMM(int id_trainee)
{
QString queryStr = QString("INSERT INTO public.tasks_amm (name, trainee_task) "
"VALUES (DEFAULT, %1) "
"RETURNING tasks_amm.task_id").arg(
QString::number(id_trainee));
return queryExecInt(queryStr);
}
int DataBaseLMS::updateTaskAMM(TaskAmmFim task)
{
QString queryStr = QString("UPDATE public.tasks_amm SET name = '%1' "
"WHERE task_id = %2 "
"RETURNING tasks_amm.task_id").arg(
task.ammProcedure.dmCode,
QString::number(task.getID()) );
return queryExecInt(queryStr);
}
Trainee DataBaseLMS::selectTrainee(int id_trainee)
{
Trainee trainee;
@@ -735,6 +756,7 @@ 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 "
@@ -755,6 +777,7 @@ QList<Task> DataBaseLMS::selectTasksOfTrainee(int trainee_id)
tasks.append(task);
}
}
*/
return tasks;
}

5
DataBaseLMS/databaselms.h
View File

@@ -7,6 +7,7 @@
#include "instructor.h"
#include "trainee.h"
#include "group.h"
#include "tasksAmmFim.h"
class DataBaseLMS
{
@@ -52,6 +53,10 @@ protected:
int deleteGroup(int group_id);
int updateGroup(Group group);
//Задача
int insertTaskAMM(int id_trainee);
int updateTaskAMM(TaskAmmFim task);
//Обучаемый
Trainee selectTrainee(int id_trainee);
QList<Trainee> selectAllTraineesInGroup(int id_group);

15
DataBaseLMS/interfacedatabaselms.cpp
View File

@@ -281,6 +281,21 @@ int InterfaceDataBaseLMS::editGroup(Group group)
return updateGroup(group);
}
int InterfaceDataBaseLMS::newTaskAMM(int id_trainee)
{
return insertTaskAMM(id_trainee);
}
int InterfaceDataBaseLMS::delTaskAMM(int id)
{
return 0;
}
int InterfaceDataBaseLMS::editTaskAMM(TaskAmmFim task)
{
return updateTaskAMM(task);
}
int InterfaceDataBaseLMS::newTrainee(int id_group)
{
return insertTrainee(id_group);

4
DataBaseLMS/interfacedatabaselms.h
View File

@@ -69,6 +69,10 @@ public:
int delGroup(int id);
int editGroup(Group group);
int newTaskAMM(int id_trainee);
int delTaskAMM(int id);
int editTaskAMM(TaskAmmFim task);
int newTrainee(int id_group);
int delTrainee(int id);
int editTrainee(Trainee trainee);

4
DataBaseLMS/tasksAmmFim.h
View File

@@ -72,6 +72,10 @@ public:
public:
void initialize(int id, QString type, QString title, QString status, QString created_date, QString changed_date);
void addMalfunction(Malfunction malfunction);
public:
void setID(int id){this->id = id;};
int getID(){return id;};
public:
int id; // для идентификации в БД

17
ServerLMS/Systems/Parsers/processparser.cpp
View File

@@ -1,4 +1,5 @@
#include "processparser.h"
#include "tasksAmmFim.h"
ProcessParser::ProcessParser(QObject *parent) : QObject(parent)
{
@@ -139,6 +140,7 @@ void ProcessParser::queryToDb(QXmlStreamReader &xmlReader,ClientHandler *client)
Instructor instructor;
Trainee trainee;
Group group;
TaskAmmFim task;
void* data = nullptr;
/*Перебираем все атрибуты тега*/
@@ -205,6 +207,17 @@ void ProcessParser::queryToDb(QXmlStreamReader &xmlReader,ClientHandler *client)
else if(name == "name")
group.setName(value);
break;
case TypeQueryToDB::TYPE_QUERY_ASSIGN_TASK_AMM_TO_TRAINEE:
if(name == "title")
task.ammProcedure.title = value;
else if(name == "dmCode")
task.ammProcedure.dmCode = value;
break;
case TypeQueryToDB::TYPE_QUERY_ASSIGN_TASK_FIM_TO_TRAINEE:
if(name == "title")
task.title = value;
break;
};
}
}
@@ -223,6 +236,10 @@ void ProcessParser::queryToDb(QXmlStreamReader &xmlReader,ClientHandler *client)
case TypeQueryToDB::TYPE_QUERY_EDIT_GROUP:
data = &group;
break;
case TypeQueryToDB::TYPE_QUERY_ASSIGN_TASK_AMM_TO_TRAINEE:
case TypeQueryToDB::TYPE_QUERY_ASSIGN_TASK_FIM_TO_TRAINEE:
data = &task;
break;
};
processingSystem->processingClientQueryToDB(client, queryToDB, id, data);

13
ServerLMS/Systems/processingsystem.cpp
View File

@@ -226,6 +226,19 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu
emit sigAuthChanged();
break;
}
case TypeQueryToDB::TYPE_QUERY_ASSIGN_TASK_AMM_TO_TRAINEE:
{
int id_new;
id_new = providerDBLMS->newTaskAMM(id);
if(id_new)
{
(*(TaskAmmFim*)data).setID(id_new);
providerDBLMS->editTaskAMM(*(TaskAmmFim*)data);
}
//emit sigTasksChanged();
break;
}
}
//client->sendXmlAnswer(arrayAnswer, PacketType::TYPE_XMLANSWER_QUERY_DB_LIST_INSTRUCTORS);

15
ServerLMS/providerdblms.cpp
View File

@@ -299,3 +299,18 @@ int ProviderDBLMS::editGroup(Group group)
{
return dbLMS->editGroup(group);
}
int ProviderDBLMS::newTaskAMM(int id_trainee)
{
return dbLMS->newTaskAMM(id_trainee);
}
int ProviderDBLMS::delTaskAMM(int id)
{
return 0;
}
int ProviderDBLMS::editTaskAMM(TaskAmmFim task)
{
return dbLMS->editTaskAMM(task);
}

5
ServerLMS/providerdblms.h
View File

@@ -4,6 +4,7 @@
#include <QObject>
#include <QDebug>
#include "interfacedatabaselms.h"
#include "tasksAmmFim.h"
class ProviderDBLMS : public QObject
{
@@ -41,6 +42,10 @@ public:
int delGroup(int id);
int editGroup(Group group);
int newTaskAMM(int id_trainee);
int delTaskAMM(int id);
int editTaskAMM(TaskAmmFim task);
Q_SIGNALS:
//сигнал о блокировке авторизации
void signal_BlockAutorization(bool block);