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

Merge branch 'DEV' into CFI-Update

Browse Source
This commit is contained in:
semenov
2026-01-29 17:27:21 +03:00
parent f3bebaeb26 406769da27
commit 4476b5ccae
14 changed files with 102 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
LibInstructorsAndTrainees/commonview.cpp
View File

@@ -26,6 +26,11 @@ CommonView::CommonView(ConnectorToServer* connectorToServer, TypeView type, QWid
treeWidget->setSortingEnabled(false);
treeWidget->setVerticalScrollMode(QAbstractItemView::ScrollMode::ScrollPerPixel);
treeWidget->verticalScrollBar()->setSingleStep(10);
treeWidget->setHorizontalScrollMode(QAbstractItemView::ScrollMode::ScrollPerPixel);
treeWidget->horizontalScrollBar()->setSingleStep(10);
waitAnimationWidget = new WaitAnimationWidget;
QMovie *movie = new QMovie(":/resources/icons/762.gif");
waitAnimationWidget->initialize(movie,this);

6
LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp
View File

@@ -5,6 +5,7 @@
#include <QThread>
#include <QResizeEvent>
#include <QScrollBar>
#include <QAbstractItemView>
#include "ammtaskswidget.h"
#include "ui_ammtaskswidget.h"
#include "checkertask.h"
@@ -100,6 +101,11 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeListTre
ui->label_Actual->setVisible(false);
ui->btnDocsUpdating->setVisible(false);
}
treeWidget->setVerticalScrollMode(QAbstractItemView::ScrollMode::ScrollPerPixel);
treeWidget->verticalScrollBar()->setSingleStep(10);
treeWidget->setHorizontalScrollMode(QAbstractItemView::ScrollMode::ScrollPerPixel);
treeWidget->horizontalScrollBar()->setSingleStep(10);
}
AMMtasksWidget::~AMMtasksWidget()

5
LibInstructorsAndTrainees/tasks/fimtaskswidget.cpp
View File

@@ -85,6 +85,11 @@ FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, TypeListTre
//ui->verticalLayout->setAlignment(Qt::AlignmentFlag::AlignBottom);
//ui->horizontalLayout_3->setAlignment(Qt::AlignmentFlag::AlignLeft);
}
treeWidget->setVerticalScrollMode(QAbstractItemView::ScrollMode::ScrollPerPixel);
treeWidget->verticalScrollBar()->setSingleStep(10);
treeWidget->setHorizontalScrollMode(QAbstractItemView::ScrollMode::ScrollPerPixel);
treeWidget->horizontalScrollBar()->setSingleStep(10);
}
FIMtasksWidget::~FIMtasksWidget()

5
LibInstructorsAndTrainees/tasks/listsubproc.cpp
View File

@@ -16,6 +16,11 @@ ListSubProc::ListSubProc(QWidget *parent) :
treeWidget->setFocusPolicy(Qt::FocusPolicy::NoFocus);
treeWidget->setVerticalScrollMode(QAbstractItemView::ScrollMode::ScrollPerPixel);
treeWidget->verticalScrollBar()->setSingleStep(10);
treeWidget->setHorizontalScrollMode(QAbstractItemView::ScrollMode::ScrollPerPixel);
treeWidget->horizontalScrollBar()->setSingleStep(10);
preparationTreeWidget();
}

17
LibInstructorsAndTrainees/trainees/personalcardtrainee.cpp
View File

@@ -98,9 +98,20 @@ void PersonalCardTrainee::loadInfo()
TimingOfTrainee timing = trainee.getTiming();
ui->lblTimeOperation->setText(timing.getOperatingTimeS());
ui->lblLoginTime->setText(timing.getEntryTimeS());
ui->lblTimeExit->setText(timing.getExitTimeS());
QTime time0;
time0.setHMS(0, 0, 0);
if(timing.getOperatingTime() == time0)
{
ui->lblTimeOperation->setText(timing.getOperatingTimeS());
ui->lblLoginTime->setText("---");
ui->lblTimeExit->setText("---");
}
else
{
ui->lblTimeOperation->setText(timing.getOperatingTimeS());
ui->lblLoginTime->setText(timing.getEntryTimeS());
ui->lblTimeExit->setText(timing.getExitTimeS());
}
}
void PersonalCardTrainee::slot_countTasksAMMforTraineeChanged(int trainee_id, QString statAMM)