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:
Кривошеин Андрей
2025-09-12 11:30:56 +03:00
parent 9f907f8649
commit df4f4cf659
4 changed files with 0 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
InstructorsAndTrainees/trainees/personalcardtrainee.cpp
View File

@@ -66,12 +66,6 @@ void PersonalCardTrainee::loadInfo()
else else
ui->lblLoginIn->setPixmap(QPixmap(QStringLiteral(":/resources/icons/circleGray.png"))); ui->lblLoginIn->setPixmap(QPixmap(QStringLiteral(":/resources/icons/circleGray.png")));
//QList<TaskAmmFim> listTasksAMM = connectorToServer->getListTasksAMMforTrainee(id_trainee);
//QList<TaskAmmFim> listTasksFIM = connectorToServer->getListTasksFIMforTrainee(id_trainee);
//ui->lblCntAMM->setText(QString::number(listTasksAMM.count()));
//ui->lblCntFIM->setText(QString::number(listTasksFIM.count()));
TimingOfTrainee timing = trainee.getTiming(); TimingOfTrainee timing = trainee.getTiming();
ui->lblTimeOperation->setText(timing.getOperatingTimeS()); ui->lblTimeOperation->setText(timing.getOperatingTimeS());
@@ -99,7 +93,6 @@ void PersonalCardTrainee::slot_NeedUpdateUI(bool treeInstructor, bool treeTraine
{ {
if(treeTrainee) if(treeTrainee)
{ {
//TODO Собственно обновление
loadInfo(); loadInfo();
} }
} }

1
InstructorsAndTrainees/trainees/personalcardtrainee.h
View File

@@ -17,7 +17,6 @@ class PersonalCardTrainee : public QWidget
Q_OBJECT Q_OBJECT
public: public:
//explicit PersonalCardTrainee(ConnectorToServer* connectorToServer, int id_trainee, QWidget *parent = nullptr);
explicit PersonalCardTrainee(ConnectorToServer* connectorToServer, MessangerController* messangerController, int id_trainee, AMMtasksWidget* ammTasksWidget_common, FIMtasksWidget* fimTasksWidget_common, QWidget *parent = nullptr); explicit PersonalCardTrainee(ConnectorToServer* connectorToServer, MessangerController* messangerController, int id_trainee, AMMtasksWidget* ammTasksWidget_common, FIMtasksWidget* fimTasksWidget_common, QWidget *parent = nullptr);
~PersonalCardTrainee(); ~PersonalCardTrainee();

27
InstructorsAndTrainees/trainees/viewertrainees.cpp
View File

@@ -5,8 +5,6 @@
ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, MessangerController* messangerController, QWidget *parent) : ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, MessangerController* messangerController, QWidget *parent) :
TraineesView(connectorToServer, CommonView::TypeView::onlyView, parent), TraineesView(connectorToServer, CommonView::TypeView::onlyView, parent),
//ammTasksWidget_pers0(nullptr),
//fimTasksWidget_pers0(nullptr),
ammTasksWidgetCommon(nullptr), ammTasksWidgetCommon(nullptr),
fimTasksWidgetCommon(nullptr), fimTasksWidgetCommon(nullptr),
messangerController(messangerController), messangerController(messangerController),
@@ -15,26 +13,10 @@ ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, MessangerCo
ui->setupUi(this); ui->setupUi(this);
connect(treeWidget, &QTreeWidget::itemDoubleClicked, this, &ViewerTrainees::on_itemDoubleClicked); connect(treeWidget, &QTreeWidget::itemDoubleClicked, this, &ViewerTrainees::on_itemDoubleClicked);
connect(treeWidget, &QTreeWidget::itemClicked, this, &ViewerTrainees::on_treeWidget_itemClicked); connect(treeWidget, &QTreeWidget::itemClicked, this, &ViewerTrainees::on_treeWidget_itemClicked);
ui->horizontalLayout_1->addWidget(treeWidget); ui->horizontalLayout_1->addWidget(treeWidget);
/*
ammTasksWidget_pers0 = new AMMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listForTrainee, this);
fimTasksWidget_pers0 = new FIMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listForTrainee, this);
connect(this, &ViewerTrainees::signal_traineeSelected, fimTasksWidget_pers0, &FIMtasksWidget::slot_traineeSelected);
connect(this, &ViewerTrainees::signal_traineeSelected, ammTasksWidget_pers0, &AMMtasksWidget::slot_traineeSelected);
connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksAMMforTrainee, ammTasksWidget_pers0, &AMMtasksWidget::slot_UpdateTasksAMMforTrainee);
connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksFIMforTrainee, fimTasksWidget_pers0, &FIMtasksWidget::slot_UpdateTasksFIMforTrainee);
ui->verticalLayout_2->addWidget(ammTasksWidget_pers0);
ui->verticalLayout_2->addWidget(fimTasksWidget_pers0);
*/
//------
ammTasksWidgetCommon = new AMMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listCommon, /*this*/nullptr); ammTasksWidgetCommon = new AMMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listCommon, /*this*/nullptr);
fimTasksWidgetCommon = new FIMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listCommon, /*this*/nullptr); fimTasksWidgetCommon = new FIMtasksWidget(connectorToServer, TypeListTreeAMMFIM::listCommon, /*this*/nullptr);
@@ -43,13 +25,6 @@ ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, MessangerCo
connect(this, &ViewerTrainees::signal_traineeSelected, fimTasksWidgetCommon, &FIMtasksWidget::slot_traineeSelected); connect(this, &ViewerTrainees::signal_traineeSelected, fimTasksWidgetCommon, &FIMtasksWidget::slot_traineeSelected);
connect(this, &ViewerTrainees::signal_traineeSelected, ammTasksWidgetCommon, &AMMtasksWidget::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);
@@ -73,8 +48,6 @@ void ViewerTrainees::setAuthComplited(bool authComplited)
void ViewerTrainees::deactivate() void ViewerTrainees::deactivate()
{ {
CommonView::deactivate(); CommonView::deactivate();
//ammTasksWidget_pers0->deactivate();
//fimTasksWidget_pers0->deactivate();
ammTasksWidgetCommon->deactivate(); ammTasksWidgetCommon->deactivate();
fimTasksWidgetCommon->deactivate(); fimTasksWidgetCommon->deactivate();

3
InstructorsAndTrainees/trainees/viewertrainees.h
View File

@@ -47,9 +47,6 @@ private:
void updateButtons() override; void updateButtons() override;
private: private:
//AMMtasksWidget* ammTasksWidget_pers0;
//FIMtasksWidget* fimTasksWidget_pers0;
AMMtasksWidget* ammTasksWidgetCommon; AMMtasksWidget* ammTasksWidgetCommon;
FIMtasksWidget* fimTasksWidgetCommon; FIMtasksWidget* fimTasksWidgetCommon;