diff --git a/VECTO3GUI2020/ViewModel/Implementation/Document/DeclarationJobViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/Document/DeclarationJobViewModel.cs index 8193a6c5d3ce5a094009cc4ea523799326905ea6..2fd8cb8a6b559a9693778d68e154013021f5883c 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 8c4e61cf97e6ce5210a7534424d1f540dda5effe..8a9c2da054dec72b6bf2b98e4640372d796b6d78 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 5017e0a0b887e9f840b0979ef88cbbd2c9ae499f..df09dd609691d1079c1f041636d0d5387a3eebc6 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 8ee584f2645137b2a1a599ae6102b584142ddbb7..b2fa385daca8be4230abfe902ce4ffc68f39c981 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 947c2083655f0aaba719ab63281922de020bde92..f74411547dde3270acf96b09e3b687e0c5980eee 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 d2cc7c9dbe9cc0f7b41ed199257971bf7f39fae6..ec2ef93d6b739799620ac833768595b2967564c4 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 4c6d542c02c0dd87d0183112aba8c426bb150fe2..2f3fc4db66874cb05282152a85d2e282062fdbd4 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 285f3a99ddd4c346434e521882b4b6ebce39b168..00b9cb5b6b8bc4b03ce0b526c722bd25e64abf49 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 dbbf38483dbd2dd6a7f44235023592fbff282d66..d8b9d37f289aa5ff3816a1e06ddbaf6154a96047 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";