Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
@@ -34,6 +34,8 @@ private slots:
|
||||
void onCommentChanged(const Evaluations::EvaluationComment &data, DataModification modType);
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
bool insertComment(const Evaluations::EvaluationComment &c);
|
||||
void retranslate() override;
|
||||
bool eventFilter(QObject *object, QEvent *event) override;
|
||||
|
||||
+6
-6
@@ -301,7 +301,7 @@ void EditSchemaDialog::onNotifyAboutSchema(const Evaluations::EvaluationSchema &
|
||||
|
||||
if (jError.error != QJsonParseError::NoError)
|
||||
{
|
||||
WARNING_LOG() << "Could not parse schema with database id " << data.id();
|
||||
WARNING_LOG(m_logger) << "Could not parse schema with database id " << data.id();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -348,7 +348,7 @@ void EditSchemaDialog::loadSchema(qint32 schemaId)
|
||||
|
||||
if (jError.error != QJsonParseError::NoError)
|
||||
{
|
||||
WARNING_LOG() << "Could not load schema with database id " << m_mapSchemata.last().id();
|
||||
WARNING_LOG(m_logger) << "Could not load schema with database id " << m_mapSchemata.last().id();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -903,12 +903,12 @@ void EditSchemaDialog::onLoadFromLibrary()
|
||||
const QJsonDocument doc(QJsonDocument::fromJson(content, &jError));
|
||||
if (jError.error != QJsonParseError::NoError)
|
||||
{
|
||||
WARNING_LOG() << "Could not parse schema !";
|
||||
WARNING_LOG(m_logger) << "Could not parse schema !";
|
||||
return;
|
||||
}
|
||||
if (!m_pModel->fromQJsonDocument(doc))
|
||||
{
|
||||
WARNING_LOG() << "Could not load schema !";
|
||||
WARNING_LOG(m_logger) << "Could not load schema !";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -929,11 +929,11 @@ bool EditSchemaDialog::onSaveToLibrary()
|
||||
int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::EvaluationSchema, m_session->exerciseId(), byteArray);
|
||||
if (fileId > 0)
|
||||
{
|
||||
DEBUG_LOG() << "Saved file with id = " << fileId;
|
||||
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
ERROR_LOG() << "Could not save file in library ";
|
||||
ERROR_LOG(m_logger) << "Could not save file in library ";
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
+2
@@ -49,6 +49,8 @@ public:
|
||||
void retranslate() override;
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void onSendEvaluationReply(const Core::FunctionReplyObject &replyObject) override final;
|
||||
|
||||
void onEvlCommentModifyReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
|
||||
|
||||
+2
@@ -27,5 +27,7 @@ public:
|
||||
void removeRow(const QModelIndex &idx, bool deleteRootAllowed = false);
|
||||
|
||||
protected:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
}
|
||||
+2
-2
@@ -128,7 +128,7 @@ QJsonDocument TreeModelSchema::toJsonDocument() const
|
||||
{
|
||||
Q_UNUSED(idx);
|
||||
Evaluations::ElementData e = v.value<Evaluations::ElementData>();
|
||||
INFO_LOG() << "toJsonDocument: Name: " << e.getText() << ", elementId: " << e.m_id << ", parent id: " << e.m_parentId;
|
||||
INFO_LOG(m_logger) << "toJsonDocument: Name: " << e.getText() << ", elementId: " << e.m_id << ", parent id: " << e.m_parentId;
|
||||
|
||||
QJsonObject obj;
|
||||
obj[QStringLiteral("id")] = e.m_id;
|
||||
@@ -172,7 +172,7 @@ bool TreeModelSchema::fromQJsonDocument(const QJsonDocument &doc)
|
||||
|
||||
|
||||
m_elementId = std::max(m_elementId, d.m_id);
|
||||
INFO_LOG() << "fromQJsonDocument: " << d.getText() << ", own id = " << d.m_id << ", parent id = " << d.m_parentId;
|
||||
INFO_LOG(m_logger) << "fromQJsonDocument: " << d.getText() << ", own id = " << d.m_id << ", parent id = " << d.m_parentId;
|
||||
}
|
||||
|
||||
++m_elementId;
|
||||
|
||||
+3
-4
@@ -9,10 +9,9 @@
|
||||
namespace Evaluations
|
||||
{
|
||||
EvlNewCommentDialog::EvlNewCommentDialog(const std::shared_ptr<OperatorManagement::Interface::Dtc> &opmDtc,
|
||||
QWidget *parent)
|
||||
: QDialog(parent),
|
||||
m_ui(new Ui::EvlNewCommentDialog)
|
||||
{
|
||||
QWidget *parent) : QDialog(parent),
|
||||
m_ui(new Ui::EvlNewCommentDialog),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_ui->setupUi(this);
|
||||
setWindowFlags(Qt::Tool);
|
||||
m_ui->m_ltsComboBox_ReceiverOperator->addItem(tr("All (Default)"), 0);
|
||||
|
||||
+2
@@ -32,6 +32,8 @@ private slots:
|
||||
void onTextChanged();
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
Ui::EvlNewCommentDialog *m_ui{nullptr};
|
||||
const int m_maxChars{255};
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user