Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-27 19:45:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

переименовал CheckerTask

Browse Source
This commit is contained in:
Кривошеин Андрей
2025-09-18 11:26:03 +03:00
parent 9f4120c2d1
commit af243cc4d8
7 changed files with 30 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
InstructorsAndTrainees/CMakeLists.txt
View File

@@ -90,9 +90,9 @@ add_library(InstructorsAndTrainees SHARED
tasks/fimtaskswidget.ui tasks/fimtaskswidget.ui
tasks/tasktreepreparation.cpp tasks/tasktreepreparation.cpp
tasks/tasktreepreparation.h tasks/tasktreepreparation.h
tasks/dialogchecktask.cpp tasks/checkertask.cpp
tasks/dialogchecktask.h tasks/checkertask.h
tasks/dialogchecktask.ui tasks/checkertask.ui
widgets/newversionwidget.cpp widgets/newversionwidget.cpp
widgets/newversionwidget.h widgets/newversionwidget.h
widgets/newversionwidget.ui widgets/newversionwidget.ui

4
InstructorsAndTrainees/tasks/ammtaskswidget.cpp
View File

@@ -6,7 +6,7 @@
#include <QResizeEvent> #include <QResizeEvent>
#include "ammtaskswidget.h" #include "ammtaskswidget.h"
#include "ui_ammtaskswidget.h" #include "ui_ammtaskswidget.h"
#include "dialogchecktask.h" #include "checkertask.h"
#include "specialmessagebox.h" #include "specialmessagebox.h"
AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeListTreeAMMFIM type, QWidget *parent) : AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeListTreeAMMFIM type, QWidget *parent) :
@@ -329,7 +329,7 @@ void AMMtasksWidget::on_btnCheck_clicked()
if(!task.getID()) if(!task.getID())
return; return;
DialogCheckTask dlg(connectorToServer, "amm", this); CheckerTask dlg(connectorToServer, "amm", this);
dlg.setTask(&task); dlg.setTask(&task);

22
InstructorsAndTrainees/tasks/dialogchecktask.cpp → InstructorsAndTrainees/tasks/checkertask.cpp
View File

