mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git
synced 2026-03-28 19:55:48 +03:00
Подправил интерфейс
This commit is contained in:
@@ -9,7 +9,7 @@ CommonView::CommonView(ConnectorToServer* connectorToServer, TypeView type, QWid
|
|||||||
treeWidget(nullptr),
|
treeWidget(nullptr),
|
||||||
typeView(type),
|
typeView(type),
|
||||||
archiveVisible(false),
|
archiveVisible(false),
|
||||||
notLoggedInVisible(false),
|
notLoggedInVisible(true),
|
||||||
adminMode(false),
|
adminMode(false),
|
||||||
authComplited(false),
|
authComplited(false),
|
||||||
lastCurrentID(0),
|
lastCurrentID(0),
|
||||||
|
|||||||
@@ -10,29 +10,6 @@ InstructorsView::InstructorsView(ConnectorToServer* connectorToServer, TypeView
|
|||||||
|
|
||||||
void InstructorsView::slot_NeedUpdateUI(bool treeInstructor, bool treeTrainee)
|
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();
|
updateButtons();
|
||||||
|
|
||||||
if(treeInstructor)
|
if(treeInstructor)
|
||||||
@@ -49,31 +26,24 @@ 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, 80);
|
treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Login, 100);
|
||||||
treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Password, 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_Archived, 80);
|
||||||
treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Logged, 80);
|
treeWidget->setColumnWidth(ColumnsTreeInsructors::clmn_Logged, 100);
|
||||||
|
|
||||||
if(typeView == TypeView::onlyView)
|
if(typeView == TypeView::onlyView)
|
||||||
{//onlyView
|
{//onlyView
|
||||||
|
archiveVisible = false;
|
||||||
|
|
||||||
treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_ID, true);
|
treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_ID, true);
|
||||||
//treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_Login, true);
|
|
||||||
treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_Password, true);
|
treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_Password, true);
|
||||||
treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_Archived, true);
|
treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_Archived, true);
|
||||||
treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_Administrator, true);
|
treeWidget->setColumnHidden(ColumnsTreeInsructors::clmn_Administrator, true);
|
||||||
|
|
||||||
if(adminMode)
|
|
||||||
archiveVisible = false;
|
|
||||||
else
|
|
||||||
archiveVisible = false;
|
|
||||||
|
|
||||||
notLoggedInVisible = true;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{//control
|
{//control
|
||||||
archiveVisible = true;
|
archiveVisible = true;
|
||||||
notLoggedInVisible = true;
|
|
||||||
|
|
||||||
if(adminMode)
|
if(adminMode)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -80,15 +80,19 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
|
|||||||
ui->verticalLayout_2->addWidget(viewerInstructors);
|
ui->verticalLayout_2->addWidget(viewerInstructors);
|
||||||
|
|
||||||
ui->btnSetVersion->hide();
|
ui->btnSetVersion->hide();
|
||||||
|
|
||||||
|
viewerTrainees->setMinimumSize(500, 500);
|
||||||
viewerTrainees->setMaximumWidth(1050);
|
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->setMaximumWidth(500);
|
||||||
|
viewerInstructors->setMaximumHeight(400);
|
||||||
|
|
||||||
messangerWidget->setMinimumSize(500, 800);
|
messangerWidget->setMinimumSize(500, 500);
|
||||||
messangerWidget->setMaximumWidth(500);
|
messangerWidget->setMaximumWidth(500);
|
||||||
|
|
||||||
//ui->btnAuthorizationInstructor->setEnabled(false);
|
//ui->btnAuthorizationInstructor->setEnabled(false);
|
||||||
|
|
||||||
|
|||||||
@@ -9,29 +9,6 @@ TraineesView::TraineesView(ConnectorToServer* connectorToServer, TypeView type,
|
|||||||
|
|
||||||
void TraineesView::slot_NeedUpdateUI(bool treeInstructor, bool treeTrainee)
|
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();
|
updateButtons();
|
||||||
|
|
||||||
if(treeTrainee)
|
if(treeTrainee)
|
||||||
@@ -48,34 +25,27 @@ void TraineesView::preparationTreeWidget()
|
|||||||
|
|
||||||
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_ID, 50);
|
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_ID, 50);
|
||||||
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Trainee, 250);
|
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_Password, 100);
|
||||||
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Class, 100);
|
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Class, 100);
|
||||||
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Computer, 100);
|
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, 80);
|
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Archived, 80);
|
||||||
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Logged, 80);
|
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Logged, 100);
|
||||||
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Tasks, 60);
|
treeWidget->setColumnWidth(ColumnsTreeTrainees::clmn_Tasks, 60);
|
||||||
|
|
||||||
|
|
||||||
if(typeView == TypeView::onlyView)
|
if(typeView == TypeView::onlyView)
|
||||||
{//onlyView
|
{//onlyView
|
||||||
|
archiveVisible = false;
|
||||||
|
|
||||||
treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_ID, true);
|
treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_ID, true);
|
||||||
//treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_Login, true);
|
|
||||||
treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_Password, true);
|
treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_Password, true);
|
||||||
treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_Archived, true);
|
treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_Archived, true);
|
||||||
|
|
||||||
if(adminMode)
|
|
||||||
archiveVisible = false;
|
|
||||||
else
|
|
||||||
archiveVisible = false;
|
|
||||||
|
|
||||||
notLoggedInVisible = true;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{//control
|
{//control
|
||||||
archiveVisible = true;
|
archiveVisible = true;
|
||||||
notLoggedInVisible = true;
|
|
||||||
|
|
||||||
if(adminMode)
|
if(adminMode)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user