diff --git a/InstructorsAndTrainees/instructors/instructorsview.cpp b/InstructorsAndTrainees/instructors/instructorsview.cpp index 1ab1788..caaca23 100644 --- a/InstructorsAndTrainees/instructors/instructorsview.cpp +++ b/InstructorsAndTrainees/instructors/instructorsview.cpp @@ -25,7 +25,7 @@ void InstructorsView::slot_NeedUpdateUI(bool treeInstructor, bool treeTrainee) if(adminMode) { treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_ID, false); - treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_Archived, false); + treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_Archived, true); } else { @@ -49,11 +49,11 @@ void InstructorsView::preparationTreeWidget() treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_ID, 50); 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_Administrator, 100); - treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Archived, 100); - treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Logged, 100); + treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Archived, 80); + treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Logged, 80); if(typeView == TypeView::onlyView) {//onlyView @@ -77,7 +77,8 @@ void InstructorsView::preparationTreeWidget() if(adminMode) { - + treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_ID, false); + treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_Archived, false); } else { diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp index 9ca8258..5b99bf9 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -65,15 +65,29 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : ui->horizontalLayout_3->addWidget(viewerTrainees); - ui->horizontalLayout_3->addWidget(messangerWidget); - ui->verticalLayout_1->addWidget(viewerInstructors); - ui->verticalLayout_2->addWidget(ammTasksWidget); - ui->verticalLayout_2->addWidget(fimTasksWidget); + QWidget* wGB2 = new QWidget(this); + QHBoxLayout* lGB2 = new QHBoxLayout(this); + 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(); - viewerTrainees->setMinimumHeight(800); - viewerInstructors->setMinimumSize(1800, 300); - messangerWidget->setMinimumSize(500, 600); + viewerTrainees->setMaximumWidth(1050); + //viewerInstructors->setMinimumSize(500, 200); + //viewerInstructors->setMaximumHeight(400); + + viewerInstructors->setMinimumSize(500, 400); + viewerInstructors->setMaximumWidth(500); + + messangerWidget->setMinimumSize(500, 800); messangerWidget->setMaximumWidth(500); //ui->btnAuthorizationInstructor->setEnabled(false); diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.ui b/InstructorsAndTrainees/instructorsandtraineeswidget.ui index 7b72e42..8c36119 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.ui +++ b/InstructorsAndTrainees/instructorsandtraineeswidget.ui @@ -20,7 +20,7 @@ Form - + @@ -236,6 +236,42 @@ + + + + Tasks + + + + + + 1 + + + + AMM + + + + + + + + + + FIM + + + + + + + + + + + + diff --git a/InstructorsAndTrainees/messanger/messangerwidget.ui b/InstructorsAndTrainees/messanger/messangerwidget.ui index 6b4da74..ff637d9 100644 --- a/InstructorsAndTrainees/messanger/messangerwidget.ui +++ b/InstructorsAndTrainees/messanger/messangerwidget.ui @@ -119,16 +119,6 @@ Tab 1 - - - - 110 - 30 - 256 - 192 - - - diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp index f64fade..a561561 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp @@ -30,6 +30,7 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, QWidget *pa preparationTreeWidget(); ui->btnAssignTaskToTrainee->setEnabled(false); + ui->btnUpdateTasks->setVisible(false); threadPreparation = new QThread(); taskTreePreparation = new TaskTreePreparation(); diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.ui b/InstructorsAndTrainees/tasks/ammtaskswidget.ui index b23e553..f248f9a 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.ui +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.ui @@ -21,54 +21,45 @@ - + - - - AMM - - - - - - - - - - - Code - - - - - - - true - - - - - - - - - - - Update List - - - - - - - Assign task - - - - - - - + + + + + + + + Code + + + + + + + true + + + + + + + + + + + Update List + + + + + + + Assign task + + + + diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp index caf7049..5d455e0 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp @@ -2,6 +2,7 @@ #include #include #include +#include #include "fimtaskswidget.h" #include "ui_fimtaskswidget.h" #include "tasksAmmFim.h" @@ -10,10 +11,14 @@ FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, QWidget *pa QWidget(parent), ui(new Ui::FIMtasksWidget), connectorToServer(connectorToServer), + treeWidget(nullptr), + userName(""), loginTraineeSelected("") { ui->setupUi(this); + qDebug() << "FIMtasksWidget init thread ID " << QThread::currentThreadId(); + treeWidget = new QTreeWidget(); ui->horizontalLayout_1->addWidget(treeWidget); @@ -22,6 +27,7 @@ FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, QWidget *pa preparationTreeWidget(); ui->btnAssignTaskToTrainee->setEnabled(false); + ui->btnUpdateTasks->setVisible(false); } FIMtasksWidget::~FIMtasksWidget() @@ -145,8 +151,8 @@ void FIMtasksWidget::fillTree() itemTask->setText(0, task->title); itemTask->setText(1, QString::number(task->id)); - itemTask->setFlags(itemTask->flags() | Qt::ItemIsUserCheckable); - itemTask->setCheckState(0, Qt::Checked); + //itemTask->setFlags(itemTask->flags() | Qt::ItemIsUserCheckable); + //itemTask->setCheckState(0, Qt::Checked); itemTask->setIcon(0, QIcon(":/resources/icons/procedure.png")); treeWidget->addTopLevelItem(itemTask); @@ -201,11 +207,13 @@ void FIMtasksWidget::reSetHeadTreeWidget() void FIMtasksWidget::slot_NeedUpdateUI() { + qDebug() << "FIMtasksWidget::slot_NeedUpdateUI thread ID " << QThread::currentThreadId(); loadTasksFIM(); } void FIMtasksWidget::slot_traineeSelected(QString login) { + qDebug() << "FIMtasksWidget::slot_traineeSelected thread ID " << QThread::currentThreadId(); loginTraineeSelected = login; } @@ -241,6 +249,17 @@ void FIMtasksWidget::deleteAllTaskAmmFim() 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() { connectorToServer->sendQueryTasksXML("fim"); @@ -265,5 +284,7 @@ void FIMtasksWidget::on_btnAssignTaskToTrainee_clicked() taskNew.title = task->title; connectorToServer->sendQueryToDB(TypeQueryToDB::TYPE_QUERY_ASSIGN_TASK_FIM_TO_TRAINEE, trainee_id, &taskNew); + + updateTaskItem(current); } } diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.h b/InstructorsAndTrainees/tasks/fimtaskswidget.h index 3be156c..2db7732 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.h +++ b/InstructorsAndTrainees/tasks/fimtaskswidget.h @@ -43,18 +43,18 @@ public Q_SLOTS: void slot_traineeSelected(QString login); private: + TaskAmmFim* getTaskByID(int id); void loadFIMtasksFromXML(QByteArray array); + void fillTree(); void preparationTreeWidget(); void reSetHeadTreeWidget(); - - void fillTree(); - void loadTasksFIM(); - TaskAmmFim* getTaskByID(int id); void deleteAllTaskAmmFim(); + void updateTaskItem(QTreeWidgetItem *itemTask); + private: Ui::FIMtasksWidget *ui; ConnectorToServer* connectorToServer; diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.ui b/InstructorsAndTrainees/tasks/fimtaskswidget.ui index df023b4..cf2853d 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.ui +++ b/InstructorsAndTrainees/tasks/fimtaskswidget.ui @@ -15,49 +15,40 @@ - + + + + - - - FIM + + + Update List + + + + + + + Assign task + + + + + + + + + + + Code + + + + + + + true - - - - - - - Update List - - - - - - - Assign task - - - - - - - - - - - Code - - - - - - - - - - - - diff --git a/InstructorsAndTrainees/trainees/traineesview.cpp b/InstructorsAndTrainees/trainees/traineesview.cpp index da57579..cee8a3b 100644 --- a/InstructorsAndTrainees/trainees/traineesview.cpp +++ b/InstructorsAndTrainees/trainees/traineesview.cpp @@ -24,7 +24,7 @@ void TraineesView::slot_NeedUpdateUI(bool treeInstructor, bool treeTrainee) if(adminMode) { treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_ID, false); - treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_Archived, false); + treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_Archived, true); } else { @@ -46,16 +46,16 @@ void TraineesView::preparationTreeWidget() reSetHeadTreeWidget(); - treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_ID, 80); + treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_ID, 50); 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_Class, 130); - treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Computer, 130); + treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Class, 100); + treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Computer, 100); treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_IP_address, 130); - treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Archived, 100); - treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Logged, 100); - treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Tasks, 200); + treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Archived, 80); + treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Logged, 80); + treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Tasks, 60); if(typeView == TypeView::onlyView) @@ -79,7 +79,8 @@ void TraineesView::preparationTreeWidget() if(adminMode) { - + treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_ID, false); + treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_Archived, false); } else {