From b5ea06ce9a3902fd1fcdff8d678b007e96c2eb7a Mon Sep 17 00:00:00 2001 From: krivoshein Date: Fri, 24 Jan 2025 16:39:12 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5=D0=B9?= =?UTF-8?q?=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- InstructorsAndTrainees/commonview.cpp | 2 +- .../instructors/instructorsview.cpp | 40 +++---------------- .../instructorsandtraineeswidget.cpp | 14 ++++--- .../trainees/traineesview.cpp | 38 ++---------------- 4 files changed, 19 insertions(+), 75 deletions(-) diff --git a/InstructorsAndTrainees/commonview.cpp b/InstructorsAndTrainees/commonview.cpp index aa7ab43..8e6bb54 100644 --- a/InstructorsAndTrainees/commonview.cpp +++ b/InstructorsAndTrainees/commonview.cpp @@ -9,7 +9,7 @@ CommonView::CommonView(ConnectorToServer* connectorToServer, TypeView type, QWid treeWidget(nullptr), typeView(type), archiveVisible(false), - notLoggedInVisible(false), + notLoggedInVisible(true), adminMode(false), authComplited(false), lastCurrentID(0), diff --git a/InstructorsAndTrainees/instructors/instructorsview.cpp b/InstructorsAndTrainees/instructors/instructorsview.cpp index caaca23..784e9ce 100644 --- a/InstructorsAndTrainees/instructors/instructorsview.cpp +++ b/InstructorsAndTrainees/instructors/instructorsview.cpp @@ -10,29 +10,6 @@ InstructorsView::InstructorsView(ConnectorToServer* connectorToServer, TypeView void InstructorsView::slot_NeedUpdateUI(bool treeInstructor, bool treeTrainee) { - if(typeView == TypeView::onlyView) - { - if(adminMode) - archiveVisible = false; - else - archiveVisible = false; - } - else - { - archiveVisible = true; - } - - if(adminMode) - { - treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_ID, false); - treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_Archived, true); - } - else - { - treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_ID, true); - treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_Archived, true); - } - updateButtons(); if(treeInstructor) @@ -49,31 +26,24 @@ void InstructorsView::preparationTreeWidget() treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_ID, 50); treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Instructor, 250); - treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Login, 80); + treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Login, 100); treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Password, 100); - treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Administrator, 100); + treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Administrator, 120); treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Archived, 80); - treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Logged, 80); + treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Logged, 100); if(typeView == TypeView::onlyView) {//onlyView + archiveVisible = false; + treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_ID, true); - //treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_Login, true); treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_Password, true); treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_Archived, true); treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_Administrator, true); - - if(adminMode) - archiveVisible = false; - else - archiveVisible = false; - - notLoggedInVisible = true; } else {//control archiveVisible = true; - notLoggedInVisible = true; if(adminMode) { diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp index 5b99bf9..274b9c0 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -80,15 +80,19 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : ui->verticalLayout_2->addWidget(viewerInstructors); ui->btnSetVersion->hide(); + + viewerTrainees->setMinimumSize(500, 500); viewerTrainees->setMaximumWidth(1050); - //viewerInstructors->setMinimumSize(500, 200); - //viewerInstructors->setMaximumHeight(400); - viewerInstructors->setMinimumSize(500, 400); + wGB2->setMinimumSize(500, 500); + //wGB2->setMaximumWidth(1050); + + viewerInstructors->setMinimumSize(400, 400); viewerInstructors->setMaximumWidth(500); + viewerInstructors->setMaximumHeight(400); - messangerWidget->setMinimumSize(500, 800); - messangerWidget->setMaximumWidth(500); + messangerWidget->setMinimumSize(500, 500); + messangerWidget->setMaximumWidth(500); //ui->btnAuthorizationInstructor->setEnabled(false); diff --git a/InstructorsAndTrainees/trainees/traineesview.cpp b/InstructorsAndTrainees/trainees/traineesview.cpp index cee8a3b..e6350fe 100644 --- a/InstructorsAndTrainees/trainees/traineesview.cpp +++ b/InstructorsAndTrainees/trainees/traineesview.cpp @@ -9,29 +9,6 @@ TraineesView::TraineesView(ConnectorToServer* connectorToServer, TypeView type, void TraineesView::slot_NeedUpdateUI(bool treeInstructor, bool treeTrainee) { - if(typeView == TypeView::onlyView) - { - if(adminMode) - archiveVisible = false; - else - archiveVisible = false; - } - else - { - archiveVisible = true; - } - - if(adminMode) - { - treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_ID, false); - treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_Archived, true); - } - else - { - treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_ID, true); - treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_Archived, true); - } - updateButtons(); if(treeTrainee) @@ -48,34 +25,27 @@ void TraineesView::preparationTreeWidget() treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_ID, 50); treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Trainee, 250); - treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Login, 80); + treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Login, 100); treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Password, 100); treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Class, 100); treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Computer, 100); treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_IP_address, 130); treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Archived, 80); - treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Logged, 80); + treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Logged, 100); treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Tasks, 60); if(typeView == TypeView::onlyView) {//onlyView + archiveVisible = false; + treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_ID, true); - //treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_Login, true); treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_Password, true); treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_Archived, true); - - if(adminMode) - archiveVisible = false; - else - archiveVisible = false; - - notLoggedInVisible = true; } else {//control archiveVisible = true; - notLoggedInVisible = true; if(adminMode) {