diff --git a/InstructorsAndTrainees/commonview.h b/InstructorsAndTrainees/commonview.h index d471625..a5d93ff 100644 --- a/InstructorsAndTrainees/commonview.h +++ b/InstructorsAndTrainees/commonview.h @@ -44,6 +44,7 @@ public: void clearSelection() { treeWidget->clearSelection(); + lastCurrentID = 0; } protected: diff --git a/InstructorsAndTrainees/trainees/traineesview.cpp b/InstructorsAndTrainees/trainees/traineesview.cpp index 33896de..27909a6 100644 --- a/InstructorsAndTrainees/trainees/traineesview.cpp +++ b/InstructorsAndTrainees/trainees/traineesview.cpp @@ -5,7 +5,7 @@ TraineesView::TraineesView(ConnectorToServer* connectorToServer, TypeView type, QWidget *parent): CommonView(connectorToServer, type, parent) { - typeObject = TypeObject::objGroup; + typeObject = TypeObject::objTrainee; } void TraineesView::resizeEvent(QResizeEvent *event) diff --git a/InstructorsAndTrainees/trainees/viewertrainees.cpp b/InstructorsAndTrainees/trainees/viewertrainees.cpp index 09cb9ee..713d7f4 100644 --- a/InstructorsAndTrainees/trainees/viewertrainees.cpp +++ b/InstructorsAndTrainees/trainees/viewertrainees.cpp @@ -151,8 +151,10 @@ void ViewerTrainees::on_treeWidget_itemClicked(QTreeWidgetItem *item, int column if(item == nullptr) return; - //if(current->childCount() == 0) + if(item->childCount() == 0) {//Выбран обучаемый + typeObject = TypeObject::objTrainee; + QString login = item->text(ColumnsTreeTrainees::clmn_Login); //if(login != "") { @@ -166,6 +168,18 @@ void ViewerTrainees::on_treeWidget_itemClicked(QTreeWidgetItem *item, int column Q_EMIT signal_traineeSelected(login); } } + else + {//Выбрана группа + typeObject = TypeObject::objGroup; + + int id_group = item->text(ColumnsTreeTrainees::clmn_ID).toInt(); + + lastCurrentID = id_group; + typeObject = TypeObject::objGroup; + + QString login = ""; + Q_EMIT signal_traineeSelected(login); + } } void ViewerTrainees::updateButtons()