From b1e807b5e3244000c184e1c833c6829551d9dc07 Mon Sep 17 00:00:00 2001
From: krivoshein <krivoshein@msk.dinamika-avia.ru>
Date: Thu, 30 Jan 2025 12:53:29 +0300
Subject: [PATCH] =?UTF-8?q?newTaskFIM=20=D0=B1=D0=B5=D0=B7=20editTaskFIM?=
 =?UTF-8?q?=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82=20=D0=BD?=
 =?UTF-8?q?=D0=B0=D0=BF=D1=80=D1=8F=D0=BC=D1=83=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DataBaseLMS/databaselms.cpp            | 5 +++--
 DataBaseLMS/databaselms.h              | 2 +-
 DataBaseLMS/interfacedatabaselms.cpp   | 4 ++--
 DataBaseLMS/interfacedatabaselms.h     | 2 +-
 ServerLMS/Systems/processingsystem.cpp | 5 ++++-
 ServerLMS/providerdblms.cpp            | 4 ++--
 ServerLMS/providerdblms.h              | 2 +-
 7 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/DataBaseLMS/databaselms.cpp b/DataBaseLMS/databaselms.cpp
index 7de46e4..b74a847 100644
--- a/DataBaseLMS/databaselms.cpp
+++ b/DataBaseLMS/databaselms.cpp
@@ -517,11 +517,12 @@ QList<TaskAmmFim> DataBaseLMS::selectTasksAMMofTrainee(int id_trainee)
     return listTasks;
 }
 
-int DataBaseLMS::insertTaskFIM(int id_trainee)
+int DataBaseLMS::insertTaskFIM(TaskAmmFim task, int id_trainee)
 {
     QString queryStr = QString("INSERT INTO public.tasks_fim (title, trainee_task) "
-                                                 "VALUES (DEFAULT, %1) "
+                                                 "VALUES ('%1', %2) "
                                                  "RETURNING tasks_fim.task_id").arg(
+                                                        task.title,
                                                         QString::number(id_trainee));
 
     return queryExecInt(queryStr);
diff --git a/DataBaseLMS/databaselms.h b/DataBaseLMS/databaselms.h
index 5b24b8b..eec4c88 100644
--- a/DataBaseLMS/databaselms.h
+++ b/DataBaseLMS/databaselms.h
@@ -59,7 +59,7 @@ protected:
     int deleteTaskAMM(int id_task);
     QList<TaskAmmFim> selectTasksAMMofTrainee(int id_trainee);
     //Задача FIM
-    int insertTaskFIM(int id_trainee);
+    int insertTaskFIM(TaskAmmFim task, int id_trainee);
     int updateTaskFIM(TaskAmmFim task);
     int deleteTaskFIM(int id_task);
     QList<TaskAmmFim> selectTasksFIMofTrainee(int id_trainee);
diff --git a/DataBaseLMS/interfacedatabaselms.cpp b/DataBaseLMS/interfacedatabaselms.cpp
index 650a55b..5d385d8 100644
--- a/DataBaseLMS/interfacedatabaselms.cpp
+++ b/DataBaseLMS/interfacedatabaselms.cpp
@@ -316,9 +316,9 @@ QList<TaskAmmFim> InterfaceDataBaseLMS::getListTasksFIMofTrainee(int id_trainee)
     return selectTasksFIMofTrainee(id_trainee);
 }
 
-int InterfaceDataBaseLMS::newTaskFIM(int id_trainee)
+int InterfaceDataBaseLMS::newTaskFIM(TaskAmmFim task, int id_trainee)
 {
-    return insertTaskFIM(id_trainee);
+    return insertTaskFIM(task, id_trainee);
 }
 
 int InterfaceDataBaseLMS::delTaskFIM(int id)
diff --git a/DataBaseLMS/interfacedatabaselms.h b/DataBaseLMS/interfacedatabaselms.h
index 6fd5f00..74b3af6 100644
--- a/DataBaseLMS/interfacedatabaselms.h
+++ b/DataBaseLMS/interfacedatabaselms.h
@@ -75,7 +75,7 @@ public:
     QList<TaskAmmFim> getListTasksAMMofTrainee(int id_trainee);
     QList<TaskAmmFim> getListTasksFIMofTrainee(int id_trainee);
 
-    int newTaskFIM(int id_trainee);
+    int newTaskFIM(TaskAmmFim task, int id_trainee);
     int delTaskFIM(int id);
     int editTaskFIM(TaskAmmFim task);
 
diff --git a/ServerLMS/Systems/processingsystem.cpp b/ServerLMS/Systems/processingsystem.cpp
index bbbd562..ed81bbc 100644
--- a/ServerLMS/Systems/processingsystem.cpp
+++ b/ServerLMS/Systems/processingsystem.cpp
@@ -261,12 +261,15 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu
         case TypeQueryToDB::TYPE_QUERY_ASSIGN_TASK_FIM_TO_TRAINEE:
         {
             int id_new;
-            id_new = providerDBLMS->newTaskFIM(id);
+            id_new = providerDBLMS->newTaskFIM(*(TaskAmmFim*)data, id);
+
+            /*
             if(id_new)
             {
                 (*(TaskAmmFim*)data).setID(id_new);
                 providerDBLMS->editTaskFIM(*(TaskAmmFim*)data);
             }
+            */
             //emit sigTasksChanged();
             //break;
         }
diff --git a/ServerLMS/providerdblms.cpp b/ServerLMS/providerdblms.cpp
index 7cd4e6f..fd646ec 100644
--- a/ServerLMS/providerdblms.cpp
+++ b/ServerLMS/providerdblms.cpp
@@ -315,9 +315,9 @@ int ProviderDBLMS::editTaskAMM(TaskAmmFim task)
     return dbLMS->editTaskAMM(task);
 }
 
-int ProviderDBLMS::newTaskFIM(int id_trainee)
+int ProviderDBLMS::newTaskFIM(TaskAmmFim task, int id_trainee)
 {
-    return dbLMS->newTaskFIM(id_trainee);
+    return dbLMS->newTaskFIM(task, id_trainee);
 }
 
 int ProviderDBLMS::delTaskFIM(int id)
diff --git a/ServerLMS/providerdblms.h b/ServerLMS/providerdblms.h
index bb138ac..a575fc8 100644
--- a/ServerLMS/providerdblms.h
+++ b/ServerLMS/providerdblms.h
@@ -46,7 +46,7 @@ public:
     int delTaskAMM(int id);
     int editTaskAMM(TaskAmmFim task);
 
-    int newTaskFIM(int id_trainee);
+    int newTaskFIM(TaskAmmFim task, int id_trainee);
     int delTaskFIM(int id);
     int editTaskFIM(TaskAmmFim task);