diff --git a/LibInstructorsAndTrainees/commonview.cpp b/LibInstructorsAndTrainees/commonview.cpp index e95f762..b81837b 100644 --- a/LibInstructorsAndTrainees/commonview.cpp +++ b/LibInstructorsAndTrainees/commonview.cpp @@ -82,6 +82,10 @@ void CommonView::setWidthColumnsTree() treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_Name, 100); listWidthColumn.append(100); + treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_AMMtasks, 100); + listWidthColumn.append(100); + treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_FIMtasks, 100); + listWidthColumn.append(100); treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_Login, 100); listWidthColumn.append(100); treeWidget->setColumnWidth(ColumnsTreeUsers::clmn_Password, 100); @@ -110,7 +114,7 @@ void CommonView::setWidthColumnsTree() void CommonView::reSetHeadTreeWidget() { - QStringList listHeaders = {tr("Name"), tr("Login"), tr("Password"), tr("Class"), tr("Computer"), tr("IP address"), tr("Administrator"), tr("Archived"), tr("Messages"), tr("Online"), tr("ID")}; + QStringList listHeaders = {tr("Name"), tr("AMM tasks"), tr("FIM tasks"), tr("Login"), tr("Password"), tr("Class"), tr("Computer"), tr("IP address"), tr("Administrator"), tr("Archived"), tr("Messages"), tr("Online"), tr("ID")}; treeWidget->setHeaderLabels(listHeaders); } @@ -156,6 +160,12 @@ void CommonView::preparationTreeWidget() if(TypeUserDB == User::TypeUserDBTrainee) treeWidget->setColumnHidden(ColumnsTreeUsers::clmn_Administrator, true); + if(TypeUserDB != User::TypeUserDBTrainee) + { + treeWidget->setColumnHidden(ColumnsTreeUsers::clmn_AMMtasks, true); + treeWidget->setColumnHidden(ColumnsTreeUsers::clmn_FIMtasks, true); + } + //treeWidget->setSortingEnabled(true); treeWidget->sortItems(ColumnsTreeUsers::clmn_Name, Qt::SortOrder::AscendingOrder); diff --git a/LibInstructorsAndTrainees/commonview.h b/LibInstructorsAndTrainees/commonview.h index cbb31e4..d62e4cc 100644 --- a/LibInstructorsAndTrainees/commonview.h +++ b/LibInstructorsAndTrainees/commonview.h @@ -32,6 +32,8 @@ public: protected: enum ColumnsTreeUsers{ clmn_Name = 0, + clmn_AMMtasks, + clmn_FIMtasks, clmn_Login, clmn_Password, clmn_Class, diff --git a/LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp b/LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp index 118f36b..1d07b3d 100644 --- a/LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -88,8 +88,8 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : ui->groupBox_Trainees->setMinimumHeight(400); - ui->groupBox_Trainees->setMinimumWidth(600); - ui->groupBox_Instructors->setMinimumWidth(600); + ui->groupBox_Trainees->setMinimumWidth(800); + ui->groupBox_Instructors->setMinimumWidth(800); //Доступность кнопок