dschick/git_bsmd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

5.9.2: kleiner Patch f HIS-Nord: Live/Testsystem Abruf einstellbar über Config

Browse Source
This commit is contained in:
Daniel Schick 2020-02-05 20:24:02 +00:00
parent 509cc64798
commit 34ecc34a90
8 changed files with 58 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Stundensheet.xlsx
View File

Binary file not shown.

16
nsw/Source/SendNSWMessageService/NSWSendService.cs
View File

@ -484,14 +484,18 @@ namespace SendNSWMessageService
} }
bsmd.hisnord.transmitter.CallTransmitter(true); if(bsmd.hisnord.Properties.Settings.Default.ConnectTestSystem)
bsmd.hisnord.transmitter.CallTransmitter(false); // wird aktuell nicht funktionieren 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 // ob test oder nicht ist in stat. dict gespeichert
bsmd.hisnord.Request.ReadResponseFiles(); bsmd.hisnord.Request.ReadResponseFiles();
bsmd.hisnord.Response.ReadAnswers(true); if (bsmd.hisnord.Properties.Settings.Default.ConnectTestSystem)
bsmd.hisnord.Response.ReadAnswers(false); bsmd.hisnord.Response.ReadAnswers(true);
if (bsmd.hisnord.Properties.Settings.Default.ConnectLiveSystem)
bsmd.hisnord.Response.ReadAnswers(false);
List<MessageCore> coresMarkedForStatusQuery = DBManager.Instance.GetMessageCoresWithNSWStatusFlag(); List<MessageCore> coresMarkedForStatusQuery = DBManager.Instance.GetMessageCoresWithNSWStatusFlag();

2
nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
View File

@ -2,6 +2,6 @@
[assembly: AssemblyCompany("schick Informatik")] [assembly: AssemblyCompany("schick Informatik")]
[assembly: AssemblyProduct("BSMD NSW interface")] [assembly: AssemblyProduct("BSMD NSW interface")]
[assembly: AssemblyInformationalVersion("5.9.1")] [assembly: AssemblyInformationalVersion("5.9.2")]
[assembly: AssemblyCopyright("Copyright © 2014-2019 schick Informatik")] [assembly: AssemblyCopyright("Copyright © 2014-2019 schick Informatik")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]

2
nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("5.9.1.*")] [assembly: AssemblyVersion("5.9.2.*")]

26
nsw/Source/bsmd.hisnord/Properties/Settings.Designer.cs generated
View File

@ -12,7 +12,7 @@ namespace bsmd.hisnord.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [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 { public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@ -130,5 +130,29 @@ namespace bsmd.hisnord.Properties {
this["LiveTransmitterRoot"] = value; 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;
}
}
} }
} }

6
nsw/Source/bsmd.hisnord/Properties/Settings.settings
View File

@ -29,5 +29,11 @@
<Setting Name="LiveTransmitterRoot" Type="System.String" Scope="User"> <Setting Name="LiveTransmitterRoot" Type="System.String" Scope="User">
<Value Profile="(Default)" /> <Value Profile="(Default)" />
</Setting> </Setting>
<Setting Name="ConnectTestSystem" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="ConnectLiveSystem" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
</Settings> </Settings>
</SettingsFile> </SettingsFile>

6
nsw/Source/bsmd.hisnord/app.config
View File

@ -34,6 +34,12 @@
<setting name="LiveTransmitterRoot" serializeAs="String"> <setting name="LiveTransmitterRoot" serializeAs="String">
<value /> <value />
</setting> </setting>
<setting name="ConnectTestSystem" serializeAs="String">
<value>False</value>
</setting>
<setting name="ConnectLiveSystem" serializeAs="String">
<value>True</value>
</setting>
</bsmd.hisnord.Properties.Settings> </bsmd.hisnord.Properties.Settings>
</userSettings> </userSettings>
</configuration> </configuration>

14
nsw/Source/bsmd.hisnord/transmitter.cs
View File

@ -157,9 +157,16 @@ namespace bsmd.hisnord
try try
{ {
XmlSerializer serializer = new XmlSerializer(typeof(result)); 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) catch (Exception ex)
@ -169,8 +176,5 @@ namespace bsmd.hisnord
return aResult; return aResult;
} }
} }
} }
} }