diff --git a/LibInstructorsAndTrainees/tasks/checkertask.cpp b/LibInstructorsAndTrainees/tasks/checkertask.cpp index 697eda8..4dcd143 100644 --- a/LibInstructorsAndTrainees/tasks/checkertask.cpp +++ b/LibInstructorsAndTrainees/tasks/checkertask.cpp @@ -34,9 +34,6 @@ CheckerTask::CheckerTask(ConnectorToServer* connectorToServer, TypeChecker type, ui->lblName->setVisible(false); ui->lblDMcode->setVisible(false); - ui->plainText->setReadOnly(true); - ui->plainText->setObjectName("plainText"); - reportFimWidget = new ReportFimWidget(this); ui->horizontalLayout_ReportWidget->addWidget(reportFimWidget); } @@ -48,7 +45,6 @@ CheckerTask::CheckerTask(ConnectorToServer* connectorToServer, TypeChecker type, ui->lblName->setVisible(false); ui->lblDMcode->setVisible(false); - ui->plainText->setVisible(false); ui->groupBox_Report->setVisible(false); ui->btnWrong->setEnabled(false); @@ -56,8 +52,6 @@ CheckerTask::CheckerTask(ConnectorToServer* connectorToServer, TypeChecker type, ui->btnWrong->setVisible(false); ui->btnCheckup->setVisible(false); } - - ui->plainText->setVisible(false); } CheckerTask::~CheckerTask() @@ -99,8 +93,6 @@ void CheckerTask::setTask(TaskAmmFim* task) fimTasksWidget->setOneTaskFim(&this->task); //Репорт - outReport(this->task.report); - reportFimWidget->setReport(this->task.report); if(this->task.status == "new") @@ -110,7 +102,6 @@ void CheckerTask::setTask(TaskAmmFim* task) ui->btnWrong->setEnabled(false); ui->btnCompleted->setEnabled(false); - ui->plainText->setVisible(false); ui->groupBox_Report->setVisible(false); } else if(this->task.status == "checkup") @@ -196,129 +187,6 @@ void CheckerTask::setModule(Module *module) id_task = this->module.getID(); } -void CheckerTask::outReport(FIMReport report) -{ - QString str; - /* - str = QString("Report ID: %1").arg(QString::number(report.id)); - ui->plainText->appendHtml(str); - ui->plainText->appendHtml("
"); - */ - - //Действия обучаемого - str = QString("%1").arg(tr("Trainee's actions:")); - ui->plainText->appendHtml(str); - - for(FIMReportItem item : report.itemList) - { - /* - //Item ID - str = QString("

Item ID: %1

").arg(QString::number(item.id)); - ui->plainText->appendHtml(str); - */ - - //AMM/FIM - str = QString("

%1

").arg(item.procedure.doc); - ui->plainText->appendHtml(str); - - //Title - str = QString("

%1

").arg(item.procedure.title); - ui->plainText->appendHtml(str); - - //DMcode - str = QString("

%1

").arg(item.procedure.dmCode); - ui->plainText->appendHtml(str); - - //Result - str = item.procedure.result; - if(str == "viewed") - str = tr("viewed"); - else if(str == "completed") - str = tr("completed"); - str = QString("

%1

").arg(str); - ui->plainText->appendHtml(str); - - //Text - str = QString("

%1 %2

").arg(tr("Comment:"), item.text); - ui->plainText->appendHtml(str); - - ui->plainText->appendHtml("
"); - } - - //ui->plainText->appendHtml("
"); - - //Устройства/приборы - bool flNeedMMEL = false; - str = QString("%1").arg(tr("Devices/instruments:")); - ui->plainText->appendHtml(str); - - for(FIMReportWarehouseItem whItem : report.warehouseItemList) - { - /* - //WhItem ID - str = QString("

WhItem ID: %1

").arg(QString::number(whItem.id)); - ui->plainText->appendHtml(str); - */ - - // статус GameObject-а в сцене - str = QString("

%1

").arg(getStatusStr(whItem.status)); - ui->plainText->appendHtml(str); - if(whItem.status == 0) - flNeedMMEL = true; - - // имя GameObject-а в сцене - //str = QString("

%1

").arg(whItem.goName); - //ui->plainText->appendHtml(str); - - // человеческое название прибора - str = QString("

%1

").arg(whItem.objName); - ui->plainText->appendHtml(str); - - // его код из документации - str = QString("

%1

").arg(whItem.code); - ui->plainText->appendHtml(str); - - ui->plainText->appendHtml("
"); - } - - //ui->plainText->appendHtml("
"); - - if(flNeedMMEL) - { - QString strMMEL = tr("Trainee believes that:"); - str = QString("

%1

").arg(strMMEL); - ui->plainText->appendHtml(str); - - if(report.mmel) - { - strMMEL = tr("The aircraft may operate with its equipment removed in accordance with the \"Master Minimum Equipment List\""); - str = QString("

%1

").arg(strMMEL); - ui->plainText->appendHtml(str); - } - else - { - strMMEL = tr("The aircraft cannot be flown with equipment removed in accordance with the \"Master Minimum Equipment List\""); - str = QString("

%1

").arg(strMMEL); - ui->plainText->appendHtml(str); - } - } -} - -QString CheckerTask::getStatusStr(int status) -{ - switch (status) - { - //демонтировано - case 0: return tr("dismantled"); - //неисправно - case 1: return tr("faulty"); - //заменено на новое со склада - case 2: return tr("replaced with a new one from the warehouse"); - //unknown - default: return "unknown"; - } -} - //НЕВЕРНО void CheckerTask::on_btnWrong_clicked() { diff --git a/LibInstructorsAndTrainees/tasks/checkertask.h b/LibInstructorsAndTrainees/tasks/checkertask.h index 80d699d..1e3b6dc 100644 --- a/LibInstructorsAndTrainees/tasks/checkertask.h +++ b/LibInstructorsAndTrainees/tasks/checkertask.h @@ -3,7 +3,6 @@ #include #include "tasksAmmFim.h" -//#include "fimtaskswidget.h" #include "module.h" #include "connectortoserver.h" #include "specialmessagebox.h" @@ -46,10 +45,6 @@ private slots: void on_btnNew_clicked(); void on_btnCheckup_clicked(); -private: - void outReport(FIMReport report); - QString getStatusStr(int status); - private: TaskAmmFim task; Module module; diff --git a/LibInstructorsAndTrainees/tasks/checkertask.ui b/LibInstructorsAndTrainees/tasks/checkertask.ui index cbb7279..999f4c4 100644 --- a/LibInstructorsAndTrainees/tasks/checkertask.ui +++ b/LibInstructorsAndTrainees/tasks/checkertask.ui @@ -133,22 +133,6 @@ - - - - 0 - 0 - - - - - 0 - 0 - - - - -