Дооптимизировал Tasks

InstructorsAndTrainees/CMakeLists.txt

@@ -9,6 +9,7 @@ add_library(InstructorsAndTrainees SHARED
   instructorsandtraineeswidget.ui
   commonview.cpp
   commonview.h
+
   trainees/editortrainees.cpp
   trainees/editortrainees.h
   trainees/editortrainees.ui
@@ -25,6 +26,7 @@ add_library(InstructorsAndTrainees SHARED
   trainees/viewertrainees.ui
   trainees/traineesview.cpp
   trainees/traineesview.h
+
   instructors/viewerinstructors.cpp
   instructors/viewerinstructors.h
   instructors/viewerinstructors.ui
@@ -39,11 +41,7 @@ add_library(InstructorsAndTrainees SHARED
   instructors/dialogauthorizationinstructor.ui
   instructors/instructorsview.cpp
   instructors/instructorsview.h
-  docTasks/doctaskswidget.cpp
+
-  docTasks/doctaskswidget.h
-  docTasks/doctaskswidget.ui
-  docTasks/module.cpp
-  docTasks/module.h
   connectorToServer/connectortoserver.cpp
   connectorToServer/connectortoserver.h
   connectorToServer/Core/sendsystem.cpp
@@ -58,6 +56,7 @@ add_library(InstructorsAndTrainees SHARED
   connectorToServer/Core/tools.h
   connectorToServer/Core/FileData.h
   connectorToServer/Datas.h
+
   messanger/messangerwidget.cpp
   messanger/messangerwidget.h
   messanger/messangerwidget.ui
@@ -66,11 +65,18 @@ add_library(InstructorsAndTrainees SHARED
   messanger/msgwidget.ui
   messanger/tabdialogmessenger.cpp
   messanger/tabdialogmessenger.h
-  docTasks/fimtaskswidget.cpp
+
-  docTasks/fimtaskswidget.h
+  tasks/ammtaskswidget.cpp
-  docTasks/fimtaskswidget.ui
+  tasks/ammtaskswidget.h
-  docTasks/tasksAmmFim.cpp
+  tasks/ammtaskswidget.ui
-  docTasks/tasksAmmFim.h
+  tasks/module.cpp
+  tasks/module.h
+  tasks/fimtaskswidget.cpp
+  tasks/fimtaskswidget.h
+  tasks/fimtaskswidget.ui
+  tasks/tasksAmmFim.cpp
+  tasks/tasksAmmFim.h
+
   resources.qrc
 )
 

InstructorsAndTrainees/instructorsandtraineeswidget.cpp

@@ -2,7 +2,6 @@
 #include "instructorsandtraineeswidget.h"
 #include "ui_instructorsandtraineeswidget.h"
 #include "dialogauthorizationinstructor.h"
-#include "doctaskswidget.h"
 
 InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
     QWidget(parent),
@@ -11,8 +10,8 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
     viewerTrainees(nullptr),
     viewerInstructors(nullptr),
     messangerWidget(nullptr),
-    docTasksWidget(nullptr),
+    ammTasksWidget(nullptr),
-    fIMtasksWidget(nullptr),
+    fimTasksWidget(nullptr),
     adminMode(false),
     loginInstructorLoggedInLocal(QStringLiteral("")),
     nameInstructorLoggedInLocal(QStringLiteral(""))
@@ -27,9 +26,6 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
     qRegisterMetaType<QList<Group>>("QList<Group>");
     qRegisterMetaType<QList<Computer>>("QList<Computer>");
     qRegisterMetaType<QList<Classroom>>("QList<Classroom>");
-    qRegisterMetaType<QList<Task>>("QList<Task>");
-
-    qRegisterMetaType<QList<TaskAmmFim>>("QList<TaskAmmFim>");
 
     connectorToServer = new ConnectorToServer(this);
     connect(connectorToServer,&ConnectorToServer::sigLoginResult,this,&InstructorsAndTraineesWidget::checkLoginResult);
@@ -56,18 +52,18 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
     connect(connectorToServer,&ConnectorToServer::signal_msgFromClientReady,messangerWidget,&MessangerWidget::slot_msgFromClientReady);
 
 
-    docTasksWidget = new DocTasksWidget(connectorToServer, this);
+    ammTasksWidget = new AMMtasksWidget(connectorToServer, this);
-    fIMtasksWidget = new FIMtasksWidget(connectorToServer, this);
+    fimTasksWidget = new FIMtasksWidget(connectorToServer, this);
 
-    connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksFIM, fIMtasksWidget, &FIMtasksWidget::slot_NeedUpdateUI);
+    connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksFIM, fimTasksWidget, &FIMtasksWidget::slot_NeedUpdateUI);
-    connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksAMM, docTasksWidget, &DocTasksWidget::slot_NeedUpdateUI);
+    connect(connectorToServer, &ConnectorToServer::signal_UpdateTasksAMM, ammTasksWidget, &AMMtasksWidget::slot_NeedUpdateUI);
 
     ui->horizontalLayout_3->addWidget(viewerTrainees);
     ui->horizontalLayout_3->addWidget(messangerWidget);
 
     ui->verticalLayout_1->addWidget(viewerInstructors);    
-    ui->verticalLayout_2->addWidget(docTasksWidget);
+    ui->verticalLayout_2->addWidget(ammTasksWidget);
-    ui->verticalLayout_2->addWidget(fIMtasksWidget);
+    ui->verticalLayout_2->addWidget(fimTasksWidget);
 
     viewerTrainees->setMinimumHeight(800);
     viewerInstructors->setMinimumSize(1800, 300);
@@ -84,8 +80,8 @@ InstructorsAndTraineesWidget::~InstructorsAndTraineesWidget()
     if(authorizationIsCompleted())
         deAuthorizationInstructor(loginInstructorLoggedInLocal);
 
-    delete docTasksWidget;
+    delete ammTasksWidget;
-    delete fIMtasksWidget;
+    delete fimTasksWidget;
     delete messangerWidget;
     delete viewerInstructors;
     delete viewerTrainees;

InstructorsAndTrainees/instructorsandtraineeswidget.h

@@ -7,7 +7,7 @@
 #include "viewertrainees.h"
 #include "viewerinstructors.h"
 #include "messangerwidget.h"
-#include "doctaskswidget.h"
+#include "ammtaskswidget.h"
 #include "fimtaskswidget.h"
 #include "connectortoserver.h"
 
@@ -16,9 +16,6 @@ Q_DECLARE_METATYPE(QList<Trainee>)
 Q_DECLARE_METATYPE(QList<Group>)
 Q_DECLARE_METATYPE(QList<Computer>)
 Q_DECLARE_METATYPE(QList<Classroom>)
-Q_DECLARE_METATYPE(QList<Task>)
-
-Q_DECLARE_METATYPE(QList<TaskAmmFim>)
 
 namespace Ui {
 class InstructorsAndTraineesWidget;
@@ -78,8 +75,8 @@ private:
     ViewerTrainees* viewerTrainees;
     ViewerInstructors* viewerInstructors;
     MessangerWidget* messangerWidget;
-    DocTasksWidget* docTasksWidget;
+    AMMtasksWidget* ammTasksWidget;
-    FIMtasksWidget* fIMtasksWidget;
+    FIMtasksWidget* fimTasksWidget;
 
     bool adminMode;
     QString loginInstructorLoggedInLocal;

InstructorsAndTrainees/tasks/ammtaskswidget.cpp

@@ -2,12 +2,12 @@
 #include <QXmlStreamReader>
 #include <QDomDocument>
 #include <QMessageBox>
-#include "doctaskswidget.h"
+#include "ammtaskswidget.h"
-#include "ui_doctaskswidget.h"
+#include "ui_ammtaskswidget.h"
 
-DocTasksWidget::DocTasksWidget(ConnectorToServer* connectorToServer, QWidget *parent) :
+AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, QWidget *parent) :
     QWidget(parent),
-    ui(new Ui::DocTasksWidget),
+    ui(new Ui::AMMtasksWidget),
     connectorToServer(connectorToServer)
 {
     ui->setupUi(this);
@@ -15,18 +15,18 @@ DocTasksWidget::DocTasksWidget(ConnectorToServer* connectorToServer, QWidget *pa
     treeWidget = new QTreeWidget();
     ui->horizontalLayout_1->addWidget(treeWidget);
 
-    connect(treeWidget, &QTreeWidget::currentItemChanged, this, &DocTasksWidget::on_treeWidget_currentItemChanged);
+    connect(treeWidget, &QTreeWidget::currentItemChanged, this, &AMMtasksWidget::on_treeWidget_currentItemChanged);
 
     preparationTreeWidget();
 }
 
-DocTasksWidget::~DocTasksWidget()
+AMMtasksWidget::~AMMtasksWidget()
 {
     deleteAllModuls();
     delete ui;
 }
 
-void DocTasksWidget::on_treeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous)
+void AMMtasksWidget::on_treeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous)
 {
     if(current == nullptr)
         return;
@@ -58,23 +58,23 @@ void DocTasksWidget::on_treeWidget_currentItemChanged(QTreeWidgetItem *current,
     }
 }
 
