From d87f8e501323cf13a9349cd65dd6bd6007a898f4 Mon Sep 17 00:00:00 2001
From: krivoshein <krivoshein@msk.dinamika-avia.ru>
Date: Wed, 29 Jan 2025 10:49:41 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=87=D0=B8=D1=89=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=BE=D0=B2=20=D0=BD?=
 =?UTF-8?q?=D0=B0=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=BD=D1=8B=D1=85=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=20=D0=BF=D1=80=D0=B8=20=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B7=D0=BB=D0=BE=D0=B3=D0=B8=D0=BD=D0=B8=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 InstructorsAndTrainees/commonview.h                | 1 +
 InstructorsAndTrainees/tasks/ammtaskswidget.h      | 2 ++
 InstructorsAndTrainees/tasks/fimtaskswidget.h      | 2 ++
 InstructorsAndTrainees/trainees/viewertrainees.cpp | 4 ++--
 InstructorsAndTrainees/trainees/viewertrainees.h   | 7 +++++++
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/InstructorsAndTrainees/commonview.h b/InstructorsAndTrainees/commonview.h
index 123cdb4..0f7755c 100644
--- a/InstructorsAndTrainees/commonview.h
+++ b/InstructorsAndTrainees/commonview.h
@@ -38,6 +38,7 @@ public:
     void clearTree()
     {
         treeWidget->clear();
+        lastCurrentID = 0;
     }
 
 protected:
diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.h b/InstructorsAndTrainees/tasks/ammtaskswidget.h
index 1bf1f7e..6d91e35 100644
--- a/InstructorsAndTrainees/tasks/ammtaskswidget.h
+++ b/InstructorsAndTrainees/tasks/ammtaskswidget.h
@@ -32,6 +32,8 @@ public:
     void clearTree()
     {
         treeWidget->clear();
+        loginTraineeSelected = "";
+        idTraineeSelected = 0;
     }
 
 public:
diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.h b/InstructorsAndTrainees/tasks/fimtaskswidget.h
index e9b90d5..bcc426d 100644
--- a/InstructorsAndTrainees/tasks/fimtaskswidget.h
+++ b/InstructorsAndTrainees/tasks/fimtaskswidget.h
@@ -35,6 +35,8 @@ public:
     void clearTree()
     {
         treeWidget->clear();
+        loginTraineeSelected = "";
+        idTraineeSelected = 0;
     }
 
 public:
diff --git a/InstructorsAndTrainees/trainees/viewertrainees.cpp b/InstructorsAndTrainees/trainees/viewertrainees.cpp
index 83bebea..042d6bf 100644
--- a/InstructorsAndTrainees/trainees/viewertrainees.cpp
+++ b/InstructorsAndTrainees/trainees/viewertrainees.cpp
@@ -117,10 +117,10 @@ void ViewerTrainees::on_treeWidget_currentItemChanged(QTreeWidgetItem *current,
     if(current == nullptr)
         return;
 
-    if(current->childCount() == 0)
+    //if(current->childCount() == 0)
     {//Выбран обучаемый
         QString login = current->text(ColumnsTreeTrainees::clmn_Login);
-        if(login != "")
+        //if(login != "")
         {
             int newCurrentID = connectorToServer->getIdTraineeByLogin(login);
 
diff --git a/InstructorsAndTrainees/trainees/viewertrainees.h b/InstructorsAndTrainees/trainees/viewertrainees.h
index e3be26a..638843d 100644
--- a/InstructorsAndTrainees/trainees/viewertrainees.h
+++ b/InstructorsAndTrainees/trainees/viewertrainees.h
@@ -22,6 +22,13 @@ public:
 public:
     void setAuthComplited(bool authComplited);
 
+    void clearTree()
+    {
+        CommonView::clearTree();
+        ammTasksWidget->clearTree();
+        fimTasksWidget->clearTree();
+    }
+
 protected:
     void changeEvent(QEvent * event) override;