В основном работает

This commit is contained in:
krivoshein
2024-12-12 17:20:06 +03:00
parent d28453440f
commit 1c9e0510a9
51 changed files with 634 additions and 810 deletions

View File

@@ -4,7 +4,7 @@
TraineesView::TraineesView(ConnectorToServer* connectorToServer, TypeView type, QWidget *parent):
CommonView(connectorToServer, type, parent)
{
typeObject = TypeObject::objGroup;
}
void TraineesView::slot_NeedUpdateUI(bool treeInstructor, bool treeTrainee)
@@ -38,7 +38,7 @@ void TraineesView::slot_NeedUpdateUI(bool treeInstructor, bool treeTrainee)
loadTraineesFromDB();
}
void TraineesView::preparationTreeWidget(/*QTreeWidget *tree*/)
void TraineesView::preparationTreeWidget()
{
mtxTreeWidget.lock();
@@ -104,10 +104,6 @@ void TraineesView::loadTraineesFromDB()
QList <Group> listGroups;
QList <Trainee> listTrainees;
//TODO
//listGroups = dbLMS->getListGroups();
//listTrainees = dbLMS->getListTrainees();
listGroups = connectorToServer->getListGroups();
listTrainees = connectorToServer->getListTrainees();
@@ -145,7 +141,7 @@ void TraineesView::loadTraineesFromDB()
if(trainee.getArchived())
{//Архивный
ItemTrainee->setText(ColumnsTreeTrainees::clmn_Archived, tr("yes"));
ItemTrainee->setIcon(ColumnsTreeTrainees::clmn_Trainee, QIcon(QStringLiteral(":/icons/traineeArchive.png")));
ItemTrainee->setIcon(ColumnsTreeTrainees::clmn_Trainee, QIcon(QStringLiteral(":/icons/archive.png")));
setItemColorArchive(ItemTrainee);
}
else
@@ -187,12 +183,13 @@ void TraineesView::loadTraineesFromDB()
ItemTrainee->setHidden(true);
}
//if(! archiveVisible && cntChildsNotArchived == 0)
//delete ItemGroup;
if(! archiveVisible && cntChildsNotArchived == 0)
delete ItemGroup;
}
treeWidget->expandAll();
/*
//if(typeView == TypeView::control)
{
QTreeWidgetItem * item = treeWidget->topLevelItem(0);
@@ -202,7 +199,12 @@ void TraineesView::loadTraineesFromDB()
if(itemChild != nullptr)
treeWidget->setCurrentItem(itemChild);
}
}
}*/
if(typeObject == TypeObject::objGroup)
setCurrentGroup(lastCurrentID);
else
setCurrentTrainee(lastCurrentID);
mtxTreeWidget.unlock();
}
@@ -212,3 +214,50 @@ void TraineesView::reSetHeadTreeWidget()
QStringList listHeaders = {tr("Trainee"), tr("Login"), tr("Password"), tr("Class"), tr("Computer"), tr("IP address"), tr("Archived"), tr("Logged"), tr("Tasks"), tr("ID")};
treeWidget->setHeaderLabels(listHeaders);
}
void TraineesView::setCurrentGroup(int id)
{
typeObject = TypeObject::objGroup;
for(int i = 0; i < treeWidget->topLevelItemCount(); i++)
{
QTreeWidgetItem * item = treeWidget->topLevelItem(i);
if(item != nullptr)
if(item->text(ColumnsTreeTrainees::clmn_ID).toInt() == id)
{
treeWidget->setCurrentItem(item);
return;
}
}
QTreeWidgetItem * item = treeWidget->topLevelItem(0);
if(item != nullptr)
treeWidget->setCurrentItem(item);
}
void TraineesView::setCurrentTrainee(int id)
{
typeObject = TypeObject::objTrainee;
for(int i = 0; i < treeWidget->topLevelItemCount(); i++)
{
QTreeWidgetItem * item = treeWidget->topLevelItem(i);
if(item != nullptr)
{
for (int j = 0; j < item->childCount(); j++)
{
QTreeWidgetItem * itemChild = item->child(j);
if(itemChild != nullptr)
if(itemChild->text(ColumnsTreeTrainees::clmn_ID).toInt() == id)
{
treeWidget->setCurrentItem(itemChild);
return;
}
}//for (int j = 0; j < item->childCount(); j++)
}
}//for(int i = 0; i < treeWidget->topLevelItemCount(); i++)
QTreeWidgetItem * item = treeWidget->topLevelItem(0);
if(item != nullptr)
treeWidget->setCurrentItem(item);
}