Изменение статуса ФИМ. Закончил

LibInstructorsAndTrainees/messanger/messangerwidget.cpp

@@ -3,6 +3,7 @@
 #include <QAbstractScrollArea>
 #include <QMessageBox>
 #include <QLabel>
+#include <QScrollBar>
 #include "instructor.h"
 #include "messangerwidget.h"
 #include "ui_messangerwidget.h"
@@ -85,6 +86,8 @@ void MessangerWidget::addTabDialogMessenger(User user)
 
         oneDialogMessenger = new OneDialogMessenger(userLocalGUI, userRemote, this);
 
+        oneDialogMessenger->setVerticalScrollMode(QAbstractItemView::ScrollMode::ScrollPerPixel);
+
         ui->verticalLayout_ListMsg->addWidget(oneDialogMessenger);
 
         //Обновляем заголовок

LibInstructorsAndTrainees/messanger/messangerwidget.ui

@@ -85,7 +85,7 @@
             <string/>
            </property>
            <property name="pixmap">
-            <pixmap resource="../../ServerLMS/ServerLMS.qrc">:/resources/icons/circleGray.png</pixmap>
+            <pixmap resource="../InstructorsAndTrainees.qrc">:/resources/icons/circleGray.png</pixmap>
            </property>
           </widget>
          </item>
@@ -128,7 +128,7 @@
           <string>Send</string>
          </property>
          <property name="icon">
-          <iconset>
+          <iconset resource="../InstructorsAndTrainees.qrc">
            <normaloff>:/resources/icons/sendMsg.png</normaloff>:/resources/icons/sendMsg.png</iconset>
          </property>
          <property name="iconSize">
@@ -149,7 +149,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../ServerLMS/ServerLMS.qrc"/>
+  <include location="../InstructorsAndTrainees.qrc"/>
  </resources>
  <connections/>
 </ui>

LibInstructorsAndTrainees/messanger/tabdialogmessenger.cpp

@@ -15,6 +15,10 @@ OneDialogMessenger::OneDialogMessenger(User userLocalGUI, User userRemote, QWidg
 
     setWordWrap(true);
     setVerticalScrollBarPolicy(Qt::ScrollBarPolicy::ScrollBarAlwaysOn);
+
+    setVerticalScrollMode(ScrollMode::ScrollPerPixel);
+
+    verticalScrollBar()->setSingleStep(10);
 }
 
 OneDialogMessenger::~OneDialogMessenger()

LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp

@@ -35,6 +35,8 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeListTre
         treeWidget->setObjectName("treeWidget_AMMforTrainee");
     ui->horizontalLayout_Tree->addWidget(treeWidget);
 
+    treeWidget->setFocusPolicy(Qt::FocusPolicy::NoFocus);
+
     connect(treeWidget, &QTreeWidget::itemClicked, this, &AMMtasksWidget::on_treeWidgetItemClicked);
     connect(treeWidget, &QTreeWidget::itemDoubleClicked, this, &AMMtasksWidget::on_treeWidgetDoubleClicked);
 
@@ -77,6 +79,18 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeListTre
         ui->btnDelete->setVisible(false);
         ui->btnStatus->setVisible(false);
     }
+    else if(type == TypeListTreeAMMFIM::listOneTask)
+    {
+        ui->btnDelete->setVisible(false);
+        ui->btnStatus->setVisible(false);
+        ui->btnAssignTask->setVisible(false);
+        ui->btnOnlyActive->setVisible(false);
+        ui->btnDocsUpdating->setVisible(false);
+        ui->label_DocsActualed->setVisible(false);
+        ui->label_Actual->setVisible(false);
+        this->treeWidget->headerItem()->setHidden(true);
+        this->treeWidget->setSelectionMode(QAbstractItemView::SelectionMode::NoSelection);
+    }
     else
     {
         ui->btnOnlyActive->setVisible(false);
@@ -117,6 +131,13 @@ void AMMtasksWidget::deactivate()
     idTraineeSelected = 0;
 }
 
