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

commitTMP

Browse Source
This commit is contained in:
krivoshein
2025-01-24 14:40:18 +03:00
parent f30972e52f
commit f25bb386c0
10 changed files with 172 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
InstructorsAndTrainees/instructors/instructorsview.cpp
View File

@@ -25,7 +25,7 @@ void InstructorsView::slot_NeedUpdateUI(bool treeInstructor, bool treeTrainee)
if(adminMode) if(adminMode)
{ {
treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_ID, false); treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_ID, false);
treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_Archived, false); treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_Archived, true);
} }
else else
{ {
@@ -49,11 +49,11 @@ void InstructorsView::preparationTreeWidget()
treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_ID, 50); treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_ID, 50);
treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Instructor, 250); treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Instructor, 250);
treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Login, 100); treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Login, 80);
treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Password, 100); treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Password, 100);
treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Administrator, 100); treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Administrator, 100);
treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Archived, 100); treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Archived, 80);
treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Logged, 100); treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Logged, 80);
if(typeView == TypeView::onlyView) if(typeView == TypeView::onlyView)
{//onlyView {//onlyView
@@ -77,7 +77,8 @@ void InstructorsView::preparationTreeWidget()
if(adminMode) if(adminMode)
{ {
treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_ID, false);
treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_Archived, false);
} }
else else
{ {

28
InstructorsAndTrainees/instructorsandtraineeswidget.cpp
View File

@@ -65,15 +65,29 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
ui->horizontalLayout_3->addWidget(viewerTrainees); ui->horizontalLayout_3->addWidget(viewerTrainees);
ui->horizontalLayout_3->addWidget(messangerWidget);
ui->verticalLayout_1->addWidget(viewerInstructors); QWidget* wGB2 = new QWidget(this);
ui->verticalLayout_2->addWidget(ammTasksWidget); QHBoxLayout* lGB2 = new QHBoxLayout(this);
ui->verticalLayout_2->addWidget(fimTasksWidget); wGB2->setLayout(lGB2);
lGB2->addWidget(ui->groupBox_2);
ui->horizontalLayout_3->addWidget(wGB2);
ui->verticalLayout_41->addWidget(ammTasksWidget);
ui->verticalLayout_42->addWidget(fimTasksWidget);
ui->verticalLayout_2->addWidget(messangerWidget);
ui->verticalLayout_2->addWidget(viewerInstructors);
ui->btnSetVersion->hide(); ui->btnSetVersion->hide();
viewerTrainees->setMinimumHeight(800); viewerTrainees->setMaximumWidth(1050);
viewerInstructors->setMinimumSize(1800, 300); //viewerInstructors->setMinimumSize(500, 200);
messangerWidget->setMinimumSize(500, 600); //viewerInstructors->setMaximumHeight(400);
viewerInstructors->setMinimumSize(500, 400);
viewerInstructors->setMaximumWidth(500);
messangerWidget->setMinimumSize(500, 800);
messangerWidget->setMaximumWidth(500); messangerWidget->setMaximumWidth(500);
//ui->btnAuthorizationInstructor->setEnabled(false); //ui->btnAuthorizationInstructor->setEnabled(false);

38
InstructorsAndTrainees/instructorsandtraineeswidget.ui
View File

@@ -20,7 +20,7 @@
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_0"> <layout class="QHBoxLayout" name="horizontalLayout_0">
<item> <item>
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
@@ -236,6 +236,42 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Tasks</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>1</number>
</property>
<widget class="QWidget" name="tab_1">
<attribute name="title">
<string>AMM</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_41"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_2">
<attribute name="title">
<string>FIM</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_42"/>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<resources> <resources>

10
InstructorsAndTrainees/messanger/messangerwidget.ui
View File

@@ -119,16 +119,6 @@
<attribute name="title"> <attribute name="title">
<string>Tab 1</string> <string>Tab 1</string>
</attribute> </attribute>
<widget class="QListWidget" name="listWidget">
<property name="geometry">
<rect>
<x>110</x>
<y>30</y>
<width>256</width>
<height>192</height>
</rect>
</property>
</widget>
</widget> </widget>
<widget class="QWidget" name="tab_2"> <widget class="QWidget" name="tab_2">
<attribute name="title"> <attribute name="title">

1
InstructorsAndTrainees/tasks/ammtaskswidget.cpp
View File

@@ -30,6 +30,7 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, QWidget *pa
preparationTreeWidget(); preparationTreeWidget();
ui->btnAssignTaskToTrainee->setEnabled(false); ui->btnAssignTaskToTrainee->setEnabled(false);
ui->btnUpdateTasks->setVisible(false);
threadPreparation = new QThread(); threadPreparation = new QThread();
taskTreePreparation = new TaskTreePreparation(); taskTreePreparation = new TaskTreePreparation();

85
InstructorsAndTrainees/tasks/ammtaskswidget.ui
View File

@@ -21,54 +21,45 @@
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QGroupBox" name="groupBox"> <layout class="QHBoxLayout" name="horizontalLayout_1"/>
<property name="title"> </item>
<string>AMM</string> <item>
</property> <layout class="QHBoxLayout" name="horizontalLayout_2">
<layout class="QGridLayout" name="gridLayout_2"> <item>
<item row="0" column="0"> <widget class="QLabel" name="label">
<layout class="QHBoxLayout" name="horizontalLayout_1"/> <property name="text">
</item> <string>Code</string>
<item row="1" column="0"> </property>
<layout class="QHBoxLayout" name="horizontalLayout_2"> </widget>
<item> </item>
<widget class="QLabel" name="label"> <item>
<property name="text"> <widget class="QLineEdit" name="editCode">
<string>Code</string> <property name="readOnly">
</property> <bool>true</bool>
</widget> </property>
</item> </widget>
<item> </item>
<widget class="QLineEdit" name="editCode"> </layout>
<property name="readOnly"> </item>
<bool>true</bool> <item>
</property> <layout class="QHBoxLayout" name="horizontalLayout_3">
</widget> <item>
</item> <widget class="QToolButton" name="btnUpdateTasks">
</layout> <property name="text">
</item> <string>Update List</string>
<item row="2" column="0"> </property>
<layout class="QHBoxLayout" name="horizontalLayout_3"> </widget>
<item> </item>
<widget class="QToolButton" name="btnUpdateTasks"> <item>
<property name="text"> <widget class="QToolButton" name="btnAssignTaskToTrainee">
<string>Update List</string> <property name="text">
</property> <string>Assign task</string>
</widget> </property>
</item> </widget>
<item> </item>
<widget class="QToolButton" name="btnAssignTaskToTrainee"> </layout>
<property name="text">
<string>Assign task</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item> </item>
</layout> </layout>
</item> </item>

25
InstructorsAndTrainees/tasks/fimtaskswidget.cpp
View File

@@ -2,6 +2,7 @@
#include <QFile> #include <QFile>
#include <QMessageBox> #include <QMessageBox>
#include <QTreeWidget> #include <QTreeWidget>
#include <QThread>
#include "fimtaskswidget.h" #include "fimtaskswidget.h"
#include "ui_fimtaskswidget.h" #include "ui_fimtaskswidget.h"
#include "tasksAmmFim.h" #include "tasksAmmFim.h"
@@ -10,10 +11,14 @@ FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, QWidget *pa
QWidget(parent), QWidget(parent),
ui(new Ui::FIMtasksWidget), ui(new Ui::FIMtasksWidget),
connectorToServer(connectorToServer), connectorToServer(connectorToServer),
treeWidget(nullptr),
userName(""),
loginTraineeSelected("") loginTraineeSelected("")
{ {
ui->setupUi(this); ui->setupUi(this);
qDebug() << "FIMtasksWidget init thread ID " << QThread::currentThreadId();
treeWidget = new QTreeWidget(); treeWidget = new QTreeWidget();
ui->horizontalLayout_1->addWidget(treeWidget); ui->horizontalLayout_1->addWidget(treeWidget);
@@ -22,6 +27,7 @@ FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, QWidget *pa
preparationTreeWidget(); preparationTreeWidget();
ui->btnAssignTaskToTrainee->setEnabled(false); ui->btnAssignTaskToTrainee->setEnabled(false);
ui->btnUpdateTasks->setVisible(false);
} }
FIMtasksWidget::~FIMtasksWidget() FIMtasksWidget::~FIMtasksWidget()
@@ -145,8 +151,8 @@ void FIMtasksWidget::fillTree()
itemTask->setText(0, task->title); itemTask->setText(0, task->title);
itemTask->setText(1, QString::number(task->id)); itemTask->setText(1, QString::number(task->id));
itemTask->setFlags(itemTask->flags() | Qt::ItemIsUserCheckable); //itemTask->setFlags(itemTask->flags() | Qt::ItemIsUserCheckable);
itemTask->setCheckState(0, Qt::Checked); //itemTask->setCheckState(0, Qt::Checked);
itemTask->setIcon(0, QIcon(":/resources/icons/procedure.png")); itemTask->setIcon(0, QIcon(":/resources/icons/procedure.png"));
treeWidget->addTopLevelItem(itemTask); treeWidget->addTopLevelItem(itemTask);
@@ -201,11 +207,13 @@ void FIMtasksWidget::reSetHeadTreeWidget()
void FIMtasksWidget::slot_NeedUpdateUI() void FIMtasksWidget::slot_NeedUpdateUI()
{ {
qDebug() << "FIMtasksWidget::slot_NeedUpdateUI thread ID " << QThread::currentThreadId();
loadTasksFIM(); loadTasksFIM();
} }
void FIMtasksWidget::slot_traineeSelected(QString login) void FIMtasksWidget::slot_traineeSelected(QString login)
{ {
qDebug() << "FIMtasksWidget::slot_traineeSelected thread ID " << QThread::currentThreadId();
loginTraineeSelected = login; loginTraineeSelected = login;
} }
@@ -241,6 +249,17 @@ void FIMtasksWidget::deleteAllTaskAmmFim()
listTaskAmmFim.clear(); listTaskAmmFim.clear();
} }
void FIMtasksWidget::updateTaskItem(QTreeWidgetItem *itemTask)
{
for (int i = 0; i < itemTask->childCount(); i++)
{
QTreeWidgetItem* itemMalfunction = itemTask->child(i);
itemMalfunction->setCheckState(0, Qt::Checked);
itemMalfunction->setExpanded(false);
}
itemTask->setExpanded(false);
}
void FIMtasksWidget::on_btnUpdateTasks_clicked() void FIMtasksWidget::on_btnUpdateTasks_clicked()
{ {
connectorToServer->sendQueryTasksXML("fim"); connectorToServer->sendQueryTasksXML("fim");
@@ -265,5 +284,7 @@ void FIMtasksWidget::on_btnAssignTaskToTrainee_clicked()
taskNew.title = task->title; taskNew.title = task->title;
connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_ASSIGN_TASK_FIM_TO_TRAINEE, trainee_id, &taskNew); connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_ASSIGN_TASK_FIM_TO_TRAINEE, trainee_id, &taskNew);
updateTaskItem(current);
} }
} }

