diff --git a/DataBaseLMS/databaselms.cpp b/DataBaseLMS/databaselms.cpp index b74a847..dacf733 100644 --- a/DataBaseLMS/databaselms.cpp +++ b/DataBaseLMS/databaselms.cpp @@ -455,11 +455,13 @@ int DataBaseLMS::updateGroup(Group group) return queryExecInt(queryStr); } -int DataBaseLMS::insertTaskAMM(int id_trainee) +int DataBaseLMS::insertTaskAMM(TaskAmmFim task, int id_trainee) { QString queryStr = QString("INSERT INTO public.tasks_amm (title, dm_code, trainee_task) " - "VALUES (DEFAULT, DEFAULT, %1) " + "VALUES ('%1', '%2', %3) " "RETURNING tasks_amm.task_id").arg( + task.ammProcedure.title, + task.ammProcedure.dmCode, QString::number(id_trainee)); return queryExecInt(queryStr); diff --git a/DataBaseLMS/databaselms.h b/DataBaseLMS/databaselms.h index eec4c88..79572a2 100644 --- a/DataBaseLMS/databaselms.h +++ b/DataBaseLMS/databaselms.h @@ -54,7 +54,7 @@ protected: int updateGroup(Group group); //Задача AMM - int insertTaskAMM(int id_trainee); + int insertTaskAMM(TaskAmmFim task, int id_trainee); int updateTaskAMM(TaskAmmFim task); int deleteTaskAMM(int id_task); QList selectTasksAMMofTrainee(int id_trainee); diff --git a/DataBaseLMS/interfacedatabaselms.cpp b/DataBaseLMS/interfacedatabaselms.cpp index 5d385d8..68e9596 100644 --- a/DataBaseLMS/interfacedatabaselms.cpp +++ b/DataBaseLMS/interfacedatabaselms.cpp @@ -291,9 +291,9 @@ int InterfaceDataBaseLMS::editGroup(Group group) return updateGroup(group); } -int InterfaceDataBaseLMS::newTaskAMM(int id_trainee) +int InterfaceDataBaseLMS::newTaskAMM(TaskAmmFim task, int id_trainee) { - return insertTaskAMM(id_trainee); + return insertTaskAMM(task, id_trainee); } int InterfaceDataBaseLMS::delTaskAMM(int id) diff --git a/DataBaseLMS/interfacedatabaselms.h b/DataBaseLMS/interfacedatabaselms.h index 74b3af6..9dad569 100644 --- a/DataBaseLMS/interfacedatabaselms.h +++ b/DataBaseLMS/interfacedatabaselms.h @@ -69,7 +69,7 @@ public: int delGroup(int id); int editGroup(Group group); - int newTaskAMM(int id_trainee); + int newTaskAMM(TaskAmmFim task, int id_trainee); int delTaskAMM(int id); int editTaskAMM(TaskAmmFim task); QList getListTasksAMMofTrainee(int id_trainee); diff --git a/ServerLMS/Systems/processingsystem.cpp b/ServerLMS/Systems/processingsystem.cpp index ed81bbc..88283fc 100644 --- a/ServerLMS/Systems/processingsystem.cpp +++ b/ServerLMS/Systems/processingsystem.cpp @@ -239,12 +239,14 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu case TypeQueryToDB::TYPE_QUERY_ASSIGN_TASK_AMM_TO_TRAINEE: { int id_new; - id_new = providerDBLMS->newTaskAMM(id); + id_new = providerDBLMS->newTaskAMM(*(TaskAmmFim*)data, id); + /* if(id_new) { (*(TaskAmmFim*)data).setID(id_new); providerDBLMS->editTaskAMM(*(TaskAmmFim*)data); } + */ //emit sigTasksChanged(); //break; } diff --git a/ServerLMS/providerdblms.cpp b/ServerLMS/providerdblms.cpp index fd646ec..bd006ab 100644 --- a/ServerLMS/providerdblms.cpp +++ b/ServerLMS/providerdblms.cpp @@ -300,9 +300,9 @@ int ProviderDBLMS::editGroup(Group group) return dbLMS->editGroup(group); } -int ProviderDBLMS::newTaskAMM(int id_trainee) +int ProviderDBLMS::newTaskAMM(TaskAmmFim task, int id_trainee) { - return dbLMS->newTaskAMM(id_trainee); + return dbLMS->newTaskAMM(task, id_trainee); } int ProviderDBLMS::delTaskAMM(int id) diff --git a/ServerLMS/providerdblms.h b/ServerLMS/providerdblms.h index a575fc8..96705f9 100644 --- a/ServerLMS/providerdblms.h +++ b/ServerLMS/providerdblms.h @@ -42,7 +42,7 @@ public: int delGroup(int id); int editGroup(Group group); - int newTaskAMM(int id_trainee); + int newTaskAMM(TaskAmmFim task, int id_trainee); int delTaskAMM(int id); int editTaskAMM(TaskAmmFim task);