bugFixing 0

InstructorsAndTrainees/instructors/editorinstructors.cpp

@@ -215,8 +215,17 @@ void EditorInstructors::on_btnArchive_clicked()
     setArchiveVisible(state);
     if(!state)
     {
+        Instructor instructor = connectorToServer->getInstructor(lastCurrentID);
+        if(instructor.getID())
+        {
+            if(instructor.getArchived())
                 lastCurrentID = 0;
         }
+        else
+        {
+            lastCurrentID = 0;
+        }
+    }
     loadInstructorsFromDB();
 }
 
@@ -225,7 +234,12 @@ void EditorInstructors::on_treeWidgetCurrentItemChanged(QTreeWidgetItem *current
     //Определяем доступность и функционал кнопок для выбранного элемента
 
     if(current == nullptr)
+    {
+        ui->btnDeleteInstructor->setEnabled(false);
+        ui->btnToOrFromArchive->setEnabled(false);
+        ui->btnEdit->setEnabled(false);
         return;
+    }
 
     QTreeWidgetItem *treeItemParent = current->parent();
     if(treeItemParent == nullptr)
@@ -269,6 +283,12 @@ void EditorInstructors::on_treeWidgetCurrentItemChanged(QTreeWidgetItem *current
         //ui->btnEdit->setEnabled(true);
         ui->btnArchive->setEnabled(true);
     }
+    else
+    {
+        ui->btnDeleteInstructor->setEnabled(false);
+        ui->btnToOrFromArchive->setEnabled(false);
+        ui->btnEdit->setEnabled(false);
+    }
 }
 
 bool EditorInstructors::verifyInstructor(Instructor instructor)

InstructorsAndTrainees/instructors/instructorsview.cpp

@@ -46,9 +46,12 @@ void InstructorsView::slot_NeedUpdateUI(bool treeInstructor, bool treeTrainee)
 {
     updateButtons();
 
+    if(authComplited)
+    {
         if(treeInstructor)
             loadInstructorsFromDB();
     }
+}
 
 void InstructorsView::preparationTreeWidget()
 {

InstructorsAndTrainees/trainees/editortrainees.cpp

@@ -325,10 +325,41 @@ void EditorTrainees::on_btnArchive_clicked()
     bool state = ui->btnArchive->isChecked();
     setArchiveVisible(state);
     if(!state)
+    {
+        if(typeObject == TypeObject::objTrainee)
+        {
+            Trainee trainee = connectorToServer->getTrainee(lastCurrentID);
+            if(trainee.getID())
+            {
+                if(trainee.getArchived())
                 {
                     lastCurrentID = 0;
                     typeObject = TypeObject::objGroup;
                 }
+            }
+            else
+            {
+                lastCurrentID = 0;
+                typeObject = TypeObject::objGroup;
+            }
+        }
+        else if(typeObject == TypeObject::objGroup)
+        {
+            Group group = connectorToServer->getGroup(lastCurrentID);
+            if(group.getID())
+            {}
+            else
+            {
+                lastCurrentID = 0;
+                typeObject = TypeObject::objGroup;
+            }
+        }
+        else
+        {
+            lastCurrentID = 0;
+            typeObject = TypeObject::objGroup;
+        }
+    }
     loadTraineesFromDB();
 }
 
@@ -337,7 +368,15 @@ void EditorTrainees::on_treeWidgetCurrentItemChanged(QTreeWidgetItem *current, Q
     //Определяем доступность и функционал кнопок для выбранного элемента
 
     if(current == nullptr)
+    {
+        ui->btnNewGroup->setEnabled(true);
+        ui->btnDeleteGroup->setEnabled(false);
+        ui->btnNewTrainee->setEnabled(false);
+        ui->btnDeleteTrainee->setEnabled(false);
+        ui->btnToOrFromArchiveTrainee->setEnabled(false);
+        ui->btnEdit->setEnabled(false);
         return;
+    }
 
     QTreeWidgetItem *treeItemParent = current->parent();
     if(treeItemParent == nullptr)

InstructorsAndTrainees/trainees/traineesview.cpp

@@ -47,9 +47,12 @@ void TraineesView::slot_NeedUpdateUI(bool treeInstructor, bool treeTrainee)
 {
     updateButtons();
 
+    if(authComplited)
+    {
         if(treeTrainee)
             loadTraineesFromDB();
     }
+}
 
 void TraineesView::preparationTreeWidget()
 {