Adds immediate migration results in progress

This commit is contained in:
torsten committed 2026-08-19 11:18:24 +02:00
1 parent 8453e104c5
commit 3bb6e89496
2102 files changed
+17482 -15071

No files matched your search

@@ -234,17 +234,17 @@ void ParticipantEdit::showIsSimulated()
void ParticipantEdit::lock()
{
DEBUG_LOG() << Q_FUNC_INFO << " START";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
m_ui->cbParty->setEnabled(true);
DEBUG_LOG() << Q_FUNC_INFO << " END";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
}
void ParticipantEdit::unlock()
{
DEBUG_LOG() << Q_FUNC_INFO << " START";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
m_ui->cbParty->setEnabled(true);
DEBUG_LOG() << Q_FUNC_INFO << " END";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
}
void ParticipantEdit::onPartyChanged()
@@ -320,7 +320,7 @@ void ParticipantEdit::onEnaDisa()
{
if (m_dtc->isAdlerVerbund(m_pTreehandler->getSelectedData().typeId()))
{
DEBUG_LOG() << "Can't Edit Adler SAA Participants";
DEBUG_LOG(m_logger) << "Can't Edit Adler SAA Participants";
enableEdit = true;
}
else
@@ -60,6 +60,7 @@ public:
const std::shared_ptr<AdvancedSymbology::ForeignDataInterface> &asbIfc);
private:
NGL::INGLLogger &m_logger;
void retranslate() override;
bool apply() override;
void showIsSimulated();
@@ -88,6 +89,7 @@ private slots:
private:
NGL::INGLLogger &m_logger;
void tableColumnOrganiserSetting() override;
bool m_asSupportService;
@@ -78,7 +78,7 @@ void ParticipantOrganisationDialog::retranslate()
void ParticipantOrganisationDialog::lock()
{
DEBUG_LOG() << Q_FUNC_INFO << " START";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
m_ui->cbParty->setEnabled(true);
@@ -90,12 +90,12 @@ void ParticipantOrganisationDialog::lock()
m_ui->tvDetached->setEnabled(false);
DEBUG_LOG() << Q_FUNC_INFO << " END";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
}
void ParticipantOrganisationDialog::unlock()
{
DEBUG_LOG() << Q_FUNC_INFO << " START";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
m_ui->cbParty->setEnabled(true);
@@ -103,7 +103,7 @@ void ParticipantOrganisationDialog::unlock()
m_ui->tvAttached->setEnabled(true);
m_ui->tvCooperate->setEnabled(true);
m_ui->tvDetached->setEnabled(true);
DEBUG_LOG() << Q_FUNC_INFO << " END";
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
}
bool ParticipantOrganisationDialog::init(const std::shared_ptr<ParticipantManagement::Interface::Dtc> &dtc,
@@ -356,7 +356,7 @@ void ParticipantOrganisationDialog::onPartyChanged()
s_preselectedParty = curPartyId;
DEBUG_LOG() << Q_FUNC_INFO << " START, curPartyId" << curPartyId
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START, curPartyId" << curPartyId
<< ", m_asSupportService=" << m_asSupportService;
@@ -421,9 +421,8 @@ void ParticipantOrganisationDialog::showContextMenu(const QPoint &position)
DeleteDelegate::DeleteDelegate(QObject *parent)
: QItemDelegate(parent)
{
DeleteDelegate::DeleteDelegate(QObject *parent) : QItemDelegate(parent),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
}
void DeleteDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
@@ -72,6 +72,8 @@ public:
void unlock() override;
private:
NGL::INGLLogger &m_logger;
QModelIndex selectedIndexView() const;
bool saveParticipantData(const ModifyParticipantDataRequest &request);
@@ -153,7 +153,7 @@ bool ParticipantPoolModel::dropMimeData(const QMimeData *data, Qt::DropAction ac
if (action != Qt::CopyAction && action != Qt::MoveAction)
return false;
DEBUG_LOG() << "dropMimeData: " << data->formats().join(QLatin1Char(','));
DEBUG_LOG(m_logger) << "dropMimeData: " << data->formats().join(QLatin1Char(','));
if (!data->hasFormat(ParticipantTemplateRoot) &&
!data->hasFormat(ParticipantPartyRoot) &&
@@ -250,7 +250,7 @@ void ParticipantPoolModel::onParticipantDataChanged(const Participant &data, Dat
const ParticipantData &part = m_vecData.at(i);
if (part.id() == data.id())
{
DEBUG_LOG() << "Modifed participant " << data.id() << ", old party: " << part.partyId() << ", new: " << data.partyId();
DEBUG_LOG(m_logger) << "Modifed participant " << data.id() << ", old party: " << part.partyId() << ", new: " << data.partyId();
if (data.partyId() != poolPartyId())
{
@@ -301,7 +301,7 @@ void ParticipantPoolModel::onParticipantOrganisationChanged(const ParticipantOrg
bool ParticipantPoolModel::moveFromPartyToPool(int rootParticipantId, const QString &mimeType)
{
ERROR_LOG() << "Moving participant " << rootParticipantId << " from party to root with mime type " << mimeType;
ERROR_LOG(m_logger) << "Moving participant " << rootParticipantId << " from party to root with mime type " << mimeType;
const Participant part = m_dtc->participant(rootParticipantId);
const QVector<Participant> newParticipants = getSuperiorParticipants(part.id());
@@ -400,7 +400,7 @@ void ParticipantPoolModel::tryRemoveParticipantFromModel(int participantId)
const ParticipantData &part = m_vecData.at(i);
if (part.id() == participantId)
{
DEBUG_LOG() << "Removing participant " << participantId;
DEBUG_LOG(m_logger) << "Removing participant " << participantId;
LtsWidgets::LtsAbstractTableModel<ParticipantManagement::ParticipantData>::removeRow(i);
break;
@@ -64,6 +64,7 @@ Q_SIGNALS:
void modifyParticipantData(const QVector<ParticipantData> &participantData, const QString &originatorMimeType);
private:
NGL::INGLLogger &m_logger;
bool moveFromPartyToPool(int rootParticipantId, const QString &mimeType);
QVector<Participant> getSuperiorParticipants(int participantId);
bool convertFromParticipantTemplateToParticipantData(const ParticipantManagement::TemplateParticipant &inputParticipant, ParticipantManagement::ParticipantData &outPutData);
@@ -74,6 +75,7 @@ private:
int poolPartyId() const { return m_asSupportService ? 1 : 0; }
private:
NGL::INGLLogger &m_logger;
bool m_asSupportService;
QVector<ParticipantData> m_fullPoolData;
QVector<ParticipantData> m_dataToDelete;
@@ -28,6 +28,8 @@ Q_SIGNALS:
void newUnitNames(const QString &, const QString &);
private:
NGL::INGLLogger &m_logger;
Ui::ParticipantUnitNamer *m_ui;
QValidator *m_validator;
};
@@ -63,7 +63,7 @@ bool TacticalOrganisation::init(const std::shared_ptr<ParticipantManagement::Int
if (!m_session->createTopicClient<Core::Interface::Ftc>(m_coreFtc))
{
ERROR_LOG() << Q_FUNC_INFO << " create coreFtc failed";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " create coreFtc failed";
return false;
}
@@ -150,7 +150,7 @@ void TacticalOrganisation::onReinitLeft()
s_preselectedPartyLeft = partyId;
auto *model = modelForParty(partyId, true);
INFO_LOG() << "Set model left: " << model;
INFO_LOG(m_logger) << "Set model left: " << model;
m_ui->dvPartyLeft->setModel(model);
#ifndef LTS_DEBUG
m_ui->dvPartyLeft->setColumnHidden(ParticipantEditModel::ColParticipantId, true);
@@ -164,7 +164,7 @@ void TacticalOrganisation::onReinitRight()
s_preselectedPartyRight = partyId;
auto *model = modelForParty(partyId, false);
INFO_LOG() << "Set model right: " << model;
INFO_LOG(m_logger) << "Set model right: " << model;
m_ui->dvPartyRight->setModel(model);
#ifndef LTS_DEBUG
m_ui->dvPartyRight->setColumnHidden(ParticipantEditModel::ColParticipantId, true);
@@ -53,6 +53,7 @@ public:
void retranslate() override;
protected:
NGL::INGLLogger &m_logger;
bool apply() override;
void onModifyParticipantDataReply(const Core::FunctionReplyObject &replyObject) override;
private Q_SLOTS: