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:
1 parent
eb1d949edc
commit
815e16368e
1718 files changed
+126739
-18495
No files matched your search
@@ -4,7 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <PluginInterfaces/data_plugin_interface.h>
|
||||
#include <FileManagement/flm_data_plugin_interface.h>
|
||||
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
|
||||
|
||||
|
||||
namespace FileManagement
|
||||
|
||||
+26
-26
@@ -1,6 +1,6 @@
|
||||
#include "flm_hq_report_converter.h"
|
||||
|
||||
#include <FileManagement/flm_data_plugin_interface.h>
|
||||
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
|
||||
#include <FileManagement/flm_ftc.h>
|
||||
#include <FileManagement/flm_ftc_types.h>
|
||||
|
||||
@@ -133,7 +133,7 @@ void FlmHqReportConverter::onGetFileContentDataReply(const FileManagement::GetFi
|
||||
{
|
||||
m_pendingRequests--;
|
||||
|
||||
const int id = static_cast<int>(reply.id());
|
||||
const int id = static_cast<int>(reply.id);
|
||||
int planId = -1;
|
||||
|
||||
for (auto it = m_hqToPlanIds.constBegin(); it != m_hqToPlanIds.constEnd(); ++it)
|
||||
@@ -148,23 +148,23 @@ void FlmHqReportConverter::onGetFileContentDataReply(const FileManagement::GetFi
|
||||
DEBUG_LOG(m_logger) << "Reply File with ID: " << id << " from plan with ID: " << planId;
|
||||
INFO_LOG(m_logger) << "Got reply with id " << id;
|
||||
|
||||
QByteArray fileContent = QByteArray::fromRawData(reinterpret_cast<const char *>(reply.content().data()), reply.content().size());
|
||||
QByteArray fileContent = QByteArray::fromRawData(reinterpret_cast<const char *>(reply.content.data()), reply.content.size());
|
||||
|
||||
DEBUG_LOG(m_logger) << "fileContent: " << fileContent;
|
||||
|
||||
FileManagement::FileContent flc = m_flmDtc->fileContent(reply.id());
|
||||
FileManagement::FileContent flc = m_flmDtc->fileContent(reply.id);
|
||||
|
||||
DEBUG_LOG(m_logger) << "FlmHqReportConverter::onGetFileContentDataReply FILECONTENTNAME: " << flc.name();
|
||||
DEBUG_LOG(m_logger) << "FlmHqReportConverter::onGetFileContentDataReply FILECONTENTNAME: " << flc.name;
|
||||
|
||||
HqReportData data = m_parser.parse(fileContent);
|
||||
data.contentFileId = id;
|
||||
data.name = QString::fromStdString(flc.name());
|
||||
data.name = QString::fromStdString(flc.name);
|
||||
|
||||
data.partyColor = QColor::fromRgb(m_ppmDtc->party(m_partyId).color());
|
||||
data.partyColor = QColor::fromRgb(m_ppmDtc->party(m_partyId).color);
|
||||
|
||||
m_convertedHqToPlanIds[planId].append(std::move(data));
|
||||
|
||||
DEBUG_LOG(m_logger) << "Content size: " << reply.content().size();
|
||||
DEBUG_LOG(m_logger) << "Content size: " << reply.content.size();
|
||||
|
||||
checkIfAllFinished();
|
||||
}
|
||||
@@ -195,23 +195,23 @@ void FlmHqReportConverter::onRequestsFinished()
|
||||
QList<HqReportData> reportDatas = it.value();
|
||||
const FileManagement::FileContent flc = m_flmDtc->fileContent(planId);
|
||||
FileManagement::GetFileContentDataRequest req;
|
||||
req.fileContentId(planId);
|
||||
req.fileContentId = planId;
|
||||
|
||||
m_flmFtc->getFileContentDataRequest(req,
|
||||
[this, planId, reportDatas = std::move(reportDatas), flc = std::move(flc)](const FileManagement::GetFileContentDataReply &reply)
|
||||
{
|
||||
const auto &fetchedFlc = reply;
|
||||
if (fetchedFlc.content().size() > 0)
|
||||
if (fetchedFlc.content.size() > 0)
|
||||
{
|
||||
QByteArray existingContent
|
||||
= QByteArray::fromRawData(reinterpret_cast<const char *>(fetchedFlc.content().data()), fetchedFlc.content().size());
|
||||
= QByteArray::fromRawData(reinterpret_cast<const char *>(fetchedFlc.content.data()), fetchedFlc.content.size());
|
||||
|
||||
if (!m_geometryModel->fromByteArray(existingContent))
|
||||
WARNING_LOG(m_logger) << "Could not load existing geometry content for planId" << planId;
|
||||
}
|
||||
|
||||
QJsonArray jsonNameArray;
|
||||
QJsonDocument existingDocs = QJsonDocument::fromJson(QByteArray::fromRawData(flc.properties().data(), flc.properties().size()));
|
||||
QJsonDocument existingDocs = QJsonDocument::fromJson(QByteArray::fromRawData(flc.properties.data(), flc.properties.size()));
|
||||
|
||||
if (existingDocs.isArray())
|
||||
jsonNameArray = existingDocs.array();
|
||||
@@ -241,21 +241,21 @@ void FlmHqReportConverter::onRequestsFinished()
|
||||
|
||||
FileManagement::FileContentModifyRequest data;
|
||||
|
||||
DEBUG_LOG(m_logger) << "FILE CONTENT: " << flc.name() << " " << flc.folderId();
|
||||
DEBUG_LOG(m_logger) << "FILE CONTENT: " << flc.name << " " << flc.folderId;
|
||||
|
||||
data.id(flc.id());
|
||||
data.name(flc.name());
|
||||
data.isTemplate(false);
|
||||
data.isHidden(false);
|
||||
data.folderId(flc.folderId());
|
||||
data.fileStatus(FileManagement::FileStatus::Valid);
|
||||
data.fileCategory(FileManagement::FileCategory::Exercise);
|
||||
data.fileType(FileManagement::FileType::TacticalPlan);
|
||||
data.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
|
||||
data.lastModified(QDateTime::currentMSecsSinceEpoch());
|
||||
data.content(LtsUtils::convert<std::vector<uint8_t>>(m_geometryModel->toByteArray()));
|
||||
data.exerciseId(m_session->exerciseId());
|
||||
data.properties(combinedNames.toStdString());
|
||||
data.id = flc.id;
|
||||
data.name = flc.name;
|
||||
data.isTemplate = false;
|
||||
data.isHidden = false;
|
||||
data.folderId = flc.folderId;
|
||||
data.fileStatus = FileManagement::FileStatus::Valid;
|
||||
data.fileCategory = FileManagement::FileCategory::Exercise;
|
||||
data.fileType = FileManagement::FileType::TacticalPlan;
|
||||
data.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
|
||||
data.lastModified = QDateTime::currentMSecsSinceEpoch();
|
||||
data.content = LtsUtils::convert<std::vector<uint8_t>>(m_geometryModel->toByteArray());
|
||||
data.exerciseId = m_session->exerciseId();
|
||||
data.properties = combinedNames.toStdString();
|
||||
m_flmFtc->fileContentModifyRequest(data, this);
|
||||
m_geometryModel->clearModel();
|
||||
});
|
||||
|
||||
+11
-11
@@ -301,17 +301,17 @@ void HQReportEdit::onCreateNewPlanClicked()
|
||||
|
||||
FileManagement::FileContentModifyRequest data;
|
||||
|
||||
data.name(planName.toStdString());
|
||||
data.isTemplate(false);
|
||||
data.isHidden(false);
|
||||
data.folderId(planModel->folderId());
|
||||
data.fileStatus(FileManagement::FileStatus::Valid);
|
||||
data.fileCategory(FileManagement::FileCategory::Exercise);
|
||||
data.fileType(FileManagement::FileType::TacticalPlan);
|
||||
data.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
|
||||
data.lastModified(QDateTime::currentMSecsSinceEpoch());
|
||||
data.content(LtsUtils::convert<std::vector<uint8_t>>(geometryModel->toByteArray()));
|
||||
data.exerciseId(m_session->exerciseId());
|
||||
data.name = planName.toStdString();
|
||||
data.isTemplate = false;
|
||||
data.isHidden = false;
|
||||
data.folderId = planModel->folderId();
|
||||
data.fileStatus = FileManagement::FileStatus::Valid;
|
||||
data.fileCategory = FileManagement::FileCategory::Exercise;
|
||||
data.fileType = FileManagement::FileType::TacticalPlan;
|
||||
data.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
|
||||
data.lastModified = QDateTime::currentMSecsSinceEpoch();
|
||||
data.content = LtsUtils::convert<std::vector<uint8_t>>(geometryModel->toByteArray());
|
||||
data.exerciseId = m_session->exerciseId();
|
||||
|
||||
m_flmFtc->fileContentModifyRequest(data,
|
||||
[this](const Core::FunctionReplyObject &reply)
|
||||
|
||||
+6
-5
@@ -2,6 +2,7 @@
|
||||
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QIODevice>
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
|
||||
namespace FileManagement
|
||||
@@ -329,17 +330,17 @@ void FlmHQReportModel::deleteHQReportData(const HQData &data)
|
||||
|
||||
void FlmHQReportModel::onFileContentChanged(const FileContent &content, DataModification modType)
|
||||
{
|
||||
if (content.folderId() != m_contentFolderId || content.fileType() != m_fileType)
|
||||
if (content.folderId != m_contentFolderId || content.fileType != m_fileType)
|
||||
return;
|
||||
|
||||
HQData data;
|
||||
data.id = content.id();
|
||||
data.name = QString::fromStdString(content.name());
|
||||
data.properties = content.properties();
|
||||
data.id = content.id;
|
||||
data.name = QString::fromStdString(content.name);
|
||||
data.properties = content.properties;
|
||||
|
||||
DEBUG_LOG(m_logger) << "FlmHQReportModel::onFileContentChanged " << "properties " << data.properties << " " << " Name: " << data.name;
|
||||
|
||||
if (content.fileStatus() == FileStatus::Deleted)
|
||||
if (content.fileStatus == FileStatus::Deleted)
|
||||
{
|
||||
if (modType == DataModification::eModified || modType == DataModification::eAdded)
|
||||
deleteHQReportData(data);
|
||||
|
||||
+1
@@ -1,5 +1,6 @@
|
||||
#include "flm_hq_report_symbol_concrete_creators.h"
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
#include <ParticipantManagement/ppm_ftc_types.h>
|
||||
namespace FileManagement {
|
||||
|
||||
+8
-6
@@ -1,16 +1,17 @@
|
||||
|
||||
|
||||
#include "topic_editor.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include "ui_topic_editor.h"
|
||||
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtilsCore/dds_vector_to_pixmap.h>
|
||||
#include <LtsWidgets/lts_text_edit_dialog.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <flm_data_plugin_interface.h>
|
||||
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
|
||||
#include <FileManagement/flm_explorer_gui_plugin_interface.h>
|
||||
#include <PresentationManagement/Script/Common/topic_designer.h>
|
||||
#include <Plugins/PresentationManagement/Gui/Script/Common/topic_designer.h>
|
||||
#include <QtWidgets/QInputDialog>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
@@ -25,6 +26,7 @@ FileTopicEditor::FileTopicEditor(LtsSession::LtsSession* session, FileContentPre
|
||||
: TopicEditorBase::TopicEditor(parent), m_session(session),
|
||||
m_getContent(new FileManagement::GetFileContent(ftc, this)), m_previewPlaybackWidget(previewWidget),
|
||||
m_ui(new Ui::FileTopicEditor)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
|
||||
m_ui->setupUi(this);
|
||||
@@ -87,7 +89,7 @@ void FileTopicEditor::updatePreview()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "file id = " << m_fileId;
|
||||
m_fileContent = m_dtc->fileContent(m_fileId);
|
||||
m_fileName = QString::fromStdString(m_fileContent.name());
|
||||
m_fileName = QString::fromStdString(m_fileContent.name);
|
||||
m_ui->leFileName->setText(m_fileName);
|
||||
DEBUG_LOG(m_logger) << "file name = " << m_fileName;
|
||||
|
||||
@@ -397,10 +399,10 @@ void FileTopicEditor::onEnterText()
|
||||
m_textEditDialog->enableBackgroundColor(true);
|
||||
QString html;
|
||||
|
||||
if (m_userText.isEmpty() && m_fileContent.id() != 0)
|
||||
if (m_userText.isEmpty() && m_fileContent.id != 0)
|
||||
{
|
||||
std::vector<uint8_t> content;
|
||||
m_getContent->getContent(m_fileContent.id(), content);
|
||||
m_getContent->getContent(m_fileContent.id, content);
|
||||
html = QString::fromUtf8(LtsUtils::toQByteArray(content));
|
||||
}
|
||||
else
|
||||
|
||||
+2
-2
@@ -4,8 +4,8 @@
|
||||
|
||||
#include <Lts/Services/FileManagement/logger.h>
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <FileManagement/Explorer/flm_preview_playback.h>
|
||||
#include <flm_data_plugin_interface.h>
|
||||
#include <Plugins/FileManagement/Gui/Explorer/flm_preview_playback.h>
|
||||
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
|
||||
#include <FileManagement/flm_explorer_gui_plugin_interface.h>
|
||||
#include <QtCore/QPointer>
|
||||
#include <TopicEditorBase/topic_editor_base.h>
|
||||
|
||||
+140
-136
@@ -1,6 +1,7 @@
|
||||
|
||||
|
||||
#include "flm_dialog.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include "flm_dialog_model_file.h"
|
||||
#include "flm_dialog_model_folder.h"
|
||||
@@ -21,7 +22,7 @@
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <ExerciseManagement/exm_data_plugin_interface.h>
|
||||
#include <FileManagement/flm_combobox_gui_plugin_interface.h>
|
||||
#include <flm_data_plugin_interface.h>
|
||||
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
|
||||
#include <FileManagement/flm_explorer_gui_plugin_interface.h>
|
||||
#include <OperatorManagement/opm_data_plugin_interface.h>
|
||||
#include <QtWidgets/QFileDialog>
|
||||
@@ -35,6 +36,7 @@ namespace FileManagement
|
||||
|
||||
FileManagementDialogWidget::FileManagementDialogWidget(QWidget* parent)
|
||||
: QWidget(parent), m_ui(new Ui::FileManagementDialogWidget), m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
if (LtsSessionData::LtsSessionData::getInstance()->isTablet())
|
||||
@@ -141,11 +143,11 @@ bool FileManagementDialogWidget::init(LtsSession::LtsSession* session, FileDialo
|
||||
DEBUG_LOG(m_logger) << "Start init model file content";
|
||||
|
||||
auto predicate = [this](const FileManagement::FileContent& fc, const QString& xmlType) {
|
||||
if (!m_isAdminMode && fc.isHidden())
|
||||
if (!m_isAdminMode && fc.isHidden)
|
||||
return false;
|
||||
|
||||
return (!fc.isDeleted() && fc.fileStatus() == FileManagement::FileStatus::Valid &&
|
||||
(xmlType.isEmpty() || fc.properties().find(xmlType.toStdString()) != std::string::npos));
|
||||
return (!fc.isDeleted && fc.fileStatus == FileManagement::FileStatus::Valid &&
|
||||
(xmlType.isEmpty() || fc.properties.find(xmlType.toStdString()) != std::string::npos));
|
||||
};
|
||||
m_modelFile->initModel(m_session, xmlType, predicate);
|
||||
|
||||
@@ -373,9 +375,9 @@ void FileManagementDialogWidget::enaDisa()
|
||||
|
||||
if (idxFolder.isValid())
|
||||
{
|
||||
m_selectedFolderId = m_modelFolder->getFolder(idxFolder).id();
|
||||
m_selectedFolderId = m_modelFolder->getFolder(idxFolder).id;
|
||||
|
||||
const auto fldPath = m_dtc->folder(m_selectedFolderId).path();
|
||||
const auto fldPath = m_dtc->folder(m_selectedFolderId).path;
|
||||
|
||||
enableAddFolder = true;
|
||||
|
||||
@@ -390,7 +392,7 @@ void FileManagementDialogWidget::enaDisa()
|
||||
|
||||
m_actionCopyFolder->setEnabled(true && userHasRightsToEditFolder);
|
||||
m_actionCutFolder->setEnabled(enableRemoveFolder && userHasRightsToEditFolder);
|
||||
if (m_copyFolder.id() > 0)
|
||||
if (m_copyFolder.id > 0)
|
||||
m_actionPasteFolder->setEnabled(true && userHasRightsToEditFolder);
|
||||
|
||||
enableImportFile = true;
|
||||
@@ -417,12 +419,12 @@ void FileManagementDialogWidget::enaDisa()
|
||||
{
|
||||
FileManagement::FileContent data = m_modelFile->getRowData(m_ui->widgetFiles->currentIndex().row());
|
||||
enableEditFile = true;
|
||||
if (data.isTemplate() || data.isUsedBy())
|
||||
if (data.isTemplate || data.isUsedBy)
|
||||
enableDeleteFile = false;
|
||||
else
|
||||
enableDeleteFile = true;
|
||||
|
||||
if (data.fileStatus() == FileManagement::FileStatus::Deleted)
|
||||
if (data.fileStatus == FileManagement::FileStatus::Deleted)
|
||||
{
|
||||
enableDeleteFile = false;
|
||||
enableRestoreFile = true;
|
||||
@@ -437,21 +439,21 @@ void FileManagementDialogWidget::enaDisa()
|
||||
data.fileType() != FileManagement::FileType::TacticalPlan)
|
||||
#endif
|
||||
enablePreviewFile = true;
|
||||
isOffice = (data.fileType() == FileManagement::FileType::OpenOfficeDocument ||
|
||||
data.fileType() == FileManagement::FileType::OpenOfficeSpreadsheet ||
|
||||
data.fileType() == FileManagement::FileType::OpenOfficePresentation ||
|
||||
data.fileType() == FileManagement::FileType::MSOfficeDocument ||
|
||||
data.fileType() == FileManagement::FileType::MSOfficeDocument97 ||
|
||||
data.fileType() == FileManagement::FileType::MSOfficeSpreadsheet ||
|
||||
data.fileType() == FileManagement::FileType::MSOfficeSpreadsheet97 ||
|
||||
data.fileType() == FileManagement::FileType::MSOfficePresentation ||
|
||||
data.fileType() == FileManagement::FileType::MSOfficePresentation97);
|
||||
isOffice = (data.fileType == FileManagement::FileType::OpenOfficeDocument ||
|
||||
data.fileType == FileManagement::FileType::OpenOfficeSpreadsheet ||
|
||||
data.fileType == FileManagement::FileType::OpenOfficePresentation ||
|
||||
data.fileType == FileManagement::FileType::MSOfficeDocument ||
|
||||
data.fileType == FileManagement::FileType::MSOfficeDocument97 ||
|
||||
data.fileType == FileManagement::FileType::MSOfficeSpreadsheet ||
|
||||
data.fileType == FileManagement::FileType::MSOfficeSpreadsheet97 ||
|
||||
data.fileType == FileManagement::FileType::MSOfficePresentation ||
|
||||
data.fileType == FileManagement::FileType::MSOfficePresentation97);
|
||||
enableRestoreFile = false;
|
||||
if (data.isTemplate())
|
||||
if (data.isTemplate)
|
||||
enableNewFileFromTemplate = true;
|
||||
}
|
||||
m_selectedFileContent = data;
|
||||
m_fileName = QString::fromStdString(data.name());
|
||||
m_fileName = QString::fromStdString(data.name);
|
||||
m_ui->leFile->setText(m_fileName);
|
||||
|
||||
enableExportFile = true;
|
||||
@@ -462,7 +464,7 @@ void FileManagementDialogWidget::enaDisa()
|
||||
}
|
||||
else
|
||||
{
|
||||
if (data.isTemplate() || data.isUsedBy())
|
||||
if (data.isTemplate || data.isUsedBy)
|
||||
enableRemoveFile = false;
|
||||
else
|
||||
enableRemoveFile = true;
|
||||
@@ -499,7 +501,7 @@ void FileManagementDialogWidget::enaDisa()
|
||||
|
||||
m_actionCopyFile->setEnabled(enableEditFile && userHasRightsToEditFiles);
|
||||
m_actionCutFile->setEnabled(enableDeleteFile && userHasRightsToEditFiles);
|
||||
if (m_copyFile.id() > 0)
|
||||
if (m_copyFile.id > 0)
|
||||
m_actionPasteFile->setEnabled(true && userHasRightsToEditFiles);
|
||||
|
||||
emit enableButtons();
|
||||
@@ -515,19 +517,19 @@ bool FileManagementDialogWidget::isFolderRemovable(const QModelIndex& idx) const
|
||||
if (!m_modelFolder->isRowRemovable(m_modelFolder->privateData(idx)))
|
||||
return false;
|
||||
|
||||
if (m_modelFolder->privateData(idx)->data().value<FileManagement::Folder>().id() ==
|
||||
FileManagement::MainFolder::GlobalDocuments ||
|
||||
m_modelFolder->privateData(idx)->data().value<FileManagement::Folder>().id() ==
|
||||
FileManagement::MainFolder::ExerciseDocuments ||
|
||||
m_modelFolder->privateData(idx)->data().value<FileManagement::Folder>().id() ==
|
||||
FileManagement::MainFolder::UserDocuments)
|
||||
if (m_modelFolder->privateData(idx)->data().value<FileManagement::Folder>().id ==
|
||||
static_cast<int>(FileManagement::MainFolder::GlobalDocuments) ||
|
||||
m_modelFolder->privateData(idx)->data().value<FileManagement::Folder>().id ==
|
||||
static_cast<int>(FileManagement::MainFolder::ExerciseDocuments) ||
|
||||
m_modelFolder->privateData(idx)->data().value<FileManagement::Folder>().id ==
|
||||
static_cast<int>(FileManagement::MainFolder::UserDocuments))
|
||||
return false;
|
||||
|
||||
int opId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
|
||||
bool userhasAdminRights =
|
||||
LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::FileManagementFileAdmin);
|
||||
if (!userhasAdminRights && opId != 99 &&
|
||||
m_modelFolder->privateData(idx)->data().value<FileManagement::Folder>().operatorId() != opId)
|
||||
m_modelFolder->privateData(idx)->data().value<FileManagement::Folder>().operatorId != opId)
|
||||
return false;
|
||||
|
||||
const auto children = m_modelFolder->privateData(idx)->children();
|
||||
@@ -593,28 +595,28 @@ void FileManagementDialogWidget::onPasteFile()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onPasteFile";
|
||||
|
||||
if (m_selectedFolderId > 0 && m_copyFile.id() > 0)
|
||||
if (m_selectedFolderId > 0 && m_copyFile.id > 0)
|
||||
{
|
||||
m_copyFile.id(0);
|
||||
if (m_selectedFolderId == m_copyFile.folderId() && m_copyFile.name() == m_selectedFileContent.name())
|
||||
m_copyFile.id = 0;
|
||||
if (m_selectedFolderId == m_copyFile.folderId && m_copyFile.name == m_selectedFileContent.name)
|
||||
{
|
||||
QString newName = QString::fromStdString(m_copyFile.name()) + tr(" (Copy)");
|
||||
m_copyFile.name(newName.toStdString());
|
||||
QString newName = QString::fromStdString(m_copyFile.name) + tr(" (Copy)");
|
||||
m_copyFile.name = newName.toStdString();
|
||||
}
|
||||
m_copyFile.folderId(m_selectedFolderId);
|
||||
m_copyFile.folderId = m_selectedFolderId;
|
||||
|
||||
int exId = 0;
|
||||
int phId = 0;
|
||||
m_copyFile.exerciseId();
|
||||
m_copyFile.phaseId();
|
||||
m_copyFile.exerciseId;
|
||||
m_copyFile.phaseId;
|
||||
|
||||
const auto fldPath = m_dtc->folder(m_selectedFolderId).path();
|
||||
const auto fldPath = m_dtc->folder(m_selectedFolderId).path;
|
||||
|
||||
if (LtsUtils::isInVector(fldPath, FileManagement::MainFolder::UserDocuments))
|
||||
m_copyFile.fileCategory(FileManagement::FileCategory::User);
|
||||
else if (LtsUtils::isInVector(fldPath, FileManagement::MainFolder::ExerciseDocuments))
|
||||
if (LtsUtils::isInVector(fldPath, static_cast<int>(FileManagement::MainFolder::UserDocuments)))
|
||||
m_copyFile.fileCategory = FileManagement::FileCategory::User;
|
||||
else if (LtsUtils::isInVector(fldPath, static_cast<int>(FileManagement::MainFolder::ExerciseDocuments)))
|
||||
{
|
||||
m_copyFile.fileCategory(FileManagement::FileCategory::Exercise);
|
||||
m_copyFile.fileCategory = FileManagement::FileCategory::Exercise;
|
||||
|
||||
if (fldPath.size() >= 2)
|
||||
{
|
||||
@@ -633,12 +635,12 @@ void FileManagementDialogWidget::onPasteFile()
|
||||
}
|
||||
|
||||
if (exId > 0)
|
||||
m_copyFile.exerciseId(exId);
|
||||
m_copyFile.exerciseId = exId;
|
||||
if (phId > 0)
|
||||
m_copyFile.phaseId(phId);
|
||||
m_copyFile.phaseId = phId;
|
||||
}
|
||||
else
|
||||
m_copyFile.fileCategory(FileManagement::FileCategory::Global);
|
||||
m_copyFile.fileCategory = FileManagement::FileCategory::Global;
|
||||
|
||||
FileContentEditDialog* dialog = new FileContentEditDialog(this);
|
||||
QString folderName = m_modelFolder->getFolderName(m_dtc->folder(m_selectedFolderId));
|
||||
@@ -691,7 +693,7 @@ void FileManagementDialogWidget::removeCurrentRowFolder()
|
||||
QModelIndex selIndex = selectedIndexViewFolder();
|
||||
NGLTreeItem* item = m_modelFolder->privateData(selIndex);
|
||||
FileManagement::Folder fld = item->data().value<FileManagement::Folder>();
|
||||
bool isRootFolder = (fld.id() == 0);
|
||||
bool isRootFolder = (fld.id == 0);
|
||||
|
||||
DEBUG_LOG(m_logger) << "isRootFolder = " << isRootFolder;
|
||||
|
||||
@@ -724,7 +726,7 @@ void FileManagementDialogWidget::onCopyFolder()
|
||||
QModelIndex selIndex = selectedIndexViewFolder();
|
||||
NGLTreeItem* item = m_modelFolder->privateData(selIndex);
|
||||
m_copyFolder = item->data().value<FileManagement::Folder>();
|
||||
m_copyFolder.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
|
||||
m_copyFolder.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
|
||||
|
||||
enaDisa();
|
||||
}
|
||||
@@ -735,7 +737,7 @@ void FileManagementDialogWidget::onCopyFile()
|
||||
|
||||
m_copyFile = m_modelFile->getRowData(m_ui->widgetFiles->currentIndex().row());
|
||||
|
||||
m_getContent->getContent(m_copyFile.id(), m_content);
|
||||
m_getContent->getContent(m_copyFile.id, m_content);
|
||||
|
||||
enaDisa();
|
||||
}
|
||||
@@ -759,7 +761,7 @@ void FileManagementDialogWidget::onCutFile()
|
||||
|
||||
m_copyFile = m_modelFile->getRowData(m_ui->widgetFiles->currentIndex().row());
|
||||
|
||||
m_getContent->getContent(m_copyFile.id(), m_content);
|
||||
m_getContent->getContent(m_copyFile.id, m_content);
|
||||
|
||||
onDeleteFile();
|
||||
|
||||
@@ -813,7 +815,7 @@ void FileManagementDialogWidget::onRemoveFile()
|
||||
DEBUG_LOG(m_logger) << "onRemoveFile";
|
||||
|
||||
FileManagement::FileContent data = m_modelFile->getRowData(selIndex.row());
|
||||
Core::RemoveElementRequest req(data.id());
|
||||
Core::RemoveElementRequest req(data.id);
|
||||
m_requestHelper->startSingleRequest([req, this]() { return m_ftc->fileContentRemoveRequest(req, this); });
|
||||
|
||||
if (m_requestHelper->failed())
|
||||
@@ -833,17 +835,17 @@ void FileManagementDialogWidget::onDeleteFile()
|
||||
m_requestHelper->startSingleRequest([this]() {
|
||||
FileManagement::FileContent data = m_modelFile->getRowData(m_ui->widgetFiles->currentIndex().row());
|
||||
|
||||
if (data.fileStatus() == FileManagement::FileStatus::Deleted)
|
||||
if (data.fileStatus == FileManagement::FileStatus::Deleted)
|
||||
return int64_t(0);
|
||||
|
||||
DEBUG_LOG(m_logger) << "Deleting file id = " << data.id();
|
||||
DEBUG_LOG(m_logger) << "Deleting file id = " << data.id;
|
||||
|
||||
FileManagement::FileContentChangeStatusRequest req;
|
||||
req.id(data.id());
|
||||
req.id = data.id;
|
||||
|
||||
req.fileStatus(FileManagement::FileStatus::Deleted);
|
||||
req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
|
||||
req.lastModified(QDateTime::currentMSecsSinceEpoch());
|
||||
req.fileStatus = FileManagement::FileStatus::Deleted;
|
||||
req.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
|
||||
req.lastModified = QDateTime::currentMSecsSinceEpoch();
|
||||
|
||||
return m_ftc->fileContentChangeStatusRequest(FileContentChangeStatusRequest(req), this);
|
||||
});
|
||||
@@ -862,7 +864,7 @@ void FileManagementDialogWidget::reInitModelFile(bool restoreSelected)
|
||||
QModelIndex selIndex = m_ui->widgetFiles->currentIndex();
|
||||
if (selIndex.isValid())
|
||||
{
|
||||
selectedFileId = m_modelFile->getRowData(selIndex.row()).id();
|
||||
selectedFileId = m_modelFile->getRowData(selIndex.row()).id;
|
||||
ERROR_LOG(m_logger) << "Selected file id = " << selectedFileId;
|
||||
}
|
||||
}
|
||||
@@ -897,17 +899,17 @@ void FileManagementDialogWidget::onRestoreFile()
|
||||
m_requestHelper->startSingleRequest([this]() {
|
||||
FileManagement::FileContent data = m_modelFile->getRowData(m_ui->widgetFiles->currentIndex().row());
|
||||
|
||||
if (data.fileStatus() == FileManagement::FileStatus::Valid)
|
||||
if (data.fileStatus == FileManagement::FileStatus::Valid)
|
||||
return int64_t(0);
|
||||
|
||||
DEBUG_LOG(m_logger) << "Deleting file id = " << data.id();
|
||||
DEBUG_LOG(m_logger) << "Deleting file id = " << data.id;
|
||||
|
||||
FileManagement::FileContentChangeStatusRequest req;
|
||||
req.id(data.id());
|
||||
req.id = data.id;
|
||||
|
||||
req.fileStatus(FileManagement::FileStatus::Valid);
|
||||
req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
|
||||
req.lastModified(QDateTime::currentMSecsSinceEpoch());
|
||||
req.fileStatus = FileManagement::FileStatus::Valid;
|
||||
req.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
|
||||
req.lastModified = QDateTime::currentMSecsSinceEpoch();
|
||||
|
||||
return m_ftc->fileContentChangeStatusRequest(FileContentChangeStatusRequest(req), this);
|
||||
});
|
||||
@@ -930,12 +932,12 @@ void FileManagementDialogWidget::onEditFile()
|
||||
return;
|
||||
|
||||
FileManagement::FileContent data = m_modelFile->getRowData(m_ui->widgetFiles->currentIndex().row());
|
||||
DEBUG_LOG(m_logger) << "onEditFileContent Id = " << data.id();
|
||||
DEBUG_LOG(m_logger) << "onEditFileContent Id = " << data.id;
|
||||
|
||||
m_getContent->getContent(data.id(), m_content);
|
||||
m_getContent->getContent(data.id, m_content);
|
||||
|
||||
FileContentEditDialog* dialog = new FileContentEditDialog(this);
|
||||
QString folderName = m_modelFolder->getFolderName(m_dtc->folder(data.folderId()));
|
||||
QString folderName = m_modelFolder->getFolderName(m_dtc->folder(data.folderId));
|
||||
|
||||
if (!dialog->init(m_session, selIndex, m_isAdminMode, folderName, data, m_content))
|
||||
{
|
||||
@@ -993,10 +995,10 @@ void FileManagementDialogWidget::onImportFile()
|
||||
QByteArray fileContent = file.readAll();
|
||||
|
||||
FileManagement::FileContent data = FileContent();
|
||||
data.folderId(m_selectedFolderId);
|
||||
data.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
|
||||
data.name(fileInfo.baseName().toStdString());
|
||||
data.fileStatus(FileManagement::FileStatus::Valid);
|
||||
data.folderId = m_selectedFolderId;
|
||||
data.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
|
||||
data.name = fileInfo.baseName().toStdString();
|
||||
data.fileStatus = FileManagement::FileStatus::Valid;
|
||||
|
||||
int exId = 0;
|
||||
int phId = 0;
|
||||
@@ -1007,12 +1009,12 @@ void FileManagementDialogWidget::onImportFile()
|
||||
phId = m_session->exerciseData()->phId;
|
||||
}
|
||||
|
||||
const auto fldPath = m_dtc->folder(m_selectedFolderId).path();
|
||||
if (LtsUtils::isInVector(fldPath, FileManagement::MainFolder::UserDocuments))
|
||||
data.fileCategory(FileManagement::FileCategory::User);
|
||||
else if (LtsUtils::isInVector(fldPath, FileManagement::MainFolder::ExerciseDocuments))
|
||||
const auto fldPath = m_dtc->folder(m_selectedFolderId).path;
|
||||
if (LtsUtils::isInVector(fldPath, static_cast<int>(FileManagement::MainFolder::UserDocuments)))
|
||||
data.fileCategory = FileManagement::FileCategory::User;
|
||||
else if (LtsUtils::isInVector(fldPath, static_cast<int>(FileManagement::MainFolder::ExerciseDocuments)))
|
||||
{
|
||||
data.fileCategory(FileManagement::FileCategory::Exercise);
|
||||
data.fileCategory = FileManagement::FileCategory::Exercise;
|
||||
if (fldPath.size() >= 2)
|
||||
{
|
||||
exId = m_dtc->getExerciseId(fldPath.at(1));
|
||||
@@ -1022,7 +1024,7 @@ void FileManagementDialogWidget::onImportFile()
|
||||
}
|
||||
else
|
||||
{
|
||||
data.fileCategory(FileManagement::FileCategory::Global);
|
||||
data.fileCategory = FileManagement::FileCategory::Global;
|
||||
exId = 0;
|
||||
phId = 0;
|
||||
}
|
||||
@@ -1030,14 +1032,14 @@ void FileManagementDialogWidget::onImportFile()
|
||||
DEBUG_LOG(m_logger) << "Exercise id = " << exId << ", phase Id = " << phId;
|
||||
|
||||
if (exId > 0)
|
||||
data.exerciseId(exId);
|
||||
data.exerciseId = exId;
|
||||
if (phId > 0)
|
||||
data.phaseId(phId);
|
||||
data.phaseId = phId;
|
||||
|
||||
data.fileType(getFileType(fileExt));
|
||||
data.fileType = getFileType(fileExt);
|
||||
|
||||
FileContentEditDialog* dialog = new FileContentEditDialog(this);
|
||||
QString folderName = m_modelFolder->getFolderName(m_dtc->folder(data.folderId()));
|
||||
QString folderName = m_modelFolder->getFolderName(m_dtc->folder(data.folderId));
|
||||
|
||||
if (!dialog->init(m_session, QModelIndex(), m_isAdminMode, folderName, data,
|
||||
LtsUtils::convert<std::vector<uint8_t>>(fileContent)))
|
||||
@@ -1085,10 +1087,10 @@ void FileManagementDialogWidget::createNewOfficeFile(const QString& fileName)
|
||||
QByteArray fileContent = file.readAll();
|
||||
|
||||
FileManagement::FileContent data;
|
||||
data.folderId(m_selectedFolderId);
|
||||
data.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
|
||||
data.name(tr("<please fill in file name>").toStdString());
|
||||
data.fileStatus(FileManagement::FileStatus::Valid);
|
||||
data.folderId = m_selectedFolderId;
|
||||
data.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
|
||||
data.name = tr("<please fill in file name>").toStdString();
|
||||
data.fileStatus = FileManagement::FileStatus::Valid;
|
||||
|
||||
int exId = 0;
|
||||
int phId = 0;
|
||||
@@ -1099,12 +1101,12 @@ void FileManagementDialogWidget::createNewOfficeFile(const QString& fileName)
|
||||
phId = m_session->exerciseData()->phId;
|
||||
}
|
||||
|
||||
const auto fldPath = m_dtc->folder(m_selectedFolderId).path();
|
||||
if (LtsUtils::isInVector(fldPath, FileManagement::MainFolder::UserDocuments))
|
||||
data.fileCategory(FileManagement::FileCategory::User);
|
||||
else if (LtsUtils::isInVector(fldPath, FileManagement::MainFolder::ExerciseDocuments))
|
||||
const auto fldPath = m_dtc->folder(m_selectedFolderId).path;
|
||||
if (LtsUtils::isInVector(fldPath, static_cast<int>(FileManagement::MainFolder::UserDocuments)))
|
||||
data.fileCategory = FileManagement::FileCategory::User;
|
||||
else if (LtsUtils::isInVector(fldPath, static_cast<int>(FileManagement::MainFolder::ExerciseDocuments)))
|
||||
{
|
||||
data.fileCategory(FileManagement::FileCategory::Exercise);
|
||||
data.fileCategory = FileManagement::FileCategory::Exercise;
|
||||
if (fldPath.size() >= 2)
|
||||
{
|
||||
exId = m_dtc->getExerciseId(fldPath.at(1));
|
||||
@@ -1114,20 +1116,20 @@ void FileManagementDialogWidget::createNewOfficeFile(const QString& fileName)
|
||||
}
|
||||
else
|
||||
{
|
||||
data.fileCategory(FileManagement::FileCategory::Global);
|
||||
data.fileCategory = FileManagement::FileCategory::Global;
|
||||
exId = 0;
|
||||
phId = 0;
|
||||
}
|
||||
|
||||
if (exId > 0)
|
||||
data.exerciseId(exId);
|
||||
data.exerciseId = exId;
|
||||
if (phId > 0)
|
||||
data.phaseId(phId);
|
||||
data.phaseId = phId;
|
||||
|
||||
data.fileType(getFileType(fileInfo.suffix()));
|
||||
data.fileType = getFileType(fileInfo.suffix());
|
||||
|
||||
FileContentEditDialog* dialog = new FileContentEditDialog(this);
|
||||
QString folderName = m_modelFolder->getFolderName(m_dtc->folder(data.folderId()));
|
||||
QString folderName = m_modelFolder->getFolderName(m_dtc->folder(data.folderId));
|
||||
|
||||
if (!dialog->init(m_session, QModelIndex(), m_isAdminMode, folderName, data,
|
||||
LtsUtils::convert<std::vector<uint8_t>>(fileContent)))
|
||||
@@ -1179,9 +1181,9 @@ void FileManagementDialogWidget::onNewFileFromTemplate()
|
||||
{
|
||||
|
||||
onCopyFile();
|
||||
m_copyFile.isTemplate(false);
|
||||
m_copyFile.isUsedBy(false);
|
||||
m_copyFile.name(tr("<please fill in file name>").toStdString());
|
||||
m_copyFile.isTemplate = false;
|
||||
m_copyFile.isUsedBy = false;
|
||||
m_copyFile.name = tr("<please fill in file name>").toStdString();
|
||||
onPasteFile();
|
||||
}
|
||||
|
||||
@@ -1267,7 +1269,7 @@ void FileManagementDialogWidget::fileContextMenuRequested(const QPoint& position
|
||||
|
||||
void FileManagementDialogWidget::onFolderChanged(const FileManagement::Folder& data, DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onFolderChanged: folder name = " << data.name();
|
||||
DEBUG_LOG(m_logger) << "onFolderChanged: folder name = " << data.name;
|
||||
|
||||
Q_UNUSED(data);
|
||||
Q_UNUSED(modType);
|
||||
@@ -1287,10 +1289,10 @@ FileManagement::FileType FileManagementDialogWidget::getFileType(const QString&
|
||||
ext = "jpg";
|
||||
std::function<bool(const FileManagement::FileTypeInfo& fti)> cb = [&type,
|
||||
&ext](const FileManagement::FileTypeInfo& fti) {
|
||||
if (fti.extension() == ext)
|
||||
if (fti.extension == ext)
|
||||
{
|
||||
|
||||
type = static_cast<FileType>(fti.id());
|
||||
type = static_cast<FileType>(fti.id);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
@@ -1312,9 +1314,9 @@ void FileManagementDialogWidget::onPreviewFile()
|
||||
|
||||
FileManagement::FileContent data = m_modelFile->getRowData(m_ui->widgetFiles->currentIndex().row());
|
||||
|
||||
FileManagement::FileType ft = data.fileType();
|
||||
FileManagement::FileType ft = data.fileType;
|
||||
|
||||
switch (ft.underlying())
|
||||
switch (ft)
|
||||
{
|
||||
case FileManagement::FileType::Jpg:
|
||||
case FileManagement::FileType::Png:
|
||||
@@ -1362,7 +1364,7 @@ void FileManagementDialogWidget::onPreviewFile()
|
||||
|
||||
QString FileManagementDialogWidget::getFileTypeStr(FileManagement::FileType fileType)
|
||||
{
|
||||
switch (fileType.underlying())
|
||||
switch (fileType)
|
||||
{
|
||||
case FileManagement::FileType::Png:
|
||||
return (QStringLiteral(".png"));
|
||||
@@ -1424,15 +1426,15 @@ void FileManagementDialogWidget::onExportFile()
|
||||
return;
|
||||
}
|
||||
|
||||
m_getContent->getContent(m_selectedFileContent.id(), m_content);
|
||||
m_getContent->getContent(m_selectedFileContent.id, m_content);
|
||||
DEBUG_LOG(m_logger) << "onExportFile(): Save File to '" << folderName << "/" << m_fileName << "'"
|
||||
<< " fileType = " << m_selectedFileContent.fileType()
|
||||
<< " getFileTypeStr = " << getFileTypeStr(m_selectedFileContent.fileType())
|
||||
<< " exportFileName = " << m_selectedFileContent.exportFileName()
|
||||
<< " fileType = " << m_selectedFileContent.fileType
|
||||
<< " getFileTypeStr = " << getFileTypeStr(m_selectedFileContent.fileType)
|
||||
<< " exportFileName = " << m_selectedFileContent.exportFileName
|
||||
<< " m_content.size = " << m_content.size();
|
||||
|
||||
QString completeFileName = m_fileName;
|
||||
completeFileName.append(getFileTypeStr(m_selectedFileContent.fileType()));
|
||||
completeFileName.append(getFileTypeStr(m_selectedFileContent.fileType));
|
||||
|
||||
QFile file;
|
||||
QDir::setCurrent(folderName);
|
||||
@@ -1473,7 +1475,7 @@ void FileManagementDialogWidget::onSelectFile()
|
||||
|
||||
m_selectedFileContent = m_modelFile->getRowData(selIndex.row());
|
||||
|
||||
DEBUG_LOG(m_logger) << "Selected file content id = " << m_selectedFileContent.id();
|
||||
DEBUG_LOG(m_logger) << "Selected file content id = " << m_selectedFileContent.id;
|
||||
emit accepted();
|
||||
}
|
||||
|
||||
@@ -1491,7 +1493,7 @@ void FileManagementDialogWidget::onChooseFileName()
|
||||
void FileManagementDialogWidget::onFileChanged(const FileManagement::FileContent& data, DataModification modType)
|
||||
{
|
||||
bool condition = showFile(data, m_xmlType);
|
||||
DEBUG_LOG(m_logger) << "onFileChanged file name = " << data.name() << ", condition = " << condition
|
||||
DEBUG_LOG(m_logger) << "onFileChanged file name = " << data.name << ", condition = " << condition
|
||||
<< ", modType = " << modType;
|
||||
|
||||
bool reInit = false;
|
||||
@@ -1517,7 +1519,7 @@ void FileManagementDialogWidget::onFileChanged(const FileManagement::FileContent
|
||||
if (condition)
|
||||
{
|
||||
|
||||
if (data.id() == m_modelFile->getRowData(row).id())
|
||||
if (data.id == m_modelFile->getRowData(row).id)
|
||||
m_modelFile->setRowData(row, data);
|
||||
else
|
||||
reInit = true;
|
||||
@@ -1533,71 +1535,71 @@ void FileManagementDialogWidget::onFileChanged(const FileManagement::FileContent
|
||||
|
||||
bool FileManagementDialogWidget::showFile(const FileManagement::FileContent& fc, const QString& xmlType)
|
||||
{
|
||||
if (fc.isDeleted())
|
||||
if (fc.isDeleted)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "is deleted: " << fc.name().c_str();
|
||||
DEBUG_LOG(m_logger) << "is deleted: " << fc.name.c_str();
|
||||
return false;
|
||||
}
|
||||
|
||||
if (fc.folderId() != m_selectedFolderId)
|
||||
if (fc.folderId != m_selectedFolderId)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Folder id does not match: " << fc.name().c_str();
|
||||
DEBUG_LOG(m_logger) << "Folder id does not match: " << fc.name.c_str();
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_fileTypes.isEmpty() && !m_fileTypes.contains(fc.fileType()))
|
||||
if (!m_fileTypes.isEmpty() && !m_fileTypes.contains(fc.fileType))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "file type does not match: " << fc.name().c_str();
|
||||
DEBUG_LOG(m_logger) << "file type does not match: " << fc.name.c_str();
|
||||
return false;
|
||||
}
|
||||
|
||||
if (m_dialogMode != FileDialogMode::Admin)
|
||||
{
|
||||
if (fc.fileStatus() != FileManagement::FileStatus::Valid)
|
||||
if (fc.fileStatus != FileManagement::FileStatus::Valid)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "file status is not valid: " << fc.name().c_str();
|
||||
DEBUG_LOG(m_logger) << "file status is not valid: " << fc.name.c_str();
|
||||
return false;
|
||||
}
|
||||
|
||||
const QModelIndex selIndex = selectedIndexViewFolder();
|
||||
const NGLTreeItem* item = m_modelFolder->privateData(selIndex);
|
||||
const FileManagement::Folder fld = item->data().value<FileManagement::Folder>();
|
||||
const QVector<int> fldPath = LtsUtils::convert<QVector<int>>(fld.path());
|
||||
const QVector<int> fldPath = LtsUtils::convert<QVector<int>>(fld.path);
|
||||
|
||||
if (fldPath.contains(FileManagement::MainFolder::UserDocuments))
|
||||
if (fldPath.contains(static_cast<int>(FileManagement::MainFolder::UserDocuments)))
|
||||
{
|
||||
const int operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
|
||||
|
||||
DEBUG_LOG(m_logger) << "Filtering files on OperatorId = " << operatorId;
|
||||
if (fc.operatorId() != operatorId)
|
||||
if (fc.operatorId != operatorId)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "operator id does not match: " << fc.name().c_str();
|
||||
DEBUG_LOG(m_logger) << "operator id does not match: " << fc.name.c_str();
|
||||
return false;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "Filtering files on User Category";
|
||||
if (fc.fileCategory() != FileManagement::FileCategory::User)
|
||||
if (fc.fileCategory != FileManagement::FileCategory::User)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "User category does not match: " << fc.name().c_str();
|
||||
DEBUG_LOG(m_logger) << "User category does not match: " << fc.name.c_str();
|
||||
}
|
||||
|
||||
if (m_session->exerciseId() > 0)
|
||||
{
|
||||
if (fc.exerciseId().is_set() && fc.exerciseId().get() != m_session->exerciseId())
|
||||
if (fc.exerciseId.has_value() && fc.exerciseId.get() != m_session->exerciseId())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "exercise does not match: " << fc.name().c_str()
|
||||
<< " is: " << fc.exerciseId() << " should be " << m_session->exerciseId();
|
||||
DEBUG_LOG(m_logger) << "exercise does not match: " << fc.name.c_str()
|
||||
<< " is: " << fc.exerciseId << " should be " << m_session->exerciseId();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (fldPath.contains(FileManagement::MainFolder::ExerciseDocuments))
|
||||
if (fldPath.contains(static_cast<int>(FileManagement::MainFolder::ExerciseDocuments)))
|
||||
{
|
||||
|
||||
DEBUG_LOG(m_logger) << "Filtering files on Exercise Category";
|
||||
if (fc.fileCategory() != FileManagement::FileCategory::Exercise)
|
||||
if (fc.fileCategory != FileManagement::FileCategory::Exercise)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "exercise category does not match: " << fc.name().c_str();
|
||||
DEBUG_LOG(m_logger) << "exercise category does not match: " << fc.name.c_str();
|
||||
return false;
|
||||
}
|
||||
if (m_session->exerciseId() > 0)
|
||||
@@ -1605,18 +1607,18 @@ bool FileManagementDialogWidget::showFile(const FileManagement::FileContent& fc,
|
||||
|
||||
DEBUG_LOG(m_logger) << "Filtering files on Exercise Category and exerciseId = "
|
||||
<< m_session->exerciseId();
|
||||
if (fc.exerciseId().is_set() && fc.exerciseId().get() != m_session->exerciseId())
|
||||
if (fc.exerciseId.has_value() && fc.exerciseId.get() != m_session->exerciseId())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "exercise does not match: " << fc.name().c_str()
|
||||
<< " is: " << fc.exerciseId() << " should be " << m_session->exerciseId();
|
||||
DEBUG_LOG(m_logger) << "exercise does not match: " << fc.name.c_str()
|
||||
<< " is: " << fc.exerciseId << " should be " << m_session->exerciseId();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (fc.fileType() == FileType::Xml && !xmlType.isEmpty() && fc.properties().size() > 0)
|
||||
if (fc.fileType == FileType::Xml && !xmlType.isEmpty() && fc.properties.size() > 0)
|
||||
{
|
||||
const QString& prop = QString::fromStdString(fc.properties());
|
||||
const QString& prop = QString::fromStdString(fc.properties);
|
||||
if (!prop.contains(xmlType, Qt::CaseSensitive))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "XmlType not found " << xmlType;
|
||||
@@ -1643,6 +1645,7 @@ void FileManagementDialogWidget::selectFolder()
|
||||
FileManagementDialogTab::FileManagementDialogTab(const QString& menuGroup, QWidget* parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly),
|
||||
m_editItemWidget(new FileManagementDialogWidget(this))
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
|
||||
if (menuGroup == tr("Document Library"))
|
||||
@@ -1744,6 +1747,7 @@ FileManagementDialog::FileManagementDialog(QWidget* parent)
|
||||
: LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal),
|
||||
m_editItemWidget(new FileManagementDialogWidget(this)), m_buttonBox(new LtsWidgets::LtsDialogButtonBox(this)),
|
||||
m_dialogMode(FileDialogMode::OpenFile)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Ctor FileManagementDialog";
|
||||
|
||||
|
||||
@@ -3,12 +3,14 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <FileManagement/flm_qmetatypes.h>
|
||||
#include <FileManagement/flm_dtc.h>
|
||||
#include <Lts/Services/FileManagement/flm_ftc.h>
|
||||
#include <Lts/Services/FileManagement/logger.h>
|
||||
#include <OperatorManagement/opm_dtc.h>
|
||||
#include <ExerciseManagement/exm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
#include <LtsWidgets/lts_frameless_dialog.h>
|
||||
@@ -211,7 +213,7 @@ public:
|
||||
const QString &xmlType = QString());
|
||||
|
||||
FileManagement::FileContent getSelectedFile() const { return m_editItemWidget->m_selectedFileContent; }
|
||||
int getSelectedFileId() const { return m_editItemWidget->m_selectedFileContent.id(); }
|
||||
int getSelectedFileId() const { return m_editItemWidget->m_selectedFileContent.id; }
|
||||
int getSelectedFolderId() const { return m_editItemWidget->m_selectedFolderId; }
|
||||
QString getFileName() const { return m_editItemWidget->m_fileName; }
|
||||
|
||||
@@ -244,7 +246,7 @@ public:
|
||||
const int &folderId = 0,
|
||||
const QString &buttonName = QString());
|
||||
|
||||
int getSelectedFileId() const { return m_editItemWidget->m_selectedFileContent.id(); }
|
||||
int getSelectedFileId() const { return m_editItemWidget->m_selectedFileContent.id; }
|
||||
int getSelectedFolder() const { return m_editItemWidget->m_selectedFolderId; }
|
||||
QString getFileName() const { return m_editItemWidget->m_fileName; }
|
||||
FileContent getSelectedFile() const { return m_editItemWidget->m_selectedFileContent; }
|
||||
|
||||
+23
-21
@@ -1,11 +1,12 @@
|
||||
|
||||
|
||||
#include "flm_dialog_model_file.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include <FileManagement/flm_translation.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <ExerciseManagement/exm_data_plugin_interface.h>
|
||||
#include <flm_data_plugin_interface.h>
|
||||
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
|
||||
#include <OperatorManagement/opm_data_plugin_interface.h>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtGui/QGuiApplication>
|
||||
@@ -21,6 +22,7 @@ DialogModelFile::DialogModelFile(QObject* parent)
|
||||
tr("Operator"), tr("Used"), tr("Uses"), tr("Last modified"), tr("Properties"), tr("Folder Id"),
|
||||
tr("File Id")},
|
||||
parent)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
}
|
||||
|
||||
@@ -58,7 +60,7 @@ QVariant DialogModelFile::data(const QModelIndex& index, int role) const
|
||||
switch (role)
|
||||
{
|
||||
case Qt::BackgroundRole: {
|
||||
if (fl.fileStatus() == FileManagement::FileStatus::Deleted)
|
||||
if (fl.fileStatus == FileManagement::FileStatus::Deleted)
|
||||
return QGuiApplication::palette().color(QPalette::Disabled, QPalette::AlternateBase);
|
||||
return QGuiApplication::palette().color(QPalette::Active, QPalette::Base);
|
||||
}
|
||||
@@ -66,41 +68,41 @@ QVariant DialogModelFile::data(const QModelIndex& index, int role) const
|
||||
switch (index.column())
|
||||
{
|
||||
case NAME:
|
||||
return QString::fromStdString(fl.name());
|
||||
return QString::fromStdString(fl.name);
|
||||
case ISTEMPLATE:
|
||||
return fl.isTemplate() ? tr("Yes") : tr("No");
|
||||
return fl.isTemplate ? tr("Yes") : tr("No");
|
||||
case FOLDER:
|
||||
return fl.folderId();
|
||||
return fl.folderId;
|
||||
case FILEID:
|
||||
return fl.id();
|
||||
return fl.id;
|
||||
case FILETYPE:
|
||||
return FileManagement::toString(fl.fileType());
|
||||
return FileManagement::toString(fl.fileType);
|
||||
case FILECATEGORY:
|
||||
return FileManagement::toString(fl.fileCategory());
|
||||
return FileManagement::toString(fl.fileCategory);
|
||||
case FILESTATUS:
|
||||
return FileManagement::toString(fl.fileStatus());
|
||||
return FileManagement::toString(fl.fileStatus);
|
||||
case OPERATOR:
|
||||
return QString::fromStdString(m_opmDtc->user(fl.operatorId()).name());
|
||||
return QString::fromStdString(m_opmDtc->user(fl.operatorId).name);
|
||||
case EXERCISE:
|
||||
return fl.exerciseId().is_set()
|
||||
? QString::fromStdString(m_exmDtc->exercise(fl.exerciseId().get()).name())
|
||||
return fl.exerciseId.has_value()
|
||||
? QString::fromStdString(m_exmDtc->exercise(fl.exerciseId.get()).name)
|
||||
: QVariant();
|
||||
case PHASE:
|
||||
return fl.phaseId().is_set()
|
||||
? QString::fromStdString(m_exmDtc->exercisePhase(fl.phaseId().get()).name())
|
||||
return fl.phaseId.has_value()
|
||||
? QString::fromStdString(m_exmDtc->exercisePhase(fl.phaseId.get()).name)
|
||||
: QVariant();
|
||||
case USEDBY:
|
||||
return fl.isUsedBy() ? tr("Yes") : tr("No");
|
||||
return fl.isUsedBy ? tr("Yes") : tr("No");
|
||||
case USES:
|
||||
return fl.usedBy();
|
||||
return fl.usedBy;
|
||||
case LASTMODIFIED:
|
||||
return QDateTime::fromMSecsSinceEpoch(fl.lastModified());
|
||||
return QDateTime::fromMSecsSinceEpoch(fl.lastModified);
|
||||
case PROPERTIES:
|
||||
return QString::fromStdString(fl.properties());
|
||||
return QString::fromStdString(fl.properties);
|
||||
}
|
||||
}
|
||||
case Qt::DecorationRole: {
|
||||
if (index.column() == NAME && fl.isHidden())
|
||||
if (index.column() == NAME && fl.isHidden)
|
||||
return QIcon(QLatin1String(":/style/lock.svg"));
|
||||
break;
|
||||
}
|
||||
@@ -115,7 +117,7 @@ FileManagement::FileContent DialogModelFile::findFileFromName(const QString& fil
|
||||
for (int row = 0; row < rowCount(); ++row)
|
||||
{
|
||||
const FileManagement::FileContent& fl = m_vecData.at(row);
|
||||
if (QString::fromStdString(fl.name()) == fileName)
|
||||
if (QString::fromStdString(fl.name) == fileName)
|
||||
return fl;
|
||||
}
|
||||
return FileManagement::FileContent();
|
||||
@@ -137,7 +139,7 @@ bool DialogFileProxyModel::lessThan(const QModelIndex& source_left, const QModel
|
||||
switch (source_left.column())
|
||||
{
|
||||
case LASTMODIFIED:
|
||||
return dataLeft.lastModified() < dataRight.lastModified();
|
||||
return dataLeft.lastModified < dataRight.lastModified;
|
||||
case NAME:
|
||||
case FILETYPE:
|
||||
case FILECATEGORY:
|
||||
|
||||
+40
-37
@@ -2,16 +2,18 @@
|
||||
|
||||
|
||||
#include "flm_dialog_model_folder.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include "ParticipantManagement/ppm.hpp"
|
||||
#include "ParticipantManagement/ppm_dtc.h"
|
||||
|
||||
#include <LtsUtils/pgarray.h>
|
||||
#include <LtsUtilsCore/pgarray.h>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
#include <nglwidgets/ngltreeitem.h>
|
||||
|
||||
#include <FileManagement/flm_translation.h>
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
|
||||
#include <flm_data_plugin_interface.h>
|
||||
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
|
||||
#include <FileManagement/flm_combobox_gui_plugin_interface.h>
|
||||
#include <FileManagement/flm_explorer_gui_plugin_interface.h>
|
||||
#include <OperatorManagement/opm_data_plugin_interface.h>
|
||||
@@ -35,6 +37,7 @@ DialogModelFolder::DialogModelFolder(QObject *parent,
|
||||
, m_exmDtc(nullptr)
|
||||
, m_opmDtc(nullptr)
|
||||
, m_ppmDtc(nullptr)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
|
||||
}
|
||||
@@ -87,26 +90,26 @@ QVariant DialogModelFolder::data(const QModelIndex &index, int role) const
|
||||
case NAME:
|
||||
return getFolderName(folderData);
|
||||
case ID:
|
||||
return folderData.id();
|
||||
return folderData.id;
|
||||
case PATH:
|
||||
return LtsUtils::IntArray(folderData.path()).toPgString();
|
||||
return LtsUtils::IntArray(folderData.path).toPgString();
|
||||
case EDITABLE:
|
||||
return folderData.isEditable() ? tr("Yes") : tr("No");
|
||||
return folderData.isEditable ? tr("Yes") : tr("No");
|
||||
case PARENT:
|
||||
return folderData.parentId();
|
||||
return folderData.parentId;
|
||||
case OPERATOR:
|
||||
return QString::fromStdString(m_opmDtc->user(folderData.operatorId()).name());
|
||||
return QString::fromStdString(m_opmDtc->user(folderData.operatorId).name);
|
||||
case MODIFIED:
|
||||
return QDateTime::fromMSecsSinceEpoch(folderData.lastModified());
|
||||
return QDateTime::fromMSecsSinceEpoch(folderData.lastModified);
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
case Qt::UserRole:
|
||||
return folderData.id();
|
||||
return folderData.id;
|
||||
case Qt::DecorationRole:
|
||||
{
|
||||
if (folderData.isHidden())
|
||||
if (folderData.isHidden)
|
||||
return item->icon();
|
||||
break;
|
||||
}
|
||||
@@ -126,24 +129,24 @@ FileManagement::Folder DialogModelFolder::getFolder(const QModelIndex &idx) cons
|
||||
|
||||
QString DialogModelFolder::getFolderName(const FileManagement::Folder &folderData) const
|
||||
{
|
||||
QString folderName = QString::fromStdString(folderData.name());
|
||||
QString folderName = QString::fromStdString(folderData.name);
|
||||
if (folderName.startsWith(QStringLiteral("$")))
|
||||
{
|
||||
folderName.remove(0, 1);
|
||||
if (folderName.startsWith(QStringLiteral("EX_")))
|
||||
{
|
||||
int exId = folderName.remove(0, 3).toInt();
|
||||
return QString::fromStdString(m_exmDtc->exercise(exId).name());
|
||||
return QString::fromStdString(m_exmDtc->exercise(exId).name);
|
||||
}
|
||||
if (folderName.startsWith(QStringLiteral("PH_")))
|
||||
{
|
||||
int phId = folderName.remove(0, 3).toInt();
|
||||
return QString::fromStdString(m_exmDtc->exercisePhase(phId).name());
|
||||
return QString::fromStdString(m_exmDtc->exercisePhase(phId).name);
|
||||
}
|
||||
if (folderName.startsWith(QStringLiteral("PY_")))
|
||||
{
|
||||
int partyId = folderName.remove(0, 3).toInt();
|
||||
return ParticipantManagement::trPartyName(m_ppmDtc->party(partyId).name());
|
||||
return ParticipantManagement::trPartyName(m_ppmDtc->party(partyId).name);
|
||||
}
|
||||
return FileManagement::trFolderName(folderName.toStdString());
|
||||
}
|
||||
@@ -173,7 +176,7 @@ bool DialogModelFolder::isRowRemovable(const NGLTreeItem *parentItem) const
|
||||
if (!parentItem)
|
||||
return false;
|
||||
FileManagement::Folder folderData = parentItem->data().value<FileManagement::Folder>();
|
||||
return folderData.isEditable();
|
||||
return folderData.isEditable;
|
||||
}
|
||||
|
||||
|
||||
@@ -189,21 +192,21 @@ bool DialogModelFolder::initModel(int exerciseId, bool isAdminMode)
|
||||
|
||||
auto cbFolders = [this, exerciseId, &tmap, &idsToExclude, isAdminMode] (const FileManagement::Folder &data)
|
||||
{
|
||||
if (data.isDeleted() ||
|
||||
(!isAdminMode && data.isHidden()))
|
||||
if (data.isDeleted ||
|
||||
(!isAdminMode && data.isHidden))
|
||||
return;
|
||||
|
||||
QString folderName = QString::fromStdString(data.name());
|
||||
QString folderName = QString::fromStdString(data.name);
|
||||
if (folderName.startsWith(QStringLiteral("$EX_")))
|
||||
{
|
||||
int exId = folderName.remove(0, 4).toInt();
|
||||
if ((exerciseId > 0 && exId != exerciseId) || exId != m_exmDtc->exercise(exId).id())
|
||||
if ((exerciseId > 0 && exId != exerciseId) || exId != m_exmDtc->exercise(exId).id)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Excluded exercise id " << exId << ", folder id " << data.id();
|
||||
idsToExclude.append(data.id());
|
||||
DEBUG_LOG(m_logger) << "Excluded exercise id " << exId << ", folder id " << data.id;
|
||||
idsToExclude.append(data.id);
|
||||
}
|
||||
}
|
||||
tmap.insert(data.id(), data);
|
||||
tmap.insert(data.id, data);
|
||||
};
|
||||
m_flmDtc->folders(cbFolders);
|
||||
|
||||
@@ -216,10 +219,10 @@ bool DialogModelFolder::initModel(int exerciseId, bool isAdminMode)
|
||||
int parentId = 0;
|
||||
FileManagement::Folder fld = iter.value();
|
||||
|
||||
if (fld.path().size() > 1)
|
||||
if (fld.path.size() > 1)
|
||||
{
|
||||
parentId = fld.path().at(fld.path().size() - 2);
|
||||
int idPos2 = fld.path().at(1);
|
||||
parentId = fld.path.at(fld.path.size() - 2);
|
||||
int idPos2 = fld.path.at(1);
|
||||
if (idsToExclude.contains(idPos2))
|
||||
continue;
|
||||
}
|
||||
@@ -230,7 +233,7 @@ bool DialogModelFolder::initModel(int exerciseId, bool isAdminMode)
|
||||
if (!parentItemIndexCache.contains(parentId))
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Invalid folder structure, parent may be hidden: " << parentId;
|
||||
WARNING_LOG(m_logger) << "Folder " << fld.name() << ", hidden: " << fld.isHidden();
|
||||
WARNING_LOG(m_logger) << "Folder " << fld.name << ", hidden: " << fld.isHidden;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -254,7 +257,7 @@ bool DialogModelFolder::onInsertRow(int &row, const QModelIndex &parent, const F
|
||||
QVariant data;
|
||||
data.setValue(folderData);
|
||||
QIcon icon;
|
||||
if (folderData.isHidden())
|
||||
if (folderData.isHidden)
|
||||
icon = QIcon(QLatin1String(":/style/lock.svg"));
|
||||
NGLTreeItem *item = new NGLTreeItem(data, icon);
|
||||
item->setModified(true);
|
||||
@@ -274,7 +277,7 @@ bool DialogModelFolder::onUpdateRow(const QModelIndex &index, const FileManageme
|
||||
emit internalDataChanged();
|
||||
|
||||
QIcon icon;
|
||||
if (folderData.isHidden())
|
||||
if (folderData.isHidden)
|
||||
icon = QIcon(QLatin1String(":/style/lock.svg"));
|
||||
return setItemData(index, data, icon);
|
||||
}
|
||||
@@ -290,7 +293,7 @@ bool DialogModelFolder::onDeleteRow(const QModelIndex &idx, bool isFirstItem)
|
||||
{
|
||||
NGLTreeItem *item = privateData(idx);
|
||||
FileManagement::Folder data = item->data().value<FileManagement::Folder>();
|
||||
data.isDeleted(true);
|
||||
data.isDeleted = true;
|
||||
}
|
||||
removeRow(idx.row(), idx.parent());
|
||||
emit internalDataChanged();
|
||||
@@ -340,11 +343,11 @@ bool DialogModelProxyFolder::lessThan(const QModelIndex &source_left, const QMod
|
||||
const FileManagement::Folder left = itemLeft->data().value<FileManagement::Folder>();
|
||||
const FileManagement::Folder right = itemRight->data().value<FileManagement::Folder>();
|
||||
|
||||
if (left.id() == FileManagement::MainFolder::GlobalDocuments || right.id() == FileManagement::MainFolder::GlobalDocuments ||
|
||||
left.id() == FileManagement::MainFolder::UserDocuments || right.id() == FileManagement::MainFolder::UserDocuments ||
|
||||
left.id() == FileManagement::MainFolder::ExerciseDocuments || right.id() == FileManagement::MainFolder::ExerciseDocuments)
|
||||
if (left.id == static_cast<int>(FileManagement::MainFolder::GlobalDocuments) || right.id == static_cast<int>(FileManagement::MainFolder::GlobalDocuments) ||
|
||||
left.id == static_cast<int>(FileManagement::MainFolder::UserDocuments) || right.id == static_cast<int>(FileManagement::MainFolder::UserDocuments) ||
|
||||
left.id == static_cast<int>(FileManagement::MainFolder::ExerciseDocuments) || right.id == static_cast<int>(FileManagement::MainFolder::ExerciseDocuments))
|
||||
{
|
||||
return left.id() < right.id();
|
||||
return left.id < right.id;
|
||||
}
|
||||
|
||||
|
||||
@@ -353,7 +356,7 @@ bool DialogModelProxyFolder::lessThan(const QModelIndex &source_left, const QMod
|
||||
|
||||
|
||||
|
||||
return left.id() < right.id();
|
||||
return left.id < right.id;
|
||||
}
|
||||
|
||||
|
||||
@@ -383,12 +386,12 @@ bool DialogModelProxyFolder::filterAcceptsRow(int source_row, const QModelIndex
|
||||
return QSortFilterProxyModel::filterAcceptsRow(source_row, source_parent);
|
||||
|
||||
const Folder data = child->data().value<Folder>();
|
||||
if (data.operatorId() != m_operatorId)
|
||||
if (data.operatorId != m_operatorId)
|
||||
{
|
||||
|
||||
for (int p : data.path())
|
||||
for (int p : data.path)
|
||||
{
|
||||
if (p == FileManagement::MainFolder::UserDocuments)
|
||||
if (p == static_cast<int>(FileManagement::MainFolder::UserDocuments))
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -94,5 +94,5 @@ protected:
|
||||
}
|
||||
|
||||
|
||||
Q_DECLARE_METATYPE(FileManagement::Folder)
|
||||
#include <FileManagement/flm_qmetatypes.h>
|
||||
|
||||
+98
-96
@@ -2,11 +2,12 @@
|
||||
|
||||
|
||||
#include "flm_edit_file_content.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include "flm_preview_file_dialog.h"
|
||||
#include "ui_flm_edit_file_content.h"
|
||||
#include "flm_set_properties_dialog.h"
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <flm_data_plugin_interface.h>
|
||||
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
|
||||
#include <FileManagement/flm_combobox_gui_plugin_interface.h>
|
||||
#include <FileManagement/flm_explorer_gui_plugin_interface.h>
|
||||
#include <OperatorManagement/opm_data_plugin_interface.h>
|
||||
@@ -27,6 +28,7 @@ FileContentEditDialog::FileContentEditDialog(QWidget *parent)
|
||||
: LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_ui(new Ui::FileContentEditDialog)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -118,7 +120,7 @@ bool FileContentEditDialog::init(LtsSession::LtsSession *session,
|
||||
this, &FileContentEditDialog::onPropertiesClicked);
|
||||
connect(m_ui->checkUsed, &QCheckBox::stateChanged, this, &FileContentEditDialog::onCheckUsedStateChanged);
|
||||
|
||||
if (m_editData.id() > 0)
|
||||
if (m_editData.id > 0)
|
||||
{
|
||||
m_ui->ltsDialogButtonBox->setText(LtsWidgets::DialogButton::Add, tr("Ok"));
|
||||
m_ui->ltsDialogButtonBox->connectButton(LtsWidgets::DialogButton::Add, this, &FileContentEditDialog::onEditItem);
|
||||
@@ -152,35 +154,35 @@ void FileContentEditDialog::getMetaData()
|
||||
m_ui->cbPhases->setCurrentIndex(0);
|
||||
m_ui->cbPhases->setEnabled(false);
|
||||
|
||||
m_ui->leName->setText(QString::fromStdString(m_editData.name()));
|
||||
m_ui->cbFileType->setCurrentIndex(m_ui->cbFileType->findData(QVariant(m_editData.fileType().underlying())));
|
||||
m_ui->cbFileCategory->setCurrentIndex(m_ui->cbFileCategory->findData(m_editData.fileCategory().underlying()));
|
||||
m_ui->cbFileStatus->setCurrentIndex(m_ui->cbFileStatus->findData(QVariant(m_editData.fileStatus().underlying())));
|
||||
m_ui->leName->setText(QString::fromStdString(m_editData.name));
|
||||
m_ui->cbFileType->setCurrentIndex(m_ui->cbFileType->findData(QVariant(static_cast<int>(m_editData.fileType))));
|
||||
m_ui->cbFileCategory->setCurrentIndex(m_ui->cbFileCategory->findData(static_cast<int>(m_editData.fileCategory)));
|
||||
m_ui->cbFileStatus->setCurrentIndex(m_ui->cbFileStatus->findData(QVariant(static_cast<int>(m_editData.fileStatus))));
|
||||
|
||||
m_ui->leFolder->setText(m_folderName);
|
||||
|
||||
m_ui->checkTemplate->setChecked(m_editData.isTemplate());
|
||||
m_ui->checkHidden->setChecked(m_editData.isHidden());
|
||||
m_ui->checkUsed->setChecked(m_editData.isUsedBy());
|
||||
m_ui->lblUses->setText(QStringLiteral("[") + QString::number(m_editData.usedBy()) + QStringLiteral("]"));
|
||||
m_ui->checkTemplate->setChecked(m_editData.isTemplate);
|
||||
m_ui->checkHidden->setChecked(m_editData.isHidden);
|
||||
m_ui->checkUsed->setChecked(m_editData.isUsedBy);
|
||||
m_ui->lblUses->setText(QStringLiteral("[") + QString::number(m_editData.usedBy) + QStringLiteral("]"));
|
||||
|
||||
m_ui->leOperator->setText(QString::fromStdString(m_opmDtc->user(m_editData.operatorId()).name()));
|
||||
m_ui->leProperties->setText(QString::fromStdString(m_editData.properties()));
|
||||
if (m_editData.fileCategory() == FileManagement::FileCategory::Exercise ||
|
||||
m_editData.fileCategory() == FileManagement::FileCategory::User)
|
||||
m_ui->leOperator->setText(QString::fromStdString(m_opmDtc->user(m_editData.operatorId).name));
|
||||
m_ui->leProperties->setText(QString::fromStdString(m_editData.properties));
|
||||
if (m_editData.fileCategory == FileManagement::FileCategory::Exercise ||
|
||||
m_editData.fileCategory == FileManagement::FileCategory::User)
|
||||
{
|
||||
if (m_editData.exerciseId().is_set())
|
||||
if (m_editData.exerciseId.has_value())
|
||||
{
|
||||
m_ui->cbExercises->setCurrentIndex(m_ui->cbExercises->findData(m_editData.exerciseId().get()));
|
||||
if (m_editData.phaseId().is_set())
|
||||
m_ui->cbPhases->setCurrentIndex(m_ui->cbPhases->findData(m_editData.phaseId().get()));
|
||||
m_ui->cbExercises->setCurrentIndex(m_ui->cbExercises->findData(m_editData.exerciseId.get()));
|
||||
if (m_editData.phaseId.has_value())
|
||||
m_ui->cbPhases->setCurrentIndex(m_ui->cbPhases->findData(m_editData.phaseId.get()));
|
||||
else
|
||||
m_ui->cbPhases->setEnabled(true);
|
||||
}
|
||||
else
|
||||
m_ui->cbExercises->setEnabled(true);
|
||||
}
|
||||
m_ui->leLastModified->setText(DTG::toStringMSec(m_editData.lastModified()));
|
||||
m_ui->leLastModified->setText(DTG::toStringMSec(m_editData.lastModified));
|
||||
}
|
||||
|
||||
|
||||
@@ -188,31 +190,31 @@ void FileContentEditDialog::setMetaData()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "setMetaData";
|
||||
|
||||
m_editData.name(m_ui->leName->text().toStdString());
|
||||
m_editData.fileType(static_cast<FileManagement::FileType>(m_ui->cbFileType->currentData().toInt()));
|
||||
m_editData.fileCategory(static_cast<FileManagement::FileCategory>(m_ui->cbFileCategory->currentData().toInt()));
|
||||
m_editData.fileStatus(static_cast<FileManagement::FileStatus>(m_ui->cbFileStatus->currentData().toInt()));
|
||||
m_editData.isTemplate(m_ui->checkTemplate->isChecked());
|
||||
m_editData.isHidden(m_ui->checkHidden->isChecked());
|
||||
m_editData.isUsedBy(m_ui->checkUsed->isChecked());
|
||||
if (m_editData.fileCategory() == FileManagement::FileCategory::Exercise)
|
||||
m_editData.name = m_ui->leName->text().toStdString();
|
||||
m_editData.fileType = static_cast<FileManagement::FileType>(m_ui->cbFileType->currentData().toInt());
|
||||
m_editData.fileCategory = static_cast<FileManagement::FileCategory>(m_ui->cbFileCategory->currentData().toInt());
|
||||
m_editData.fileStatus = static_cast<FileManagement::FileStatus>(m_ui->cbFileStatus->currentData().toInt());
|
||||
m_editData.isTemplate = m_ui->checkTemplate->isChecked();
|
||||
m_editData.isHidden = m_ui->checkHidden->isChecked();
|
||||
m_editData.isUsedBy = m_ui->checkUsed->isChecked();
|
||||
if (m_editData.fileCategory == FileManagement::FileCategory::Exercise)
|
||||
{
|
||||
if (m_ui->cbExercises->currentData().toInt() > 0)
|
||||
{
|
||||
m_editData.exerciseId(m_ui->cbExercises->currentData().toInt());
|
||||
m_editData.exerciseId = m_ui->cbExercises->currentData().toInt();
|
||||
if (m_ui->cbPhases->currentData().toInt() > 0)
|
||||
m_editData.phaseId(m_ui->cbPhases->currentData().toInt());
|
||||
m_editData.phaseId = m_ui->cbPhases->currentData().toInt();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
m_editData.exerciseId();
|
||||
m_editData.phaseId();
|
||||
m_editData.exerciseId;
|
||||
m_editData.phaseId;
|
||||
}
|
||||
m_editData.properties(m_ui->leProperties->text().toStdString());
|
||||
m_editData.lastModified(QDateTime::currentMSecsSinceEpoch());
|
||||
m_editData.properties = m_ui->leProperties->text().toStdString();
|
||||
m_editData.lastModified = QDateTime::currentMSecsSinceEpoch();
|
||||
|
||||
m_editData.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
|
||||
m_editData.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
|
||||
|
||||
}
|
||||
|
||||
@@ -224,36 +226,36 @@ void FileContentEditDialog::onAddItem()
|
||||
setMetaData();
|
||||
|
||||
FileContentModifyRequest data;
|
||||
data.name(m_editData.name());
|
||||
data.fileType(m_editData.fileType());
|
||||
data.fileCategory(m_editData.fileCategory());
|
||||
data.fileStatus(m_editData.fileStatus());
|
||||
data.properties(m_editData.properties());
|
||||
data.isTemplate(m_editData.isTemplate());
|
||||
data.isHidden(m_editData.isHidden());
|
||||
data.isUsedBy(m_editData.isUsedBy());
|
||||
data.usedBy(m_editData.usedBy());
|
||||
data.folderId(m_editData.folderId());
|
||||
if (m_editData.fileCategory() == FileManagement::FileCategory::Exercise ||
|
||||
m_editData.fileCategory() == FileManagement::FileCategory::User)
|
||||
data.name = m_editData.name;
|
||||
data.fileType = m_editData.fileType;
|
||||
data.fileCategory = m_editData.fileCategory;
|
||||
data.fileStatus = m_editData.fileStatus;
|
||||
data.properties = m_editData.properties;
|
||||
data.isTemplate = m_editData.isTemplate;
|
||||
data.isHidden = m_editData.isHidden;
|
||||
data.isUsedBy = m_editData.isUsedBy;
|
||||
data.usedBy = m_editData.usedBy;
|
||||
data.folderId = m_editData.folderId;
|
||||
if (m_editData.fileCategory == FileManagement::FileCategory::Exercise ||
|
||||
m_editData.fileCategory == FileManagement::FileCategory::User)
|
||||
{
|
||||
if (m_editData.exerciseId().is_set())
|
||||
if (m_editData.exerciseId.has_value())
|
||||
{
|
||||
data.exerciseId(m_editData.exerciseId().get());
|
||||
if (m_editData.phaseId().is_set())
|
||||
data.phaseId(m_editData.phaseId().get());
|
||||
data.exerciseId = m_editData.exerciseId.get();
|
||||
if (m_editData.phaseId.has_value())
|
||||
data.phaseId = m_editData.phaseId.get();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
m_editData.exerciseId();
|
||||
m_editData.phaseId();
|
||||
m_editData.exerciseId;
|
||||
m_editData.phaseId;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "onAddItem: Content size = " << m_content.size();
|
||||
data.content(m_content);
|
||||
data.content = m_content;
|
||||
|
||||
data.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
|
||||
data.lastModified(QDateTime::currentMSecsSinceEpoch());
|
||||
data.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
|
||||
data.lastModified = QDateTime::currentMSecsSinceEpoch();
|
||||
|
||||
if (!m_requestHelper->startSingleRequest([data, this]() {return m_ftc->fileContentModifyRequest(data, this);}))
|
||||
return;
|
||||
@@ -271,39 +273,39 @@ void FileContentEditDialog::onEditItem()
|
||||
setMetaData();
|
||||
|
||||
FileContentModifyRequest data;
|
||||
data.id(m_editData.id());
|
||||
data.name(m_editData.name());
|
||||
data.fileType(m_editData.fileType());
|
||||
data.fileCategory(m_editData.fileCategory());
|
||||
data.fileStatus(m_editData.fileStatus());
|
||||
data.properties(m_editData.properties());
|
||||
data.isTemplate(m_editData.isTemplate());
|
||||
data.isHidden(m_editData.isHidden());
|
||||
data.isUsedBy(m_editData.isUsedBy());
|
||||
data.usedBy(m_editData.usedBy());
|
||||
data.folderId(m_editData.folderId());
|
||||
if (m_editData.fileCategory() == FileManagement::FileCategory::Exercise ||
|
||||
m_editData.fileCategory() == FileManagement::FileCategory::User)
|
||||
data.id = m_editData.id;
|
||||
data.name = m_editData.name;
|
||||
data.fileType = m_editData.fileType;
|
||||
data.fileCategory = m_editData.fileCategory;
|
||||
data.fileStatus = m_editData.fileStatus;
|
||||
data.properties = m_editData.properties;
|
||||
data.isTemplate = m_editData.isTemplate;
|
||||
data.isHidden = m_editData.isHidden;
|
||||
data.isUsedBy = m_editData.isUsedBy;
|
||||
data.usedBy = m_editData.usedBy;
|
||||
data.folderId = m_editData.folderId;
|
||||
if (m_editData.fileCategory == FileManagement::FileCategory::Exercise ||
|
||||
m_editData.fileCategory == FileManagement::FileCategory::User)
|
||||
{
|
||||
if (m_editData.exerciseId().is_set())
|
||||
if (m_editData.exerciseId.has_value())
|
||||
{
|
||||
data.exerciseId(m_editData.exerciseId().get());
|
||||
if (m_editData.phaseId().is_set())
|
||||
data.phaseId(m_editData.phaseId().get());
|
||||
data.exerciseId = m_editData.exerciseId.get();
|
||||
if (m_editData.phaseId.has_value())
|
||||
data.phaseId = m_editData.phaseId.get();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
m_editData.exerciseId();
|
||||
m_editData.phaseId();
|
||||
m_editData.exerciseId;
|
||||
m_editData.phaseId;
|
||||
}
|
||||
data.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
|
||||
data.lastModified(QDateTime::currentMSecsSinceEpoch());
|
||||
data.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
|
||||
data.lastModified = QDateTime::currentMSecsSinceEpoch();
|
||||
|
||||
DEBUG_LOG(m_logger) << "onEditItem: Content size = " << m_content.size();
|
||||
data.content(m_content);
|
||||
data.content = m_content;
|
||||
|
||||
DEBUG_LOG(m_logger) << "Modify FileContent id = " << data.id();
|
||||
DEBUG_LOG(m_logger) << "Modify FileContent id = " << data.id;
|
||||
|
||||
if (!m_requestHelper->startSingleRequest([ = ]()
|
||||
{
|
||||
@@ -320,7 +322,7 @@ void FileContentEditDialog::onComboFileTypeChanged(int crt)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onComboFileTypeChanged crt = " << crt;
|
||||
m_ui->cbFileType->setCurrentIndex(crt);
|
||||
m_editData.fileType(static_cast<FileManagement::FileType>(m_ui->cbFileType->currentData().toInt()));
|
||||
m_editData.fileType = static_cast<FileManagement::FileType>(m_ui->cbFileType->currentData().toInt());
|
||||
}
|
||||
|
||||
|
||||
@@ -328,7 +330,7 @@ void FileContentEditDialog::onComboFileStatusChanged(int crt)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onComboFileStatusChanged crt = " << crt;
|
||||
m_ui->cbFileStatus->setCurrentIndex(crt);
|
||||
m_editData.fileStatus(static_cast<FileManagement::FileStatus>(m_ui->cbFileStatus->currentData().toInt()));
|
||||
m_editData.fileStatus = static_cast<FileManagement::FileStatus>(m_ui->cbFileStatus->currentData().toInt());
|
||||
}
|
||||
|
||||
|
||||
@@ -336,7 +338,7 @@ void FileContentEditDialog::onComboFileCategoryChanged(int crt)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onComboFileCategoryChanged crt = " << crt;
|
||||
m_ui->cbFileCategory->setCurrentIndex(crt);
|
||||
m_editData.fileCategory(static_cast<FileManagement::FileCategory>(m_ui->cbFileCategory->currentData().toInt()));
|
||||
m_editData.fileCategory = static_cast<FileManagement::FileCategory>(m_ui->cbFileCategory->currentData().toInt());
|
||||
|
||||
|
||||
|
||||
@@ -350,13 +352,13 @@ void FileContentEditDialog::onComboExerciseChanged(int crt)
|
||||
m_ui->cbExercises->setCurrentIndex(crt);
|
||||
if (m_ui->cbExercises->currentData().toInt() > 0)
|
||||
{
|
||||
m_editData.exerciseId(m_ui->cbExercises->currentData().toInt());
|
||||
m_editData.exerciseId = m_ui->cbExercises->currentData().toInt();
|
||||
m_ui->cbPhases->setEnabled(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_editData.exerciseId().reset();
|
||||
m_editData.phaseId().reset();
|
||||
m_editData.exerciseId.reset();
|
||||
m_editData.phaseId.reset();
|
||||
m_ui->cbPhases->setEnabled(false);
|
||||
}
|
||||
fillPhasesComboBox();
|
||||
@@ -368,9 +370,9 @@ void FileContentEditDialog::onComboPhaseChanged(int crt)
|
||||
DEBUG_LOG(m_logger) << "onComboPhaseChanged crt = " << crt;
|
||||
m_ui->cbPhases->setCurrentIndex(crt);
|
||||
if (m_ui->cbPhases->currentData().toInt() > 0)
|
||||
m_editData.phaseId(m_ui->cbPhases->currentData().toInt());
|
||||
m_editData.phaseId = m_ui->cbPhases->currentData().toInt();
|
||||
else
|
||||
m_editData.phaseId().reset();
|
||||
m_editData.phaseId.reset();
|
||||
}
|
||||
|
||||
|
||||
@@ -382,7 +384,7 @@ void FileContentEditDialog::fillExercisesComboBox()
|
||||
m_ui->cbExercises->addItem(tr("<not set>"), 0);
|
||||
auto cbEx = [this] (const ExerciseManagement::Exercise &ex)
|
||||
{
|
||||
m_ui->cbExercises->addItem(QString::fromStdString(ex.name()), ex.id());
|
||||
m_ui->cbExercises->addItem(QString::fromStdString(ex.name), ex.id);
|
||||
};
|
||||
m_exmDtc->exercises(cbEx);
|
||||
}
|
||||
@@ -394,21 +396,21 @@ void FileContentEditDialog::fillPhasesComboBox()
|
||||
QSignalBlocker blocker(m_ui->cbPhases);
|
||||
m_ui->cbPhases->clear();
|
||||
m_ui->cbPhases->addItem(tr("<not set>"), 0);
|
||||
if (m_editData.exerciseId().is_set())
|
||||
if (m_editData.exerciseId.has_value())
|
||||
{
|
||||
const int exId = m_editData.exerciseId().get();
|
||||
const int exId = m_editData.exerciseId.get();
|
||||
DEBUG_LOG(m_logger) << "ExId = " << exId;
|
||||
if (exId > 0)
|
||||
{
|
||||
auto cbPhases = [this, exId] (const ExerciseManagement::ExercisePhase &ph)
|
||||
{
|
||||
if (ph.exerciseId() == exId)
|
||||
m_ui->cbPhases->addItem(QString::fromStdString(ph.name()), ph.id());
|
||||
if (ph.exerciseId == exId)
|
||||
m_ui->cbPhases->addItem(QString::fromStdString(ph.name), ph.id);
|
||||
};
|
||||
m_exmDtc->exercisePhases(cbPhases);
|
||||
}
|
||||
if (m_editData.phaseId().is_set())
|
||||
m_ui->cbPhases->setCurrentIndex(m_ui->cbPhases->findData(m_editData.phaseId().get()));
|
||||
if (m_editData.phaseId.has_value())
|
||||
m_ui->cbPhases->setCurrentIndex(m_ui->cbPhases->findData(m_editData.phaseId.get()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -427,10 +429,10 @@ void FileContentEditDialog::onCheckUsedStateChanged(int newState)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onCheckUsedClicked: newState = " << newState;
|
||||
if (newState == Qt::Checked)
|
||||
m_editData.usedBy(1);
|
||||
m_editData.usedBy = 1;
|
||||
else
|
||||
m_editData.usedBy(0);
|
||||
m_ui->lblUses->setText(QLatin1Char('[') + QString::number(m_editData.usedBy()) + QLatin1Char(']'));
|
||||
m_editData.usedBy = 0;
|
||||
m_ui->lblUses->setText(QLatin1Char('[') + QString::number(m_editData.usedBy) + QLatin1Char(']'));
|
||||
}
|
||||
|
||||
}
|
||||
+21
-19
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "flm_edit_folder.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include "ui_flm_edit_folder.h"
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
|
||||
@@ -14,6 +15,7 @@ FolderEditDialog::FolderEditDialog(QWidget *parent)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_ui(new Ui::FolderEditDialog)
|
||||
, m_workingIndex(QModelIndex())
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -67,16 +69,16 @@ bool FolderEditDialog::init(const QModelIndex &workingIndex, const int &folderId
|
||||
setWindowTitle(tr("Create New Folder"));
|
||||
if (m_folderId > 0)
|
||||
{
|
||||
m_ui->leName->setText(QString::fromStdString(m_editData.name()));
|
||||
m_ui->leName->setText(QString::fromStdString(m_editData.name));
|
||||
m_ui->ltsDialogButtonBox->setText(LtsWidgets::DialogButton::Add, tr("Rename"));
|
||||
setWindowTitle(tr("Edit Folder"));
|
||||
}
|
||||
else if (data.id() > 0)
|
||||
m_ui->leName->setText(QString::fromStdString(m_editData.name()));
|
||||
else if (data.id > 0)
|
||||
m_ui->leName->setText(QString::fromStdString(m_editData.name));
|
||||
m_ui->ltsDialogButtonBox->connectButton(LtsWidgets::DialogButton::Add, this, &FolderEditDialog::onAddEditFolder);
|
||||
|
||||
m_ui->cbHidden->setVisible(isAdminMode);
|
||||
m_ui->cbHidden->setChecked(m_editData.isHidden());
|
||||
m_ui->cbHidden->setChecked(m_editData.isHidden);
|
||||
|
||||
#ifdef TABLET_MODE
|
||||
m_ui->leName->setFocusPolicy(Qt::ClickFocus);
|
||||
@@ -94,7 +96,7 @@ void FolderEditDialog::onAddEditFolder()
|
||||
if (apply())
|
||||
{
|
||||
close();
|
||||
DEBUG_LOG(m_logger) << "Added / Edited folder " << m_editData.name();
|
||||
DEBUG_LOG(m_logger) << "Added / Edited folder " << m_editData.name;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -108,13 +110,13 @@ bool FolderEditDialog::apply()
|
||||
m_requestHelper->addRequest([this]()
|
||||
{
|
||||
FolderModifyRequest req;
|
||||
req.id(m_folderId);
|
||||
req.name(m_ui->leName->text().toStdString());
|
||||
req.path(m_dtc->folder(m_folderId).path());
|
||||
req.isEditable(true);
|
||||
req.isHidden(m_ui->cbHidden->isChecked());
|
||||
req.parentId(m_dtc->folder(m_folderId).parentId());
|
||||
req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
|
||||
req.id = m_folderId;
|
||||
req.name = m_ui->leName->text().toStdString();
|
||||
req.path = m_dtc->folder(m_folderId).path;
|
||||
req.isEditable = true;
|
||||
req.isHidden = m_ui->cbHidden->isChecked();
|
||||
req.parentId = m_dtc->folder(m_folderId).parentId;
|
||||
req.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
|
||||
return m_ftc->folderModifyRequest(req, this);
|
||||
});
|
||||
|
||||
@@ -125,18 +127,18 @@ bool FolderEditDialog::apply()
|
||||
DEBUG_LOG(m_logger) << "Create new folder";
|
||||
|
||||
FolderModifyRequest req;
|
||||
req.name(m_ui->leName->text().toStdString());
|
||||
req.isEditable(true);
|
||||
req.isHidden(m_ui->cbHidden->isChecked());
|
||||
req.parentId(m_parentFolderId);
|
||||
req.name = m_ui->leName->text().toStdString();
|
||||
req.isEditable = true;
|
||||
req.isHidden = m_ui->cbHidden->isChecked();
|
||||
req.parentId = m_parentFolderId;
|
||||
std::vector<int> parentPath;
|
||||
if (m_parentFolderId > 0)
|
||||
{
|
||||
FileManagement::Folder fld = m_dtc->folder(m_parentFolderId);
|
||||
parentPath = fld.path();
|
||||
parentPath = fld.path;
|
||||
}
|
||||
req.path(parentPath);
|
||||
req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
|
||||
req.path = parentPath;
|
||||
req.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
|
||||
|
||||
m_requestHelper->addRequest([req, this]()
|
||||
{
|
||||
|
||||
+83
-81
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "flm_explorer_gui_plugin.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include "flm_dialog.h"
|
||||
#include "flm_preview_playback.h"
|
||||
#include "flm_get_content_async.h"
|
||||
@@ -12,7 +13,7 @@
|
||||
#include <LtsWidgets/lts_events.h>
|
||||
#include <LtsWidgets/lts_base_layout_widget.h>
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtilsCore/dds_vector_to_pixmap.h>
|
||||
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
@@ -53,6 +54,7 @@ const QString InterfaceImpl::s_flmHQReportScheme = QStringLiteral("flmHQReport")
|
||||
InterfaceImpl::InterfaceImpl(LtsSession::LtsSession *session)
|
||||
: GuiPluginBase::Interface(session, getLogger("Plugins.Gui.Flm.Explorer"))
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
qApp->installEventFilter(this);
|
||||
}
|
||||
@@ -288,7 +290,7 @@ int InterfaceImpl::saveFileContent(QWidget *parent,
|
||||
delete dialog;
|
||||
|
||||
INFO_LOG(m_logger) << "FileToSave: Folder id = " << folderId
|
||||
<< ", File id = " << fileToModify.id()
|
||||
<< ", File id = " << fileToModify.id
|
||||
<< ", File name = " << fileName;
|
||||
|
||||
if (folderId < 1 || fileName.isEmpty())
|
||||
@@ -297,7 +299,7 @@ int InterfaceImpl::saveFileContent(QWidget *parent,
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (fileToModify.id() > 0)
|
||||
if (fileToModify.id > 0)
|
||||
{
|
||||
bool doNotOverwrite = (LtsWidgets::Button::No == LtsWidgets::LtsMessageDialog::showMessage( m_session->baseLayout()
|
||||
, tr("Do you want to overwrite the existing file?")
|
||||
@@ -313,55 +315,55 @@ int InterfaceImpl::saveFileContent(QWidget *parent,
|
||||
|
||||
FileManagement::FileContentModifyRequest request;
|
||||
|
||||
request.id(fileToModify.id());
|
||||
request.name(fileName.toStdString());
|
||||
request.isTemplate(fileToModify.isTemplate());
|
||||
request.folderId(folderId);
|
||||
const QVector<int> fldPath = LtsUtils::convert<QVector<int>>(m_dtc->folder(folderId).path());
|
||||
request.id = fileToModify.id;
|
||||
request.name = fileName.toStdString();
|
||||
request.isTemplate = fileToModify.isTemplate;
|
||||
request.folderId = folderId;
|
||||
const QVector<int> fldPath = LtsUtils::convert<QVector<int>>(m_dtc->folder(folderId).path);
|
||||
|
||||
if (fileToModify.id() > 0)
|
||||
request.fileCategory(fileToModify.fileCategory());
|
||||
if (fileToModify.id > 0)
|
||||
request.fileCategory = fileToModify.fileCategory;
|
||||
else
|
||||
{
|
||||
if (fldPath.contains(FileManagement::MainFolder::UserDocuments))
|
||||
request.fileCategory(FileManagement::FileCategory::User);
|
||||
else if (fldPath.contains(FileManagement::MainFolder::ExerciseDocuments))
|
||||
request.fileCategory(FileManagement::FileCategory::Exercise);
|
||||
if (fldPath.contains(static_cast<int>(FileManagement::MainFolder::UserDocuments)))
|
||||
request.fileCategory = FileManagement::FileCategory::User;
|
||||
else if (fldPath.contains(static_cast<int>(FileManagement::MainFolder::ExerciseDocuments)))
|
||||
request.fileCategory = FileManagement::FileCategory::Exercise;
|
||||
else
|
||||
request.fileCategory(FileManagement::FileCategory::Global);
|
||||
request.fileCategory = FileManagement::FileCategory::Global;
|
||||
}
|
||||
request.fileType(targetFileType);
|
||||
request.fileStatus(FileManagement::FileStatus::Valid);
|
||||
request.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
|
||||
request.content(LtsUtils::convert<std::vector<uint8_t>>(content));
|
||||
request.isUsedBy(false);
|
||||
request.usedBy(0);
|
||||
request.lastModified(QDateTime::currentMSecsSinceEpoch());
|
||||
request.fileType = targetFileType;
|
||||
request.fileStatus = FileManagement::FileStatus::Valid;
|
||||
request.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
|
||||
request.content = LtsUtils::convert<std::vector<uint8_t>>(content);
|
||||
request.isUsedBy = false;
|
||||
request.usedBy = 0;
|
||||
request.lastModified = QDateTime::currentMSecsSinceEpoch();
|
||||
|
||||
|
||||
if (exerciseId > 0 && request.fileCategory() == FileManagement::FileCategory::Exercise)
|
||||
if (exerciseId > 0 && request.fileCategory == FileManagement::FileCategory::Exercise)
|
||||
{
|
||||
request.exerciseId(exerciseId);
|
||||
if (fileToModify.phaseId().is_set())
|
||||
request.phaseId(fileToModify.phaseId().get());
|
||||
request.exerciseId = exerciseId;
|
||||
if (fileToModify.phaseId.has_value())
|
||||
request.phaseId = fileToModify.phaseId.get();
|
||||
else
|
||||
{
|
||||
|
||||
int phId = (fldPath.size() > 3) ? m_dtc->getExerciseId(fldPath.at(3)) : 0;
|
||||
if (phId > 0)
|
||||
request.phaseId(phId);
|
||||
request.phaseId = phId;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
request.exerciseId();
|
||||
request.phaseId();
|
||||
request.exerciseId;
|
||||
request.phaseId;
|
||||
}
|
||||
|
||||
if (!properties.isEmpty())
|
||||
request.properties(properties.toStdString());
|
||||
request.properties = properties.toStdString();
|
||||
else
|
||||
request.properties(fileToModify.properties());
|
||||
request.properties = fileToModify.properties;
|
||||
|
||||
|
||||
if (targetFileType == FileManagement::FileType::Xml && !content.isEmpty())
|
||||
@@ -371,10 +373,10 @@ int InterfaceImpl::saveFileContent(QWidget *parent,
|
||||
{
|
||||
QJsonObject obj;
|
||||
|
||||
if (fileToModify.properties().size() != 0)
|
||||
if (fileToModify.properties.size() != 0)
|
||||
{
|
||||
const QByteArray &attributesJson = QByteArray::fromRawData(fileToModify.properties().c_str(),
|
||||
fileToModify.properties().size());
|
||||
const QByteArray &attributesJson = QByteArray::fromRawData(fileToModify.properties.c_str(),
|
||||
fileToModify.properties.size());
|
||||
QJsonParseError parseError;
|
||||
QJsonDocument jDoc(QJsonDocument::fromJson(attributesJson, &parseError));
|
||||
|
||||
@@ -383,7 +385,7 @@ int InterfaceImpl::saveFileContent(QWidget *parent,
|
||||
}
|
||||
obj[QStringLiteral("XmlType")] = xmlTypeValue;
|
||||
|
||||
request.properties(QJsonDocument(obj).toJson(QJsonDocument::Compact).toStdString());
|
||||
request.properties = QJsonDocument(obj).toJson(QJsonDocument::Compact).toStdString();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -409,7 +411,7 @@ int InterfaceImpl::getFileId(FileManagement::FileType fileType, const QString &f
|
||||
|
||||
QString InterfaceImpl::getFileName(int fileId) const
|
||||
{
|
||||
return QString::fromStdString(m_dtc->fileContent(fileId).name());
|
||||
return QString::fromStdString(m_dtc->fileContent(fileId).name);
|
||||
}
|
||||
|
||||
|
||||
@@ -417,31 +419,31 @@ bool InterfaceImpl::saveContent(int fileId, const QByteArray &content, const QSt
|
||||
{
|
||||
FileManagement::FileContent fileToModify = m_dtc->fileContent(fileId);
|
||||
|
||||
if (fileToModify.id() <= 0)
|
||||
if (fileToModify.id <= 0)
|
||||
return false;
|
||||
|
||||
FileManagement::FileContentModifyRequest request;
|
||||
|
||||
request.id(fileId);
|
||||
request.name(fileToModify.name());
|
||||
request.isTemplate(fileToModify.isTemplate());
|
||||
request.folderId(fileToModify.folderId());
|
||||
request.fileCategory(fileToModify.fileCategory());
|
||||
request.fileType(fileToModify.fileType());
|
||||
request.fileStatus(fileToModify.fileStatus());
|
||||
request.isUsedBy(fileToModify.isUsedBy());
|
||||
request.usedBy(fileToModify.usedBy());
|
||||
request.exerciseId(fileToModify.exerciseId());
|
||||
request.phaseId(fileToModify.phaseId());
|
||||
request.id = fileId;
|
||||
request.name = fileToModify.name;
|
||||
request.isTemplate = fileToModify.isTemplate;
|
||||
request.folderId = fileToModify.folderId;
|
||||
request.fileCategory = fileToModify.fileCategory;
|
||||
request.fileType = fileToModify.fileType;
|
||||
request.fileStatus = fileToModify.fileStatus;
|
||||
request.isUsedBy = fileToModify.isUsedBy;
|
||||
request.usedBy = fileToModify.usedBy;
|
||||
request.exerciseId = fileToModify.exerciseId;
|
||||
request.phaseId = fileToModify.phaseId;
|
||||
|
||||
request.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
|
||||
request.lastModified(QDateTime::currentMSecsSinceEpoch());
|
||||
request.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
|
||||
request.lastModified = QDateTime::currentMSecsSinceEpoch();
|
||||
|
||||
request.content(LtsUtils::convert<std::vector<uint8_t>>(content));
|
||||
request.content = LtsUtils::convert<std::vector<uint8_t>>(content);
|
||||
if (!properties.isEmpty())
|
||||
request.properties(properties.toStdString());
|
||||
request.properties = properties.toStdString();
|
||||
else
|
||||
request.properties(fileToModify.properties());
|
||||
request.properties = fileToModify.properties;
|
||||
|
||||
if (!m_requestHelper->startSingleRequest([this, request]()
|
||||
{
|
||||
@@ -457,21 +459,21 @@ int InterfaceImpl::newFileContent(FileContent fc, const QByteArray &content)
|
||||
{
|
||||
FileManagement::FileContentModifyRequest request;
|
||||
|
||||
request.name(fc.name());
|
||||
request.isTemplate(fc.isTemplate());
|
||||
request.folderId(fc.folderId());
|
||||
request.fileCategory(fc.fileCategory());
|
||||
request.fileType(fc.fileType());
|
||||
request.fileStatus(fc.fileStatus());
|
||||
request.isUsedBy(fc.isUsedBy());
|
||||
request.usedBy(fc.usedBy());
|
||||
request.exerciseId(fc.exerciseId());
|
||||
request.phaseId(fc.phaseId());
|
||||
request.properties(fc.properties());
|
||||
request.operatorId(fc.operatorId());
|
||||
request.lastModified(QDateTime::currentMSecsSinceEpoch());
|
||||
request.name = fc.name;
|
||||
request.isTemplate = fc.isTemplate;
|
||||
request.folderId = fc.folderId;
|
||||
request.fileCategory = fc.fileCategory;
|
||||
request.fileType = fc.fileType;
|
||||
request.fileStatus = fc.fileStatus;
|
||||
request.isUsedBy = fc.isUsedBy;
|
||||
request.usedBy = fc.usedBy;
|
||||
request.exerciseId = fc.exerciseId;
|
||||
request.phaseId = fc.phaseId;
|
||||
request.properties = fc.properties;
|
||||
request.operatorId = fc.operatorId;
|
||||
request.lastModified = QDateTime::currentMSecsSinceEpoch();
|
||||
|
||||
request.content(LtsUtils::convert<std::vector<uint8_t>>(content));
|
||||
request.content = LtsUtils::convert<std::vector<uint8_t>>(content);
|
||||
|
||||
if (!m_requestHelper->startSingleRequest([this, request]()
|
||||
{
|
||||
@@ -487,10 +489,10 @@ bool InterfaceImpl::deleteFileContent(int fileId)
|
||||
{
|
||||
FileManagement::FileContent fc = m_dtc->fileContent(fileId);
|
||||
|
||||
if (fc.id() <= 0)
|
||||
if (fc.id <= 0)
|
||||
return false;
|
||||
|
||||
if (fc.fileStatus() == FileManagement::FileStatus::Deleted)
|
||||
if (fc.fileStatus == FileManagement::FileStatus::Deleted)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "File content already deleted for id = " << fileId;
|
||||
return true;
|
||||
@@ -498,10 +500,10 @@ bool InterfaceImpl::deleteFileContent(int fileId)
|
||||
|
||||
FileManagement::FileContentChangeStatusRequest request;
|
||||
|
||||
request.id(fileId);
|
||||
request.fileStatus(FileManagement::FileStatus::Deleted);
|
||||
request.lastModified(QDateTime::currentMSecsSinceEpoch());
|
||||
request.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
|
||||
request.id = fileId;
|
||||
request.fileStatus = FileManagement::FileStatus::Deleted;
|
||||
request.lastModified = QDateTime::currentMSecsSinceEpoch();
|
||||
request.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
|
||||
|
||||
if (!m_requestHelper->startSingleRequest([this, request]()
|
||||
{
|
||||
@@ -556,11 +558,11 @@ int InterfaceImpl::loadFileContent(QWidget *parent,
|
||||
auto cbRet = [&content](const Core::FunctionReply & baseReply)
|
||||
{
|
||||
const auto &replyObject = static_cast<const FileManagement::GetFileContentDataReply &>(baseReply);
|
||||
content = LtsUtils::toQByteArray(replyObject.content());
|
||||
content = LtsUtils::toQByteArray(replyObject.content);
|
||||
};
|
||||
|
||||
FileManagement::GetFileContentDataRequest req;
|
||||
req.fileContentId(fileId);
|
||||
req.fileContentId = fileId;
|
||||
auto cb = [req, this]()
|
||||
{
|
||||
return m_ftc->getFileContentDataRequest(req, this);
|
||||
@@ -622,11 +624,11 @@ bool InterfaceImpl::loadContent(int fileId, QByteArray &content, bool bQuiet)
|
||||
auto cbRet = [&content](const Core::FunctionReply &baseReply)
|
||||
{
|
||||
const auto &replyObject = static_cast<const FileManagement::GetFileContentDataReply &>(baseReply);
|
||||
content = LtsUtils::toQByteArray(replyObject.content());
|
||||
content = LtsUtils::toQByteArray(replyObject.content);
|
||||
};
|
||||
|
||||
FileManagement::GetFileContentDataRequest req;
|
||||
req.fileContentId(fileId);
|
||||
req.fileContentId = fileId;
|
||||
auto cb = [req, this]()
|
||||
{
|
||||
return m_ftc->getFileContentDataRequest(req, this);
|
||||
@@ -783,7 +785,7 @@ bool InterfaceImpl::TopicReplayInterface::playbackInit(const QJsonObject &attrib
|
||||
if (fileId > 0)
|
||||
fc = m_dtc->fileContent(fileId);
|
||||
else
|
||||
fc.fileType(FileManagement::FileType::Text);
|
||||
fc.fileType = FileManagement::FileType::Text;
|
||||
|
||||
if (!m_previewWidget)
|
||||
{
|
||||
@@ -830,7 +832,7 @@ bool InterfaceImpl::TopicReplayInterface::exportTopic(const QJsonObject &attribu
|
||||
|
||||
DEBUG_LOG(m_logger) << "Trying to export file with id " << fileId << " to " << strPathToFile;
|
||||
FileManagement::FileContent fc = m_dtc->fileContent(fileId);
|
||||
GetFileContentAsync *getFileContent = new GetFileContentAsync(fc.id(), m_ftc);
|
||||
GetFileContentAsync *getFileContent = new GetFileContentAsync(fc.id, m_ftc);
|
||||
|
||||
connect(getFileContent, &GetFileContentAsync::signalDone,
|
||||
getFileContent, [pExportNotifier, getFileContent, fc, strPathToFile]()
|
||||
@@ -838,9 +840,9 @@ bool InterfaceImpl::TopicReplayInterface::exportTopic(const QJsonObject &attribu
|
||||
qWarning() << Q_FUNC_INFO << "file content arrived!";
|
||||
|
||||
const std::vector<uint8_t> &content = getFileContent->content();
|
||||
QString strFileName(QString::number(fc.id()));
|
||||
QString strFileName(QString::number(fc.id));
|
||||
|
||||
switch (fc.fileType().underlying())
|
||||
switch (fc.fileType)
|
||||
{
|
||||
case FileManagement::FileType::Png:
|
||||
{
|
||||
|
||||
+2
-1
@@ -6,7 +6,7 @@
|
||||
#include <Lts/Services/FileManagement/logger.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
|
||||
#include <flm_data_plugin_interface.h>
|
||||
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
|
||||
#include <FileManagement/flm_explorer_gui_plugin_interface.h>
|
||||
#include <OperatorManagement/opm_dtc.h>
|
||||
#include <ExerciseManagement/exm_dtc.h>
|
||||
@@ -148,6 +148,7 @@ private:
|
||||
std::shared_ptr<FileManagement::Interface::Dtc> m_dtc;
|
||||
std::shared_ptr<FileManagement::Interface::Ftc> m_ftc;
|
||||
FileManagement::FileContentPreviewPlaybackWidget *m_previewWidget{nullptr};
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
TopicReplay::Interface *createInterface(TopicEditorBase::TopicType) override { return new TopicReplayInterface(m_dtc, m_ftc); }
|
||||
|
||||
|
||||
+4
-2
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "flm_get_content.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
|
||||
namespace FileManagement
|
||||
@@ -12,6 +13,7 @@ GetFileContent::GetFileContent(const std::shared_ptr<FileManagement::Interface::
|
||||
: QObject(parent)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_ftc(ftc)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
}
|
||||
|
||||
@@ -28,14 +30,14 @@ bool GetFileContent::getContent(int fileContentId, std::vector<uint8_t> &content
|
||||
auto handleContent = [this, &content](const Core::FunctionReply & baseReply)
|
||||
{
|
||||
const GetFileContentDataReply &reply = static_cast<const GetFileContentDataReply &>(baseReply);
|
||||
content = reply.content();
|
||||
content = reply.content;
|
||||
DEBUG_LOG(m_logger) << "Content size: " << content.size();
|
||||
};
|
||||
|
||||
auto sendReq = [this, fileContentId]()
|
||||
{
|
||||
GetFileContentDataRequest req;
|
||||
req.fileContentId(fileContentId);
|
||||
req.fileContentId = fileContentId;
|
||||
return m_ftc->getFileContentDataRequest(req, this);
|
||||
};
|
||||
|
||||
|
||||
+3
-3
@@ -10,20 +10,20 @@ GetFileContentAsync::GetFileContentAsync(int fileContentId, const std::shared_pt
|
||||
: QObject()
|
||||
{
|
||||
GetFileContentDataRequest req;
|
||||
req.fileContentId(fileContentId);
|
||||
req.fileContentId = fileContentId;
|
||||
flmFtc->getFileContentDataRequest(req, this);
|
||||
}
|
||||
|
||||
|
||||
void GetFileContentAsync::onGetFileContentDataReply(const GetFileContentDataReply &reply)
|
||||
{
|
||||
if (!reply.errorString().empty())
|
||||
if (!reply.errorString.empty())
|
||||
{
|
||||
emit signalFailed();
|
||||
return;
|
||||
}
|
||||
|
||||
m_content = reply.content();
|
||||
m_content = reply.content;
|
||||
emit signalDone();
|
||||
}
|
||||
}
|
||||
+11
-10
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "flm_office_integration.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
@@ -99,9 +100,9 @@ bool OfficeIntegration::callLibreOffice()
|
||||
QStringList arguments;
|
||||
arguments << QStringLiteral("-jar") << QStringLiteral("/opt/libreOfficeAddin/RheinmetallLibreOfficeLauncher.jar")
|
||||
<< QStringLiteral("--jdbcConnectionString") << connString
|
||||
<< QStringLiteral("--operatorId") << QString::number(m_selectedFileContent.operatorId())
|
||||
<< QStringLiteral("--documentId") << QString::number(m_selectedFileContent.id())
|
||||
<< QStringLiteral("--fileCategoryId") << QString::number(m_selectedFileContent.fileCategory().underlying())
|
||||
<< QStringLiteral("--operatorId") << QString::number(m_selectedFileContent.operatorId)
|
||||
<< QStringLiteral("--documentId") << QString::number(m_selectedFileContent.id)
|
||||
<< QStringLiteral("--fileCategoryId") << QString::number(static_cast<int>(m_selectedFileContent.fileCategory))
|
||||
<< QStringLiteral("--libreOfficeHost") << QStringLiteral("localhost")
|
||||
<< QStringLiteral("--libreOfficePort") << QStringLiteral("8100");
|
||||
|
||||
@@ -140,26 +141,26 @@ QString OfficeIntegration::getParas() const
|
||||
paras += QStringLiteral(",");
|
||||
|
||||
paras += QStringLiteral("operatorId:");
|
||||
paras += QString::number(m_selectedFileContent.operatorId());
|
||||
paras += QString::number(m_selectedFileContent.operatorId);
|
||||
paras += QStringLiteral(",");
|
||||
|
||||
paras += QStringLiteral("documentId:");
|
||||
paras += QString::number(m_selectedFileContent.id());
|
||||
paras += QString::number(m_selectedFileContent.id);
|
||||
paras += QStringLiteral(",");
|
||||
|
||||
paras += QStringLiteral("fileCategoryId:");
|
||||
paras += QString::number(m_selectedFileContent.fileCategory().underlying());
|
||||
paras += QString::number(static_cast<int>(m_selectedFileContent.fileCategory));
|
||||
|
||||
if (m_selectedFileContent.exerciseId().is_set())
|
||||
if (m_selectedFileContent.exerciseId.has_value())
|
||||
{
|
||||
paras += QStringLiteral(",");
|
||||
paras += QStringLiteral("exerciseId:");
|
||||
paras += QString::number(m_selectedFileContent.exerciseId().get());
|
||||
if (m_selectedFileContent.phaseId().is_set())
|
||||
paras += QString::number(m_selectedFileContent.exerciseId.get());
|
||||
if (m_selectedFileContent.phaseId.has_value())
|
||||
{
|
||||
paras += QStringLiteral(",");
|
||||
paras += QStringLiteral("phaseId:");
|
||||
paras += QString::number(m_selectedFileContent.phaseId().get());
|
||||
paras += QString::number(m_selectedFileContent.phaseId.get());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+9
-7
@@ -2,9 +2,10 @@
|
||||
|
||||
|
||||
#include "flm_preview_file_dialog.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include "ui_flm_preview_file_dialog.h"
|
||||
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtilsCore/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsPrinting/printing.h>
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
@@ -24,6 +25,7 @@ FileContentPreviewDialog::FileContentPreviewDialog(LtsSession::LtsSession *sessi
|
||||
, m_session(session)
|
||||
, m_getContent(new FileManagement::GetFileContent(ftc, this))
|
||||
, m_content(QByteArray())
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_ui->line->setVisible(false);
|
||||
@@ -47,18 +49,18 @@ bool FileContentPreviewDialog::init(const FileContent &data)
|
||||
connect(m_ui->buttonBox->getButton(LtsWidgets::DialogButton::Print), &QPushButton::clicked, this, &FileContentPreviewDialog::onPrint);
|
||||
|
||||
m_data = data;
|
||||
if (m_data.id() > 0)
|
||||
if (m_data.id > 0)
|
||||
{
|
||||
std::vector<uint8_t> content;
|
||||
m_getContent->getContent(m_data.id(), content);
|
||||
m_getContent->getContent(m_data.id, content);
|
||||
m_content = LtsUtils::toQByteArray(content);
|
||||
}
|
||||
|
||||
m_ui->lblTitle->setText(tr("Preview File Content: %1").arg(QString::fromStdString(data.name())));
|
||||
m_ui->lblTitle->setText(tr("Preview File Content: %1").arg(QString::fromStdString(data.name)));
|
||||
|
||||
DEBUG_LOG(m_logger) << "Content size: " << m_content.size();
|
||||
|
||||
switch (data.fileType().underlying())
|
||||
switch (data.fileType)
|
||||
{
|
||||
case FileManagement::FileType::Png:
|
||||
case FileManagement::FileType::Jpg:
|
||||
@@ -131,10 +133,10 @@ void FileContentPreviewDialog::onPrint()
|
||||
auto s = Settings::settings();
|
||||
|
||||
QVector<QImage> images = m_ui->pdfWidget->getPrintableImages(150 );
|
||||
LtsPrinting::printPDFImages(this, QString::fromStdString(m_data.name()), s->printPath(), images);
|
||||
LtsPrinting::printPDFImages(this, QString::fromStdString(m_data.name), s->printPath(), images);
|
||||
}
|
||||
else
|
||||
LtsPrinting::printWidget(m_session, this, m_ui->stackedWidget->currentWidget(), QString::fromStdString(m_data.name()));
|
||||
LtsPrinting::printWidget(m_session, this, m_ui->stackedWidget->currentWidget(), QString::fromStdString(m_data.name));
|
||||
}
|
||||
|
||||
}
|
||||
+8
-7
@@ -2,9 +2,10 @@
|
||||
|
||||
|
||||
#include "flm_preview_playback.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include "ui_flm_preview_playback.h"
|
||||
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtilsCore/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <nglwidgets/nglpdfwidget.h>
|
||||
@@ -71,10 +72,10 @@ bool FileContentPreviewPlaybackWidget::init(const FileContent &data, int pageNo,
|
||||
m_userText = userText;
|
||||
|
||||
DEBUG_LOG(m_logger) << "FileContentPreviewPlaybackWidget::init - (fileId, pageNo, zoomFactor, rotation) = ("
|
||||
<< m_data.id() << "," << m_pageNo << "," << m_zoomFactor << ", " << m_rotation << ")";
|
||||
<< m_data.id << "," << m_pageNo << "," << m_zoomFactor << ", " << m_rotation << ")";
|
||||
|
||||
if (m_userText.isEmpty() && m_data.id() > 0)
|
||||
m_getContent->getContent(m_data.id(), m_content);
|
||||
if (m_userText.isEmpty() && m_data.id > 0)
|
||||
m_getContent->getContent(m_data.id, m_content);
|
||||
|
||||
DEBUG_LOG(m_logger) << "Content size: " << m_content.size() << ", " << m_pageNo;
|
||||
|
||||
@@ -85,7 +86,7 @@ bool FileContentPreviewPlaybackWidget::init(const FileContent &data, int pageNo,
|
||||
m_ui->teText->setVisible(false);
|
||||
m_pdfWidget->setVisible(false);
|
||||
|
||||
switch (data.fileType().underlying())
|
||||
switch (data.fileType)
|
||||
{
|
||||
case FileManagement::FileType::Png:
|
||||
case FileManagement::FileType::Jpg:
|
||||
@@ -96,7 +97,7 @@ bool FileContentPreviewPlaybackWidget::init(const FileContent &data, int pageNo,
|
||||
}
|
||||
case FileManagement::FileType::Text:
|
||||
{
|
||||
if (!m_userText.isEmpty() && m_data.id() == 0)
|
||||
if (!m_userText.isEmpty() && m_data.id == 0)
|
||||
{
|
||||
m_ui->teText->setHtml(m_userText);
|
||||
m_ui->teText->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
|
||||
@@ -141,7 +142,7 @@ bool FileContentPreviewPlaybackWidget::init(const FileContent &data, int pageNo,
|
||||
case FileManagement::FileType::Unknown:
|
||||
default:
|
||||
{
|
||||
if (!m_userText.isEmpty() && m_data.id() == 0)
|
||||
if (!m_userText.isEmpty() && m_data.id == 0)
|
||||
{
|
||||
m_ui->teText->setHtml(m_userText);
|
||||
m_ui->teText->setVisible(true);
|
||||
|
||||
+2
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "flm_set_properties_dialog.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include "ui_flm_set_properties_dialog.h"
|
||||
|
||||
#include <QtWidgets/QLineEdit>
|
||||
@@ -17,6 +18,7 @@ SetPropertiesDialog::SetPropertiesDialog(QLineEdit *lineEdit, QWidget *parent)
|
||||
: LtsWidgets::LtsFramelessDialog(parent)
|
||||
, m_ui(new Ui::SetPropertiesDialog)
|
||||
, m_lineEdit(lineEdit)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Ctor SetPropertiesDialog";
|
||||
m_ui->setupUi(this);
|
||||
|
||||
+25
-25
@@ -12,39 +12,39 @@ bool FlmComboBox::fill(LtsWidgets::LtsComboBox *cbx, FlmComboBoxType type)
|
||||
{
|
||||
case FlmComboBoxType::CbFileCategory:
|
||||
{
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileCategory::Global), FileManagement::FileCategory::Global);
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileCategory::Exercise), FileManagement::FileCategory::Exercise);
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileCategory::User), FileManagement::FileCategory::User);
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileCategory::Global), static_cast<int>(FileManagement::FileCategory::Global));
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileCategory::Exercise), static_cast<int>(FileManagement::FileCategory::Exercise));
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileCategory::User), static_cast<int>(FileManagement::FileCategory::User));
|
||||
break;
|
||||
}
|
||||
case FlmComboBoxType::CbFileStatus:
|
||||
{
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileStatus::Valid), FileManagement::FileStatus::Valid);
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileStatus::Deleted), FileManagement::FileStatus::Deleted);
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileStatus::Valid), static_cast<int>(FileManagement::FileStatus::Valid));
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileStatus::Deleted), static_cast<int>(FileManagement::FileStatus::Deleted));
|
||||
break;
|
||||
}
|
||||
case FlmComboBoxType::CbFileType:
|
||||
{
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::Unknown), FileManagement::FileType::Unknown);
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::Text), FileManagement::FileType::Text);
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::Xml), FileManagement::FileType::Xml);
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::Pdf), FileManagement::FileType::Pdf);
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::Jpg), FileManagement::FileType::Jpg);
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::Png), FileManagement::FileType::Png);
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::TacticalPlan), FileManagement::FileType::TacticalPlan);
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::OperatorFavourite), FileManagement::FileType::OperatorFavourite);
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::OperatorDefinedSymbol), FileManagement::FileType::OperatorDefinedSymbol);
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::OpenOfficeDocument), FileManagement::FileType::OpenOfficeDocument);
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::OpenOfficeSpreadsheet), FileManagement::FileType::OpenOfficeSpreadsheet);
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::OpenOfficePresentation), FileManagement::FileType::OpenOfficePresentation);
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::MSOfficeDocument), FileManagement::FileType::MSOfficeDocument);
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::MSOfficeDocument97), FileManagement::FileType::MSOfficeDocument97);
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::MSOfficeSpreadsheet), FileManagement::FileType::MSOfficeSpreadsheet);
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::MSOfficeSpreadsheet97), FileManagement::FileType::MSOfficeSpreadsheet97);
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::MSOfficePresentation), FileManagement::FileType::MSOfficePresentation);
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::MSOfficePresentation97), FileManagement::FileType::MSOfficePresentation97);
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::EvaluationSchema), FileManagement::FileType::EvaluationSchema);
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::AdlerJson), FileManagement::FileType::AdlerJson);
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::Unknown), static_cast<int>(FileManagement::FileType::Unknown));
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::Text), static_cast<int>(FileManagement::FileType::Text));
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::Xml), static_cast<int>(FileManagement::FileType::Xml));
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::Pdf), static_cast<int>(FileManagement::FileType::Pdf));
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::Jpg), static_cast<int>(FileManagement::FileType::Jpg));
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::Png), static_cast<int>(FileManagement::FileType::Png));
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::TacticalPlan), static_cast<int>(FileManagement::FileType::TacticalPlan));
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::OperatorFavourite), static_cast<int>(FileManagement::FileType::OperatorFavourite));
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::OperatorDefinedSymbol), static_cast<int>(FileManagement::FileType::OperatorDefinedSymbol));
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::OpenOfficeDocument), static_cast<int>(FileManagement::FileType::OpenOfficeDocument));
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::OpenOfficeSpreadsheet), static_cast<int>(FileManagement::FileType::OpenOfficeSpreadsheet));
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::OpenOfficePresentation), static_cast<int>(FileManagement::FileType::OpenOfficePresentation));
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::MSOfficeDocument), static_cast<int>(FileManagement::FileType::MSOfficeDocument));
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::MSOfficeDocument97), static_cast<int>(FileManagement::FileType::MSOfficeDocument97));
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::MSOfficeSpreadsheet), static_cast<int>(FileManagement::FileType::MSOfficeSpreadsheet));
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::MSOfficeSpreadsheet97), static_cast<int>(FileManagement::FileType::MSOfficeSpreadsheet97));
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::MSOfficePresentation), static_cast<int>(FileManagement::FileType::MSOfficePresentation));
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::MSOfficePresentation97), static_cast<int>(FileManagement::FileType::MSOfficePresentation97));
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::EvaluationSchema), static_cast<int>(FileManagement::FileType::EvaluationSchema));
|
||||
cbx->addItem(FileManagement::toString(FileManagement::FileType::AdlerJson), static_cast<int>(FileManagement::FileType::AdlerJson));
|
||||
break;
|
||||
}
|
||||
case FlmComboBoxType::CbUnknown:
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <FileManagement/flm_combobox_gui_plugin_interface.h>
|
||||
#include <flm_data_plugin_interface.h>
|
||||
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
|
||||
|
||||
#include <QtWidgets/QComboBox>
|
||||
|
||||
|
||||
Reference in new issue
Block a user