From 9edb82e439a0b399618a8e52ce2bfa60cd8211a3 Mon Sep 17 00:00:00 2001
From: "harald.martini@student.tugraz.at" <harald.martini@student.tugraz.at>
Date: Mon, 4 Oct 2021 10:42:25 +0200
Subject: [PATCH] Added xmldocumenttype as string to IDocumentViewModel
---
.../Document/DeclarationJobViewModel.cs | 4 +++-
.../DeclarationTrailerJobDocumentViewModel.cs | 4 +++-
.../Document/SimulationOnlyDeclarationJob.cs | 2 ++
.../Interfaces/Document/IDocumentViewModel.cs | 2 ++
.../Implementation/CreateVifViewModel.cs | 2 ++
.../Implementation/MultistageJobViewModel_v0_1.cs | 2 ++
.../Implementation/StageInputViewModel.cs | 2 ++
VECTO3GUI2020/Views/JoblistView.xaml | 2 +-
VectoCore/VectoCore/Utils/XMLDefinitions.cs | 15 ++++++++++++++-
9 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/VECTO3GUI2020/ViewModel/Implementation/Document/DeclarationJobViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/Document/DeclarationJobViewModel.cs
index 8193a6c5d3..2fd8cb8a6b 100644
--- a/VECTO3GUI2020/ViewModel/Implementation/Document/DeclarationJobViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/Implementation/Document/DeclarationJobViewModel.cs
@@ -16,7 +16,9 @@ namespace VECTO3GUI2020.ViewModel.Implementation.Document
public XmlDocumentType? DocumentType { get; }
- public DataSource DataSource => _jobEditViewModel.DataSource;
+ public string DocumentTypeName => DocumentType?.GetName();
+
+ public DataSource DataSource => _jobEditViewModel.DataSource;
private IJobEditViewModel _jobEditViewModel;
diff --git a/VECTO3GUI2020/ViewModel/Implementation/Document/DeclarationTrailerJobDocumentViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/Document/DeclarationTrailerJobDocumentViewModel.cs
index 8c4e61cf97..8a9c2da054 100644
--- a/VECTO3GUI2020/ViewModel/Implementation/Document/DeclarationTrailerJobDocumentViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/Implementation/Document/DeclarationTrailerJobDocumentViewModel.cs
@@ -15,7 +15,9 @@ namespace VECTO3GUI2020.ViewModel.Implementation.Document
public XmlDocumentType? DocumentType { get; }
- public DataSource DataSource => throw new System.NotImplementedException();
+ public string DocumentTypeName => DocumentType?.GetName();
+
+ public DataSource DataSource => throw new System.NotImplementedException();
public string SourceFile { get; }
diff --git a/VECTO3GUI2020/ViewModel/Implementation/Document/SimulationOnlyDeclarationJob.cs b/VECTO3GUI2020/ViewModel/Implementation/Document/SimulationOnlyDeclarationJob.cs
index 5017e0a0b8..df09dd6096 100644
--- a/VECTO3GUI2020/ViewModel/Implementation/Document/SimulationOnlyDeclarationJob.cs
+++ b/VECTO3GUI2020/ViewModel/Implementation/Document/SimulationOnlyDeclarationJob.cs
@@ -23,6 +23,8 @@ namespace VECTO3GUI2020.ViewModel.Implementation.Document
get => _documentType;
}
+ public string DocumentTypeName => _documentType?.GetName();
+
public DataSource DataSource
{
get => _dataSource;
diff --git a/VECTO3GUI2020/ViewModel/Interfaces/Document/IDocumentViewModel.cs b/VECTO3GUI2020/ViewModel/Interfaces/Document/IDocumentViewModel.cs
index 8ee584f264..b2fa385dac 100644
--- a/VECTO3GUI2020/ViewModel/Interfaces/Document/IDocumentViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/Interfaces/Document/IDocumentViewModel.cs
@@ -9,6 +9,8 @@ namespace VECTO3GUI2020.ViewModel.Interfaces.Document
{
string DocumentName { get; }
XmlDocumentType? DocumentType { get; }
+
+ string DocumentTypeName { get; }
DataSource DataSource { get; }
IEditViewModel EditViewModel { get; }
bool Selected { get; set; }
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/CreateVifViewModel.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/CreateVifViewModel.cs
index 947c208365..f74411547d 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/CreateVifViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/CreateVifViewModel.cs
@@ -460,6 +460,8 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
//Remove this from
public XmlDocumentType? DocumentType => null;
+ public string DocumentTypeName => "New VIF";
+
public DataSource DataSource
{
get => _dataSource;
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs
index d2cc7c9dbe..ec2ef93d6b 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs
@@ -293,6 +293,8 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
public XmlDocumentType? DocumentType => XmlDocumentType.MultistageOutputData;
+ public string DocumentTypeName => DocumentType?.GetName();
+
public DataSource DataSource => _dataSource;
public IEditViewModel EditViewModel => this;
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageInputViewModel.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageInputViewModel.cs
index 4c6d542c02..2f3fc4db66 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageInputViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageInputViewModel.cs
@@ -106,6 +106,8 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
public XmlDocumentType? DocumentType => _documentType;
+ public string DocumentTypeName => "Step input";
+
public DataSource DataSource
{
get => _dataSource;
diff --git a/VECTO3GUI2020/Views/JoblistView.xaml b/VECTO3GUI2020/Views/JoblistView.xaml
index 285f3a99dd..00b9cb5b6b 100644
--- a/VECTO3GUI2020/Views/JoblistView.xaml
+++ b/VECTO3GUI2020/Views/JoblistView.xaml
@@ -111,7 +111,7 @@
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTextColumn IsReadOnly="True" Header="Name" Binding="{Binding DocumentName}"></DataGridTextColumn>
- <DataGridTextColumn IsReadOnly ="True" Header="Type" Binding="{Binding DocumentType}"></DataGridTextColumn>
+ <DataGridTextColumn IsReadOnly ="True" Header="Type" Binding="{Binding DocumentTypeName}"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly ="True" Header="File" Binding="{Binding DataSource.SourceFile}"></DataGridTextColumn>
</DataGrid.Columns>
diff --git a/VectoCore/VectoCore/Utils/XMLDefinitions.cs b/VectoCore/VectoCore/Utils/XMLDefinitions.cs
index dbbf38483d..d8b9d37f28 100644
--- a/VectoCore/VectoCore/Utils/XMLDefinitions.cs
+++ b/VectoCore/VectoCore/Utils/XMLDefinitions.cs
@@ -50,12 +50,25 @@ namespace TUGraz.VectoCore.Utils
MultistageOutputData = 1 << 10
}
+ public static class XmlDocumentTypeExtensions
+ {
+ public static string GetName(this XmlDocumentType docType)
+ {
+ switch (docType) {
+ case XmlDocumentType.MultistageOutputData:
+ return "Multistep output data";
+ default:
+ return docType.ToString();
+ }
+ }
+ }
+
public static class XMLDefinitions
{
//public const string SchemaBaseURL = "file:///E:/QUAM/Workspace/VECTO_quam/VectoCore/VectoCore/Resources/XSD/";
public const string SCHEMA_BASE_LOCATION = "https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/";
-
+
public const string DEV = ":DEV";
public const string ENGINEERING_NAMESPACE = "urn:tugraz:ivt:VectoAPI:EngineeringDefinitions";
--
GitLab