Adds immediate migration results in progress

qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader.cpp

@@ -121,7 +121,7 @@ bool BaseDownloader::init()
 
 void BaseDownloader::onStartBaseDownloadReply(const BaseDownloadReply &replyObject)
 {
-  DEBUG_LOG() << "NEW STATE REPLY: " << replyObject.currentStep() << " \n" << replyObject.progress();
+  DEBUG_LOG(m_logger) << "NEW STATE REPLY: " << replyObject.currentStep() << " \n" << replyObject.progress();
   switch (replyObject.replyState().underlying())
   {
   case Core::FtReplyState::InProgress:
@@ -208,7 +208,7 @@ void BaseDownloader::startBaseDownload()
                                      m_ui->leServer->text().toStdString(),
                                      QDateTime::currentMSecsSinceEpoch());
 
-  DEBUG_LOG() << "EXERCISE ID: " << m_exerciseId;
+  DEBUG_LOG(m_logger) << "EXERCISE ID: " << m_exerciseId;
   
   if (m_ftc->startBaseDownloadRequest(req, this))
   {
@@ -317,13 +317,13 @@ void BaseDownloader::onNewTextMessageFromSocket(const QString &message)
   m_timer->stop();
   if (m_state == ConnectionState::ConnectedToExternalServer)
   {
-    DEBUG_LOG() << "message from SVC " << message;
+    DEBUG_LOG(m_logger) << "message from SVC " << message;
 
     doConnectToExerciseManagement(message);
   }
   else if (m_state == ConnectionState::ConnectedToExerciseManagement)
   {
-    DEBUG_LOG() << "message from EXM " << message;
+    DEBUG_LOG(m_logger) << "message from EXM " << message;
     fillExerciseModel(message);
   }
 }
@@ -400,7 +400,7 @@ void BaseDownloader::onOcPdfDownloadClicked()
   }
   const QString matrixOperator = LtsSessionData::LtsSessionData::getInstance()->getOperatorName();
 
-  DEBUG_LOG()<<Q_FUNC_INFO<<" folderId:" <<folderId<<" operatorName: "<<matrixOperator;
+  DEBUG_LOG(m_logger)<<Q_FUNC_INFO<<" folderId:" <<folderId<<" operatorName: "<<matrixOperator;
   OcPdfDownloadRequest req(folderId,matrixOperator.toStdString());
   m_ftc->ocPdfDownloadRequest(req, this);
 }
@@ -417,12 +417,12 @@ void BaseDownloader::doConnectToExerciseManagement(const QString &message)
   QJsonDocument doc = QJsonDocument::fromJson(message.toUtf8());
   if (!doc.isObject())
   {
-    WARNING_LOG() << "No Valid Object in " << message;
+    WARNING_LOG(m_logger) << "No Valid Object in " << message;
     return;
   }
   if (!doc.object().value(QStringLiteral("data")).isArray())
   {
-    WARNING_LOG() << "No Data Array in" << message;
+    WARNING_LOG(m_logger) << "No Data Array in" << message;
     return;
   }
 
@@ -456,7 +456,7 @@ void BaseDownloader::doConnectToExerciseManagement(const QString &message)
 
   if (exPort > 0)
   {
-    DEBUG_LOG() << "Connect To EXM";
+    DEBUG_LOG(m_logger) << "Connect To EXM";
     m_socket->open(getUrl(m_ui->leServer->text(), exPort));
   }
 
@@ -465,14 +465,14 @@ void BaseDownloader::doConnectToExerciseManagement(const QString &message)
 QUrl BaseDownloader::getUrl(const QString &adress, unsigned short port) const
 {
   QString url = QLatin1String("ws://") + adress + QLatin1Char(':') + QString::number(port);
-  DEBUG_LOG() << "Connect to: "  << url;
+  DEBUG_LOG(m_logger) << "Connect to: "  << url;
 
   return QUrl(url);
 }
 
 void BaseDownloader::sendProcessListRequest()
 {
-  DEBUG_LOG() << "send processListRequest message to SVC";
+  DEBUG_LOG(m_logger) << "send processListRequest message to SVC";
   m_timer->start();
   m_socket->sendTextMessage(QStringLiteral("{\"type\": \"servicePortsInformationRequest\",\"uuid\": \"7777\"}"));
   m_ui->leStatus->setText(tr("Wait for Service Data."));
@@ -481,7 +481,7 @@ void BaseDownloader::sendProcessListRequest()
 
 void BaseDownloader::sendExerciseListRequest()
 {
-  DEBUG_LOG() << "send exerciseListRequest message to EXM";
+  DEBUG_LOG(m_logger) << "send exerciseListRequest message to EXM";
   m_timer->start();
   m_ftcTimer->start();
   m_socket->sendTextMessage(QStringLiteral("{\"type\": \"exerciseInformationRequest\",\"uuid\": \"7777\"}"));
@@ -498,7 +498,7 @@ void BaseDownloader::fillExerciseModel(const QString &exerciseList)
   QJsonDocument doc = QJsonDocument::fromJson(exerciseList.toUtf8());
   if (!doc.isObject() || !doc.object().value(QStringLiteral("data")).isArray())
   {
-    WARNING_LOG() << "No Valid Object in " << exerciseList;
+    WARNING_LOG(m_logger) << "No Valid Object in " << exerciseList;
     m_ui->leStatus->setText(tr("Got Invalid Data from Exercise Management."));
     return;
   }

qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader.h

@@ -67,6 +67,8 @@ private Q_SLOTS:
   void onOcPdfDownloadClicked();
 
 private:
+
+NGL::INGLLogger &m_logger;
   void retranslate() override;
   void doConnectToExerciseManagement(const QString &message);
   QUrl getUrl(const QString &adress, unsigned short port) const;

qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader_message.h

@@ -32,6 +32,8 @@ private Q_SLOTS:
 
 private:
 
+
+NGL::INGLLogger &m_logger;
 private:
   Ui::BaseDownloaderMessage *m_ui;
 };

qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_base_downloader_pdf_selector.h

@@ -37,6 +37,8 @@ Q_SIGNALS:
   void ok();
 
 private: 
+
+NGL::INGLLogger &m_logger;
   void addFile(const PdfInfo &document);
 
 private: 

qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_ex_model.h

@@ -32,6 +32,8 @@ public:
   QVariant data(const QModelIndex &, int) const override final;
 
 private:
+
+NGL::INGLLogger &m_logger;
   friend class ExProxyModel;
 };