From 54e9ae6019e820950986a4ceebf4496101974bf5 Mon Sep 17 00:00:00 2001 From: krivoshein Date: Mon, 27 Jan 2025 10:31:01 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B8=20=D0=B7=D0=B0=D0=B4=D0=B0?= =?UTF-8?q?=D1=87=20=D0=B4=D0=BB=D1=8F=20=D0=BA=D0=BE=D0=BD=D0=BA=D1=80?= =?UTF-8?q?=D0=B5=D1=82=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BE=D0=B1=D1=83=D1=87?= =?UTF-8?q?=D0=B0=D0=B5=D0=BC=D0=BE=D0=B3=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../instructorsandtraineeswidget.cpp | 4 ++-- InstructorsAndTrainees/tasks/ammtaskswidget.cpp | 10 +++++++++- InstructorsAndTrainees/tasks/ammtaskswidget.h | 8 +++++++- InstructorsAndTrainees/tasks/fimtaskswidget.cpp | 10 +++++++++- InstructorsAndTrainees/tasks/fimtaskswidget.h | 10 +++++++++- InstructorsAndTrainees/trainees/viewertrainees.cpp | 10 +++++++++- InstructorsAndTrainees/trainees/viewertrainees.h | 6 ++++++ InstructorsAndTrainees/trainees/viewertrainees.ui | 3 +++ 8 files changed, 54 insertions(+), 7 deletions(-) diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp index 274b9c0..7aab0dc 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/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); - fimTasksWidget = new FIMtasksWidget(connectorToServer, this); + ammTasksWidget = new AMMtasksWidget(connectorToServer, AMMtasksWidget::TypeList::listCommon, 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); diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp index f80f14d..3af1b3b 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp +++ b/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); diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.h b/InstructorsAndTrainees/tasks/ammtaskswidget.h index 71772e0..f25f290 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.h +++ b/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 listAllModules; diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp index 5d455e0..5e95f64 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp +++ b/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() diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.h b/InstructorsAndTrainees/tasks/fimtaskswidget.h index 2db7732..54720db 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.h +++ b/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; diff --git a/InstructorsAndTrainees/trainees/viewertrainees.cpp b/InstructorsAndTrainees/trainees/viewertrainees.cpp index ab3b2e9..f467191 100644 --- a/InstructorsAndTrainees/trainees/viewertrainees.cpp +++ b/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); } diff --git a/InstructorsAndTrainees/trainees/viewertrainees.h b/InstructorsAndTrainees/trainees/viewertrainees.h index 1dc19be..e3be26a 100644 --- a/InstructorsAndTrainees/trainees/viewertrainees.h +++ b/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; }; diff --git a/InstructorsAndTrainees/trainees/viewertrainees.ui b/InstructorsAndTrainees/trainees/viewertrainees.ui index aee5a98..122e49d 100644 --- a/InstructorsAndTrainees/trainees/viewertrainees.ui +++ b/InstructorsAndTrainees/trainees/viewertrainees.ui @@ -38,6 +38,9 @@ + + +