diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index 37511ca7..ef74cb13 100644 Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ diff --git a/nsw/Source/SendNSWMessageService/NSWSendService.cs b/nsw/Source/SendNSWMessageService/NSWSendService.cs index e28ac5e1..e565b488 100644 --- a/nsw/Source/SendNSWMessageService/NSWSendService.cs +++ b/nsw/Source/SendNSWMessageService/NSWSendService.cs @@ -484,14 +484,18 @@ namespace SendNSWMessageService } - bsmd.hisnord.transmitter.CallTransmitter(true); - bsmd.hisnord.transmitter.CallTransmitter(false); // wird aktuell nicht funktionieren + if(bsmd.hisnord.Properties.Settings.Default.ConnectTestSystem) + bsmd.hisnord.transmitter.CallTransmitter(true); + if(bsmd.hisnord.Properties.Settings.Default.ConnectLiveSystem) + bsmd.hisnord.transmitter.CallTransmitter(false); - // ob test oder nicht ist in stat. dict gespeicher - bsmd.hisnord.Request.ReadResponseFiles(); + // ob test oder nicht ist in stat. dict gespeichert + bsmd.hisnord.Request.ReadResponseFiles(); - bsmd.hisnord.Response.ReadAnswers(true); - bsmd.hisnord.Response.ReadAnswers(false); + if (bsmd.hisnord.Properties.Settings.Default.ConnectTestSystem) + bsmd.hisnord.Response.ReadAnswers(true); + if (bsmd.hisnord.Properties.Settings.Default.ConnectLiveSystem) + bsmd.hisnord.Response.ReadAnswers(false); List coresMarkedForStatusQuery = DBManager.Instance.GetMessageCoresWithNSWStatusFlag(); diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs index d422bd48..77da0894 100644 --- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs +++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs @@ -2,6 +2,6 @@ [assembly: AssemblyCompany("schick Informatik")] [assembly: AssemblyProduct("BSMD NSW interface")] -[assembly: AssemblyInformationalVersion("5.9.1")] +[assembly: AssemblyInformationalVersion("5.9.2")] [assembly: AssemblyCopyright("Copyright © 2014-2019 schick Informatik")] [assembly: AssemblyTrademark("")] \ No newline at end of file diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs index 8d5d1682..a9161850 100644 --- a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs +++ b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("5.9.1.*")] +[assembly: AssemblyVersion("5.9.2.*")] diff --git a/nsw/Source/bsmd.hisnord/Properties/Settings.Designer.cs b/nsw/Source/bsmd.hisnord/Properties/Settings.Designer.cs index 9cbc6cdd..243c3969 100644 --- a/nsw/Source/bsmd.hisnord/Properties/Settings.Designer.cs +++ b/nsw/Source/bsmd.hisnord/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace bsmd.hisnord.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.2.0.0")] public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -130,5 +130,29 @@ namespace bsmd.hisnord.Properties { this["LiveTransmitterRoot"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool ConnectTestSystem { + get { + return ((bool)(this["ConnectTestSystem"])); + } + set { + this["ConnectTestSystem"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool ConnectLiveSystem { + get { + return ((bool)(this["ConnectLiveSystem"])); + } + set { + this["ConnectLiveSystem"] = value; + } + } } } diff --git a/nsw/Source/bsmd.hisnord/Properties/Settings.settings b/nsw/Source/bsmd.hisnord/Properties/Settings.settings index def01398..35a943b2 100644 --- a/nsw/Source/bsmd.hisnord/Properties/Settings.settings +++ b/nsw/Source/bsmd.hisnord/Properties/Settings.settings @@ -29,5 +29,11 @@ + + False + + + True + \ No newline at end of file diff --git a/nsw/Source/bsmd.hisnord/app.config b/nsw/Source/bsmd.hisnord/app.config index 68e7f51b..72c489c2 100644 --- a/nsw/Source/bsmd.hisnord/app.config +++ b/nsw/Source/bsmd.hisnord/app.config @@ -34,6 +34,12 @@ + + False + + + True + \ No newline at end of file diff --git a/nsw/Source/bsmd.hisnord/transmitter.cs b/nsw/Source/bsmd.hisnord/transmitter.cs index fe3a0152..95362d4a 100644 --- a/nsw/Source/bsmd.hisnord/transmitter.cs +++ b/nsw/Source/bsmd.hisnord/transmitter.cs @@ -157,9 +157,16 @@ namespace bsmd.hisnord try { XmlSerializer serializer = new XmlSerializer(typeof(result)); - using (FileStream fs = new FileStream(filename, FileMode.Open)) + if (!File.Exists(filename)) { - aResult = (result)serializer.Deserialize(fs); + _log.WarnFormat("Expected file {0} does not exist!", filename); + } + else + { + using (FileStream fs = new FileStream(filename, FileMode.Open)) + { + aResult = (result)serializer.Deserialize(fs); + } } } catch (Exception ex) @@ -169,8 +176,5 @@ namespace bsmd.hisnord return aResult; } } - - - } }