Adds immediate migration results
This commit is contained in:
2395 files changed
+357322
-2524
No files matched your search
@@ -42,7 +42,7 @@ NGL_TARGET_LINK_LIBRARIES(svcObdCommon
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
PUBLIC
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
ngldb
|
||||
ddscore
|
||||
NGLLogger
|
||||
@@ -148,7 +148,7 @@ CODEGEN_SQL(SRCS_exe ${xml_FILE})
|
||||
NGL_ADD_SVC_ICON(SRCS_exe)
|
||||
NGL_ADD_EXECUTABLE(SV svcOcBaseDownload ${SRCS_exe})
|
||||
NGL_TARGET_LINK_LIBRARIES(svcOcBaseDownload
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
dbAdminCopyExercise
|
||||
svcObdCommon
|
||||
svcObdServer
|
||||
|
||||
+2
-1
@@ -7,6 +7,7 @@
|
||||
* Created by Philipp Dassow, SLST, 2017-12-05
|
||||
*/
|
||||
#include "client_message.h"
|
||||
#include <utility>
|
||||
|
||||
#include <AssetManagement/asm_db.h>
|
||||
#include <ExerciseManagement/exm_db.h>
|
||||
@@ -250,7 +251,7 @@ void PdfListMessage::process()
|
||||
|
||||
QJsonArray arr = m_data.toArray();
|
||||
|
||||
for (const QJsonValue ¤t : qAsConst(arr))
|
||||
for (const QJsonValue ¤t : std::as_const(arr))
|
||||
{
|
||||
if (!current.isObject())
|
||||
continue;
|
||||
|
||||
+5
-4
@@ -7,6 +7,7 @@
|
||||
*/
|
||||
|
||||
#include "handler_base_download.h"
|
||||
#include <utility>
|
||||
|
||||
#include <QStringList>
|
||||
#include <QSettings>
|
||||
@@ -1126,7 +1127,7 @@ void HandlerBaseDownload::removeOldExercises()
|
||||
}
|
||||
QVector<ExerciseManagement::Database::ExmExercise> exercises;
|
||||
exmDbHandler->db()->select(exercises);
|
||||
for (const auto &ex : qAsConst(exercises))
|
||||
for (const auto &ex : std::as_const(exercises))
|
||||
{
|
||||
if (m_exTblGen->dropExerciseSchema(ex.id, false))
|
||||
continue;
|
||||
@@ -1718,7 +1719,7 @@ void HandlerBaseDownload::copyFromOldDatabase()
|
||||
//TODO: add more tables if needed, check data in these tables, z.B. in rec_equipment_position.equipment_number is always negative (?!)
|
||||
|
||||
DBTransaction trans(m_dbConnection);
|
||||
for (const QString &table : qAsConst(tableList))
|
||||
for (const QString &table : std::as_const(tableList))
|
||||
{
|
||||
if (!copyTable(dbIn, m_dbConnection, table))
|
||||
ERROR_LOG(m_logger) << "Failed to copy table " << table;
|
||||
@@ -1852,7 +1853,7 @@ void HandlerBaseDownload::copyOldFlmData(const QSqlDatabase &dbIn, const QSqlDat
|
||||
QVector<Database::FlmFolder> flmFolderData;
|
||||
dbIfcNew->select(flmFolderData);
|
||||
qint64 folderId = -1;
|
||||
for (const auto &folder : qAsConst(flmFolderData))
|
||||
for (const auto &folder : std::as_const(flmFolderData))
|
||||
{
|
||||
if (folder.name == QStringLiteral("Snapshots"))
|
||||
{
|
||||
@@ -1868,7 +1869,7 @@ void HandlerBaseDownload::copyOldFlmData(const QSqlDatabase &dbIn, const QSqlDat
|
||||
|
||||
if (folderId > 0) // found Snapshots folder for the exercise id
|
||||
{
|
||||
for (auto data : qAsConst(flmData))
|
||||
for (auto data : std::as_const(flmData))
|
||||
{
|
||||
if (data.folderId == folderId || //snapshots
|
||||
(data.fileTypeId.underlying() == FileManagement::FileType::Pdf)) //old PDF
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
*/
|
||||
|
||||
#include "handler_pdf_download.h"
|
||||
#include <utility>
|
||||
|
||||
#include "WebSocketInterface/Messages/reply_message.h"
|
||||
#include <QUuid>
|
||||
@@ -172,7 +173,7 @@ void HandlerPdfDownload::onStartPdfDownloadRequest(const rti::core::SampleIdenti
|
||||
return false;
|
||||
};
|
||||
QVector<pdfInfo> pdfInfoVec;
|
||||
for (const auto ¤t : qAsConst(m_pdfData))
|
||||
for (const auto ¤t : std::as_const(m_pdfData))
|
||||
{
|
||||
if (!containsId(request.documentIds(), current.id))
|
||||
continue;
|
||||
|
||||
Reference in new issue
Block a user