-void DocTasksWidget::slot_NeedUpdateUI()
+void AMMtasksWidget::slot_NeedUpdateUI()
 {
     loadTasksAMM();
 }
 
-void DocTasksWidget::loadTasksAMM()
+void AMMtasksWidget::loadTasksAMM()
 {
     //Обновление дерева
     treeWidget->clear();
 
     QByteArray array = connectorToServer->getListTaskAmmArray();
-    loadDocTasksFromXML(array);
+    loadAMMtasksFromXML(array);
 
-    updateTreeWidget();
+    fillTree();
 }
 
-void DocTasksWidget::domElementParser(QDomElement element, Module* moduleParent)
+void AMMtasksWidget::domElementParser(QDomElement element, Module* moduleParent)
 {
     QString name;
 
@@ -175,7 +175,7 @@ void DocTasksWidget::domElementParser(QDomElement element, Module* moduleParent)
     }while (! (childElement = childElement.nextSiblingElement()).isNull());
 }
 
-void DocTasksWidget::loadDocTasksFromXML(QByteArray array)
+void AMMtasksWidget::loadAMMtasksFromXML(QByteArray array)
 {
     deleteAllModuls();
 
@@ -190,7 +190,7 @@ void DocTasksWidget::loadDocTasksFromXML(QByteArray array)
     domElementParser(manifestElement, nullptr);
 }
 
