Adds immediate migration results in progress

2026-08-19 11:18:24 +02:00
1 parent 8453e104c5
commit 3bb6e89496
@@ -58,7 +58,7 @@ bool MvsDialog::init(const std::shared_ptr<AudioVideoManagement::Interface::Dtc>
  {
    delete m_model;
    m_model = nullptr;
-    ERROR_LOG() << "Could not init model";
+    ERROR_LOG(m_logger) << "Could not init model";
    return false;
  }

@@ -178,14 +178,14 @@ void MvsDialog::onExportButtonClicked()

  int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
  if (fileId > 0)
-    DEBUG_LOG() << "Saved file with id = " << fileId;
+    DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
  else
-    ERROR_LOG() << "Could not save file in library ";
+    ERROR_LOG(m_logger) << "Could not save file in library ";
 }

 void MvsDialog::onImportButtonClicked()
 {
-  DEBUG_LOG() << " onImportButtonClicked() ";
+  DEBUG_LOG(m_logger) << " onImportButtonClicked() ";

  QByteArray content;
  int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::AVMMvsDialog));
@@ -211,7 +211,7 @@ void MvsDialog::onImportButtonClicked()
          return m_avmFtc->videoTeamModifyRequest(request, this);
        });
      }
-      INFO_LOG() << "--- onImportButtonClicked() ";
+      INFO_LOG(m_logger) << "--- onImportButtonClicked() ";
    }
  }
 }
@@ -70,6 +70,8 @@ private Q_SLOTS:
  void onImportButtonClicked();

 private: 
+
+NGL::INGLLogger &m_logger;
  void retranslate() override;
  void tableColumnOrganiserSetting() override;

@@ -41,6 +41,8 @@ Q_SIGNALS:
  void modifyRequest(const AudioVideoManagement::VideoTeamModifyRequest &request);

 protected:
+
+NGL::INGLLogger &m_logger;
  bool apply() override;

 private: 
@@ -77,7 +77,7 @@ QByteArray MvsModel::modelToJson()

  for (int row = 0; row < rowCount(); row++)
  {
-    DEBUG_LOG() << "row =" << ": " << row;
+    DEBUG_LOG(m_logger) << "row =" << ": " << row;
    QJsonObject inner;
    const VideoTeam &config     = m_vecData.at(row);
    inner[QStringLiteral("id")] =         config.id();
@@ -118,7 +118,7 @@ QVector<VideoTeamModifyRequest> MvsModel::jsonToVideoTeamVector(const QByteArray
    config.exerciseId(m_exerciseId);
    config.streamName(obj[QStringLiteral("streamName")].toString().toStdString());

-    INFO_LOG() << "insertRow: " << config.name()
+    INFO_LOG(m_logger) << "insertRow: " << config.name()
                       << " VideoTeamId=" << config.id();
    result.append(std::move(config));
  }
@@ -35,6 +35,7 @@ public:
  QVector<VideoTeamModifyRequest> jsonToVideoTeamVector(const QByteArray &content);
  bool isFiltered(const VideoTeam &data, DataModification modType) const override;
 private: 
+NGL::INGLLogger &m_logger;
  std::shared_ptr<AudioVideoManagement::Interface::Dtc> m_avmDtc;
  int32_t m_exerciseId;

@@ -169,7 +169,7 @@ void MvsVideoTeamDialog::setData()
 bool MvsVideoTeamDialog::apply()
 {
  VideoReceiverModifyActiveRequest req;
-  DEBUG_LOG() << "apply m_videoTeamButtonGroup.size=" << m_videoTeamButtonGroup.size();
+  DEBUG_LOG(m_logger) << "apply m_videoTeamButtonGroup.size=" << m_videoTeamButtonGroup.size();
  QMap<int, QButtonGroup *> ::const_iterator itBg;
  for (itBg = m_videoTeamButtonGroup.constBegin(); itBg != m_videoTeamButtonGroup.constEnd(); ++itBg)
  {
@@ -177,9 +177,9 @@ bool MvsVideoTeamDialog::apply()
    int mainStructureElementId = itBg.value()->checkedId();
    int oldActiveId = m_dtc->getActiveVideoReceiver(teamId);

-    DEBUG_LOG() << "Team id = " << teamId;
-    DEBUG_LOG() << "Main structure element id = " << mainStructureElementId;
-    DEBUG_LOG() << "Old active video receiver = " << oldActiveId;
+    DEBUG_LOG(m_logger) << "Team id = " << teamId;
+    DEBUG_LOG(m_logger) << "Main structure element id = " << mainStructureElementId;
+    DEBUG_LOG(m_logger) << "Old active video receiver = " << oldActiveId;

    if (itBg.value()->checkedId() == 0)  
    {
@@ -199,7 +199,7 @@ bool MvsVideoTeamDialog::apply()
      req.isActive(true);
      req.id(m_receiverIds.value(QPair<int, int>(mainStructureElementId, teamId)));
    }
-    DEBUG_LOG() << "itBg.key=" << itBg.key()
+    DEBUG_LOG(m_logger) << "itBg.key=" << itBg.key()
                        << " mainStructureElementId=" << mainStructureElementId
                        << " teamId=" << teamId
                        << " id=" << req.id()
@@ -47,6 +47,8 @@ public:
  void onVideoReceiverModifyActiveReply(const Core::FunctionReplyObject &reply)  override final { m_requestHelper->requestReply(reply); }

 private:
+
+NGL::INGLLogger &m_logger;
  ReceiverElement *createReceiverElement(const VideoReceiver &rec);

 private slots: