diff --git a/LibInstructorsAndTrainees/tasks/checkertask.cpp b/LibInstructorsAndTrainees/tasks/checkertask.cpp index 2a1cef4..7828467 100644 --- a/LibInstructorsAndTrainees/tasks/checkertask.cpp +++ b/LibInstructorsAndTrainees/tasks/checkertask.cpp @@ -202,12 +202,16 @@ void CheckerTask::outReport(FIMReport report) 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); + str = QString("%1
").arg(item.procedure.dmCode); ui->plainText->appendHtml(str); //Result @@ -220,10 +224,10 @@ void CheckerTask::outReport(FIMReport report) ui->plainText->appendHtml(str); //Text - str = QString("%1
").arg(item.text); + str = QString("%1 %2
").arg(tr("Comment:"), item.text); ui->plainText->appendHtml(str); - //ui->plainText->appendHtml("%1
").arg(whItem.goName); - ui->plainText->appendHtml(str); + //str = QString("%1
").arg(whItem.goName); + //ui->plainText->appendHtml(str); // человеческое название прибора str = QString("%1
").arg(whItem.objName); @@ -259,7 +263,7 @@ void CheckerTask::outReport(FIMReport report) str = QString("%1
").arg(whItem.code); ui->plainText->appendHtml(str); - //ui->plainText->appendHtml("%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); + } } } diff --git a/LibServer/Systems/Parsers/processparser.cpp b/LibServer/Systems/Parsers/processparser.cpp index c8d5189..bf7540c 100644 --- a/LibServer/Systems/Parsers/processparser.cpp +++ b/LibServer/Systems/Parsers/processparser.cpp @@ -221,43 +221,16 @@ void ProcessParser::clientUnityTaskFIMreport(QXmlStreamReader &xmlReader, Client } else if(reportItemNode.nodeName() == "mmel") { - report.mmel = (reportItemNode.nodeValue() == "true" ? true : false); + QString str1 = reportItemNode.nodeValue(); + QString str2 = reportItemNode.toElement().text(); + + report.mmel = (reportItemNode.toElement().text() == "true" ? true : false); } } task.report = report; } } - /* - - //TODO -------------- (!Заглушка!) Отчет о выполнении - FIMReport report; - FIMReportItem reportItem; - QString text; // текст, вводимый обучаемым - ProcedureID procedure; // ссылка на процедуру, при необходимости - - text = "1. Выполнил такую процедуру"; - procedure.doc = "fim"; - procedure.title = "Процедура №1"; - procedure.dmCode = "RRJ-N-27-92-00-51D01-420A-A"; - procedure.result = "viewed"; - reportItem.text = text; - reportItem.procedure = procedure; - report.itemList.append(reportItem); - - text = "2. Выполнил такую процедуру"; - procedure.doc = "fim"; - procedure.title = "Процедура №2"; - procedure.dmCode = "RRJ-N-28-22-00-01A01-420A-A"; - procedure.result = "viewed"; - reportItem.text = text; - reportItem.procedure = procedure; - report.itemList.append(reportItem); - - task.report = report; - //----------------- - */ - listTasks.append(task);