From 9d53b3e251d03441194902a89bef4627de675a37 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Fri, 23 Dec 2022 19:47:41 +0100 Subject: [PATCH] added new HIS target --- ENI2/EditControls/CopyDeclarationDialog.xaml.cs | 7 ++++--- ENI2/EditControls/NewWithIdDialog.xaml.cs | 3 ++- ENI2/EditControls/VisitIdDialog.xaml.cs | 3 ++- bsmd.database/Message.cs | 2 ++ bsmd.database/Properties/AssemblyProductInfo.cs | 2 +- bsmd.database/Properties/AssemblyProjectInfo.cs | 2 +- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ENI2/EditControls/CopyDeclarationDialog.xaml.cs b/ENI2/EditControls/CopyDeclarationDialog.xaml.cs index 3e32da9b..4f6a6ec4 100644 --- a/ENI2/EditControls/CopyDeclarationDialog.xaml.cs +++ b/ENI2/EditControls/CopyDeclarationDialog.xaml.cs @@ -74,10 +74,11 @@ namespace ENI2.EditControls private void CopyDeclarationDialog_Loaded(object sender, System.Windows.RoutedEventArgs e) { this.OKClicked += VisitIdDialog_OKClicked; - List> comboDataSource = new List>() + List> comboDataSource = new List>() { - new KeyValuePair( Message.NSWProvider.DBH, "DBH" ), - new KeyValuePair( Message.NSWProvider.DUDR, "HIS-Nord" ), + new KeyValuePair( Message.NSWProvider.DBH, "DBH" ), + new KeyValuePair( Message.NSWProvider.DBH_MAERSK, "DBH / Maersk" ), + new KeyValuePair( Message.NSWProvider.DUDR, "HIS-Nord" ), }; this.comboBoxInitialHIS.ItemsSource = comboDataSource; diff --git a/ENI2/EditControls/NewWithIdDialog.xaml.cs b/ENI2/EditControls/NewWithIdDialog.xaml.cs index 3d569bf3..7ba0d309 100644 --- a/ENI2/EditControls/NewWithIdDialog.xaml.cs +++ b/ENI2/EditControls/NewWithIdDialog.xaml.cs @@ -31,7 +31,8 @@ namespace ENI2.EditControls List> comboDataSource = new List>() { new KeyValuePair( Message.NSWProvider.DUDR, "HIS-Nord" ), - new KeyValuePair(Message.NSWProvider.DBH, "DBH") + new KeyValuePair(Message.NSWProvider.DBH, "DBH"), + new KeyValuePair(Message.NSWProvider.DBH_MAERSK, "DBH / Maersk") }; this.comboBoxInitialHIS.ItemsSource = comboDataSource; diff --git a/ENI2/EditControls/VisitIdDialog.xaml.cs b/ENI2/EditControls/VisitIdDialog.xaml.cs index ae152674..d15edf20 100644 --- a/ENI2/EditControls/VisitIdDialog.xaml.cs +++ b/ENI2/EditControls/VisitIdDialog.xaml.cs @@ -29,8 +29,9 @@ namespace ENI2.EditControls this.OKClicked += VisitIdDialog_OKClicked; List> comboDataSource = new List>() { - new KeyValuePair( Message.NSWProvider.DBH, "DBH" ), new KeyValuePair( Message.NSWProvider.DUDR, "HIS-Nord" ), + new KeyValuePair( Message.NSWProvider.DBH, "DBH" ), + new KeyValuePair(Message.NSWProvider.DBH_MAERSK, "DBH / Naersk") }; this.comboBoxInitialHIS.ItemsSource = comboDataSource; diff --git a/bsmd.database/Message.cs b/bsmd.database/Message.cs index 8c1684db..a7f28999 100644 --- a/bsmd.database/Message.cs +++ b/bsmd.database/Message.cs @@ -182,6 +182,8 @@ namespace bsmd.database [Description("HIS-Nord")] DUDR, + [Description("dbh / Maersk")] + DBH_MAERSK } // Late to the party: generic flags Enum/Field diff --git a/bsmd.database/Properties/AssemblyProductInfo.cs b/bsmd.database/Properties/AssemblyProductInfo.cs index 500e1f5c..564ff8ca 100644 --- a/bsmd.database/Properties/AssemblyProductInfo.cs +++ b/bsmd.database/Properties/AssemblyProductInfo.cs @@ -2,6 +2,6 @@ [assembly: AssemblyCompany("schick Informatik")] [assembly: AssemblyProduct("BSMD NSW interface")] -[assembly: AssemblyInformationalVersion("7.7.0")] +[assembly: AssemblyInformationalVersion("7.8.0")] [assembly: AssemblyCopyright("Copyright © 2014-2022 schick Informatik")] [assembly: AssemblyTrademark("")] \ No newline at end of file diff --git a/bsmd.database/Properties/AssemblyProjectInfo.cs b/bsmd.database/Properties/AssemblyProjectInfo.cs index 771af8fe..046c0723 100644 --- a/bsmd.database/Properties/AssemblyProjectInfo.cs +++ b/bsmd.database/Properties/AssemblyProjectInfo.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("7.7.0.*")] +[assembly: AssemblyVersion("7.8.0.*")]