bugFix refact 0

LibInstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp

@@ -154,7 +154,7 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
                     continue;
                 }
 
-                quint64 toFile = file.write(tmpBlock);
+                qint64 toFile = file.write(tmpBlock);
                 emit sigSendDebugLog(Tools::getTime() + "CLIENT: toFile :" + toFile);
 
                 sizeReceiveData += toFile;
@@ -278,12 +278,8 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
             emit signal_AnswerDocsChanged();
         }
 
-        //if(packetType == PacketType::TYPE_XMLANSWER_QUERY_LIST_SUB_PROC_AMM)
-        //{
 
-        //}
+        //А)xml-ответы на запросы к БД (или автоматическая рассылка)
-
-        //А)xml-ответы на запросы к БД
         //B)перечни Подпроцедур
         switch(packetType)
         {
@@ -304,15 +300,16 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
                     stream.startTransaction();
                     stream >> fileSize;
 
-                    if(!stream.commitTransaction()){
+                    if(!stream.commitTransaction())
+                    {
                         emit sigSendDebugLog(Tools::getTime() + "CLIENT: fileSize - FAIL commitTransaction");
 
-                        if (!socket->waitForReadyRead(TCP_READ_TIMEOUT)) {
+                        if (!socket->waitForReadyRead(TCP_READ_TIMEOUT))
+                        {
                             emit sigSendDebugLog(Tools::getTime() + "CLIENT: ERROR! readyRead timeout - fileSize!!!");
                             return;
                         }
                         continue;
-
                     }
 
                     emit sigSendDebugLog("CLIENT: filesize: " + QString::number(fileSize));
@@ -332,13 +329,16 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
                     stream.startTransaction();
                     stream >> tmpBlock;
 
-                    if(!stream.commitTransaction()){
+                    if(!stream.commitTransaction())
+                    {
 
-                        if(socket->state() == QAbstractSocket::UnconnectedState){
+                        if(socket->state() == QAbstractSocket::UnconnectedState)
+                        {
                             emit sigSocketDisabled();
                             return;
                         }
-                        if(socket->waitForReadyRead(TCP_READ_TIMEOUT)){
+                        if(socket->waitForReadyRead(TCP_READ_TIMEOUT))
+                        {
                             continue;
                         }
 
@@ -349,7 +349,6 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
 
                     emit sigSendDebugLog(Tools::getTime() + "CLIENT: toFile :" + array.size());
 
-                    //sizeReceiveData += array.size();
                     sizeReceiveData = array.size();
                     countSend++;
 
@@ -384,21 +383,6 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
                 }
 
                 packetType = PacketType::TYPE_NONE;
-
-
-
-                /*
-                QByteArray array;
-                stream.startTransaction();
-                stream >> array;
-
-                if(!stream.commitTransaction())
-                    continue;
-
-                xmlParserQueryToDB(packetType, array);
-
-                packetType = PacketType::TYPE_NONE;
-                */
             }
             break;
         };

LibInstructorsAndTrainees/metatypes.cpp

@@ -1,7 +1,6 @@
 #include "metatypes.h"
 
 
-
 void registerMetaType()
 {
     qRegisterMetaType<QList<Instructor>>("QList<Instructor>");
@@ -11,16 +10,9 @@ void registerMetaType()
     qRegisterMetaType<QList<Classroom>>("QList<Classroom>");
     qRegisterMetaType<QList<Module*>>("QList<Module*>");
     qRegisterMetaType<QList<TaskAmmFim>>("QList<TaskAmmFim>");
-    //qRegisterMetaType<QMap<int, QList<TaskAmmFim>>>("QMap<int, QList<TaskAmmFim>>");
-
-
     qRegisterMetaType<MapListsTasksAllTraineeType>("MapListsTasksAllTraineeType");
-
     qRegisterMetaType<PacketType>("PacketType");
     qRegisterMetaType<ClientMessage>("ClientMessage");
     qRegisterMetaType<QList<QTreeWidgetItem*>>("QList<QTreeWidgetItem*>");
-
     qRegisterMetaType<QList<SubProc>>("QList<SubProc>");
-
-    qRegisterMetaType<QMap<int, float>>("QMap<int, float>");
 }

LibInstructorsAndTrainees/metatypes.h

@@ -2,7 +2,6 @@
 #define METATYPES_H
 
 #include <QTreeWidgetItem>
-#include <QMap>
 
 #include "instructor.h"
 #include "trainee.h"
@@ -25,12 +24,10 @@ Q_DECLARE_METATYPE(QList<Computer>)
 Q_DECLARE_METATYPE(QList<Classroom>)
 Q_DECLARE_METATYPE(QList<Module*>)
 Q_DECLARE_METATYPE(QList<TaskAmmFim>)
+Q_DECLARE_METATYPE(MapListsTasksAllTraineeType)
 Q_DECLARE_METATYPE(PacketType)
 Q_DECLARE_METATYPE(ClientMessage)
 Q_DECLARE_METATYPE(QList<QTreeWidgetItem*>)
-
-Q_DECLARE_METATYPE(MapListsTasksAllTraineeType)
-
 Q_DECLARE_METATYPE(QList<SubProc>)
 
 #endif // METATYPES_H

LibServer/Systems/processingsystem.cpp

@@ -330,14 +330,6 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu
                 //Отправка списка задач AMM всех обучаемых клиенту GUI
                 sendListsTasksAMMofAllTraineestoClient(client, listTrainees);
             }
-            /*
-            for(Trainee trainee : listTrainees)
-            {
-                //Отправка списка задач AMM этого обучаемого клиенту GUI
-                sendListTasksAMMofTraineetoClient(client, trainee.getID());
-                //Отправка списка задач FIM этого обучаемого клиенту GUI
-                sendListTasksFIMofTraineetoClient(client, trainee.getID());
-            }*/
 
             break;
         }

LibServer/Systems/sendsystem.cpp

@@ -97,14 +97,12 @@ void SendSystem::sendFileBlockByteArray(QByteArray array, PacketType packetType)
          stream << packetType; //Отправляем тип блока
          stream << size;
 
-         //while (size > 0)
          while (bytesSended < size)
          {
              QByteArray chunk = array.mid(bytesSended,sendFileBlockSize);
              stream << chunk;
 
              bytesSended += chunk.length();
-             //size -= bytesSended;
          }
     }
     else