Добавил списки задач для конкретного обучаемого

InstructorsAndTrainees/instructorsandtraineeswidget.cpp

@@ -48,8 +48,8 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
 
     connect(connectorToServer,&ConnectorToServer::signal_ConnectedToServer,this,&InstructorsAndTraineesWidget::slot_ConnectedToServer);
 
-    ammTasksWidget = new AMMtasksWidget(connectorToServer, this);
+    ammTasksWidget = new AMMtasksWidget(connectorToServer, AMMtasksWidget::TypeList::listCommon, this);
-    fimTasksWidget = new FIMtasksWidget(connectorToServer, this);
+    fimTasksWidget = new FIMtasksWidget(connectorToServer, FIMtasksWidget::TypeList::listForTrainee, this);
 
     connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksFIM, fimTasksWidget, &FIMtasksWidget::slot_NeedUpdateUI);
     connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksAMM, ammTasksWidget, &AMMtasksWidget::slot_NeedUpdateUI);

InstructorsAndTrainees/tasks/ammtaskswidget.cpp

@@ -7,11 +7,12 @@
 #include "ammtaskswidget.h"
 #include "ui_ammtaskswidget.h"
 
-AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, QWidget *parent) :
+AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeList type, QWidget *parent) :
     QWidget(parent),
     ui(new Ui::AMMtasksWidget),
     connectorToServer(connectorToServer),
     treeWidget(nullptr),
+    type(type),
     loginTraineeSelected(""),
     threadPreparation(nullptr),
     threadAnimation(nullptr),
@@ -32,6 +33,13 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, QWidget *pa
     ui->btnAssignTaskToTrainee->setEnabled(false);    
     ui->btnUpdateTasks->setVisible(false);
 
+    if(type == TypeList::listForTrainee)
+    {
+        ui->btnAssignTaskToTrainee->setVisible(false);
+        ui->label->setVisible(false);
+        ui->editCode->setVisible(false);
+    }
+
     threadPreparation = new QThread();
     taskTreePreparation = new TaskTreePreparation();
     taskTreePreparation->moveToThread(threadPreparation);

InstructorsAndTrainees/tasks/ammtaskswidget.h

@@ -17,10 +17,15 @@ class AMMtasksWidget : public QWidget
     Q_OBJECT
 
 public:
+    enum TypeList
+    {
+        listCommon = 0,
+        listForTrainee
+    };
 
 
 public:
-    explicit AMMtasksWidget(ConnectorToServer* connectorToServer, QWidget *parent = nullptr);
+    explicit AMMtasksWidget(ConnectorToServer* connectorToServer, TypeList type, QWidget *parent = nullptr);
     ~AMMtasksWidget();
 
 public:
@@ -58,6 +63,7 @@ private:
     Ui::AMMtasksWidget *ui;
     ConnectorToServer* connectorToServer;
     QTreeWidget* treeWidget;
+    TypeList type;
 
 private:
     QList<Module*> listAllModules;

InstructorsAndTrainees/tasks/fimtaskswidget.cpp

@@ -7,11 +7,12 @@
 #include "ui_fimtaskswidget.h"
 #include "tasksAmmFim.h"
 
-FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, QWidget *parent) :
+FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, TypeList type, QWidget *parent) :
     QWidget(parent),
     ui(new Ui::FIMtasksWidget),
     connectorToServer(connectorToServer),
     treeWidget(nullptr),
+    type(type),
     userName(""),
     loginTraineeSelected("")
 {
@@ -28,6 +29,13 @@ FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, QWidget *pa
 
     ui->btnAssignTaskToTrainee->setEnabled(false);
     ui->btnUpdateTasks->setVisible(false);
+
+    if(type == TypeList::listForTrainee)
+    {
+        ui->btnAssignTaskToTrainee->setVisible(false);
+        ui->label->setVisible(false);
+        ui->editCode->setVisible(false);
+    }
 }
 
 FIMtasksWidget::~FIMtasksWidget()

InstructorsAndTrainees/tasks/fimtaskswidget.h

@@ -14,6 +14,13 @@ class FIMtasksWidget : public QWidget
 {
     Q_OBJECT
 
+public:
+    enum TypeList
+    {
+        listCommon = 0,
+        listForTrainee
+    };
+
 private:
     enum ColumnsTree{
         clmn_Title = 0,
@@ -21,7 +28,7 @@ private:
     };
 
 public:
-    explicit FIMtasksWidget(ConnectorToServer* connectorToServer, QWidget *parent = nullptr);
+    explicit FIMtasksWidget(ConnectorToServer* connectorToServer, TypeList type, QWidget *parent = nullptr);
     ~FIMtasksWidget();
 
 public:
@@ -59,6 +66,7 @@ private:
     Ui::FIMtasksWidget *ui;
     ConnectorToServer* connectorToServer;
     QTreeWidget* treeWidget;
+    TypeList type;
 
 private:
     QString userName;

InstructorsAndTrainees/trainees/viewertrainees.cpp

@@ -4,7 +4,9 @@
 
 ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, QWidget *parent) :
     TraineesView(connectorToServer, CommonView::TypeView::onlyView, parent),
-    ui(new Ui::ViewerTrainees)
+    ui(new Ui::ViewerTrainees),
+    ammTasksWidget(nullptr),
+    fimTasksWidget(nullptr)
 {
     ui->setupUi(this);
 
@@ -12,6 +14,12 @@ ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, QWidget *pa
 
     ui->horizontalLayout_1->addWidget(treeWidget);
 
+    ammTasksWidget = new AMMtasksWidget(connectorToServer, AMMtasksWidget::TypeList::listForTrainee, this);
+    fimTasksWidget = new FIMtasksWidget(connectorToServer, FIMtasksWidget::TypeList::listForTrainee, this);
+
+    ui->verticalLayout_2->addWidget(ammTasksWidget);
+    ui->verticalLayout_2->addWidget(fimTasksWidget);
+
     preparationTreeWidget();
     setNotLoggedInVisible(true);
 }

InstructorsAndTrainees/trainees/viewertrainees.h

@@ -2,6 +2,8 @@
 #define TRAINEESWIDGET_H
 
 #include "traineesview.h"
+#include "ammtaskswidget.h"
+#include "fimtaskswidget.h"
 
 namespace Ui {
 class ViewerTrainees;
@@ -43,6 +45,10 @@ Q_SIGNALS:
 private:
     void updateButtons() override;
 
+private:
+    AMMtasksWidget* ammTasksWidget;
+    FIMtasksWidget* fimTasksWidget;
+
 private:
     Ui::ViewerTrainees *ui;
 };

InstructorsAndTrainees/trainees/viewertrainees.ui

@@ -38,6 +38,9 @@
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_1"/>
           </item>
+          <item>
+           <layout class="QVBoxLayout" name="verticalLayout_2"/>
+          </item>
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_2">
             <item>