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

Отделил Дебаг паки от проекта и вынес их из гита

Browse Source
This commit is contained in:
krivoshein
2024-12-25 14:32:18 +03:00
parent bf7b0ac741
commit fc1b58e743
603 changed files with 165 additions and 259874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.cpp.bak
View File

@@ -1,64 +0,0 @@
#include "dialogedittrainee.h"
#include "ui_dialogedittrainee.h"
#include "computersLocations.h"
DialogEditTrainee::DialogEditTrainee(ComputersLocations* computersLocations, QWidget *parent) :
QDialog(parent),
ui(new Ui::DialogEditTrainee),
computersLocations(computersLocations),
nameGroup()
{
ui->setupUi(this);
ui->comboLocation->clear();
ui->comboLocation->addItems(computersLocations->getAllLocations());
ui->comboLocation->setCurrentIndex(0);
//setLocation(getLocation());
ui->comboComputer->clear();
ui->comboComputer->addItems(computersLocations->getAllComputersOfLocation(ui->comboLocation->currentText()));
}
DialogEditTrainee::~DialogEditTrainee()
{
delete ui;
}
void DialogEditTrainee::setTrainee(Trainee trainee)
{
ui->editName->setText(trainee.getName());
ui->editLogin->setText(trainee.getLogin());
ui->editPassword->setText(trainee.getPassword());
ui->comboLocation->setCurrentText(trainee.getLearnClass());
ui->comboComputer->clear();
ui->comboComputer->addItems(computersLocations->getAllComputersOfLocation(ui->comboLocation->currentText()));
ui->comboComputer->setCurrentText(trainee.getComputer());
ui->checkArchived->setChecked(trainee.getArchived());
ui->checkLoggedIn->setChecked(trainee.getLoggedIn());
ui->editWhatItDoes->setText(trainee.getWhatItDoes());
nameGroup = trainee.getGroup();
}
Trainee DialogEditTrainee::getTrainee()
{
Trainee trainee;
trainee.setName(ui->editName->text());
trainee.setLogin(ui->editLogin->text());
trainee.setPassword(ui->editPassword->text());
trainee.setLearnClass(ui->comboLocation->currentText());
trainee.setComputer(ui->comboComputer->currentText());
trainee.setArchived(ui->checkArchived->isChecked());
trainee.setLoggedIn(ui->checkLoggedIn->isChecked());
trainee.setWhatItDoes(ui->editWhatItDoes->text());
trainee.setGroup(nameGroup);
return trainee;
}
void DialogEditTrainee::on_comboLocation_currentIndexChanged(const QString &arg1)
{
ui->comboComputer->clear();
ui->comboComputer->addItems(computersLocations->getAllComputersOfLocation(arg1));
}

33
DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.h.bak
View File

@@ -1,33 +0,0 @@
#ifndef DIALOGEDITTRAINEE_H
#define DIALOGEDITTRAINEE_H
#include <QDialog>
#include "trainee.h"
#include "computersLocations.h"
namespace Ui {
class DialogEditTrainee;
}
class DialogEditTrainee : public QDialog
{
Q_OBJECT
public:
explicit DialogEditTrainee(ComputersLocations* computersLocations, QWidget *parent = nullptr);
~DialogEditTrainee();
void setTrainee(Trainee trainee);
Trainee getTrainee();
private slots:
void on_comboLocation_currentIndexChanged(const QString &arg1);
private:
Ui::DialogEditTrainee *ui;
ComputersLocations* computersLocations;
QString nameGroup;
};
#endif // DIALOGEDITTRAINEE_H

13
DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.ui
View File

