report upgrade 2

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("<b>Report ID: %1</b>").arg(QString::number(report.id));
-    ui->plainText->appendHtml(str);
-    ui->plainText->appendHtml("<br>");
-    */
-
-    //Действия обучаемого
-    str = QString("<b>%1</b>").arg(tr("Trainee's actions:"));
-    ui->plainText->appendHtml(str);
-
-    for(FIMReportItem item : report.itemList)
-    {
-        /*
-        //Item ID
-        str = QString("<p>Item ID: %1</p>").arg(QString::number(item.id));
-        ui->plainText->appendHtml(str);
-        */
-
-        //AMM/FIM
-        str = QString("<p style=\"color:gray;\">%1</p>").arg(item.procedure.doc);
-        ui->plainText->appendHtml(str);
-
-        //Title
-        str = QString("<p style=\"color:blue;\">%1</p>").arg(item.procedure.title);
-        ui->plainText->appendHtml(str);
-
-        //DMcode
-        str = QString("<p style=\"color:gray;\">%1</p>").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("<p>%1</p>").arg(str);
-        ui->plainText->appendHtml(str);
-
-        //Text
-        str = QString("<p style=\"color:gray;\">%1 %2</p>").arg(tr("Comment:"), item.text);
-        ui->plainText->appendHtml(str);
-
-        ui->plainText->appendHtml("<br>");
-    }
-
-    //ui->plainText->appendHtml("<br>");
-
-    //Устройства/приборы
-    bool flNeedMMEL = false;
-    str = QString("<b>%1</b>").arg(tr("Devices/instruments:"));
-    ui->plainText->appendHtml(str);
-
-    for(FIMReportWarehouseItem whItem : report.warehouseItemList)
-    {
-        /*
-        //WhItem ID
-        str = QString("<p>WhItem ID: %1</p>").arg(QString::number(whItem.id));
-        ui->plainText->appendHtml(str);
-        */
-
-        // статус GameObject-а в сцене
-        str = QString("<p>%1</p>").arg(getStatusStr(whItem.status));
-        ui->plainText->appendHtml(str);
-        if(whItem.status == 0)
-            flNeedMMEL = true;
-
-        // имя GameObject-а в сцене
-        //str = QString("<p>%1</p>").arg(whItem.goName);
-        //ui->plainText->appendHtml(str);
-
-        // человеческое название прибора
-        str = QString("<p>%1</p>").arg(whItem.objName);
-        ui->plainText->appendHtml(str);
-
-        // его код из документации
-        str = QString("<p>%1</p>").arg(whItem.code);
-        ui->plainText->appendHtml(str);
-
-        ui->plainText->appendHtml("<br>");
-    }
-
-    //ui->plainText->appendHtml("<br>");
-
-    if(flNeedMMEL)
-    {
-        QString strMMEL = tr("Trainee believes that:");
-        str = QString("<p style=\"color:gray;\">%1</p>").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("<p style=\"color:green;\">%1</p>").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("<p style=\"color:orange;\">%1</p>").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()
 {

LibInstructorsAndTrainees/tasks/checkertask.h

@@ -3,7 +3,6 @@
 
 #include <QWidget>
 #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;

LibInstructorsAndTrainees/tasks/checkertask.ui

@@ -133,22 +133,6 @@
                 </property>
                 <layout class="QGridLayout" name="gridLayout_2">
                  <item row="0" column="0">
-                  <widget class="QPlainTextEdit" name="plainText">
-                   <property name="sizePolicy">
-                    <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-                     <horstretch>0</horstretch>
-                     <verstretch>0</verstretch>
-                    </sizepolicy>
-                   </property>
-                   <property name="minimumSize">
-                    <size>
-                     <width>0</width>
-                     <height>0</height>
-                    </size>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="1" column="0">
                   <layout class="QHBoxLayout" name="horizontalLayout_ReportWidget"/>
                  </item>
                 </layout>