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

@@ -48,17 +48,17 @@ bool OperatorPartyAssignment::init(LtsSession::LtsSession *session)
m_buttonBox->getButton(LtsWidgets::DialogButton::Ok)->setVisible(false);
if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
{
ERROR_LOG()<<" -- Couldn't init ppmDtc";
ERROR_LOG(m_logger)<<" -- Couldn't init ppmDtc";
return false;
}
if (!m_session->getDtc<OperatorManagement::DataInterface>(m_opmDtc))
{
ERROR_LOG()<<" -- Couldn't init opmDtc";
ERROR_LOG(m_logger)<<" -- Couldn't init opmDtc";
return false;
}
if (!m_session->getFtc<ParticipantManagement::DataInterface>(m_ppmFtc))
{
ERROR_LOG()<<" -- Couldn't init ppmFtc";
ERROR_LOG(m_logger)<<" -- Couldn't init ppmFtc";
return false;
}
@@ -98,7 +98,7 @@ QMap<int, bool> OperatorPartyAssignment::getPartyStatesForOpertator() const
DEBUG_LOG()<<" -- [getPartyStatesForOpertator] -> ";
DEBUG_LOG(m_logger)<<" -- [getPartyStatesForOpertator] -> ";
const auto &partys = m_ppmDtc->partys();
QMap<int,bool> mapPartyCheckStates;
for (auto p : partys)
@@ -41,11 +41,13 @@ private slots:
void onOperatorChanged(const OperatorManagement::User &data, DataModification modType);
void onSelectionOperatorChanged(const int index);
private:
NGL::INGLLogger &m_logger;
void retranslate() override;
bool apply() override;
void onModifyPartyDataReply(const Core::FunctionReplyObject &replyObject) override { m_requestHelper->requestReply(replyObject); }
void enaDisa();
private:
NGL::INGLLogger &m_logger;
QString m_menuGroup;
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
std::shared_ptr<ParticipantManagement::Interface::Ftc> m_ppmFtc;
@@ -35,6 +35,8 @@ public slots:
void updateView(const QMap<int, bool> partyCheckStates);
protected:
NGL::INGLLogger &m_logger;
QVariant data(const QModelIndex &, int) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override final;
Qt::ItemFlags flags(const QModelIndex &index) const override;
@@ -70,7 +70,7 @@ void PartyEdit::lock()
bool PartyEdit::init(int partyId, LtsSession::LtsSession *session)
{
DEBUG_LOG() << "PartyEdit::init()";
DEBUG_LOG(m_logger) << "PartyEdit::init()";
m_session = session;
if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_dtc))
@@ -179,7 +179,7 @@ bool PartyEdit::apply()
reqOpm.rolePresetId(user.rolePresetId());
QString properties = QString::fromUtf8(QJsonDocument(opmProperties).toJson());
DEBUG_LOG() << "properties: " << properties;
DEBUG_LOG(m_logger) << "properties: " << properties;
reqOpm.properties(properties.toStdString());
m_requestHelper->addRequest([reqOpm, this]()
@@ -364,14 +364,14 @@ void PartyEdit::notificationCheck()
{
if (!m_dtcOpm->isAdlerAllowedParty(m_session->exerciseId(), m_partyId, LtsSessionData::LtsSessionData::getInstance()->getOperatorId()))
{
WARNING_LOG() << "Party " << m_partyId << " not allowed for this user";
WARNING_LOG(m_logger) << "Party " << m_partyId << " not allowed for this user";
m_ui->lblNotifications->hide();
m_ui->cbAdlerNotification->hide();
m_ui->cbCombatOrder->hide();
return;
}
DEBUG_LOG() << "Party allowed for ADLER notifications";
DEBUG_LOG(m_logger) << "Party allowed for ADLER notifications";
const std::string properties = m_dtcOpm->user(LtsSessionData::LtsSessionData::getInstance()->getOperatorId()).properties();
QJsonObject opmProperties(QJsonDocument::fromJson(QByteArray::fromStdString(properties)).object());
@@ -407,7 +407,7 @@ void PartyEdit::notificationCheck()
void PartyEdit::modifyPartyProperties()
{
DEBUG_LOG() << Q_FUNC_INFO;
DEBUG_LOG(m_logger) << Q_FUNC_INFO;
ParticipantManagement::Party requestParty;
requestParty = m_dtc->party(m_partyId);
@@ -422,11 +422,11 @@ void PartyEdit::modifyPartyProperties()
if (parserError.error != QJsonParseError::NoError)
{
ERROR_LOG() << "Error parsing json document: " << parserError.errorString() << " '" << propertiesBa << "'";
ERROR_LOG(m_logger) << "Error parsing json document: " << parserError.errorString() << " '" << propertiesBa << "'";
doc = QJsonDocument();
}
DEBUG_LOG() << "json to parse: " << doc.toJson();
DEBUG_LOG(m_logger) << "json to parse: " << doc.toJson();
QJsonObject obj(doc.object());
obj[QStringLiteral("Adler")] = adlerPropertiesObj;
@@ -34,12 +34,12 @@ bool PartyModel::initModel(LtsSession::LtsSession *session)
m_session = session;
if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
{
ERROR_LOG()<<" Couldn't load ppmDtc!!! ";
ERROR_LOG(m_logger)<<" Couldn't load ppmDtc!!! ";
return false;
}
if (!m_session->getDtc<OperatorManagement::DataInterface>(m_opmDtc))
{
ERROR_LOG()<<" Couldn't load opmDtc!!! ";
ERROR_LOG(m_logger)<<" Couldn't load opmDtc!!! ";
return false;
}
@@ -40,6 +40,8 @@ public:
QVariant data(const QModelIndex &, int) const override;
protected:
NGL::INGLLogger &m_logger;
bool isFiltered(const Party &data, DataModification modType) const override
{
@@ -196,7 +196,7 @@ void PartyView::onSyncParties()
SyncPartiesRequest req;
req.exerciseId(m_session->exerciseId());
DEBUG_LOG() << "Sync parties for exercise " << req.exerciseId();
DEBUG_LOG(m_logger) << "Sync parties for exercise " << req.exerciseId();
return m_ftc->syncPartiesRequest(req, this);
});
@@ -39,6 +39,11 @@ public:
private:
NGL::INGLLogger &m_logger;
void retranslate() override;
void onModifyPartyDataReply(const Core::FunctionReplyObject &replyObject) override { m_requestHelper->requestReply(replyObject); }
void onRemovePartyReply(const Core::FunctionReplyObject &replyObject) override { m_requestHelper->requestReply(replyObject); }