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

refact

Browse Source
This commit is contained in:
Кривошеин Андрей
2025-12-25 13:47:00 +03:00
parent a06f7653c5
commit 645dc130f4
2 changed files with 27 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
LibInstructorsAndTrainees/tasks/checkertask.cpp
View File

@@ -202,12 +202,16 @@ void CheckerTask::outReport(FIMReport report)
ui->plainText->appendHtml(str); ui->plainText->appendHtml(str);
*/ */
//AMM/FIM
str = QString("<p style=\"color:gray;\">%1</p>").arg(item.procedure.doc);
ui->plainText->appendHtml(str);
//Title //Title
str = QString("<p style=\"color:blue;\">%1</p>").arg(item.procedure.title); str = QString("<p style=\"color:blue;\">%1</p>").arg(item.procedure.title);
ui->plainText->appendHtml(str); ui->plainText->appendHtml(str);
//DMcode //DMcode
str = QString("<p>%1</p>").arg(item.procedure.dmCode); str = QString("<p style=\"color:gray;\">%1</p>").arg(item.procedure.dmCode);
ui->plainText->appendHtml(str); ui->plainText->appendHtml(str);
//Result //Result
@@ -220,10 +224,10 @@ void CheckerTask::outReport(FIMReport report)
ui->plainText->appendHtml(str); ui->plainText->appendHtml(str);
//Text //Text
str = QString("<p style=\"color:green;\">%1</p>").arg(item.text); str = QString("<p style=\"color:gray;\">%1 %2</p>").arg(tr("Comment:"), item.text);
ui->plainText->appendHtml(str); ui->plainText->appendHtml(str);
//ui->plainText->appendHtml("<br>"); ui->plainText->appendHtml("<br>");
} }
//ui->plainText->appendHtml("<br>"); //ui->plainText->appendHtml("<br>");
@@ -248,8 +252,8 @@ void CheckerTask::outReport(FIMReport report)
flNeedMMEL = true; flNeedMMEL = true;
// имя GameObject-а в сцене // имя GameObject-а в сцене
str = QString("<p>%1</p>").arg(whItem.goName); //str = QString("<p>%1</p>").arg(whItem.goName);
ui->plainText->appendHtml(str); //ui->plainText->appendHtml(str);
// человеческое название прибора // человеческое название прибора
str = QString("<p>%1</p>").arg(whItem.objName); str = QString("<p>%1</p>").arg(whItem.objName);
@@ -259,7 +263,7 @@ void CheckerTask::outReport(FIMReport report)
str = QString("<p>%1</p>").arg(whItem.code); str = QString("<p>%1</p>").arg(whItem.code);
ui->plainText->appendHtml(str); ui->plainText->appendHtml(str);
//ui->plainText->appendHtml("<br>"); ui->plainText->appendHtml("<br>");
} }
//ui->plainText->appendHtml("<br>"); //ui->plainText->appendHtml("<br>");
@@ -267,14 +271,21 @@ void CheckerTask::outReport(FIMReport report)
if(flNeedMMEL) if(flNeedMMEL)
{ {
QString strMMEL = tr("Trainee believes that:"); QString strMMEL = tr("Trainee believes that:");
if(report.mmel)
strMMEL += tr("The aircraft may operate with its equipment removed in accordance with the \"Master Minimum Equipment List\"");
else
strMMEL += tr("The aircraft cannot be flown with equipment removed in accordance with the \"Master Minimum Equipment List\"");
str = QString("<p style=\"color:gray;\">%1</p>").arg(strMMEL); str = QString("<p style=\"color:gray;\">%1</p>").arg(strMMEL);
ui->plainText->appendHtml(str); 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);
}
} }
} }

35
LibServer/Systems/Parsers/processparser.cpp
View File

@@ -221,43 +221,16 @@ void ProcessParser::clientUnityTaskFIMreport(QXmlStreamReader &xmlReader, Client
} }
else if(reportItemNode.nodeName() == "mmel") 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; 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); listTasks.append(task);