+void AMMtasksWidget::setOneTaskAmm(TaskAmmFim *task)
+{
+    QList<TaskAmmFim> listTask;
+    listTask.append(*task);
+    emit signal_prepareAMMListItemsForTrainee(listTask);
+}
+
 void AMMtasksWidget::waitAnimationWidgetShowWithPlay()
 {
     waitAnimationWidget->showWithPlay();
@@ -282,7 +303,7 @@ void AMMtasksWidget::loadTasksAMM(bool flRequestFirst)
 
 void AMMtasksWidget::slot_AMMlistItemsReady(QList<QTreeWidgetItem *> listItems)
 {
-    if(type != TypeListTreeAMMFIM::listForTrainee)
+    if(type != TypeListTreeAMMFIM::listForTrainee && type != TypeListTreeAMMFIM::listOneTask)
     {
         //Обновление дерева
         treeWidget->clear();
@@ -296,6 +317,13 @@ void AMMtasksWidget::slot_AMMlistItemsReady(QList<QTreeWidgetItem *> listItems)
     if(item != nullptr)
         treeWidget->setCurrentItem(item);
         */
+    QTreeWidgetItem * item = treeWidget->topLevelItem(0);
+    if(item != nullptr)
+    {
+        //treeWidget->setCurrentItem(item);
+        if(type == TypeListTreeAMMFIM::listOneTask)
+            treeWidget->expandAll();
+    }
 
     if(type == TypeListTreeAMMFIM::listForTrainee)
         setCurrentTask(lastCurrentID);
@@ -363,7 +391,7 @@ void AMMtasksWidget::preparationTreeWidget()
 
     reSetHeadTreeWidget();
 
-    if(type == TypeListTreeAMMFIM::listCommon)
+    if(type == TypeListTreeAMMFIM::listCommon || type == TypeListTreeAMMFIM::listOneTask)
     {
         treeWidget->setColumnHidden(ColumnsTreeAMM::clmnAMM_ID, true);
         treeWidget->setColumnHidden(ColumnsTreeAMM::clmnAMM_status, true);

LibInstructorsAndTrainees/tasks/ammtaskswidget.h

@@ -26,6 +26,7 @@ public:
 
 public:
     void deactivate();
+    void setOneTaskAmm(TaskAmmFim* task);
     void waitAnimationWidgetShowWithPlay();
 
     void setDocsActualed(bool flActualed);

LibInstructorsAndTrainees/tasks/checkertask.cpp

@@ -2,12 +2,14 @@
 #include "specialmessagebox.h"
 #include "ui_checkertask.h"
 #include "fimtaskswidget.h"
+#include "ammtaskswidget.h"
 
 CheckerTask::CheckerTask(ConnectorToServer* connectorToServer, TypeChecker type, QWidget *parent) :
     QWidget(parent),
     ui(new Ui::CheckerTask),
     connectorToServer(connectorToServer),
     fimTasksWidget(nullptr),
+    ammTasksWidget(nullptr),
     flChanged(false),
     id_task(0),
     type(TypeChecker::fim_check)
@@ -34,11 +36,19 @@ CheckerTask::CheckerTask(ConnectorToServer* connectorToServer, TypeChecker type,
     }
     else if(type == TypeChecker::amm_check)
     {
+        ammTasksWidget = new AMMtasksWidget(nullptr, TypeListTreeAMMFIM::listOneTask, this);
+        ui->verticalLayout_3->addWidget(ammTasksWidget);
+
+        ui->lblName->setVisible(false);
+        ui->lblDMcode->setVisible(false);
+
         ui->plainText->setVisible(false);
         ui->label->setVisible(false);
 
         ui->btnWrong->setEnabled(false);
         ui->btnCheckup->setEnabled(false);
+        ui->btnWrong->setVisible(false);
+        ui->btnCheckup->setVisible(false);
     }
 }
 
@@ -50,6 +60,12 @@ CheckerTask::~CheckerTask()
         fimTasksWidget = nullptr;
     }
 
+    if(ammTasksWidget)
+    {
+        delete ammTasksWidget;
+        ammTasksWidget = nullptr;
+    }
+
     delete ui;
 }
 
@@ -77,6 +93,9 @@ void CheckerTask::setTask(TaskAmmFim* task)
             ui->btnCheckup->setEnabled(false);
             ui->btnWrong->setEnabled(false);
             ui->btnCompleted->setEnabled(false);
+
+            ui->plainText->setVisible(false);
+            ui->label->setVisible(false);
         }
         else if(this->task.status == "checkup")
         {
@@ -109,6 +128,9 @@ void CheckerTask::setTask(TaskAmmFim* task)
     }
     else if(type == TypeChecker::amm_check)
     {
+        //Задача
+        ammTasksWidget->setOneTaskAmm(&this->task);
+
         if(this->task.status == "new")
         {
             ui->btnNew->setEnabled(false);

LibInstructorsAndTrainees/tasks/checkertask.h

@@ -13,6 +13,7 @@ class CheckerTask;
 }
 
 class FIMtasksWidget;
+class AMMtasksWidget;
 
 class CheckerTask : public QWidget
 {
@@ -56,6 +57,7 @@ private:
 private:
     ConnectorToServer* connectorToServer;
     FIMtasksWidget* fimTasksWidget;
+    AMMtasksWidget* ammTasksWidget;
 
     bool flChanged;
     int id_task;

LibInstructorsAndTrainees/tasks/dialogchekertask.cpp

@@ -23,7 +23,7 @@ DialogChekerTask::DialogChekerTask(ConnectorToServer* connectorToServer, Checker
         break;
     case CheckerTask::TypeChecker::amm_check:
         this->setWindowTitle(tr("Status Task"));
-        this->setMinimumSize(400, 200);
+        this->setMinimumSize(1400, 500);
         break;
     default:
         break;

LibInstructorsAndTrainees/tasks/fimtaskswidget.cpp

@@ -32,6 +32,8 @@ FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, TypeListTre
     treeWidget = new QTreeWidget();
     ui->horizontalLayout_Tree->addWidget(treeWidget);
 
+    treeWidget->setFocusPolicy(Qt::FocusPolicy::NoFocus);
+
     //connect(treeWidget, &QTreeWidget::currentItemChanged, this, &FIMtasksWidget::on_treeWidgetCurrentItemChanged);
     connect(treeWidget, &QTreeWidget::itemClicked, this, &FIMtasksWidget::on_treeWidgetItemClicked);
 
@@ -465,6 +467,7 @@ void FIMtasksWidget::setCurrentTask(int id)
             if(item->text(ColumnsTreeFIM::clmnFIM_ID).toInt() == id)
             {
                 treeWidget->setCurrentItem(item);
+                treeWidget->itemClicked(item, 0);
                 return;
             }
     }

LibInstructorsAndTrainees/tasks/fimtaskswidget.h

@@ -27,7 +27,7 @@ public:
 
 public:
     void deactivate();
-    void setOneTaskFim(TaskAmmFim* task); //FIM
+    void setOneTaskFim(TaskAmmFim* task);
     void waitAnimationWidgetShowWithPlay();
 
 public:

LibInstructorsAndTrainees/tasks/listsubproc.cpp

@@ -14,6 +14,8 @@ ListSubProc::ListSubProc(QWidget *parent) :
     treeWidget = new QTreeWidget();
     ui->horizontalLayout_Tree->addWidget(treeWidget);
 
+    treeWidget->setFocusPolicy(Qt::FocusPolicy::NoFocus);
+
     preparationTreeWidget();
 }
 

LibInstructorsAndTrainees/tasks/listsubproc.ui

@@ -72,7 +72,7 @@
           <string>Assign</string>
          </property>
          <property name="icon">
-          <iconset resource="../../ServerLMS/ServerLMS.qrc">
+          <iconset resource="../InstructorsAndTrainees.qrc">
            <normaloff>:/resources/icons/circleGreen.png</normaloff>:/resources/icons/circleGreen.png</iconset>
          </property>
          <property name="iconSize">
@@ -93,7 +93,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../ServerLMS/ServerLMS.qrc"/>
+  <include location="../InstructorsAndTrainees.qrc"/>
  </resources>
  <connections/>
 </ui>

LibInstructorsAndTrainees/tasks/subprocitemwidget.ui

@@ -43,6 +43,15 @@
        <property name="frameShadow">
         <enum>QFrame::Sunken</enum>
        </property>
+       <property name="verticalScrollBarPolicy">
+        <enum>Qt::ScrollBarAlwaysOff</enum>
+       </property>
+       <property name="horizontalScrollBarPolicy">
+        <enum>Qt::ScrollBarAlwaysOff</enum>
+       </property>
+       <property name="autoScroll">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
     </layout>

LibInstructorsAndTrainees/tasks/tasktreepreparation.cpp

@@ -531,7 +531,7 @@ void TaskAMMFIMTreePreparation::slot_prepareAMMListItemsForTrainee(QList<TaskAmm
         item->setToolTip(0, text);
 
 
-        if(type == TypeListTreeAMMFIM::listForTrainee)
+        if(type == TypeListTreeAMMFIM::listForTrainee || type == TypeListTreeAMMFIM::listOneTask)
         {
             //Подпроцедуры
             if(task.listSubProc.count())
@@ -635,7 +635,7 @@ void TaskAMMFIMTreePreparation::slot_prepareFIMListItems(QByteArray array)
                     itemSign->setText(ColumnsTreeFIM::clmnFIM_Title, sign.description);
                     //itemSign->setFlags(itemSign->flags() | Qt::ItemIsUserCheckable);
                     //itemSign->setCheckState(ColumnsTreeFIM::clmnFIM_Title, Qt::Checked);
-                    itemSign->setIcon(ColumnsTreeFIM::clmnFIM_Title, QIcon(":/resources/icons/sign.png"));
+                    itemSign->setIcon(ColumnsTreeFIM::clmnFIM_Title, QIcon(":/resources/icons/sign.png").pixmap(24, 24));
                     itemSign->setToolTip(ColumnsTreeFIM::clmnFIM_Title, sign.description);
 
                     itemMalfunction->addChild(itemSign);