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

@@ -13,20 +13,19 @@
//------------------------------------------------------------------------------
namespace TargetManagement
{
ObjectShootbackArea::ObjectShootbackArea(MainHandler *mainHandler)
: m_mainHandler(mainHandler)
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG() << Q_FUNC_INFO << " END";
ObjectShootbackArea::ObjectShootbackArea(MainHandler *mainHandler) : m_mainHandler(mainHandler),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
}
//------------------------------------------------------------------------------
ObjectShootbackArea::~ObjectShootbackArea()
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
if (isValid())
m_mainHandler->dds()->dtsTgt()->removeShootbackAreaByKey(m_data.id());
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
}
//------------------------------------------------------------------------------
@@ -44,7 +43,7 @@ bool ObjectShootbackArea::isUsed() const
//------------------------------------------------------------------------------
Core::FunctionReplyObject ObjectShootbackArea::createObject(const ShootbackArea &data)
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
m_data = data;
if (m_data.id() <= 0)
@@ -57,20 +56,20 @@ Core::FunctionReplyObject ObjectShootbackArea::createObject(const ShootbackArea
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting ShootbackArea-data into database"));
m_data.id(dbData.id);
DEBUG_LOG() << "New TgtShootbackArea: " << m_data.id();
DEBUG_LOG(m_logger) << "New TgtShootbackArea: " << m_data.id();
}
// Publish Data via DTS
onPublishData();
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
return Core::FunctionReplyObject(m_data.id());
}
//------------------------------------------------------------------------------
Core::FunctionReplyObject ObjectShootbackArea::updateObject(const ShootbackArea &data)
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
if (!isValid())
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Object not valid/blocked"));
@@ -81,12 +80,12 @@ Core::FunctionReplyObject ObjectShootbackArea::updateObject(const ShootbackArea
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating ShootbackArea-data into database"));
m_data = data;
DEBUG_LOG() << "Data changed for ShootbackAreaId: " << m_data.id();
DEBUG_LOG(m_logger) << "Data changed for ShootbackAreaId: " << m_data.id();
// Publish Data via DTS
onPublishData();
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
return Core::FunctionReplyObject(m_data.id());
}
@@ -107,7 +106,7 @@ Core::FunctionReplyObject ObjectShootbackArea::setUsed(bool isUsed)
//------------------------------------------------------------------------------
Core::FunctionReplyObject ObjectShootbackArea::removeObject()
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
if (isUsed())
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "ShootbackArea still in use"));
@@ -117,17 +116,17 @@ Core::FunctionReplyObject ObjectShootbackArea::removeObject()
if (!m_mainHandler->dds()->dtsTgt()->removeShootbackAreaByKey(m_data.id()))
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "ShootbackArea with id %1 can not be removed from DDS")).arg(m_data.id());
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
return Core::FunctionReplyObject(m_data.id());
}
//------------------------------------------------------------------------------
void ObjectShootbackArea::onPublishData()
{
TRACE_LOG() << "Publish ShootbackArea-data to dds (" << m_data.id() << ") ...";
TRACE_LOG(m_logger) << "Publish ShootbackArea-data to dds (" << m_data.id() << ") ...";
if (!m_mainHandler->dds()->dtsTgt()->publish(m_data))
ERROR_LOG() << "Error publishing ShootbackArea-data to dds";
ERROR_LOG(m_logger) << "Error publishing ShootbackArea-data to dds";
}
// -------------------------------------------------------------------------------------------------------