-void DocTasksWidget::deleteAllModuls()
+void AMMtasksWidget::deleteAllModuls()
 {
     for(Module* module: listAllModules)
     {
@@ -202,7 +202,7 @@ void DocTasksWidget::deleteAllModuls()
     listAllModules.clear();
 }
 
-Module *DocTasksWidget::searchModuleByID(int id)
+Module *AMMtasksWidget::searchModuleByID(int id)
 {
     Module* ptrModule = nullptr;
 
@@ -216,7 +216,7 @@ Module *DocTasksWidget::searchModuleByID(int id)
     return nullptr;
 }
 
-void DocTasksWidget::preparationTreeWidget()
+void AMMtasksWidget::preparationTreeWidget()
 {
     treeWidget->setColumnCount(2);
 
@@ -228,13 +228,13 @@ void DocTasksWidget::preparationTreeWidget()
     //treeWidget->setColumnHidden(ColumnsTree::clmn_ID, true);
 }
 
-void DocTasksWidget::reSetHeadTreeWidget()
+void AMMtasksWidget::reSetHeadTreeWidget()
 {
     QStringList listHeaders = {tr("PM/DM"), tr("ID")};
     treeWidget->setHeaderLabels(listHeaders);
 }
 
-void DocTasksWidget::updateTreeWidget()
+void AMMtasksWidget::fillTree()
 {
     //Обновление дерева
     treeWidget->clear();
@@ -245,7 +245,7 @@ void DocTasksWidget::updateTreeWidget()
     }
 }
 
