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

Карточка обучаемого. Задачи. Общие виджеты.

Browse Source
This commit is contained in:
Кривошеин Андрей
2025-09-01 18:29:47 +03:00
parent b13b59beed
commit 5b74577347
4 changed files with 74 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
InstructorsAndTrainees/trainees/personalcardtrainee.cpp
View File

@@ -1,14 +1,15 @@
#include "personalcardtrainee.h" #include "personalcardtrainee.h"
#include "ui_personalcardtrainee.h" #include "ui_personalcardtrainee.h"
PersonalCardTrainee::PersonalCardTrainee(ConnectorToServer* connectorToServer, int id_trainee, QWidget *parent) : //PersonalCardTrainee::PersonalCardTrainee(ConnectorToServer* connectorToServer, int id_trainee, QWidget *parent) :
PersonalCardTrainee::PersonalCardTrainee(ConnectorToServer* connectorToServer, int id_trainee, AMMtasksWidget* ammTasksWidgetIn, FIMtasksWidget* fimTasksWidgetIn, QWidget *parent) :
QWidget(parent), QWidget(parent),
connectorToServer(connectorToServer), connectorToServer(connectorToServer),
id_trainee(id_trainee), id_trainee(id_trainee),
ammTasksWidget_personal(nullptr), ammTasksWidget_personal(nullptr),
fimTasksWidget_personal(nullptr), fimTasksWidget_personal(nullptr),
ammTasksWidget(nullptr), ammTasksWidget(ammTasksWidgetIn),
fimTasksWidget(nullptr), fimTasksWidget(fimTasksWidgetIn),
ui(new Ui::PersonalCardTrainee) ui(new Ui::PersonalCardTrainee)
{ {
ui->setupUi(this); ui->setupUi(this);
@@ -31,30 +32,36 @@ PersonalCardTrainee::PersonalCardTrainee(ConnectorToServer* connectorToServer, i
ui->verticalLayout_FIMpersonal->addWidget(fimTasksWidget_personal); ui->verticalLayout_FIMpersonal->addWidget(fimTasksWidget_personal);
ammTasksWidget = new AMMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listCommon, this); //ammTasksWidget = new AMMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listCommon, this);
fimTasksWidget = new FIMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listCommon, this); //fimTasksWidget = new FIMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listCommon, this);
connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksFIM, fimTasksWidget, &FIMtasksWidget::slot_NeedUpdateUI); // connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksFIM, fimTasksWidget, &FIMtasksWidget::slot_NeedUpdateUI);
connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksAMM, ammTasksWidget, &AMMtasksWidget::slot_NeedUpdateUI); // connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksAMM, ammTasksWidget, &AMMtasksWidget::slot_NeedUpdateUI);
//connect(viewerTrainees, &ViewerTrainees::signal_traineeSelected, fimTasksWidget, &FIMtasksWidget::slot_traineeSelected); //connect(viewerTrainees, &ViewerTrainees::signal_traineeSelected, fimTasksWidget, &FIMtasksWidget::slot_traineeSelected);
//connect(viewerTrainees, &ViewerTrainees::signal_traineeSelected, ammTasksWidget, &AMMtasksWidget::slot_traineeSelected); //connect(viewerTrainees, &ViewerTrainees::signal_traineeSelected, ammTasksWidget, &AMMtasksWidget::slot_traineeSelected);
fimTasksWidget->slot_traineeSelected(connectorToServer->getTrainee(id_trainee).getLogin()); // fimTasksWidget->slot_traineeSelected(connectorToServer->getTrainee(id_trainee).getLogin());
ammTasksWidget->slot_traineeSelected(connectorToServer->getTrainee(id_trainee).getLogin()); // ammTasksWidget->slot_traineeSelected(connectorToServer->getTrainee(id_trainee).getLogin());
ui->verticalLayout_AMMcommon->addWidget(ammTasksWidget); ui->verticalLayout_AMMcommon->addWidget(ammTasksWidget);
ui->verticalLayout_FIMcommon->addWidget(fimTasksWidget); ui->verticalLayout_FIMcommon->addWidget(fimTasksWidget);
//connectorToServer->sendQueryTasksXML("fim"); //connectorToServer->sendQueryTasksXML("fim");
//connectorToServer->sendQueryTasksXML("amm"); //connectorToServer->sendQueryTasksXML("amm");
fimTasksWidget->slot_NeedUpdateUI(); // fimTasksWidget->slot_NeedUpdateUI();
ammTasksWidget->slot_NeedUpdateUI(); // ammTasksWidget->slot_NeedUpdateUI();
} }
PersonalCardTrainee::~PersonalCardTrainee() PersonalCardTrainee::~PersonalCardTrainee()
{ {
delete ammTasksWidget; //delete ammTasksWidget;
delete fimTasksWidget; //delete fimTasksWidget;
//ui->verticalLayout_AMMcommon->removeWidget(ammTasksWidget);
//ui->verticalLayout_AMMcommon->removeWidget(fimTasksWidget);
//ammTasksWidget = nullptr;
//fimTasksWidget = nullptr;
delete ammTasksWidget_personal; delete ammTasksWidget_personal;
delete fimTasksWidget_personal; delete fimTasksWidget_personal;

3
InstructorsAndTrainees/trainees/personalcardtrainee.h
View File

@@ -15,7 +15,8 @@ class PersonalCardTrainee : public QWidget
Q_OBJECT Q_OBJECT
public: public:
explicit PersonalCardTrainee(ConnectorToServer* connectorToServer, int id_trainee, QWidget *parent = nullptr); //explicit PersonalCardTrainee(ConnectorToServer* connectorToServer, int id_trainee, QWidget *parent = nullptr);
explicit PersonalCardTrainee(ConnectorToServer* connectorToServer, int id_trainee, AMMtasksWidget* ammTasksWidget, FIMtasksWidget* fimTasksWidget, QWidget *parent = nullptr);
~PersonalCardTrainee(); ~PersonalCardTrainee();
private: private:

62
InstructorsAndTrainees/trainees/viewertrainees.cpp
View File

@@ -5,9 +5,11 @@
ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, QWidget *parent) : ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, QWidget *parent) :
TraineesView(connectorToServer, CommonView::TypeView::onlyView, parent), TraineesView(connectorToServer, CommonView::TypeView::onlyView, parent),
ui(new Ui::ViewerTrainees), ammTasksWidget_pers0(nullptr),
ammTasksWidget(nullptr), fimTasksWidget_pers0(nullptr),
fimTasksWidget(nullptr) ammTasksWidgetCommon(nullptr),
fimTasksWidgetCommon(nullptr),
ui(new Ui::ViewerTrainees)
{ {
ui->setupUi(this); ui->setupUi(this);
@@ -16,17 +18,35 @@ ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, QWidget *pa
ui->horizontalLayout_11->addWidget(treeWidget); ui->horizontalLayout_11->addWidget(treeWidget);
ammTasksWidget = new AMMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listForTrainee, this); //------
fimTasksWidget = new FIMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listForTrainee, this); ammTasksWidget_pers0 = new AMMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listForTrainee, this);
fimTasksWidget_pers0 = new FIMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listForTrainee, this);
connect(this, &ViewerTrainees::signal_traineeSelected, fimTasksWidget, &FIMtasksWidget::slot_traineeSelected); connect(this, &ViewerTrainees::signal_traineeSelected, fimTasksWidget_pers0, &FIMtasksWidget::slot_traineeSelected);
connect(this, &ViewerTrainees::signal_traineeSelected, ammTasksWidget, &AMMtasksWidget::slot_traineeSelected); connect(this, &ViewerTrainees::signal_traineeSelected, ammTasksWidget_pers0, &AMMtasksWidget::slot_traineeSelected);
connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksAMMforTrainee, ammTasksWidget, &AMMtasksWidget::slot_UpdateTasksAMMforTrainee); connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksAMMforTrainee, ammTasksWidget_pers0, &AMMtasksWidget::slot_UpdateTasksAMMforTrainee);
connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksFIMforTrainee, fimTasksWidget, &FIMtasksWidget::slot_UpdateTasksFIMforTrainee); connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksFIMforTrainee, fimTasksWidget_pers0, &FIMtasksWidget::slot_UpdateTasksFIMforTrainee);
ui->verticalLayout_2->addWidget(ammTasksWidget); ui->verticalLayout_2->addWidget(ammTasksWidget_pers0);
ui->verticalLayout_2->addWidget(fimTasksWidget); ui->verticalLayout_2->addWidget(fimTasksWidget_pers0);
//------
//------
ammTasksWidgetCommon = new AMMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listCommon, /*this*/nullptr);
fimTasksWidgetCommon = new FIMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listCommon, /*this*/nullptr);
connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksFIM, fimTasksWidgetCommon, &FIMtasksWidget::slot_NeedUpdateUI);
connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksAMM, ammTasksWidgetCommon, &AMMtasksWidget::slot_NeedUpdateUI);
connect(this, &ViewerTrainees::signal_traineeSelected, fimTasksWidgetCommon, &FIMtasksWidget::slot_traineeSelected);
connect(this, &ViewerTrainees::signal_traineeSelected, ammTasksWidgetCommon, &AMMtasksWidget::slot_traineeSelected);
connect(fimTasksWidgetCommon, &FIMtasksWidget::signal_AssignedTask, this, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayFIM);
connect(ammTasksWidgetCommon, &AMMtasksWidget::signal_AssignedTask, this, &ViewerTrainees::slot_waitAnimationWidgetShowWithPlayAMM);
//ammTasksWidgetCommon->setParent(this);
//fimTasksWidgetCommon->setParent(this);
//------
preparationTreeWidget(); preparationTreeWidget();
setNotLoggedInVisible(true); setNotLoggedInVisible(true);
@@ -36,6 +56,9 @@ ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, QWidget *pa
ViewerTrainees::~ViewerTrainees() ViewerTrainees::~ViewerTrainees()
{ {
delete ammTasksWidgetCommon;
delete fimTasksWidgetCommon;
delete ui; delete ui;
} }
@@ -48,8 +71,11 @@ void ViewerTrainees::setAuthComplited(bool authComplited)
void ViewerTrainees::deactivate() void ViewerTrainees::deactivate()
{ {
CommonView::deactivate(); CommonView::deactivate();
ammTasksWidget->deactivate(); ammTasksWidget_pers0->deactivate();
fimTasksWidget->deactivate(); fimTasksWidget_pers0->deactivate();
ammTasksWidgetCommon->deactivate();
fimTasksWidgetCommon->deactivate();
updateButtons(); updateButtons();
} }
@@ -94,12 +120,12 @@ void ViewerTrainees::slot_tabMessengerChanged(QString login)
void ViewerTrainees::slot_waitAnimationWidgetShowWithPlayFIM() void ViewerTrainees::slot_waitAnimationWidgetShowWithPlayFIM()
{ {
fimTasksWidget->waitAnimationWidgetShowWithPlay(); fimTasksWidget_pers0->waitAnimationWidgetShowWithPlay();
} }
void ViewerTrainees::slot_waitAnimationWidgetShowWithPlayAMM() void ViewerTrainees::slot_waitAnimationWidgetShowWithPlayAMM()
{ {
ammTasksWidget->waitAnimationWidgetShowWithPlay(); ammTasksWidget_pers0->waitAnimationWidgetShowWithPlay();
} }
void ViewerTrainees::changeEvent(QEvent *event) void ViewerTrainees::changeEvent(QEvent *event)
@@ -168,7 +194,8 @@ void ViewerTrainees::on_itemDoubleClicked(QTreeWidgetItem *item, int column)
{ {
int id_trainee = connectorToServer->getIdTraineeByLogin(login); int id_trainee = connectorToServer->getIdTraineeByLogin(login);
PersonalCardTrainee cardTrainee(connectorToServer, id_trainee, this);
PersonalCardTrainee cardTrainee(connectorToServer, id_trainee, ammTasksWidgetCommon, fimTasksWidgetCommon, this);
QDialog* dialog = new QDialog(this); QDialog* dialog = new QDialog(this);
QHBoxLayout *layout = new QHBoxLayout(dialog); QHBoxLayout *layout = new QHBoxLayout(dialog);
@@ -176,6 +203,9 @@ void ViewerTrainees::on_itemDoubleClicked(QTreeWidgetItem *item, int column)
dialog->setWindowTitle(tr("Personal card trainee")); dialog->setWindowTitle(tr("Personal card trainee"));
dialog->setMinimumSize(1600, 800); dialog->setMinimumSize(1600, 800);
dialog->exec(); dialog->exec();
ammTasksWidgetCommon->setParent(this);
fimTasksWidgetCommon->setParent(this);
} }
} }
} }

7
InstructorsAndTrainees/trainees/viewertrainees.h
View File

@@ -53,8 +53,11 @@ private:
void updateButtons() override; void updateButtons() override;
private: private:
AMMtasksWidget* ammTasksWidget; AMMtasksWidget* ammTasksWidget_pers0;
FIMtasksWidget* fimTasksWidget; FIMtasksWidget* fimTasksWidget_pers0;
AMMtasksWidget* ammTasksWidgetCommon;
FIMtasksWidget* fimTasksWidgetCommon;
private: private:
Ui::ViewerTrainees *ui; Ui::ViewerTrainees *ui;