PSQL 02.11.2024

This commit is contained in:
krivoshein
2024-11-02 13:43:57 +03:00
parent 9422c5e257
commit 0f1fa71c33
76 changed files with 576 additions and 493 deletions

View File

@@ -100,21 +100,28 @@ void EditorTrainees::on_btnToOrFromArchiveTrainee_clicked()
QString name = treeItemCurrent->text(0);
if(dbTrainees->isArchived(name))
Trainee trainee = dbTrainees->getTrainee(name);
if(trainee.getArchived())
{//Архивный
dbTrainees->fromeArchiveTrainee(name);
loadTraineesFromDB();
setCurrentTrainee(name);
trainee.setArchived(false);
if(dbTrainees->editTrainee(name, trainee))
{
loadTraineesFromDB();
setCurrentTrainee(trainee.getName());
}
}
else
{//Не Архивный
dbTrainees->toArchiveTrainee(name);
trainee.setArchived(true);
if(dbTrainees->editTrainee(name, trainee))
{
if(!archiveVisible)
ui->btnArchive->click();
if(!archiveVisible)
ui->btnArchive->click();
loadTraineesFromDB();
setCurrentTrainee(name);
loadTraineesFromDB();
setCurrentTrainee(trainee.getName());
}
}
}
}
@@ -134,15 +141,16 @@ void EditorTrainees::on_btnEdit_clicked()
QString nameGroup = treeItemCurrent->text(0);
DialogEditGroup dlg(this);
dlg.setName(nameGroup);
dlg.setGroup(dbTrainees->getGroup(nameGroup));
switch( dlg.exec() )
{
case QDialog::Accepted:
{
if(dbTrainees->editGroup(nameGroup, dlg.getName()))
if(dbTrainees->editGroup(nameGroup, dlg.getGroup()))
{
loadTraineesFromDB();
setCurrentGroup(dlg.getName());
setCurrentGroup(dlg.getGroup().getName());
}
else
QMessageBox::critical(this, tr("Editing error!"),