переименовал CheckerTask

InstructorsAndTrainees/CMakeLists.txt

@@ -90,9 +90,9 @@ add_library(InstructorsAndTrainees SHARED
   tasks/fimtaskswidget.ui
   tasks/tasktreepreparation.cpp
   tasks/tasktreepreparation.h
-  tasks/dialogchecktask.cpp
-  tasks/dialogchecktask.h
-  tasks/dialogchecktask.ui
+  tasks/checkertask.cpp
+  tasks/checkertask.h
+  tasks/checkertask.ui
   widgets/newversionwidget.cpp
   widgets/newversionwidget.h
   widgets/newversionwidget.ui

InstructorsAndTrainees/tasks/ammtaskswidget.cpp

@@ -6,7 +6,7 @@
 #include <QResizeEvent>
 #include "ammtaskswidget.h"
 #include "ui_ammtaskswidget.h"
-#include "dialogchecktask.h"
+#include "checkertask.h"
 #include "specialmessagebox.h"
 
 AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeListTreeAMMFIM type, QWidget *parent) :
@@ -329,7 +329,7 @@ void AMMtasksWidget::on_btnCheck_clicked()
         if(!task.getID())
             return;
 
-        DialogCheckTask dlg(connectorToServer, "amm", this);        
+        CheckerTask dlg(connectorToServer, "amm", this);        
 
         dlg.setTask(&task);
 

InstructorsAndTrainees/tasks/checkertask.cpp

@@ -1,10 +1,10 @@
-#include "dialogchecktask.h"
+#include "checkertask.h"
 #include "specialmessagebox.h"
-#include "ui_dialogchecktask.h"
+#include "ui_checkertask.h"
 
-DialogCheckTask::DialogCheckTask(ConnectorToServer* connectorToServer, QString type, QWidget *parent) :
+CheckerTask::CheckerTask(ConnectorToServer* connectorToServer, QString type, QWidget *parent) :
     QWidget(parent),
-    ui(new Ui::DialogCheckTask),
+    ui(new Ui::CheckerTask),
     connectorToServer(connectorToServer),
     fimTasksWidget(nullptr),
     flChanged(false),
@@ -38,7 +38,7 @@ DialogCheckTask::DialogCheckTask(ConnectorToServer* connectorToServer, QString t
     }
 }
 
-DialogCheckTask::~DialogCheckTask()
+CheckerTask::~CheckerTask()
 {
     if(fimTasksWidget)
     {
@@ -48,7 +48,7 @@ DialogCheckTask::~DialogCheckTask()
     delete ui;
 }
 
-void DialogCheckTask::setTask(TaskAmmFim* task)
+void CheckerTask::setTask(TaskAmmFim* task)
 {
     this->task = *task;
     id_task = task->getID();
@@ -70,18 +70,18 @@ void DialogCheckTask::setTask(TaskAmmFim* task)
     }
 }
 
-TaskAmmFim DialogCheckTask::getTask()
+TaskAmmFim CheckerTask::getTask()
 {
     return this->task;
 }
 
-void DialogCheckTask::setModule(Module *module)
+void CheckerTask::setModule(Module *module)
 {
     this->module = *module;
     id_task = this->module.getID();
 }
 
