mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git
synced 2026-03-28 19:55:48 +03:00
bugFixing 5
This commit is contained in:
@@ -52,6 +52,9 @@ PersonalCardTrainee::~PersonalCardTrainee()
|
||||
|
||||
messangerController->deleteWidget(messangerWidget);
|
||||
|
||||
//ui->verticalLayout_AMMcommon->removeWidget(ammTasksWidget_common);
|
||||
//ui->verticalLayout_FIMcommon->removeWidget(fimTasksWidget_common);
|
||||
|
||||
delete ui;
|
||||
}
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@ ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, MessangerCo
|
||||
fimTasksWidgetCommon(nullptr),
|
||||
messangerController(messangerController),
|
||||
dlgEditor(nullptr),
|
||||
dlgCardTrainee(nullptr),
|
||||
ui(new Ui::ViewerTrainees)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
@@ -40,6 +41,9 @@ ViewerTrainees::~ViewerTrainees()
|
||||
if(dlgEditor)
|
||||
dlgEditor->close();
|
||||
|
||||
if(dlgCardTrainee)
|
||||
dlgCardTrainee->close();
|
||||
|
||||
delete ui;
|
||||
}
|
||||
|
||||
@@ -54,6 +58,9 @@ void ViewerTrainees::deactivate()
|
||||
if(dlgEditor)
|
||||
dlgEditor->close();
|
||||
|
||||
if(dlgCardTrainee)
|
||||
dlgCardTrainee->close();
|
||||
|
||||
CommonView::deactivate();
|
||||
|
||||
ammTasksWidgetCommon->deactivate();
|
||||
@@ -69,7 +76,6 @@ void ViewerTrainees::changeEvent(QEvent *event)
|
||||
ui->retranslateUi(this);
|
||||
|
||||
reSetHeadTreeWidget();
|
||||
//loadTraineesFromDB();
|
||||
slot_NeedUpdateUI(false, true);
|
||||
}
|
||||
}
|
||||
@@ -111,22 +117,25 @@ void ViewerTrainees::on_itemDoubleClicked(QTreeWidgetItem *item, int column)
|
||||
int id_trainee = connectorToServer->getIdTraineeByLogin(login);
|
||||
|
||||
|
||||
PersonalCardTrainee cardTrainee(connectorToServer, messangerController, id_trainee, ammTasksWidgetCommon, fimTasksWidgetCommon, this);
|
||||
PersonalCardTrainee* cardTrainee = new PersonalCardTrainee(connectorToServer, messangerController, id_trainee, ammTasksWidgetCommon, fimTasksWidgetCommon, this);
|
||||
|
||||
QDialog* dialog = new QDialog(this,
|
||||
dlgCardTrainee = new QDialog(this,
|
||||
Qt::WindowSystemMenuHint
|
||||
| Qt::WindowMaximizeButtonHint
|
||||
| Qt::WindowMinimizeButtonHint
|
||||
| Qt::WindowCloseButtonHint);
|
||||
|
||||
QHBoxLayout *layout = new QHBoxLayout(dialog);
|
||||
layout->addWidget(&cardTrainee);
|
||||
dialog->setWindowTitle(tr("Personal card trainee"));
|
||||
dialog->setMinimumSize(1900, 1000);
|
||||
dialog->exec();
|
||||
QHBoxLayout *layout = new QHBoxLayout(dlgCardTrainee);
|
||||
layout->addWidget(cardTrainee);
|
||||
dlgCardTrainee->setWindowTitle(tr("Personal card trainee"));
|
||||
dlgCardTrainee->setMinimumSize(1900, 1000);
|
||||
dlgCardTrainee->exec();
|
||||
|
||||
ammTasksWidgetCommon->setParent(this);
|
||||
fimTasksWidgetCommon->setParent(this);
|
||||
|
||||
delete dlgCardTrainee;
|
||||
dlgCardTrainee = nullptr;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -53,6 +53,7 @@ private:
|
||||
MessangerController* messangerController;
|
||||
|
||||
QDialog* dlgEditor;
|
||||
QDialog* dlgCardTrainee;
|
||||
|
||||
private:
|
||||
Ui::ViewerTrainees *ui;
|
||||
|
||||
Reference in New Issue
Block a user