@@ -1,10 +1,10 @@
#include "dialogchecktask.h" #include "checkertask.h"
#include "specialmessagebox.h" #include "specialmessagebox.h"
#include "ui_dialogchecktask.h" #include "ui_checkertask.h"
DialogCheckTask::DialogCheckTask(ConnectorToServer* connectorToServer, QString type, QWidget *parent) : CheckerTask::CheckerTask(ConnectorToServer* connectorToServer, QString type, QWidget *parent) :
QWidget(parent), QWidget(parent),
ui(new Ui::DialogCheckTask), ui(new Ui::CheckerTask),
connectorToServer(connectorToServer), connectorToServer(connectorToServer),
fimTasksWidget(nullptr), fimTasksWidget(nullptr),
flChanged(false), flChanged(false),
@@ -38,7 +38,7 @@ DialogCheckTask::DialogCheckTask(ConnectorToServer* connectorToServer, QString t
} }
} }
DialogCheckTask::~DialogCheckTask() CheckerTask::~CheckerTask()
{ {
if(fimTasksWidget) if(fimTasksWidget)
{ {
@@ -48,7 +48,7 @@ DialogCheckTask::~DialogCheckTask()
delete ui; delete ui;
} }
void DialogCheckTask::setTask(TaskAmmFim* task) void CheckerTask::setTask(TaskAmmFim* task)
{ {
this->task = *task; this->task = *task;
id_task = task->getID(); id_task = task->getID();
@@ -70,18 +70,18 @@ void DialogCheckTask::setTask(TaskAmmFim* task)
} }
} }
TaskAmmFim DialogCheckTask::getTask() TaskAmmFim CheckerTask::getTask()
{ {
return this->task; return this->task;
} }
void DialogCheckTask::setModule(Module *module) void CheckerTask::setModule(Module *module)
{ {
this->module = *module; this->module = *module;
id_task = this->module.getID(); id_task = this->module.getID();
} }
void DialogCheckTask::outReport(FIMReport report) void CheckerTask::outReport(FIMReport report)
{ {
QString str; QString str;
/* /*
@@ -123,7 +123,7 @@ void DialogCheckTask::outReport(FIMReport report)
} }
} }
void DialogCheckTask::on_btnWrong_clicked() void CheckerTask::on_btnWrong_clicked()
{ {
TypeQueryToDB typeQuery; TypeQueryToDB typeQuery;
QString status; QString status;
@@ -150,7 +150,7 @@ void DialogCheckTask::on_btnWrong_clicked()
} }
} }
void DialogCheckTask::on_btnRight_clicked() void CheckerTask::on_btnRight_clicked()
{ {
TypeQueryToDB typeQuery; TypeQueryToDB typeQuery;
QString status; QString status;

10
InstructorsAndTrainees/tasks/dialogchecktask.h → InstructorsAndTrainees/tasks/checkertask.h
View File

@@ -6,16 +6,16 @@
#include "fimtaskswidget.h" #include "fimtaskswidget.h"
namespace Ui { namespace Ui {
class DialogCheckTask; class CheckerTask;
} }
class DialogCheckTask : public QWidget class CheckerTask : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit DialogCheckTask(ConnectorToServer* connectorToServer, QString type, QWidget *parent = nullptr); explicit CheckerTask(ConnectorToServer* connectorToServer, QString type, QWidget *parent = nullptr);
~DialogCheckTask(); ~CheckerTask();
public: public:
void setTask(TaskAmmFim* task); void setTask(TaskAmmFim* task);
@@ -36,7 +36,7 @@ private:
Module module; Module module;
private: private:
Ui::DialogCheckTask *ui; Ui::CheckerTask *ui;
private: private:
ConnectorToServer* connectorToServer; ConnectorToServer* connectorToServer;
FIMtasksWidget* fimTasksWidget; FIMtasksWidget* fimTasksWidget;

4
InstructorsAndTrainees/tasks/dialogchecktask.ui → InstructorsAndTrainees/tasks/checkertask.ui
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>DialogCheckTask</class> <class>CheckerTask</class>
<widget class="QWidget" name="DialogCheckTask"> <widget class="QWidget" name="CheckerTask">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>

4
InstructorsAndTrainees/tasks/fimtaskswidget.cpp
View File

@@ -7,7 +7,7 @@
#include "fimtaskswidget.h" #include "fimtaskswidget.h"
#include "ui_fimtaskswidget.h" #include "ui_fimtaskswidget.h"
#include "tasksAmmFim.h" #include "tasksAmmFim.h"
#include "dialogchecktask.h" #include "checkertask.h"
#include "specialmessagebox.h" #include "specialmessagebox.h"
FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, TypeListTreeAMMFIM type, QWidget *parent) : FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, TypeListTreeAMMFIM type, QWidget *parent) :
@@ -391,7 +391,7 @@ void FIMtasksWidget::on_btnCheck_clicked()
if(!task.getID()) if(!task.getID())
return; return;
DialogCheckTask* checkTask = new DialogCheckTask(connectorToServer, "fim", this); CheckerTask* checkTask = new CheckerTask(connectorToServer, "fim", this);
checkTask->setTask(&task); checkTask->setTask(&task);

26
InstructorsAndTrainees/trainees/viewertrainees.cpp
View File

@@ -134,33 +134,17 @@ void ViewerTrainees::on_itemDoubleClicked(QTreeWidgetItem *item, int column)
{ {
int id_trainee = connectorToServer->getIdTraineeByLogin(login); int id_trainee = connectorToServer->getIdTraineeByLogin(login);
/*
PersonalCardTrainee* cardTrainee = new PersonalCardTrainee(connectorToServer, messangerController, id_trainee, ammTasksWidgetCommon, fimTasksWidgetCommon, this);
dlgCardTrainee = new QDialog(this,
Qt::WindowSystemMenuHint
| Qt::WindowMaximizeButtonHint
| Qt::WindowMinimizeButtonHint
| Qt::WindowCloseButtonHint);
QHBoxLayout *layout = new QHBoxLayout(dlgCardTrainee);
layout->addWidget(cardTrainee);
dlgCardTrainee->setWindowTitle(tr("Personal card trainee"));
dlgCardTrainee->setMinimumSize(1400, 700);
dlgCardTrainee->setWindowState(Qt::WindowMaximized);
dlgCardTrainee->setModal(true);
dlgCardTrainee->exec();
*/
dlgCardTrainee = new DialogCardTrainee(connectorToServer, messangerController, id_trainee, ammTasksWidgetCommon, fimTasksWidgetCommon, this); dlgCardTrainee = new DialogCardTrainee(connectorToServer, messangerController, id_trainee, ammTasksWidgetCommon, fimTasksWidgetCommon, this);
dlgCardTrainee->exec(); dlgCardTrainee->exec();
ammTasksWidgetCommon->setParent(this); ammTasksWidgetCommon->setParent(this);
fimTasksWidgetCommon->setParent(this); fimTasksWidgetCommon->setParent(this);
delete dlgCardTrainee; if(dlgCardTrainee)
dlgCardTrainee = nullptr; {
delete dlgCardTrainee;
dlgCardTrainee = nullptr;
}
} }
} }
} }