Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
1718 files changed
+126739
-18495
No files matched your search
+35
-33
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "flm_handler.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <utility>
|
||||
#include "FileManagement/flm_operator_rights.h"
|
||||
#include "main_dispatcher.h"
|
||||
@@ -25,6 +26,7 @@ FlmHandler::FlmHandler(QObject *parent)
|
||||
, m_ftcFlm(nullptr)
|
||||
, m_ftcNom(nullptr)
|
||||
, m_opmDtc(nullptr)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
}
|
||||
|
||||
@@ -67,24 +69,24 @@ bool FlmHandler::processHQMessage(int partyId, const QString &name, int meldungs
|
||||
}
|
||||
|
||||
FileManagement::FileContentModifyRequest fileContentReq;
|
||||
fileContentReq.isTemplate(false);
|
||||
fileContentReq.isHidden(true);
|
||||
fileContentReq.folderId(folderHXMessagesId);
|
||||
const QVector<int> fldPath = LtsUtils::convert<QVector<int>>(m_dtcFlm->folder(folderHXMessagesId).path());
|
||||
fileContentReq.fileCategory(FileManagement::FileCategory::Exercise);
|
||||
fileContentReq.fileType(FileManagement::FileType::AdlerJson);
|
||||
fileContentReq.fileStatus(FileManagement::FileStatus::Valid);
|
||||
fileContentReq.isTemplate = false;
|
||||
fileContentReq.isHidden = true;
|
||||
fileContentReq.folderId = folderHXMessagesId;
|
||||
const QVector<int> fldPath = LtsUtils::convert<QVector<int>>(m_dtcFlm->folder(folderHXMessagesId).path);
|
||||
fileContentReq.fileCategory = FileManagement::FileCategory::Exercise;
|
||||
fileContentReq.fileType = FileManagement::FileType::AdlerJson;
|
||||
fileContentReq.fileStatus = FileManagement::FileStatus::Valid;
|
||||
|
||||
QByteArray content = QJsonDocument(obj).toJson(QJsonDocument::Compact).constData();
|
||||
fileContentReq.content(LtsUtils::convert<std::vector<uint8_t>>(content));
|
||||
fileContentReq.content = LtsUtils::convert<std::vector<uint8_t>>(content);
|
||||
|
||||
fileContentReq.isUsedBy(false);
|
||||
fileContentReq.usedBy(0);
|
||||
fileContentReq.lastModified(m_mainDispatcher->ddsHandler()->partitionTime());
|
||||
fileContentReq.exerciseId(m_exerciseId);
|
||||
fileContentReq.operatorId(99);
|
||||
fileContentReq.isUsedBy = false;
|
||||
fileContentReq.usedBy = 0;
|
||||
fileContentReq.lastModified = m_mainDispatcher->ddsHandler()->partitionTime();
|
||||
fileContentReq.exerciseId = m_exerciseId;
|
||||
fileContentReq.operatorId = 99;
|
||||
|
||||
DEBUG_LOG(m_logger) << "HQ: name: " << fileContentReq.name() << ", folderId: " << folderHXMessagesId << ", exerciseId: " << m_exerciseId << ", partyId: " << partyId;
|
||||
DEBUG_LOG(m_logger) << "HQ: name: " << fileContentReq.name << ", folderId: " << folderHXMessagesId << ", exerciseId: " << m_exerciseId << ", partyId: " << partyId;
|
||||
|
||||
|
||||
QRegularExpression re(QStringLiteral("_\\d+$"));
|
||||
@@ -96,7 +98,7 @@ bool FlmHandler::processHQMessage(int partyId, const QString &name, int meldungs
|
||||
ERROR_LOG(m_logger) << "BaseName: " << baseName << "|";
|
||||
|
||||
QStringList fileNames;
|
||||
if (!m_dtcFlm->getAllFiles(fileContentReq.fileType(), folderHXMessagesId, fileNames, true))
|
||||
if (!m_dtcFlm->getAllFiles(fileContentReq.fileType, folderHXMessagesId, fileNames, true))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error while reading fileNames for folderId: " << folderHXMessagesId;
|
||||
return false;
|
||||
@@ -134,7 +136,7 @@ bool FlmHandler::processHQMessage(int partyId, const QString &name, int meldungs
|
||||
const QString newName = baseName
|
||||
+ QStringLiteral("_") + QString::number(++maxNumber);
|
||||
DEBUG_LOG(m_logger) << "newName : " << newName;
|
||||
fileContentReq.name(newName.toStdString());
|
||||
fileContentReq.name = newName.toStdString();
|
||||
|
||||
|
||||
m_partyId = partyId;
|
||||
@@ -152,7 +154,7 @@ void FlmHandler::createHQNotification(const int partyId, const int folderId, con
|
||||
qint64 expiryTime = currentTime + s->getInteger(QStringLiteral("NOM/expiryIntervalMSec"), 2 * 24 * 60 * 60 * 1000);
|
||||
NotificationManagement::NomNotification notif;
|
||||
|
||||
notif.title(tr("HQ Report").toStdString());
|
||||
notif.title = tr("HQ Report").toStdString();
|
||||
|
||||
QString linkName = tr("Open HQ Report Dialog");
|
||||
QString content = QStringLiteral("[%1](//flmHQReport/?party=%2&folder=%3&file=%4)").arg(linkName).arg(partyId).arg(folderId).arg(fileId);
|
||||
@@ -167,28 +169,28 @@ void FlmHandler::createHQNotification(const int partyId, const int folderId, con
|
||||
content = content.replace(QStringLiteral("[%1](%2)").arg(it.value(), it.key()), QStringLiteral("<a href='%1'>%2</a>").arg(it.key(), it.value()));
|
||||
}
|
||||
|
||||
notif.content(content.toStdString());
|
||||
notif.timeStamp(currentTime);
|
||||
notif.expiryTime(expiryTime);
|
||||
notif.content = content.toStdString();
|
||||
notif.timeStamp = currentTime;
|
||||
notif.expiryTime = expiryTime;
|
||||
|
||||
int prio = s->getInteger(QStringLiteral("NOM/notificationPriority"), 3);
|
||||
DEBUG_LOG(m_logger) << " Setting: NotificationPriority: " << prio;
|
||||
notif.priority(static_cast<NotificationManagement::Priority>(prio));
|
||||
notif.processedPriority(NotificationManagement::Priority::Low);
|
||||
notif.exerciseId(m_exerciseId);
|
||||
notif.priority = static_cast<NotificationManagement::Priority>(prio);
|
||||
notif.processedPriority = NotificationManagement::Priority::Low;
|
||||
notif.exerciseId = m_exerciseId;
|
||||
|
||||
for (const auto &userId : m_opmDtc->getOperatorsByOperatorRight(OperatorRights::FileManagementFilesEdit))
|
||||
{
|
||||
NotificationManagement::Address addr;
|
||||
addr.addressId(userId);
|
||||
addr.isRead(false);
|
||||
addr.name(m_opmDtc->user(userId).name());
|
||||
addr.addressType(NotificationManagement::AddressType::Operator);
|
||||
notif.recipientIds().push_back(addr);
|
||||
addr.addressId = userId;
|
||||
addr.isRead = false;
|
||||
addr.name = m_opmDtc->user(userId).name;
|
||||
addr.addressType = NotificationManagement::AddressType::Operator;
|
||||
notif.recipientIds.push_back(addr);
|
||||
}
|
||||
|
||||
NotificationManagement::CreateNotificationRequest notifReq;
|
||||
notifReq.notification(notif);
|
||||
notifReq.notification = notif;
|
||||
|
||||
if (!m_ftcNom->createNotificationRequest(notifReq, this))
|
||||
ERROR_LOG(m_logger) << "Error requesting create Notification data";
|
||||
@@ -210,10 +212,10 @@ void FlmHandler::initHQFolders(int partyId)
|
||||
std::vector<std::string> vecFolderNames = {"HQ Data", partyName.toStdString(), "Messages"};
|
||||
|
||||
FileManagement::PathCreateRequest req;
|
||||
req.path(vecFolderNames);
|
||||
req.parentId(exerciseFolderId);
|
||||
req.isEditable(false);
|
||||
req.operatorId(99);
|
||||
req.path = vecFolderNames;
|
||||
req.parentId = exerciseFolderId;
|
||||
req.isEditable = false;
|
||||
req.operatorId = 99;
|
||||
|
||||
m_ftcFlm->pathCreateRequest(req, this);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user