8
InstructorsAndTrainees/tasks/fimtaskswidget.h
View File

@@ -43,18 +43,18 @@ public Q_SLOTS:
void slot_traineeSelected(QString login); void slot_traineeSelected(QString login);
private: private:
TaskAmmFim* getTaskByID(int id);
void loadFIMtasksFromXML(QByteArray array); void loadFIMtasksFromXML(QByteArray array);
void fillTree();
void preparationTreeWidget(); void preparationTreeWidget();
void reSetHeadTreeWidget(); void reSetHeadTreeWidget();
void fillTree();
void loadTasksFIM(); void loadTasksFIM();
TaskAmmFim* getTaskByID(int id);
void deleteAllTaskAmmFim(); void deleteAllTaskAmmFim();
void updateTaskItem(QTreeWidgetItem *itemTask);
private: private:
Ui::FIMtasksWidget *ui; Ui::FIMtasksWidget *ui;
ConnectorToServer* connectorToServer; ConnectorToServer* connectorToServer;

73
InstructorsAndTrainees/tasks/fimtaskswidget.ui
View File

@@ -15,49 +15,40 @@
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QHBoxLayout" name="horizontalLayout_1"/>
</item>
<item row="2" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item> <item>
<widget class="QGroupBox" name="groupBox"> <widget class="QToolButton" name="btnUpdateTasks">
<property name="title"> <property name="text">
<string>FIM</string> <string>Update List</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="btnAssignTaskToTrainee">
<property name="text">
<string>Assign task</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Code</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="editCode">
<property name="readOnly">
<bool>true</bool>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="4" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QToolButton" name="btnUpdateTasks">
<property name="text">
<string>Update List</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="btnAssignTaskToTrainee">
<property name="text">
<string>Assign task</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Code</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="editCode"/>
</item>
</layout>
</item>
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_1"/>
</item>
</layout>
</widget> </widget>
</item> </item>
</layout> </layout>

