Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-29 20:05:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

PSQL 02.11.2024

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

105
DB_IaT/InstructorsAndTrainees/trainees/databasetrainees.cpp
View File

@@ -46,10 +46,20 @@ bool DataBaseTrainees::AuthorizationTrainee(QString login, QString password, QSt
if(listOfTrainees[i].getLogin() == login && listOfTrainees[i].getPassword() == password)
{
listOfTrainees[i].setLoggedIn(true);
listOfTrainees[i].setLearnClass(learnClass);
listOfTrainees[i].setComputer(computer);
return true;
Trainee trainee = listOfTrainees[i];
trainee.setLoggedIn(true);
trainee.setLearnClass(learnClass);
trainee.setComputer(computer);
bool result = dbLMS->updateTrainee(trainee);
if(result)
{
LoadTraineesGroupsPSQL();
return true;
}
else
return false;
}
}
return false;
@@ -60,42 +70,54 @@ bool DataBaseTrainees::deAuthorizationTrainee(QString login)
//Обучаемые
for(int i = 0; i < listOfTrainees.count(); i++)
{
//if(listOfTrainees[i].getArchived())
//continue;
if(listOfTrainees[i].getArchived())
continue;
if(listOfTrainees[i].getLogin() == login)
{
listOfTrainees[i].setLoggedIn(false);
listOfTrainees[i].setLearnClass(QStringLiteral(""));
listOfTrainees[i].setComputer(QStringLiteral(""));
return true;
Trainee trainee = listOfTrainees[i];
trainee.setLoggedIn(false);
trainee.setLearnClass(QStringLiteral(""));
trainee.setComputer(QStringLiteral(""));
bool result = dbLMS->updateTrainee(trainee);
if(result)
{
LoadTraineesGroupsPSQL();
return true;
}
else
return false;
}
}
return false;
}
void DataBaseTrainees::setWhatItDoes(QString login, QString whatItDoes)
void DataBaseTrainees::setTasks(QString login, QStringList tasks)
{
//Обучаемые
for(int i = 0; i < listOfTrainees.count(); i++)
{
if(listOfTrainees[i].getLogin() == login)
listOfTrainees[i].setWhatItDoes(whatItDoes);
listOfTrainees[i].setTasks(tasks);
}
}
QStringList DataBaseTrainees::getWhatItDoes(QString login)
QStringList DataBaseTrainees::getTasks(QString login)
{
QString whatItDoes = QStringLiteral("");
QStringList tasks;
//Обучаемые
for(int i = 0; i < listOfTrainees.count(); i++)
{
if(listOfTrainees[i].getLogin() == login)
whatItDoes = listOfTrainees[i].getWhatItDoes();
{
tasks = listOfTrainees[i].getTasks();
}
}
return whatItDoes.split(QStringLiteral(";"));
return tasks;
}
QString DataBaseTrainees::getNameTraineeOnComputer(QString computer)
@@ -230,17 +252,16 @@ bool DataBaseTrainees::deleteGroup(QString name)
return true;
}
bool DataBaseTrainees::editGroup(QString name, QString newName)
bool DataBaseTrainees::editGroup(QString name, Group group)
{
//Группы
for(int i = 0; i < listOfGroups.count(); i++)
{
if(listOfGroups[i].getName() == name)
{
if(!checkExistNameGroup(newName) || newName == name)
if(!checkExistNameGroup(group.getName()) || group.getName() == name)
{
Group group = listOfGroups[i];
group.setName(newName);
//group.setID(listOfGroups[i].getID());
bool result = dbLMS->updateGroup(group);
@@ -280,7 +301,7 @@ QString DataBaseTrainees::newTrainee(QString nameGroup)
trainee.setComputer(QStringLiteral(""));
trainee.setArchived(false);
trainee.setLoggedIn(false);
trainee.setWhatItDoes(QStringLiteral(""));
//trainee.setWhatItDoes(QStringLiteral(""));
bool result = dbLMS->insertTrainee(trainee);
@@ -314,46 +335,6 @@ void DataBaseTrainees::deleteTrainee(QString name)
}
}
void DataBaseTrainees::toArchiveTrainee(QString name)
{
//Обучаемые
for(int i = 0; i < listOfTrainees.count(); i++)
{
if(listOfTrainees[i].getName() == name)
if(! listOfTrainees[i].getArchived())
{
Trainee trainee = listOfTrainees[i];
trainee.setArchived(true);
bool result = dbLMS->updateTrainee(trainee);
if(result)
LoadTraineesGroupsPSQL();
//listOfTrainees[i].setArchived(true);
}
}
}
void DataBaseTrainees::fromeArchiveTrainee(QString name)
{
//Обучаемые
for(int i = 0; i < listOfTrainees.count(); i++)
{
if(listOfTrainees[i].getName() == name)
if(listOfTrainees[i].getArchived())
{
Trainee trainee = listOfTrainees[i];
trainee.setArchived(false);
bool result = dbLMS->updateTrainee(trainee);
if(result)
LoadTraineesGroupsPSQL();
//listOfTrainees[i].setArchived(false);
}
}
}
bool DataBaseTrainees::editTrainee(QString name, Trainee trainee)
{
//Обучаемые
@@ -364,7 +345,7 @@ bool DataBaseTrainees::editTrainee(QString name, Trainee trainee)
if( (!checkExistNameTrainee(trainee.getName()) || trainee.getName() == name) &&
(!checkExistLoginTrainee(trainee.getLogin()) || trainee.getLogin() == listOfTrainees[i].getLogin()) )
{
trainee.setID(listOfTrainees[i].getID());
//trainee.setID(listOfTrainees[i].getID());
bool result = dbLMS->updateTrainee(trainee);

8
DB_IaT/InstructorsAndTrainees/trainees/databasetrainees.h
View File

@@ -24,8 +24,8 @@ public:
bool AuthorizationTrainee(QString login, QString password, QString learnClass, QString computer);
bool deAuthorizationTrainee(QString login);
void setWhatItDoes(QString login, QString whatItDoes);
QStringList getWhatItDoes(QString login);
void setTasks(QString login, QStringList tasks);
QStringList getTasks(QString login);
QString getNameTraineeOnComputer(QString computer);
Trainee getTraineeOnComputer(QString computer);
@@ -43,12 +43,10 @@ public:
QString newGroup();
bool deleteGroup(QString name);
bool editGroup(QString name, QString newName);
bool editGroup(QString name, Group group);
QString newTrainee(QString nameGroup);
void deleteTrainee(QString name);
void toArchiveTrainee(QString name);
void fromeArchiveTrainee(QString name);
bool editTrainee(QString name, Trainee trainee);
bool isArchived(QString name);

19
DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.cpp
View File

@@ -3,7 +3,8 @@
DialogEditGroup::DialogEditGroup(QWidget *parent) :
QDialog(parent),
ui(new Ui::DialogEditGroup)
ui(new Ui::DialogEditGroup),
groupInput()
{
ui->setupUi(this);
}
@@ -12,3 +13,19 @@ DialogEditGroup::~DialogEditGroup()
{
delete ui;
}
void DialogEditGroup::setGroup(Group group)
{
groupInput = group;
ui->editName->setText(group.getName());
}
Group DialogEditGroup::getGroup()
{
Group group = groupInput;
group.setName(ui->editName->text());
return group;
}

14
DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.h
View File

@@ -4,6 +4,7 @@
#include <QDialog>
#include "ui_dialogeditgroup.h"
#include "computersLocations.h"
#include "group.h"
namespace Ui {
class DialogEditGroup;
@@ -17,18 +18,13 @@ public:
explicit DialogEditGroup(QWidget *parent = nullptr);
~DialogEditGroup();
void setName(QString name)
{
ui->editName->setText(name);
}
QString getName()
{
return ui->editName->text();
}
void setGroup(Group group);
Group getGroup();
private:
Ui::DialogEditGroup *ui;
Group groupInput;
};
#endif // DIALOGEDITGROUP_H

15
DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.cpp
View File

@@ -4,7 +4,7 @@
DialogEditTrainee::DialogEditTrainee(QWidget *parent) :
QDialog(parent),
ui(new Ui::DialogEditTrainee),
nameGroup()
traineeInput()
{
ui->setupUi(this);
}
@@ -16,29 +16,26 @@ DialogEditTrainee::~DialogEditTrainee()
void DialogEditTrainee::setTrainee(Trainee trainee)
{
traineeInput = trainee;
ui->editName->setText(trainee.getName());
ui->editLogin->setText(trainee.getLogin());
ui->editPassword->setText(trainee.getPassword());
ui->checkArchived->setChecked(trainee.getArchived());
ui->checkLoggedIn->setChecked(trainee.getLoggedIn());
nameGroup = trainee.getGroup();
}
Trainee DialogEditTrainee::getTrainee()
{
Trainee trainee;
Trainee trainee = traineeInput;
trainee.setName(ui->editName->text());
trainee.setLogin(ui->editLogin->text());
trainee.setPassword(ui->editPassword->text());
trainee.setLearnClass(QStringLiteral(""));
trainee.setComputer(QStringLiteral(""));
trainee.setArchived(ui->checkArchived->isChecked());
trainee.setLoggedIn(ui->checkLoggedIn->isChecked());
trainee.setWhatItDoes(QStringLiteral(""));
trainee.setGroup(nameGroup);
return trainee;
}

2
DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.h
View File

@@ -22,7 +22,7 @@ public:
private:
Ui::DialogEditTrainee *ui;
QString nameGroup;
Trainee traineeInput;
};
#endif // DIALOGEDITTRAINEE_H

34
DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp
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!"),

2
DB_IaT/InstructorsAndTrainees/trainees/editortrainees.h
View File

@@ -11,7 +11,7 @@ namespace Ui {
class EditorTrainees;
}
//Диалог для просмотра и управления БД Обучаемых
//Виджет для редактирования БД Обучаемых
class EditorTrainees : /*public QDialog,*/ public TraineesView
{

38
DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp
View File

@@ -15,31 +15,32 @@ void TraineesView::preparationTreeWidget(QTreeWidget *tree)
if(treeWidget == nullptr)
return;
treeWidget->setColumnCount(8);
treeWidget->setColumnCount(9);
reSetHeadTreeWidget();
treeWidget->header()->setStyleSheet(QStringLiteral("font-size: 12pt;"));
treeWidget->header()->setStyleSheet(QStringLiteral("font-size: 10pt;"));
treeWidget->setColumnWidth(0, 200);
treeWidget->setColumnWidth(1, 130);
treeWidget->setColumnWidth(2, 130);
treeWidget->setColumnWidth(0, 250);
treeWidget->setColumnWidth(1, 100);
treeWidget->setColumnWidth(2, 100);
treeWidget->setColumnWidth(3, 130);
treeWidget->setColumnWidth(4, 130);
treeWidget->setColumnWidth(5, 130);
treeWidget->setColumnWidth(6, 130);
treeWidget->setColumnWidth(7, 100);
treeWidget->setColumnWidth(6, 80);
treeWidget->setColumnWidth(7, 80);
treeWidget->setColumnWidth(8, 100);
if(typeView == TypeView::onlyView)
{//onlyView
treeWidget->setColumnHidden(1, true);
treeWidget->setColumnHidden(2, true);
treeWidget->setColumnHidden(5, true);
treeWidget->setColumnHidden(7, true);
treeWidget->setColumnHidden(6, true);
treeWidget->setColumnHidden(8, true);
}
else
{//control
treeWidget->setColumnHidden(5, true);
treeWidget->setColumnHidden(6, true);
}
}
@@ -74,32 +75,33 @@ void TraineesView::loadTraineesFromDB()
ItemTrainee->setText(2, trainee.getPassword());
ItemTrainee->setText(3, trainee.getLearnClass());
ItemTrainee->setText(4, trainee.getComputer());
ItemTrainee->setText(5, trainee.getIpAddress());
if(trainee.getArchived())
{//Архивный
ItemTrainee->setText(5, tr("yes"));
ItemTrainee->setText(6, tr("yes"));
ItemTrainee->setIcon(0, QIcon(QStringLiteral(":/icons/traineeArchive.png")));
setItemColorArchive(ItemTrainee);
}
else
{//Не Архивный
ItemTrainee->setText(5, tr("no"));
ItemTrainee->setText(6, tr("no"));
ItemTrainee->setIcon(0, QIcon(QStringLiteral(":/icons/trainee.png")));
setItemColorNoArchive(ItemTrainee);
}
if(trainee.getLoggedIn())
{//Залогинен
ItemTrainee->setText(6, tr("yes"));
ItemTrainee->setIcon(6, QIcon(QStringLiteral(":/icons/circleGreen.png")));
ItemTrainee->setText(7, tr("yes"));
ItemTrainee->setIcon(7, QIcon(QStringLiteral(":/icons/circleGreen.png")));
}
else
{//Не Залогинен
ItemTrainee->setText(6, tr("no"));
ItemTrainee->setIcon(6, QIcon(QStringLiteral(":/icons/circleGray.png")));
ItemTrainee->setText(7, tr("no"));
ItemTrainee->setIcon(7, QIcon(QStringLiteral(":/icons/circleGray.png")));
}
ItemTrainee->setText(7, trainee.getWhatItDoes());
ItemTrainee->setText(8, QString(trainee.getTasks().join(QStringLiteral(";"))));
ItemGroup->addChild(ItemTrainee);
@@ -129,6 +131,6 @@ void TraineesView::loadTraineesFromDB()
void TraineesView::reSetHeadTreeWidget()
{
QStringList listHeaders = {tr("Trainee"), tr("Login"), tr("Password"), tr("Class"), tr("Computer"), tr("Archived"), tr("Logged"), tr("Tasks")};
QStringList listHeaders = {tr("Trainee"), tr("Login"), tr("Password"), tr("Class"), tr("Computer"), tr("IP address"), tr("Archived"), tr("Logged"), tr("Tasks")};
treeWidget->setHeaderLabels(listHeaders);
}

2
DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.h
View File

@@ -14,7 +14,7 @@ class ViewerTrainees;
//Виджет только для просмотра БД Обучаемых
class INSTRUCTORSANDTRAINEES_EXPORT ViewerTrainees : /*public QWidget,*/ public TraineesView
class INSTRUCTORSANDTRAINEES_EXPORT ViewerTrainees : public TraineesView
{
Q_OBJECT

5
DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.ui
View File

@@ -23,6 +23,11 @@
<layout class="QHBoxLayout" name="horizontalLayout_1">
<item>
<widget class="QGroupBox" name="groupBox">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="title">
<string>Trainees</string>
</property>