From 05d4e02d026f2fae08c66006533053568faf7cab Mon Sep 17 00:00:00 2001
From: krivoshein <krivoshein@msk.constanta-design.ru>
Date: Wed, 1 Oct 2025 17:23:50 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B8=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B8=20=D0=B8=20?=
 =?UTF-8?q?DMcode=20=20=D0=B2=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?=
 =?UTF-8?q?=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DOCS/Андрей/Board.md                         |  2 +-
 InstructorsAndTrainees/tasks/checkertask.cpp | 29 +++++++-
 InstructorsAndTrainees/tasks/checkertask.ui  | 74 +++++++++++++++++++-
 3 files changed, 101 insertions(+), 4 deletions(-)

diff --git a/DOCS/Андрей/Board.md b/DOCS/Андрей/Board.md
index e6c04b3..a069a07 100644
--- a/DOCS/Андрей/Board.md
+++ b/DOCS/Андрей/Board.md
@@ -11,6 +11,7 @@ kanban-plugin: board
 
 ## Complete
 
+- [ ] Добавить текущий статус задачи в "Проверке задачи" (AMM, FIM)
 - [ ] выдавать trainee_id при авторизации и вытащить передачу Trainee ID из тасок
 - [ ] Подсчет учебного времени -  дельта между включением и выключением
 - [ ] регистрация времени включения и выключения тренажера (по приходу уходу пакета is unity) с регистрацие БД
@@ -74,7 +75,6 @@ kanban-plugin: board
 
 - [ ] Введение логина только латиницей
 - [ ] Блокировка авторизации не работает при входе в редакторы И/О
-- [ ] Добавить текущий статус задачи в "Проверке задачи" (AMM, FIM)
 
 
 ## Замечания Кирилл
diff --git a/InstructorsAndTrainees/tasks/checkertask.cpp b/InstructorsAndTrainees/tasks/checkertask.cpp
index 967297c..b0ab2ac 100644
--- a/InstructorsAndTrainees/tasks/checkertask.cpp
+++ b/InstructorsAndTrainees/tasks/checkertask.cpp
@@ -21,6 +21,8 @@ CheckerTask::CheckerTask(ConnectorToServer* connectorToServer, QString type, QWi
         fimTasksWidget = new FIMtasksWidget(nullptr, TypeListTreeAMMFIM::listOneTask, this);
 
         ui->verticalLayout_3->addWidget(fimTasksWidget);
+        ui->lblName->setVisible(false);
+        ui->lblDMcode->setVisible(false);
 
         ui->plainText->setReadOnly(true);
         ui->plainText->setObjectName("plainText");
@@ -29,7 +31,7 @@ CheckerTask::CheckerTask(ConnectorToServer* connectorToServer, QString type, QWi
     {
         ui->plainText->setVisible(false);
         ui->label->setVisible(false);
-        ui->label_2->setVisible(false);
+        //ui->label_Task->setVisible(false);
         ui->btnRight->setText(tr("Completed"));
         ui->btnWrong->setText(tr("New"));
         ui->btnWrong->setIcon(QIcon(QStringLiteral(":/resources/icons/circleGray.png")));
@@ -73,6 +75,31 @@ void CheckerTask::setTask(TaskAmmFim* task)
             ui->btnRight->setEnabled(true);
         else
             ui->btnWrong->setEnabled(true);
+
+        ui->lblName->setText(task->ammProcedure.title);
+        ui->lblDMcode->setText(task->ammProcedure.dmCode);
+    }
+
+    //Статус
+    if(this->task.status == "completed")
+    {
+        ui->lblStatusCurrText->setText(tr("completed"));
+        ui->lblStatusCurrIco->setPixmap(QPixmap(QStringLiteral(":/resources/icons/circleGreen.png")));
+    }
+    else if(this->task.status == "failed")
+    {
+        ui->lblStatusCurrText->setText(tr("failed"));
+        ui->lblStatusCurrIco->setPixmap(QPixmap(QStringLiteral(":/resources/icons/circleRed.png")));
+    }
+    else if(this->task.status == "checkup")
+    {
+        ui->lblStatusCurrText->setText(tr("checkup"));
+        ui->lblStatusCurrIco->setPixmap(QPixmap(QStringLiteral(":/resources/icons/circleYellow.png")));
+    }
+    else
+    {
+        ui->lblStatusCurrText->setText(tr("new"));
+        ui->lblStatusCurrIco->setPixmap(QPixmap(QStringLiteral(":/resources/icons/circleGray.png")));
     }
 }
 
diff --git a/InstructorsAndTrainees/tasks/checkertask.ui b/InstructorsAndTrainees/tasks/checkertask.ui
index 026d626..691a5f2 100644
--- a/InstructorsAndTrainees/tasks/checkertask.ui
+++ b/InstructorsAndTrainees/tasks/checkertask.ui
@@ -16,14 +16,84 @@
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_5">
+       <item>
+        <widget class="QLabel" name="label_Task">
+         <property name="text">
+          <string>Task</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_4">
+         <item>
+          <widget class="QLabel" name="lblStatusCurrIco">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>32</width>
+             <height>32</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>32</width>
+             <height>32</height>
+            </size>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+           <property name="pixmap">
+            <pixmap resource="../resources.qrc">:/resources/icons/rectGray.png</pixmap>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="lblStatusCurrText">
+           <property name="text">
+            <string>TextLabel</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout_3">
        <item>
         <layout class="QVBoxLayout" name="verticalLayout_3">
          <item>
-          <widget class="QLabel" name="label_2">
+          <widget class="QLabel" name="lblName">
            <property name="text">
-            <string>Task</string>
+            <string>Name</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="lblDMcode">
+           <property name="text">
+            <string>DM Code</string>
            </property>
           </widget>
          </item>