@@ -20,7 +20,7 @@
<string>Trainee</string>
</property>
<property name="windowIcon">
<iconset resource="../resources.qrc">
<iconset>
<normaloff>:/icons/trainee.png</normaloff>:/icons/trainee.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
@@ -136,8 +136,8 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/icons/archive.png</normaloff>
<disabledoff>:/icons/archive.png</disabledoff>:/icons/archive.png</iconset>
<normaloff>:/resources/icons/archive.png</normaloff>
<disabledoff>:/resources/icons/archive.png</disabledoff>:/resources/icons/archive.png</iconset>
</property>
<property name="checkable">
<bool>true</bool>
@@ -163,8 +163,11 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/icons/circleGreen.png</normaloff>
<disabledoff>:/icons/circleGreen.png</disabledoff>:/icons/circleGreen.png</iconset>
<normaloff>:/resources/icons/circleGreen.png</normaloff>
<disabledoff>:/resources/icons/circleGreen.png</disabledoff>:/resources/icons/circleGreen.png</iconset>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>

6
DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp
View File

@@ -348,7 +348,7 @@ void EditorTrainees::on_treeWidget_currentItemChanged(QTreeWidgetItem *current,
ui->btnArchive->setEnabled(true);
ui->btnToOrFromArchiveTrainee->setText(tr("To archive"));
ui->btnToOrFromArchiveTrainee->setIcon(QIcon(QStringLiteral(":/icons/traineeArchive.png")));
ui->btnToOrFromArchiveTrainee->setIcon(QIcon(QStringLiteral(":/resources/icons/traineeArchive.png")));
}
else
{//Выбран обучаемый
@@ -366,14 +366,14 @@ void EditorTrainees::on_treeWidget_currentItemChanged(QTreeWidgetItem *current,
//ui->btnDeleteTrainee->setEnabled(true);
ui->btnToOrFromArchiveTrainee->setText(tr("From archive"));
ui->btnToOrFromArchiveTrainee->setIcon(QIcon(QStringLiteral(":/icons/traineeFromArchive.png")));
ui->btnToOrFromArchiveTrainee->setIcon(QIcon(QStringLiteral(":/resources/icons/traineeFromArchive.png")));
}
else
{//Не Архивный
//ui->btnDeleteTrainee->setEnabled(false);
ui->btnToOrFromArchiveTrainee->setText(tr("To archive"));
ui->btnToOrFromArchiveTrainee->setIcon(QIcon(QStringLiteral(":/icons/traineeArchive.png")));
ui->btnToOrFromArchiveTrainee->setIcon(QIcon(QStringLiteral(":/resources/icons/traineeArchive.png")));
}
if(connectorToServer->isLoggedInTrainee(id_trainee))

14
DB_IaT/InstructorsAndTrainees/trainees/editortrainees.ui
View File

@@ -55,7 +55,7 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/icons/newGroup.png</normaloff>:/icons/newGroup.png</iconset>
<normaloff>:/resources/icons/newGroup.png</normaloff>:/resources/icons/newGroup.png</iconset>
</property>
<property name="iconSize">
<size>
@@ -93,7 +93,7 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/icons/deleteGroup.png</normaloff>:/icons/deleteGroup.png</iconset>
<normaloff>:/resources/icons/deleteGroup.png</normaloff>:/resources/icons/deleteGroup.png</iconset>
</property>
<property name="iconSize">
<size>
@@ -131,7 +131,7 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/icons/addTrainee.png</normaloff>:/icons/addTrainee.png</iconset>
<normaloff>:/resources/icons/addTrainee.png</normaloff>:/resources/icons/addTrainee.png</iconset>
</property>
<property name="iconSize">
<size>
@@ -169,7 +169,7 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/icons/deleteTrainee.png</normaloff>:/icons/deleteTrainee.png</iconset>
<normaloff>:/resources/icons/deleteTrainee.png</normaloff>:/resources/icons/deleteTrainee.png</iconset>
</property>
<property name="iconSize">
<size>
@@ -207,7 +207,7 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/icons/traineeArchive.png</normaloff>:/icons/traineeArchive.png</iconset>
<normaloff>:/resources/icons/traineeArchive.png</normaloff>:/resources/icons/traineeArchive.png</iconset>
</property>
<property name="iconSize">
<size>
@@ -245,7 +245,7 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/icons/edit.png</normaloff>:/icons/edit.png</iconset>
<normaloff>:/resources/icons/edit.png</normaloff>:/resources/icons/edit.png</iconset>
</property>
<property name="iconSize">
<size>
@@ -296,7 +296,7 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/icons/archive.png</normaloff>:/icons/archive.png</iconset>
<normaloff>:/resources/icons/archive.png</normaloff>:/resources/icons/archive.png</iconset>
</property>
<property name="iconSize">
<size>

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

@@ -115,7 +115,7 @@ void TraineesView::loadTraineesFromDB()
QTreeWidgetItem *ItemGroup = new QTreeWidgetItem(treeWidget);
ItemGroup->setText(ColumnsTreeTrainees::clmn_ID, QString::number(group.getID()));
ItemGroup->setText(ColumnsTreeTrainees::clmn_Trainee, group.getName());
ItemGroup->setIcon(ColumnsTreeTrainees::clmn_Trainee, QIcon(QStringLiteral(":/icons/group.png")));
ItemGroup->setIcon(ColumnsTreeTrainees::clmn_Trainee, QIcon(QStringLiteral(":/resources/icons/group.png")));
setItemColor(ItemGroup, QColor(170, 190, 170));
//ItemGroup->set Property("greenButton", QVariant(true));
@@ -144,13 +144,13 @@ void TraineesView::loadTraineesFromDB()
if(trainee.getArchived())
{//Архивный
ItemTrainee->setText(ColumnsTreeTrainees::clmn_Archived, tr("yes"));
ItemTrainee->setIcon(ColumnsTreeTrainees::clmn_Trainee, QIcon(QStringLiteral(":/icons/archive.png")));
ItemTrainee->setIcon(ColumnsTreeTrainees::clmn_Trainee, QIcon(QStringLiteral(":/resources/icons/archive.png")));
setItemColorArchive(ItemTrainee);
}
else
{//Не Архивный
ItemTrainee->setText(ColumnsTreeTrainees::clmn_Archived, tr("no"));
ItemTrainee->setIcon(ColumnsTreeTrainees::clmn_Trainee, QIcon(QStringLiteral(":/icons/trainee.png")));
ItemTrainee->setIcon(ColumnsTreeTrainees::clmn_Trainee, QIcon(QStringLiteral(":/resources/icons/trainee.png")));
setItemColorNoArchive(ItemTrainee);
cntChildsNotArchived++;
}
@@ -158,12 +158,12 @@ void TraineesView::loadTraineesFromDB()
if(trainee.getLoggedIn())
{//Залогинен
ItemTrainee->setText(ColumnsTreeTrainees::clmn_Logged, tr("yes"));
ItemTrainee->setIcon(ColumnsTreeTrainees::clmn_Logged, QIcon(QStringLiteral(":/icons/circleGreen.png")));
ItemTrainee->setIcon(ColumnsTreeTrainees::clmn_Logged, QIcon(QStringLiteral(":/resources/icons/circleGreen.png")));
}
else
{//Не Залогинен
ItemTrainee->setText(ColumnsTreeTrainees::clmn_Logged, tr("no"));
ItemTrainee->setIcon(ColumnsTreeTrainees::clmn_Logged, QIcon(QStringLiteral(":/icons/circleGray.png")));
ItemTrainee->setIcon(ColumnsTreeTrainees::clmn_Logged, QIcon(QStringLiteral(":/resources/icons/circleGray.png")));
}
QString tasksStr;

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

@@ -69,7 +69,7 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/icons/DB-trainees.png</normaloff>:/icons/DB-trainees.png</iconset>
<normaloff>:/resources/icons/DB-trainees.png</normaloff>:/resources/icons/DB-trainees.png</iconset>
</property>
<property name="iconSize">
<size>