Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+2
@@ -47,6 +47,8 @@ public:
|
||||
bool isFiltered( const OperatorManagement::User &data, DataModification modType ) const override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
QString hasVisibleParties(const std::vector<PartiesByExercise> &vpbe) const;
|
||||
QString visibleParties(const std::vector<int32_t> &parties) const;
|
||||
QString effectiveAcls(std::vector<int32_t> acls) const;
|
||||
|
||||
+1
-1
@@ -41,7 +41,7 @@ bool RemoteShutdownDialog::init(const std::shared_ptr<AssetManagement::Interface
|
||||
const std::shared_ptr<AssetManagement::Interface::Dtc> &asmDtc)
|
||||
{
|
||||
int thisWsId = LtsSessionData::LtsSessionData::getInstance()->getWorkstationId();
|
||||
DEBUG_LOG() << "ws id = " << thisWsId;
|
||||
DEBUG_LOG(m_logger) << "ws id = " << thisWsId;
|
||||
|
||||
if (thisWsId <= 0 || asmFtc == nullptr)
|
||||
return false;
|
||||
|
||||
+2
@@ -28,6 +28,8 @@ public:
|
||||
const std::shared_ptr<OperatorManagement::Interface::Ftc> &ftc);
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void retranslate() override;
|
||||
|
||||
AclDialogModel *m_model;
|
||||
|
||||
+2
@@ -27,6 +27,8 @@ public:
|
||||
QVariant data(const QModelIndex &, int) const override final;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<OperatorManagement::Interface::Dtc> m_dtc;
|
||||
std::shared_ptr<OperatorManagement::Interface::Ftc> m_ftc;
|
||||
};
|
||||
|
||||
+2
@@ -44,6 +44,8 @@ class GroupEditDialog
|
||||
void onGroupChangeNameReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void retranslate() override;
|
||||
bool apply() override;
|
||||
|
||||
|
||||
+1
@@ -32,6 +32,7 @@ public:
|
||||
|
||||
QVariant data(const QModelIndex &, int) const override final;
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
bool isFiltered(const Group &data, DataModification modType) const override
|
||||
{
|
||||
if (m_hideHidden && data.isHidden())
|
||||
|
||||
+1
-1
@@ -120,7 +120,7 @@ void OperatorDialog::onEditOperator()
|
||||
|
||||
if (op.id() <= 0)
|
||||
return;
|
||||
DEBUG_LOG() << "current Operator Id: " << op.id();
|
||||
DEBUG_LOG(m_logger) << "current Operator Id: " << op.id();
|
||||
|
||||
OperatorEditDialog *dialog = new OperatorEditDialog(op.id(), m_session, m_menuGroup, this);
|
||||
const QString identifier = QLatin1String("EditOperator") + QString::number(op.id());
|
||||
|
||||
+1
@@ -40,6 +40,7 @@ public:
|
||||
bool init(LtsSession::LtsSession *session);
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
void retranslate() override;
|
||||
void onOperatorRemoveReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
|
||||
void tableColumnOrganiserSetting() override;
|
||||
|
||||
+6
-6
@@ -170,7 +170,7 @@ bool OperatorEditDialog::operatorCreateModify(const OperatorCreateModifyRequest
|
||||
return false;
|
||||
}
|
||||
|
||||
DEBUG_LOG() << "req.name: " << req.name();
|
||||
DEBUG_LOG(m_logger) << "req.name: " << req.name();
|
||||
return m_requestHelper->startSingleRequest([this, req]()
|
||||
{
|
||||
return m_ftc->operatorCreateModifyRequest(req, this);
|
||||
@@ -365,7 +365,7 @@ bool OperatorEditDialog::apply()
|
||||
const QVector<int> visiblePartyIds = m_visiblePartiesModel->getCheckedIds();
|
||||
std::vector<OperatorManagement::PartiesByExercise> vpbe;
|
||||
PartiesByExercise pbe;
|
||||
DEBUG_LOG() << "----------------- m_session.exerciseId:" << m_session->exerciseId();
|
||||
DEBUG_LOG(m_logger) << "----------------- m_session.exerciseId:" << m_session->exerciseId();
|
||||
pbe.exerciseId(0);
|
||||
pbe.visibleParties().set({});
|
||||
std::copy(visiblePartyIds.begin(), visiblePartyIds.end(), std::back_inserter(pbe.visibleParties().get()));
|
||||
@@ -402,7 +402,7 @@ bool OperatorEditDialog::apply()
|
||||
const QVector<int> visiblePartyIds = m_visiblePartiesModel->getCheckedIds();
|
||||
std::vector<OperatorManagement::PartiesByExercise> vpbe;
|
||||
PartiesByExercise pbe;
|
||||
DEBUG_LOG() << "----------------- m_session.exerciseId:" << m_session->exerciseId();
|
||||
DEBUG_LOG(m_logger) << "----------------- m_session.exerciseId:" << m_session->exerciseId();
|
||||
pbe.exerciseId(0);
|
||||
pbe.visibleParties().set({});
|
||||
std::copy(visiblePartyIds.begin(), visiblePartyIds.end(), std::back_inserter(pbe.visibleParties().get()));
|
||||
@@ -460,7 +460,7 @@ void OperatorEditDialog::createFolders()
|
||||
return;
|
||||
}
|
||||
|
||||
DEBUG_LOG() << "User Folder created with id = " << folderId;
|
||||
DEBUG_LOG(m_logger) << "User Folder created with id = " << folderId;
|
||||
|
||||
#ifdef GUEZ_MODE
|
||||
|
||||
@@ -473,7 +473,7 @@ void OperatorEditDialog::createFolders()
|
||||
return;
|
||||
}
|
||||
|
||||
DEBUG_LOG() << "User Subfolder created with id = " << subFolderId;
|
||||
DEBUG_LOG(m_logger) << "User Subfolder created with id = " << subFolderId;
|
||||
#endif
|
||||
|
||||
LtsWidgets::LtsMessageDialog::showMessage(this, tr("User folders successfully created"));
|
||||
@@ -499,7 +499,7 @@ int OperatorEditDialog::createFolder(int parentFolderId, const QString &folderNa
|
||||
return m_flmFtc->folderModifyRequest(req, this);
|
||||
});
|
||||
|
||||
DEBUG_LOG() << "Created folder id = " << m_requestHelper->getRepliedId();
|
||||
DEBUG_LOG(m_logger) << "Created folder id = " << m_requestHelper->getRepliedId();
|
||||
|
||||
return m_requestHelper->getRepliedId();
|
||||
}
|
||||
|
||||
+2
@@ -49,6 +49,7 @@ public:
|
||||
void onFolderModifyReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
void retranslate() override;
|
||||
bool apply() override final;
|
||||
int createFolder(int parentFolderId, const QString &folderName, int userId, bool isHidden = false);
|
||||
@@ -69,6 +70,7 @@ signals:
|
||||
void sendData(const OperatorManagement::User &data);
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
int m_operatorId;
|
||||
bool m_pictureChanged;
|
||||
bool m_visiblePartiesChanged;
|
||||
|
||||
+2
@@ -35,6 +35,8 @@ public:
|
||||
bool hideHidden = true);
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void retranslate() override;
|
||||
void onGroupRemoveReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
|
||||
void tableColumnOrganiserSetting() override;
|
||||
|
||||
+2
@@ -35,6 +35,8 @@ public:
|
||||
bool init(LtsSession::LtsSession *session);
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void retranslate() override;
|
||||
void onOperatorRemoveReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
|
||||
void tableColumnOrganiserSetting() override;
|
||||
|
||||
+5
-5
@@ -25,7 +25,7 @@ bool SettingsGroup::init()
|
||||
if (!m_subSetHandler || !m_opSettings)
|
||||
{
|
||||
|
||||
ERROR_LOG() << " SettingsGroup::init() failed. this=" << this
|
||||
ERROR_LOG(m_logger) << " SettingsGroup::init() failed. this=" << this
|
||||
<< ", typeid.name='" << typeid(*this).name()
|
||||
<< ", m_id='" << m_id
|
||||
<< ", m_group='" << m_group;
|
||||
@@ -71,7 +71,7 @@ void SettingsGroup::startLoad()
|
||||
#else
|
||||
if (!m_subSetHandler)
|
||||
{
|
||||
ERROR_LOG() << " SettingsGroup::startLoad() : no m_subSetHandler. this=" << this
|
||||
ERROR_LOG(m_logger) << " SettingsGroup::startLoad() : no m_subSetHandler. this=" << this
|
||||
<< ", typeid.name='" << typeid(*this).name()
|
||||
<< ", m_id='" << m_id
|
||||
<< ", m_group='" << m_group;
|
||||
@@ -93,19 +93,19 @@ void SettingsGroup::startSave()
|
||||
return;
|
||||
for (SubSet &subset : m_subsets)
|
||||
{
|
||||
DEBUG_LOG() << "saving11 subset for group: " << m_group
|
||||
DEBUG_LOG(m_logger) << "saving11 subset for group: " << m_group
|
||||
<< ", id:" << m_id
|
||||
<< ", subset.name=" << subset.name
|
||||
<< ", subset.data=" << subset.data.toString();
|
||||
|
||||
bool saveSubSetOk = m_subSetHandler->saveSubSet(subset);
|
||||
if (!saveSubSetOk)
|
||||
WARNING_LOG() << "saving22 subset failed for group: " << m_group
|
||||
WARNING_LOG(m_logger) << "saving22 subset failed for group: " << m_group
|
||||
<< ", id:" << m_id
|
||||
<< ", subset.name=" << subset.name
|
||||
<< ", subset.data=" << subset.data.toString();
|
||||
else
|
||||
DEBUG_LOG() << "saving22 subset for group: " << m_group
|
||||
DEBUG_LOG(m_logger) << "saving22 subset for group: " << m_group
|
||||
<< ", id:" << m_id
|
||||
<< ", subset.name=" << subset.name
|
||||
<< ", subset.data=" << subset.data.toString();
|
||||
|
||||
+2
@@ -87,6 +87,8 @@ public:
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
virtual bool aboutToLoad() { return true; }
|
||||
virtual bool aboutToSave() { return true; }
|
||||
virtual bool aboutToDelete() { return true; }
|
||||
|
||||
+12
-12
@@ -44,7 +44,7 @@ OperatorSettingsDialog::OperatorSettingsDialog(LtsSession::LtsSession *session,
|
||||
, m_workspaceMap(nullptr)
|
||||
, m_filterMap(nullptr)
|
||||
{
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
|
||||
m_ui->setupUi(this);
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@ OperatorSettingsDialog::OperatorSettingsDialog(LtsSession::LtsSession *session,
|
||||
connect(m_ui->pbDEBUGNewWsID, &QPushButton::clicked, this, [this]()
|
||||
{
|
||||
const QString newId(QUuid::createUuid().toString());
|
||||
ERROR_LOG() << "new WsId" << newId;
|
||||
ERROR_LOG(m_logger) << "new WsId" << newId;
|
||||
m_session->setWorkspaceId(newId);
|
||||
});
|
||||
}
|
||||
@@ -146,17 +146,17 @@ OperatorSettingsDialog::OperatorSettingsDialog(LtsSession::LtsSession *session,
|
||||
connect(m_ui->cbScriptsHideOnDrag, &QCheckBox::toggled, m_timer, static_cast<void (QTimer::*)(void)>(&QTimer::start));
|
||||
m_ui->cbScriptsHideOnDrag->setChecked(m_opSettings->value(QStringLiteral("Scripts"), QStringLiteral("HideOnDrag"), true).toBool());
|
||||
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
|
||||
OperatorSettingsDialog::~OperatorSettingsDialog()
|
||||
{
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
|
||||
if (m_timer->isActive())
|
||||
onTimerTimeout();
|
||||
delete m_ui;
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
|
||||
@@ -258,7 +258,7 @@ void OperatorSettingsDialog::onWorkspaceLoad()
|
||||
QString workspaceId = m_ui->cbWorkspaces->currentData().toString();
|
||||
if (workspaceId.compare(QUuid().toString()) == 0)
|
||||
{
|
||||
WARNING_LOG() << "Tried to load a Workspace with Null-Uuid! ... skipping";
|
||||
WARNING_LOG(m_logger) << "Tried to load a Workspace with Null-Uuid! ... skipping";
|
||||
m_ui->cbWorkspaces->setCurrentIndex(0);
|
||||
return;
|
||||
}
|
||||
@@ -297,7 +297,7 @@ void OperatorSettingsDialog::onWorkspaceOverwrite()
|
||||
|
||||
|
||||
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " emit signalOverwriteWorkspace: "
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " emit signalOverwriteWorkspace: "
|
||||
<< " workspaceId= '" << workspaceId << "'"
|
||||
<< " workspaceName= '" << workspaceName << "'";
|
||||
emit signalOverwriteWorkspace(workspaceId, workspaceName, QString());
|
||||
@@ -324,7 +324,7 @@ void OperatorSettingsDialog::onWorkspacesComboboxIndexChanged(int index)
|
||||
{
|
||||
const QString &wspId = m_ui->cbWorkspaces->itemData(index).toString();
|
||||
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: '" << wspId << "'"
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: '" << wspId << "'"
|
||||
<< " itemText: '" << m_ui->cbWorkspaces->itemText(index) << "'";
|
||||
|
||||
if (!m_workspaceMap->contains(wspId) || m_workspaceMap->value(wspId)->data().isEmpty())
|
||||
@@ -370,7 +370,7 @@ void OperatorSettingsDialog::onFilterPresetLoad()
|
||||
QString filterPresetId = m_ui->cbFilterPresets->currentData().toString();
|
||||
if (filterPresetId.compare(QUuid().toString()) == 0)
|
||||
{
|
||||
WARNING_LOG() << "Tried to load a FilterPreset with Null-Uuid! ... skipping";
|
||||
WARNING_LOG(m_logger) << "Tried to load a FilterPreset with Null-Uuid! ... skipping";
|
||||
m_ui->cbFilterPresets->setCurrentIndex(0);
|
||||
return;
|
||||
}
|
||||
@@ -451,7 +451,7 @@ void OperatorSettingsDialog::onFilterPresetDelete()
|
||||
void OperatorSettingsDialog::onFilterPresetsComboboxIndexChanged(int index)
|
||||
{
|
||||
const QString &id = m_ui->cbFilterPresets->itemData(index).toString();
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: '" << id << "'"
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: '" << id << "'"
|
||||
<< " itemText: '" << m_ui->cbFilterPresets->itemText(index) << "'";
|
||||
|
||||
m_ui->pbLoadFilterPreset->setProperty(DISABLE_FAST_CLICKS_PROPERTY, QVariant());
|
||||
@@ -498,13 +498,13 @@ void OperatorSettingsDialog::updateCombobox(QComboBox *cbx, const QMap<QString,
|
||||
const QJsonObject &mapValue = it.value()->data();
|
||||
if (mapValue.isEmpty())
|
||||
{
|
||||
WARNING_LOG() << "Entry with Id: " << it.key() << " has empty data! ... skipping this entry";
|
||||
WARNING_LOG(m_logger) << "Entry with Id: " << it.key() << " has empty data! ... skipping this entry";
|
||||
continue;
|
||||
}
|
||||
QString name = mapValue.value(QStringLiteral("name")).toString();
|
||||
if (name.isEmpty())
|
||||
{
|
||||
WARNING_LOG() << "Entry with Id: " << it.key() << " has empty name! ... skipping this entry";
|
||||
WARNING_LOG(m_logger) << "Entry with Id: " << it.key() << " has empty name! ... skipping this entry";
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
+1
@@ -184,6 +184,7 @@ signals:
|
||||
void linesRemovedChanged(int numLines);
|
||||
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
void paintEvent(QPaintEvent *event) override;
|
||||
void keyPressEvent(QKeyEvent *event) override;
|
||||
void timerEvent(QTimerEvent *event) override;
|
||||
|
||||
Reference in new issue
Block a user