Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-28 19:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

bugFixing 0

Browse Source
This commit is contained in:
Кривошеин Андрей
2025-09-16 11:03:10 +03:00
parent 0e81d14566
commit 31cf125c2f
4 changed files with 72 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
InstructorsAndTrainees/instructors/editorinstructors.cpp
View File

@@ -215,7 +215,16 @@ void EditorInstructors::on_btnArchive_clicked()
setArchiveVisible(state);
if(!state)
{
lastCurrentID = 0;
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)

7
InstructorsAndTrainees/instructors/instructorsview.cpp
View File

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

43
InstructorsAndTrainees/trainees/editortrainees.cpp
View File

@@ -326,8 +326,39 @@ void EditorTrainees::on_btnArchive_clicked()
setArchiveVisible(state);
if(!state)
{
lastCurrentID = 0;
typeObject = TypeObject::objGroup;
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)

7
InstructorsAndTrainees/trainees/traineesview.cpp
View File

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