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

@@ -41,6 +41,8 @@ public:
const MessagingModel::Box &box);
private:
NGL::INGLLogger &m_logger;
void retranslate() override;
void onSelectionChanged();
void onShowMessage();
@@ -151,7 +151,7 @@ void MessagingModel::onSpecificsEquipmentChanged(const TrainingAreaBaseOC::Speci
int oldParticipantId = m_ownParticipantId;
m_ownParticipantId = m_ppmDtc->participantIdByEquipmentNumber(data.equipmentNumber());
if (m_ownParticipantId <= 0)
WARNING_LOG() << "EquipmentNumber " << data.equipmentNumber() << " is not present in current set of PPM-participants.";
WARNING_LOG(m_logger) << "EquipmentNumber " << data.equipmentNumber() << " is not present in current set of PPM-participants.";
if (oldParticipantId != m_ownParticipantId)
reInitModel();
@@ -50,6 +50,8 @@ public:
QVariant data(const QModelIndex &, int) const override;
protected:
NGL::INGLLogger &m_logger;
bool isFiltered(const OperatorMessage &msg, DataModification modType) const override;
private slots:
@@ -93,7 +93,7 @@ NewMessageDialog::NewMessageDialog(LtsSession::LtsSession *session, QWidget *par
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_session(session)
{
INFO_LOG() << "NewMessageDialog::Konstruktor";
INFO_LOG(m_logger) << "NewMessageDialog::Konstruktor";
m_ui->setupUi(this);
m_ui->leSubject->clear();
@@ -166,7 +166,7 @@ bool NewMessageDialog::init(const std::shared_ptr<Messaging::Interface::Dtc> &dt
m_ftc = ftc;
m_opmCbxDtc = opmCbxDtc;
INFO_LOG() << "NewMessageDialog::init";
INFO_LOG(m_logger) << "NewMessageDialog::init";
fillAddressBox();
return true;
@@ -182,7 +182,7 @@ bool NewMessageDialog::initAnswerDialog(const Messaging::OperatorMessage &msg)
if (msg.senderType() == Messaging::AddressType_def::ObserverController)
{
int idx = m_ui->cmbOperators->findData(0-msg.senderId());
INFO_LOG() << "senderId=" << 0-msg.senderId()
INFO_LOG(m_logger) << "senderId=" << 0-msg.senderId()
<< " idx = " << idx;
m_ui->cmbOperators->setCurrentIndex(idx);
}
@@ -223,11 +223,11 @@ bool NewMessageDialog::initAnswerDialog(const Messaging::OperatorMessage &msg)
bool NewMessageDialog::apply()
{
DEBUG_LOG() << "--- onSendMessage() ";
DEBUG_LOG(m_logger) << "--- onSendMessage() ";
QString subject = m_ui->leSubject->text();
QString message = m_ui->teMessage->toPlainText();
DEBUG_LOG() << "subject = " << subject
DEBUG_LOG(m_logger) << "subject = " << subject
<< ",message = " << message;
@@ -238,7 +238,7 @@ bool NewMessageDialog::apply()
{
CreateOperatorMessageRequest comr;
DEBUG_LOG() << "request for Operators";
DEBUG_LOG(m_logger) << "request for Operators";
comr.senderId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
comr.subject(subject.toStdString());
comr.senderType(Messaging::AddressType_def::type::Operator);
@@ -250,21 +250,21 @@ bool NewMessageDialog::apply()
for (const RecipientModel::Recipient &r : recvOperators)
{
comr.recipientIds().push_back(r.recipientId);
DEBUG_LOG() << "recipientId =" << r.recipientId;
DEBUG_LOG(m_logger) << "recipientId =" << r.recipientId;
}
m_requestHelper->addRequest([comr, this]()
{
DEBUG_LOG() << "m_ftc->createOperatorMessageRequest ";
DEBUG_LOG(m_logger) << "m_ftc->createOperatorMessageRequest ";
return m_ftc->createOperatorMessageRequest(comr, this);
});
}
DEBUG_LOG() << " m_recipientModel->countOcMessages=" << recvOCs.size();
DEBUG_LOG(m_logger) << " m_recipientModel->countOcMessages=" << recvOCs.size();
if (!recvOCs.isEmpty())
{
CreateOperatorMessageRequest comrOC;
DEBUG_LOG() << "request for OCs";
DEBUG_LOG(m_logger) << "request for OCs";
comrOC.senderId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
comrOC.subject(subject.toStdString());
comrOC.senderType(Messaging::AddressType_def::type::Operator);
@@ -275,11 +275,11 @@ bool NewMessageDialog::apply()
for (const RecipientModel::Recipient &r : recvOCs)
{
comrOC.recipientIds().push_back(r.recipientId);
DEBUG_LOG() << "recipientId OC =" << r.recipientId;
DEBUG_LOG(m_logger) << "recipientId OC =" << r.recipientId;
}
m_requestHelper->addRequest([comrOC, this]()
{
DEBUG_LOG() << "m_ftc->createOperatorMessageRequest OC";
DEBUG_LOG(m_logger) << "m_ftc->createOperatorMessageRequest OC";
return m_ftc->createOperatorMessageRequest(comrOC, this);
});
}
@@ -295,7 +295,7 @@ void NewMessageDialog::fillAddressBox()
void NewMessageDialog::addrTypeChanged()
{
DEBUG_LOG() << "************** addrTypeChanged ";
DEBUG_LOG(m_logger) << "************** addrTypeChanged ";
fillAddressBox();
if (m_session->app() != LtsAppDescriptor::App::OC)
m_ui->lblCharsLeft->setVisible(m_ui->cbxAddrType->isChecked() || m_recipientsContainsOc);
@@ -310,13 +310,13 @@ void NewMessageDialog::addAddr()
r.recipientId = abs(m_ui->cmbOperators->currentData().toInt());
m_recipientModel->addData(r);
DEBUG_LOG() << "************** addAddr: " << m_ui->cmbOperators->currentText()
DEBUG_LOG(m_logger) << "************** addAddr: " << m_ui->cmbOperators->currentText()
<< " isOperator:" << r.isOperator;
}
void NewMessageDialog::removeAddr()
{
DEBUG_LOG() << "************** removeAddr ";
DEBUG_LOG(m_logger) << "************** removeAddr ";
QModelIndex modelIndex = m_ui->addrListView->currentIndex();
m_recipientModel->removeData(modelIndex);
m_ui->addrRemoveButton->setEnabled(m_recipientModel->rowCount() > 0);
@@ -325,7 +325,7 @@ void NewMessageDialog::removeAddr()
void NewMessageDialog::onAddrSelectionChanged()
{
DEBUG_LOG() << "************** onAddrSelectionChanged ";
DEBUG_LOG(m_logger) << "************** onAddrSelectionChanged ";
m_ui->addrRemoveButton->setEnabled(true);
}
@@ -71,7 +71,7 @@ bool ShowMessageDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
QDateTime qDateTime;
qDateTime.setMSecsSinceEpoch(operatorMessage.timeStamp());
QString time = qDateTime.toUTC().toString();
INFO_LOG() << " time = " << time;
INFO_LOG(m_logger) << " time = " << time;
m_ui->time->setText(time);
m_ui->msgContent->append(QString::fromStdString(operatorMessage.message()));
@@ -128,13 +128,13 @@ void ShowMessageDialog::onAnswerMessage()
NewMessageDialog *answerDialog = new NewMessageDialog(m_session, this);
if (!answerDialog->init(m_dtc, m_ftc, m_opmCbxDtc))
{
ERROR_LOG() << "Can't initialize NewMessageDialog!";
ERROR_LOG(m_logger) << "Can't initialize NewMessageDialog!";
return;
}
if (!answerDialog->initAnswerDialog(m_operatorMessage))
{
ERROR_LOG() << "Can't set values from previous message!";
ERROR_LOG(m_logger) << "Can't set values from previous message!";
return;
}