Merge branch 'work' into merge-task-and-verController

ServerLMS/Data/typesDataServerClient.h

@@ -3,6 +3,7 @@
 
 #include <QList>
 #include <QString>
+#include "typeQueryToDB.h"
 
 #define NOTIFY_SERVER_END            "END"
 #define NOTIFY_SERVER_BLOCKED   "BLOCKED"
@@ -60,7 +61,7 @@ class ClientDeAutorization
 public:
     QString Login;
 };
-
+/*
 enum TypeQueryToDB{
     TYPE_QUERY_GET_ALL_LISTS,
     TYPE_QUERY_NEW_INSTRUCTOR,
@@ -75,6 +76,7 @@ enum TypeQueryToDB{
     TYPE_QUERY_ASSIGN_TASK_AMM_TO_TRAINEE,
     TYPE_QUERY_ASSIGN_TASK_FIM_TO_TRAINEE
 };
+*/
 
 class ClientQueryToDB{
 public:

ServerLMS/Systems/processingsystem.cpp

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

ServerLMS/providerdblms.cpp

@@ -307,10 +307,25 @@ int ProviderDBLMS::newTaskAMM(int id_trainee)
 
 int ProviderDBLMS::delTaskAMM(int id)
 {
-    return 0;
+    return dbLMS->delTaskAMM(id);
 }
 
 int ProviderDBLMS::editTaskAMM(TaskAmmFim task)
 {
     return dbLMS->editTaskAMM(task);
 }
+
+int ProviderDBLMS::newTaskFIM(int id_trainee)
+{
+    return dbLMS->newTaskFIM(id_trainee);
+}
+
+int ProviderDBLMS::delTaskFIM(int id)
+{
+    return dbLMS->delTaskFIM(id);
+}
+
+int ProviderDBLMS::editTaskFIM(TaskAmmFim task)
+{
+    return dbLMS->editTaskFIM(task);
+}

ServerLMS/providerdblms.h

@@ -46,6 +46,10 @@ public:
     int delTaskAMM(int id);
     int editTaskAMM(TaskAmmFim task);
 
+    int newTaskFIM(int id_trainee);
+    int delTaskFIM(int id);
+    int editTaskFIM(TaskAmmFim task);
+
 Q_SIGNALS:
     //сигнал о блокировке авторизации
     void signal_BlockAutorization(bool block);