Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-27 19:45:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
krivoshein
2025-01-27 10:31:01 +03:00
parent 2fe92856f8
commit 54e9ae6019
8 changed files with 54 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
InstructorsAndTrainees/instructorsandtraineeswidget.cpp
View File

@@ -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);

10
InstructorsAndTrainees/tasks/ammtaskswidget.cpp
View File

@@ -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);

8
InstructorsAndTrainees/tasks/ammtaskswidget.h
View File

@@ -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;

10
InstructorsAndTrainees/tasks/fimtaskswidget.cpp
View File

@@ -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()

10
InstructorsAndTrainees/tasks/fimtaskswidget.h
View File

@@ -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;

10
InstructorsAndTrainees/trainees/viewertrainees.cpp
View File

@@ -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);
}

6
InstructorsAndTrainees/trainees/viewertrainees.h
View File

@@ -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;
};

3
InstructorsAndTrainees/trainees/viewertrainees.ui
View File

@@ -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>