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

@@ -94,7 +94,7 @@ void AssignGuezNasatPartDialog::retranslate()
bool AssignGuezNasatPartDialog::apply()
{
INFO_LOG() << "AssignGuezNasatPartDialog::apply()";
INFO_LOG(m_logger) << "AssignGuezNasatPartDialog::apply()";
int32_t participantId = m_ui->cmbParticipants->currentData().toInt();
int32_t nasatAircraftId = m_ui->cmbNasats->currentData().toInt();
@@ -45,7 +45,7 @@ bool GuezNasatPartDialog::init(const std::shared_ptr<GuezNasat::Interface::Ftc>
m_exmDtc = exmDtc;
m_ppmDtc = ppmDtc;
INFO_LOG() << "GuezNasatPartDialog::init";
INFO_LOG(m_logger) << "GuezNasatPartDialog::init";
m_nasatAircraftParticipantModel = new GuezNasat::NasatAircraftParticipantModel(this);
m_nasatAircraftParticipantModel->initModel(m_dtc, m_exmDtc, m_ppmDtc, ppmGuiCbxIfc, m_session);
m_ui->widget->setModel(m_nasatAircraftParticipantModel);
@@ -89,11 +89,11 @@ void GuezNasatPartDialog::retranslate()
void GuezNasatPartDialog::onNewAircraftPart()
{
INFO_LOG() << "onNewAircraft";
INFO_LOG(m_logger) << "onNewAircraft";
AssignGuezNasatPartDialog *assignGuezNasatPartDialog = new AssignGuezNasatPartDialog(m_session->exerciseId(), this);
if (!assignGuezNasatPartDialog->init(m_ftc, m_nasatAircraftParticipantModel))
{
ERROR_LOG() << QLatin1String("Can't initialize AssignGuezNasatPartDialog!");
ERROR_LOG(m_logger) << QLatin1String("Can't initialize AssignGuezNasatPartDialog!");
delete assignGuezNasatPartDialog;
return;
}
@@ -107,11 +107,11 @@ void GuezNasatPartDialog::onEditAircraftPart()
const QModelIndex curIdx = m_ui->widget->currentIndex();
if (!curIdx.isValid())
return;
INFO_LOG() << "onEditAircraft";
INFO_LOG(m_logger) << "onEditAircraft";
AssignGuezNasatPartDialog *assignGuezNasatPartDialog = new AssignGuezNasatPartDialog(m_session->exerciseId(), this);
if (!assignGuezNasatPartDialog->init(m_ftc, m_nasatAircraftParticipantModel, m_nasatAircraftParticipantModel->getRowData(curIdx.row())))
{
ERROR_LOG() << QLatin1String("Can't initialize assignGuezNasatPartDialog!");
ERROR_LOG(m_logger) << QLatin1String("Can't initialize assignGuezNasatPartDialog!");
delete assignGuezNasatPartDialog;
return;
}
@@ -130,7 +130,7 @@ void GuezNasatPartDialog::onRemoveAircraftPart()
const QModelIndex curIdx = m_ui->widget->currentIndex();
if (!curIdx.isValid())
return;
INFO_LOG() << "onRemoveNewAircraft";
INFO_LOG(m_logger) << "onRemoveNewAircraft";
NasatAircraftParticipant req;
req.id(m_nasatAircraftParticipantModel->getRowData(curIdx.row()).id());
@@ -42,7 +42,7 @@ bool NasatAircraftModel::initModel(const std::shared_ptr<GuezNasat::Interface::D
QVariant NasatAircraftModel::data(const QModelIndex &index, int role) const
{
INFO_LOG() << "NasatAircraftModel::data";
INFO_LOG(m_logger) << "NasatAircraftModel::data";
if (role != Qt::DisplayRole || !indexIsValid(index))
return QVariant();
@@ -33,6 +33,8 @@ public:
QVariant data(const QModelIndex &, int) const override;
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<GuezNasat::Interface::Dtc> m_dtc;
};
}
@@ -39,7 +39,7 @@ bool NasatAircraftParticipantModel::initModel(const std::shared_ptr<GuezNasat::I
const QMap<qint32, GuezNasat::NasatAircraftParticipant> nasatAircraftParticipants = m_dtc->nasatAircraftParticipants();
INFO_LOG() << "initModel - #NasatAircraftParticipantModel: " << nasatAircraftParticipants.size() ;
INFO_LOG(m_logger) << "initModel - #NasatAircraftParticipantModel: " << nasatAircraftParticipants.size() ;
connect(m_dtc.get(), &Interface::Dtc::nasatAircraftParticipantChanged,
this, &NasatAircraftParticipantModel::onNasatAircraftParticipantChanged);
@@ -83,7 +83,7 @@ bool NasatAircraftParticipantModel::initModel(const std::shared_ptr<GuezNasat::I
QVariant NasatAircraftParticipantModel::data(const QModelIndex &index, int role) const
{
INFO_LOG() << "NasatAircraftParticipantModel::data";
INFO_LOG(m_logger) << "NasatAircraftParticipantModel::data";
if ((role != Qt::DisplayRole && role != Qt::DecorationRole) || !indexIsValid(index))
return QVariant();
@@ -100,7 +100,7 @@ QVariant NasatAircraftParticipantModel::data(const QModelIndex &index, int role)
switch (index.column())
{
case Id:
INFO_LOG() << "nasatAircraftParticipant.id()=" << nasatAircraftParticipant.id();
INFO_LOG(m_logger) << "nasatAircraftParticipant.id()=" << nasatAircraftParticipant.id();
return nasatAircraftParticipant.id();
case NasatAircreaftId:
return nasatAircraftParticipant.nasatAircraftId();
@@ -158,7 +158,7 @@ void NasatAircraftParticipantModel::onNasatAircraftParticipantChanged(const Guez
void NasatAircraftParticipantModel::onExerciseChanged(const ExerciseManagement::Exercise &data,
const DataModification modType)
{
INFO_LOG() << "onExerciseChanged: " << data << ", " << modType;
INFO_LOG(m_logger) << "onExerciseChanged: " << data << ", " << modType;
switch (modType)
{
@@ -175,7 +175,7 @@ void NasatAircraftParticipantModel::onExerciseChanged(const ExerciseManagement::
void NasatAircraftParticipantModel::onTypeChanged(const ParticipantManagement::Type &data,
const DataModification modType)
{
INFO_LOG() << "onTypeChanged:" << data << ", " << modType;
INFO_LOG(m_logger) << "onTypeChanged:" << data << ", " << modType;
switch (modType)
{
@@ -192,7 +192,7 @@ void NasatAircraftParticipantModel::onTypeChanged(const ParticipantManagement::T
void NasatAircraftParticipantModel::onParticipantChanged(const ParticipantManagement::Participant &data,
DataModification modType)
{
INFO_LOG() << "onParticipantChanged: " << data << ", " << modType;
INFO_LOG(m_logger) << "onParticipantChanged: " << data << ", " << modType;
if (data.isDeleted())
modType = DataModification::eRemoved;
@@ -204,7 +204,7 @@ void NasatAircraftParticipantModel::onParticipantChanged(const ParticipantManage
case DataModification::eModified:
case DataModification::eAdded:
{
DEBUG_LOG() << "DataModification::eAdded Participant"
DEBUG_LOG(m_logger) << "DataModification::eAdded Participant"
<< " TypeId=" << data.typeId()
<< " " << data.name();
@@ -228,7 +228,7 @@ void NasatAircraftParticipantModel::onParticipantChanged(const ParticipantManage
void NasatAircraftParticipantModel::onNasatAircraftChanged(const GuezNasat::NasatAircraft &data,
const DataModification modType)
{
DEBUG_LOG() << "onNasatAircraftChanged: " << data << ", " << modType;
DEBUG_LOG(m_logger) << "onNasatAircraftChanged: " << data << ", " << modType;
switch (modType)
{
case DataModification::eRemoved:
@@ -71,6 +71,8 @@ private slots:
const DataModification modType);
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<GuezNasat::Interface::Dtc> m_dtc;
std::shared_ptr<ExerciseManagement::Interface::Dtc> m_exm_dtc;
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppm_dtc;
@@ -35,7 +35,7 @@ bool GuezNasatDialog::init(const std::shared_ptr<GuezNasat::Interface::Ftc> &ftc
m_ftc = ftc;
m_dtc = dtc;
INFO_LOG() << "GuezNasatDialog::init";
INFO_LOG(m_logger) << "GuezNasatDialog::init";
m_nasatAircraftModel = new GuezNasat::NasatAircraftModel(this);
m_nasatAircraftModel->initModel(m_dtc);
m_ui->widget->setModel(m_nasatAircraftModel);
@@ -74,11 +74,11 @@ void GuezNasatDialog::retranslate()
void GuezNasatDialog::onNewAircraft()
{
INFO_LOG() << "onNewAircraft";
INFO_LOG(m_logger) << "onNewAircraft";
NewGuezNasatDialog *newGuezNasatDialog = new NewGuezNasatDialog(this);
if (!newGuezNasatDialog->init(m_ftc))
{
ERROR_LOG() << "Can't initialize NewGuezNasatDialog!";
ERROR_LOG(m_logger) << "Can't initialize NewGuezNasatDialog!";
delete newGuezNasatDialog;
return;
}
@@ -93,11 +93,11 @@ void GuezNasatDialog::onEditAircraft()
if (!curIdx.isValid())
return;
INFO_LOG() << "onEditAircraft";
INFO_LOG(m_logger) << "onEditAircraft";
NewGuezNasatDialog *editGuezNasatDialog = new NewGuezNasatDialog(this);
if (!editGuezNasatDialog->init(m_ftc, m_nasatAircraftModel->getRowData(curIdx.row())))
{
ERROR_LOG() << "Can't initialize NewGuezNasatDialog!";
ERROR_LOG(m_logger) << "Can't initialize NewGuezNasatDialog!";
delete editGuezNasatDialog;
return;
}
@@ -117,7 +117,7 @@ void GuezNasatDialog::onRemoveAircraft()
if (!curIdx.isValid())
return;
INFO_LOG() << "onRemoveNewAircraft";
INFO_LOG(m_logger) << "onRemoveNewAircraft";
NasatAircraft req;
req.id(m_nasatAircraftModel->getRowData(curIdx.row()).id());