19
InstructorsAndTrainees/trainees/traineesview.cpp
View File

@@ -24,7 +24,7 @@ void TraineesView::slot_NeedUpdateUI(bool treeInstructor, bool treeTrainee)
if(adminMode) if(adminMode)
{ {
treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_ID, false); treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_ID, false);
treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_Archived, false); treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_Archived, true);
} }
else else
{ {
@@ -46,16 +46,16 @@ void TraineesView::preparationTreeWidget()
reSetHeadTreeWidget(); reSetHeadTreeWidget();
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_ID, 80); treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_ID, 50);
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Trainee, 250); treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Trainee, 250);
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Login, 100); treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Login, 80);
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Password, 100); treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Password, 100);
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Class, 130); treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Class, 100);
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Computer, 130); treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Computer, 100);
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_IP_address, 130); treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_IP_address, 130);
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Archived, 100); treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Archived, 80);
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Logged, 100); treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Logged, 80);
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Tasks, 200); treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Tasks, 60);
if(typeView == TypeView::onlyView) if(typeView == TypeView::onlyView)
@@ -79,7 +79,8 @@ void TraineesView::preparationTreeWidget()
if(adminMode) if(adminMode)
{ {
treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_ID, false);
treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_Archived, false);
} }
else else
{ {