From 645dc130f496365c536156bc9bcdaf9bd01d1c53 Mon Sep 17 00:00:00 2001
From: krivoshein <krivoshein@msk.constanta-design.ru>
Date: Thu, 25 Dec 2025 13:47:00 +0300
Subject: [PATCH] refact

---
 .../tasks/checkertask.cpp                     | 35 ++++++++++++-------
 LibServer/Systems/Parsers/processparser.cpp   | 35 +++----------------
 2 files changed, 27 insertions(+), 43 deletions(-)

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("<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>%1</p>").arg(item.procedure.dmCode);
+        str = QString("<p style=\"color:gray;\">%1</p>").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("<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("<br>");
+        ui->plainText->appendHtml("<br>");
     }
 
     //ui->plainText->appendHtml("<br>");
@@ -248,8 +252,8 @@ void CheckerTask::outReport(FIMReport report)
             flNeedMMEL = true;
 
         // имя GameObject-а в сцене
-        str = QString("<p>%1</p>").arg(whItem.goName);
-        ui->plainText->appendHtml(str);
+        //str = QString("<p>%1</p>").arg(whItem.goName);
+        //ui->plainText->appendHtml(str);
 
         // человеческое название прибора
         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);
         ui->plainText->appendHtml(str);
 
-        //ui->plainText->appendHtml("<br>");
+        ui->plainText->appendHtml("<br>");
     }
 
     //ui->plainText->appendHtml("<br>");
@@ -267,14 +271,21 @@ void CheckerTask::outReport(FIMReport report)
     if(flNeedMMEL)
     {
         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);
         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);
+        }
     }
 }
 
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);