diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp index a561561..f80f14d 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp @@ -153,13 +153,14 @@ void AMMtasksWidget::preparationTreeWidget() treeWidget->setColumnWidth(ColumnsTree::clmn_ID, 80); treeWidget->setColumnWidth(ColumnsTree::clmn_PMorDM, 900); + treeWidget->setColumnWidth(ColumnsTree::clmn_code, 200); //treeWidget->setColumnHidden(ColumnsTree::clmn_ID, true); } void AMMtasksWidget::reSetHeadTreeWidget() { - QStringList listHeaders = {tr("PM/DM"), tr("ID")}; + QStringList listHeaders = {tr("PM/DM"), tr("Code"), tr("ID")}; treeWidget->setHeaderLabels(listHeaders); } diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.h b/InstructorsAndTrainees/tasks/ammtaskswidget.h index 73f8fa1..71772e0 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.h +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.h @@ -16,11 +16,8 @@ class AMMtasksWidget : public QWidget { Q_OBJECT -private: - enum ColumnsTree{ - clmn_PMorDM = 0, - clmn_ID - }; +public: + public: explicit AMMtasksWidget(ConnectorToServer* connectorToServer, QWidget *parent = nullptr); diff --git a/InstructorsAndTrainees/tasks/tasktreepreparation.cpp b/InstructorsAndTrainees/tasks/tasktreepreparation.cpp index e749139..17a7200 100644 --- a/InstructorsAndTrainees/tasks/tasktreepreparation.cpp +++ b/InstructorsAndTrainees/tasks/tasktreepreparation.cpp @@ -2,6 +2,7 @@ #include #include "tasktreepreparation.h" + TaskTreePreparation::TaskTreePreparation(QObject *parent) : QObject(parent), listAllModules(nullptr) @@ -18,8 +19,9 @@ QTreeWidgetItem *TaskTreePreparation::addModuleToTreeWidget(Module *module, QTre { QTreeWidgetItem* itemModule = nullptr; - QString text; + QString text = ""; QString ID = QString::number(module->getID()); + QString code = ""; itemModule = new QTreeWidgetItem(); @@ -30,6 +32,7 @@ QTreeWidgetItem *TaskTreePreparation::addModuleToTreeWidget(Module *module, QTre { PM* PMmodul = static_cast(module); text = PMmodul->getLangStructRus().title; + code = PMmodul->pmCode(); for(Module* module : PMmodul->getListChildModules()) { @@ -40,14 +43,16 @@ QTreeWidgetItem *TaskTreePreparation::addModuleToTreeWidget(Module *module, QTre { DM* DMmodul = static_cast(module); text = DMmodul->getLangStructRus().techName; + code = DMmodul->dmCode(); //itemModule->setFlags(itemModule->flags() | Qt::ItemIsUserCheckable); //itemModule->setCheckState(0, Qt::Checked); itemModule->setIcon(0, QIcon(":/resources/icons/procedure.png")); } - itemModule->setText(0, text); - itemModule->setText(1, ID); + itemModule->setText(ColumnsTree::clmn_PMorDM, text); + itemModule->setText(ColumnsTree::clmn_code, code); + itemModule->setText(ColumnsTree::clmn_ID, ID); return itemModule; } diff --git a/InstructorsAndTrainees/tasks/tasktreepreparation.h b/InstructorsAndTrainees/tasks/tasktreepreparation.h index 1f9bc31..c6bdbd2 100644 --- a/InstructorsAndTrainees/tasks/tasktreepreparation.h +++ b/InstructorsAndTrainees/tasks/tasktreepreparation.h @@ -6,6 +6,12 @@ #include #include "module.h" +enum ColumnsTree{ + clmn_PMorDM = 0, + clmn_code, + clmn_ID +}; + class TaskTreePreparation : public QObject { Q_OBJECT