From c57b94786f12adef61938abf2ed49ebb2d5010df Mon Sep 17 00:00:00 2001 From: krivoshein Date: Wed, 10 Sep 2025 12:27:35 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8B=D0=B1=D0=BE=D1=80=20=D0=9E=D0=B1?= =?UTF-8?q?=D1=83=D1=87=D0=B0=D0=B5=D0=BC=D1=8B=D1=85/=D0=98=D0=BD=D1=81?= =?UTF-8?q?=D1=82=D1=80=D1=83=D0=BA=D1=82=D0=BE=D1=80=D0=BE=D0=B2=20=D0=B8?= =?UTF-8?q?=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- InstructorsAndTrainees/commonview.h | 1 + InstructorsAndTrainees/trainees/traineesview.cpp | 2 +- .../trainees/viewertrainees.cpp | 16 +++++++++++++++- 3 files changed, 17 insertions(+), 2 deletions(-) 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()