-void DocTasksWidget::addModuleToTreeWidget(Module *module, QTreeWidgetItem* parentItem)
+void AMMtasksWidget::addModuleToTreeWidget(Module *module, QTreeWidgetItem* parentItem)
 {
     QTreeWidgetItem* itemModule = nullptr;
 
@@ -287,7 +287,7 @@ void DocTasksWidget::addModuleToTreeWidget(Module *module, QTreeWidgetItem* pare
 }
 
 
-void DocTasksWidget::on_btnUpdateTasks_clicked()
+void AMMtasksWidget::on_btnUpdateTasks_clicked()
 {
     connectorToServer->sendQueryTasksXML("amm");
 }

InstructorsAndTrainees/tasks/ammtaskswidget.h

@@ -1,5 +1,5 @@
-#ifndef DOCTASKSWIDGET_H
+#ifndef AMMTASKSWIDGET_H
-#define DOCTASKSWIDGET_H
+#define AMMTASKSWIDGET_H
 
 #include <QWidget>
 #include <QTreeWidget>
@@ -8,10 +8,10 @@
 #include "connectortoserver.h"
 
 namespace Ui {
-class DocTasksWidget;
+class AMMtasksWidget;
 }
 
-class DocTasksWidget : public QWidget
+class AMMtasksWidget : public QWidget
 {
     Q_OBJECT
 
@@ -22,12 +22,11 @@ private:
     };
 
 public:
-    explicit DocTasksWidget(ConnectorToServer* connectorToServer, QWidget *parent = nullptr);
+    explicit AMMtasksWidget(ConnectorToServer* connectorToServer, QWidget *parent = nullptr);
-    ~DocTasksWidget();
+    ~AMMtasksWidget();
 
 private Q_SLOTS:
     void on_treeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
-
     void on_btnUpdateTasks_clicked();
 
 public Q_SLOTS:
@@ -35,20 +34,21 @@ public Q_SLOTS:
     void slot_NeedUpdateUI();
 
 private:
-    void loadDocTasksFromXML(QByteArray array);
+    void loadAMMtasksFromXML(QByteArray array);
     void domElementParser(QDomElement element, Module* moduleParent);
     void deleteAllModuls();
     Module* searchModuleByID(int id);
 
     void preparationTreeWidget();
     void reSetHeadTreeWidget();
-    void updateTreeWidget();
+
+    void fillTree();
     void addModuleToTreeWidget(Module* module, QTreeWidgetItem* parentItem = nullptr);
 
     void loadTasksAMM();
 
 private:
-    Ui::DocTasksWidget *ui;
+    Ui::AMMtasksWidget *ui;
     ConnectorToServer* connectorToServer;
     QTreeWidget* treeWidget;
 
@@ -56,4 +56,4 @@ private:
     QList<Module*> listAllModules;
 };
 
-#endif // DOCTASKSWIDGET_H
+#endif // AMMTASKSWIDGET_H

InstructorsAndTrainees/tasks/ammtaskswidget.ui

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

InstructorsAndTrainees/tasks/fimtaskswidget.cpp

@@ -24,7 +24,7 @@ FIMtasksWidget::~FIMtasksWidget()
     delete ui;
 }
 
-void FIMtasksWidget::loadTasksAmmFimFromXML(QByteArray array)
+void FIMtasksWidget::loadFIMtasksFromXML(QByteArray array)
 {
     listTaskAmmFim.clear();
 
@@ -178,7 +178,7 @@ void FIMtasksWidget::loadTasksFIM()
     treeWidget->clear();
 
     QByteArray array = connectorToServer->getListTaskFimArray();
-    loadTasksAmmFimFromXML(array);
+    loadFIMtasksFromXML(array);
 
     //собственно обновление дерева
     fillTree();

InstructorsAndTrainees/tasks/fimtaskswidget.h

@@ -32,12 +32,13 @@ public Q_SLOTS:
     void slot_NeedUpdateUI();
 
 private:
-    void loadTasksAmmFimFromXML(QByteArray array);
+    void loadFIMtasksFromXML(QByteArray array);
 
-    void fillTree();
     void preparationTreeWidget();
     void reSetHeadTreeWidget();
 
+    void fillTree();
+
     void loadTasksFIM();
 
 private: