Вынес подготовку дерева FIM в отдельный поток

InstructorsAndTrainees/tasks/ammtaskswidget.h

@@ -6,7 +6,7 @@
 #include <QDomNode>
 #include "module.h"
 #include "connectortoserver.h"
-#include "taskTreePreparation.h"
+#include "tasktreepreparation.h"
 
 namespace Ui {
 class AMMtasksWidget;
@@ -17,15 +17,7 @@ class AMMtasksWidget : public QWidget
     Q_OBJECT
 
 public:
-    enum TypeList
-    {
-        listCommon = 0,
-        listForTrainee
-    };
-
-
-public:
-    explicit AMMtasksWidget(ConnectorToServer* connectorToServer, TypeList type, QWidget *parent = nullptr);
+    explicit AMMtasksWidget(ConnectorToServer* connectorToServer, TypeListTreeAMMFIM type, QWidget *parent = nullptr);
     ~AMMtasksWidget();
 
 public:
@@ -38,7 +30,6 @@ protected:
 
 private Q_SLOTS:
     void on_treeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
-    void on_btnUpdateTasks_clicked();
     void on_btnDelete_clicked();
     void on_btnCheck_clicked();
     void on_btnAssignTask_clicked();    
@@ -53,16 +44,15 @@ public Q_SLOTS:
 
     void slot_UpdateTasksAMMforTrainee(int trainee_id);
 
-private:
-    Module* searchModuleByID(int id);
+private:    
     void preparationTreeWidget();
     void reSetHeadTreeWidget();
     void loadTasksAMM(bool flRequestFromDB = true);
     void assignTaskAMMtoTrainee();
 
 Q_SIGNALS:
-    void signal_prepareAMMListItems(QByteArray array, QList<Module*>* listAllModules, bool flOnlyActive);
-    void signal_prepareAMMListItemsForTrainee(QList<TaskAmmFim> listTask, QList<Module*>* listAllModules);
+    void signal_prepareAMMListItems(QByteArray array, bool flOnlyActive);
+    void signal_prepareAMMListItemsForTrainee(QList<TaskAmmFim> listTask);
 public Q_SLOTS:
     void slot_AMMlistItemsReady(QList<QTreeWidgetItem*> listItems);
 
@@ -70,20 +60,16 @@ private:
     Ui::AMMtasksWidget *ui;
     ConnectorToServer* connectorToServer;
     QTreeWidget* treeWidget;
-    TypeList type;
+    TypeListTreeAMMFIM type;
 
-private:
-    QList<Module*> listAllModules;
     QString loginTraineeSelected;
     int idTraineeSelected;
 
     QThread* threadPreparation;
-    TaskTreePreparation* taskTreePreparation;
+    TaskAMMFIMTreePreparation* taskTreePreparation;
     WaitAnimationWidget *waitAnimationWidget;
 
     bool flOnlyActive; //AMM
-
-    QByteArray arrayAMM; //AMM
 };
 
 #endif // AMMTASKSWIDGET_H