refact2

InstructorsAndTrainees/trainees/personalcardtrainee.cpp

@@ -52,8 +52,17 @@ PersonalCardTrainee::PersonalCardTrainee(ConnectorToServer* connectorToServer, M
 
 PersonalCardTrainee::~PersonalCardTrainee()
 {
-    delete ammTasksWidget_personal;
-    delete fimTasksWidget_personal;
+    if(ammTasksWidget_personal)
+    {
+        delete ammTasksWidget_personal;
+        ammTasksWidget_personal = nullptr;
+    }
+
+    if(fimTasksWidget_personal)
+    {
+        delete fimTasksWidget_personal;
+        fimTasksWidget_personal = nullptr;
+    }
 
     messangerController->deleteWidget(messangerWidget);
 
@@ -63,6 +72,11 @@ PersonalCardTrainee::~PersonalCardTrainee()
     delete ui;
 }
 
+void PersonalCardTrainee::closeEvent(QCloseEvent *event)
+{
+    fimTasksWidget_personal->closeDlgCheckTask();
+}
+
 void PersonalCardTrainee::loadInfo()
 {
     Trainee trainee = connectorToServer->getTrainee(id_trainee);

InstructorsAndTrainees/trainees/personalcardtrainee.h

@@ -20,6 +20,8 @@ public:
     explicit PersonalCardTrainee(ConnectorToServer* connectorToServer, MessangerController* messangerController, int id_trainee, AMMtasksWidget* ammTasksWidget_common, FIMtasksWidget* fimTasksWidget_common, QWidget *parent = nullptr);
     ~PersonalCardTrainee();
 
+    void closeEvent(QCloseEvent *event) override;
+
 private:
     void loadInfo();
 

InstructorsAndTrainees/trainees/traineesview.cpp

@@ -30,7 +30,13 @@ void TraineesView::resizeEvent(QResizeEvent *event)
     else
     {//control
         if(adminMode)
-            widthTrainee = width - (470 + 10);
+        {
+#ifdef PROJECT_TYPE_DEBUG
+           widthTrainee = width - (470 + 10);
+#else
+           widthTrainee = width - (420 + 10);
+#endif
+        }
         else
             widthTrainee = width - (440 + 10);
     }
@@ -80,7 +86,11 @@ void TraineesView::preparationTreeWidget()
 
         if(adminMode)
         {
+#ifdef PROJECT_TYPE_DEBUG
             treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_ID, false);
+#else
+            treeWidget->setColumnHidden(ColumnsTreeTrainees::clmn_ID, true);
+#endif
         }
         else
         {

InstructorsAndTrainees/trainees/viewertrainees.cpp

@@ -35,8 +35,17 @@ ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, MessangerCo
 
 ViewerTrainees::~ViewerTrainees()
 {
-    delete ammTasksWidgetCommon;
-    delete fimTasksWidgetCommon;
+    if(ammTasksWidgetCommon)
+    {
+        delete ammTasksWidgetCommon;
+        ammTasksWidgetCommon = nullptr;
+    }
+
+    if(fimTasksWidgetCommon)
+    {
+        delete fimTasksWidgetCommon;
+        fimTasksWidgetCommon = nullptr;
+    }
 
     if(dlgEditor)
         dlgEditor->close();
@@ -59,7 +68,9 @@ void ViewerTrainees::deactivate()
         dlgEditor->close();
 
     if(dlgCardTrainee)
+    {
         dlgCardTrainee->close();
+    }
 
     CommonView::deactivate();
 
@@ -88,12 +99,17 @@ void ViewerTrainees::on_btnEditorTrainees_clicked()
     connect(connectorToServer, &ConnectorToServer::signal_UpdateDB, editorTraineesGroups, &EditorTrainees::slot_NeedUpdateUI);
     editorTraineesGroups->activate();
 
-    dlgEditor = new QDialog(this);
+    dlgEditor = new QDialog(this,
+                            Qt::WindowSystemMenuHint
+                          | Qt::WindowMaximizeButtonHint
+                          | Qt::WindowMinimizeButtonHint
+                          | Qt::WindowCloseButtonHint);
     QHBoxLayout *layout = new QHBoxLayout(dlgEditor);
     layout->addWidget(editorTraineesGroups);
     dlgEditor->setWindowTitle(tr("Editor of trainees"));
     dlgEditor->setMinimumSize(1400, 700);
-    dlgEditor->setWindowFlags(dlgEditor->windowFlags() & ~Qt::WindowContextHelpButtonHint);
+    dlgEditor->setWindowState(Qt::WindowMaximized);
+    dlgEditor->setModal(true);
     dlgEditor->exec();
 
     delete dlgEditor;
@@ -129,8 +145,9 @@ void ViewerTrainees::on_itemDoubleClicked(QTreeWidgetItem *item, int column)
             QHBoxLayout *layout = new QHBoxLayout(dlgCardTrainee);
             layout->addWidget(cardTrainee);
             dlgCardTrainee->setWindowTitle(tr("Personal card trainee"));
-            //dlgCardTrainee->setMinimumSize(1900, 1000);
-            dlgCardTrainee->showMaximized();
+            dlgCardTrainee->setMinimumSize(1400, 700);
+            dlgCardTrainee->setWindowState(Qt::WindowMaximized);
+            dlgCardTrainee->setModal(true);
             dlgCardTrainee->exec();
 
             ammTasksWidgetCommon->setParent(this);