-void DialogCheckTask::outReport(FIMReport report)
+void CheckerTask::outReport(FIMReport report)
 {
     QString str;
     /*
@@ -123,7 +123,7 @@ void DialogCheckTask::outReport(FIMReport report)
     }
 }
 
-void DialogCheckTask::on_btnWrong_clicked()
+void CheckerTask::on_btnWrong_clicked()
 {
     TypeQueryToDB typeQuery;
     QString status;
@@ -150,7 +150,7 @@ void DialogCheckTask::on_btnWrong_clicked()
     }
 }
 
-void DialogCheckTask::on_btnRight_clicked()
+void CheckerTask::on_btnRight_clicked()
 {
     TypeQueryToDB typeQuery;
     QString status;

InstructorsAndTrainees/tasks/checkertask.h

@@ -6,16 +6,16 @@
 #include "fimtaskswidget.h"
 
 namespace Ui {
-class DialogCheckTask;
+class CheckerTask;
 }
 
-class DialogCheckTask : public QWidget
+class CheckerTask : public QWidget
 {
     Q_OBJECT
 
 public:
-    explicit DialogCheckTask(ConnectorToServer* connectorToServer, QString type, QWidget *parent = nullptr);
-    ~DialogCheckTask();
+    explicit CheckerTask(ConnectorToServer* connectorToServer, QString type, QWidget *parent = nullptr);
+    ~CheckerTask();
 
 public:
     void setTask(TaskAmmFim* task);
@@ -36,7 +36,7 @@ private:
     Module module;
 
 private:
-    Ui::DialogCheckTask *ui;
+    Ui::CheckerTask *ui;
 private:
     ConnectorToServer* connectorToServer;
     FIMtasksWidget* fimTasksWidget;

InstructorsAndTrainees/tasks/checkertask.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>DialogCheckTask</class>
- <widget class="QWidget" name="DialogCheckTask">
+ <class>CheckerTask</class>
+ <widget class="QWidget" name="CheckerTask">
   <property name="geometry">
    <rect>
     <x>0</x>

InstructorsAndTrainees/tasks/fimtaskswidget.cpp

@@ -7,7 +7,7 @@
 #include "fimtaskswidget.h"
 #include "ui_fimtaskswidget.h"
 #include "tasksAmmFim.h"
-#include "dialogchecktask.h"
+#include "checkertask.h"
 #include "specialmessagebox.h"
 
 FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, TypeListTreeAMMFIM type, QWidget *parent) :
@@ -391,7 +391,7 @@ void FIMtasksWidget::on_btnCheck_clicked()
             if(!task.getID())
                 return;
 
-            DialogCheckTask* checkTask = new DialogCheckTask(connectorToServer, "fim", this);
+            CheckerTask* checkTask = new CheckerTask(connectorToServer, "fim", this);
 
             checkTask->setTask(&task);
 

InstructorsAndTrainees/trainees/viewertrainees.cpp

@@ -134,33 +134,17 @@ void ViewerTrainees::on_itemDoubleClicked(QTreeWidgetItem *item, int column)
         {
             int id_trainee = connectorToServer->getIdTraineeByLogin(login);
 
-
-            /*
-            PersonalCardTrainee* cardTrainee = new PersonalCardTrainee(connectorToServer, messangerController, id_trainee, ammTasksWidgetCommon, fimTasksWidgetCommon, this);
-
-            dlgCardTrainee = new QDialog(this,
-                                            Qt::WindowSystemMenuHint
-                                          | Qt::WindowMaximizeButtonHint
-                                          | Qt::WindowMinimizeButtonHint
-                                          | Qt::WindowCloseButtonHint);
-
-            QHBoxLayout *layout = new QHBoxLayout(dlgCardTrainee);
-            layout->addWidget(cardTrainee);
-            dlgCardTrainee->setWindowTitle(tr("Personal card trainee"));
-            dlgCardTrainee->setMinimumSize(1400, 700);
-            dlgCardTrainee->setWindowState(Qt::WindowMaximized);
-            dlgCardTrainee->setModal(true);
-            dlgCardTrainee->exec();
-            */
-
             dlgCardTrainee = new DialogCardTrainee(connectorToServer, messangerController, id_trainee, ammTasksWidgetCommon, fimTasksWidgetCommon, this);
             dlgCardTrainee->exec();
 
             ammTasksWidgetCommon->setParent(this);
             fimTasksWidgetCommon->setParent(this);
 
-            delete dlgCardTrainee;
-            dlgCardTrainee = nullptr;
+            if(dlgCardTrainee)
+            {
+                delete dlgCardTrainee;
+                dlgCardTrainee = nullptr;
+            }
         }
     }
 }