diff --git a/.nuget/packages.config b/.nuget/packages.config new file mode 100755 index 0000000..330b15c --- /dev/null +++ b/.nuget/packages.config @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj index 02c04b1..4c7e441 100755 --- a/Tests/Tests.csproj +++ b/Tests/Tests.csproj @@ -41,19 +41,19 @@ zaaReloaded2.pfx - - ..\packages\Bovender.0.16.2.0\lib\net40\Bovender.dll + + ..\packages\Bovender.0.17.0.0\lib\net40\Bovender.dll True True - ..\packages\NLog.4.3.7\lib\net40\NLog.dll + ..\packages\NLog.4.4.3\lib\net40\NLog.dll True - - ..\packages\NUnit.3.4.1\lib\net40\nunit.framework.dll + + ..\packages\NUnit.3.6.1\lib\net40\nunit.framework.dll True @@ -70,8 +70,8 @@ - - ..\packages\YamlDotNet.Signed.3.9.0\lib\net35\YamlDotNet.dll + + ..\packages\YamlDotNet.Signed.4.1.0\lib\net35\YamlDotNet.dll True diff --git a/Tests/app.config b/Tests/app.config index 5974e15..9fa19d3 100755 --- a/Tests/app.config +++ b/Tests/app.config @@ -22,7 +22,7 @@ - + diff --git a/Tests/packages.config b/Tests/packages.config index 6494a9c..6ce6096 100755 --- a/Tests/packages.config +++ b/Tests/packages.config @@ -1,8 +1,8 @@  - + - - - + + + \ No newline at end of file diff --git a/zaaReloaded2.sln b/zaaReloaded2.sln index ef73426..b73ff38 100755 --- a/zaaReloaded2.sln +++ b/zaaReloaded2.sln @@ -1,12 +1,17 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 +VisualStudioVersion = 12.0.40629.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "zaaReloaded2", "zaaReloaded2\zaaReloaded2.csproj", "{0478F1B0-17F2-4151-8F93-1CB6EB9732C5}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{529544E3-3C26-4688-B39D-04DA30F05E20}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{386B2FA0-E39A-4BC4-930F-0BCF3787DC5E}" + ProjectSection(SolutionItems) = preProject + .nuget\packages.config = .nuget\packages.config + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/zaaReloaded2/Controller/Elements/CustomText.cs b/zaaReloaded2/Controller/Elements/CustomText.cs index 24e9c0b..efaf963 100755 --- a/zaaReloaded2/Controller/Elements/CustomText.cs +++ b/zaaReloaded2/Controller/Elements/CustomText.cs @@ -29,6 +29,7 @@ namespace zaaReloaded2.Controller.Elements [Serializable] public class CustomText : FormatElementBase, ISerializable { + [YamlDotNet.Serialization.YamlIgnore] public override string Label { get diff --git a/zaaReloaded2/Controller/Elements/ElementBase.cs b/zaaReloaded2/Controller/Elements/ElementBase.cs index c695cac..c31f8b3 100755 --- a/zaaReloaded2/Controller/Elements/ElementBase.cs +++ b/zaaReloaded2/Controller/Elements/ElementBase.cs @@ -33,6 +33,7 @@ namespace zaaReloaded2.Controller.Elements /// /// Returns the label for this formatting element. /// + [YamlDotNet.Serialization.YamlIgnore] abstract public string Label { get; } /// diff --git a/zaaReloaded2/Controller/Elements/Items.cs b/zaaReloaded2/Controller/Elements/Items.cs index e07f67a..d861900 100755 --- a/zaaReloaded2/Controller/Elements/Items.cs +++ b/zaaReloaded2/Controller/Elements/Items.cs @@ -37,6 +37,7 @@ namespace zaaReloaded2.Controller.Elements { #region ElementBase implementation + [YamlDotNet.Serialization.YamlIgnore] public override string Label { get diff --git a/zaaReloaded2/Controller/Elements/SelectEachDay.cs b/zaaReloaded2/Controller/Elements/SelectEachDay.cs index 91bdf4c..2a497ef 100755 --- a/zaaReloaded2/Controller/Elements/SelectEachDay.cs +++ b/zaaReloaded2/Controller/Elements/SelectEachDay.cs @@ -26,6 +26,7 @@ namespace zaaReloaded2.Controller.Elements [Serializable] public class SelectEachDay : ControlElementBase { + [YamlDotNet.Serialization.YamlIgnore] public override string Label { get { return "Jeder Tag"; } diff --git a/zaaReloaded2/Controller/Settings.cs b/zaaReloaded2/Controller/Settings.cs index 879dc17..80e391f 100755 --- a/zaaReloaded2/Controller/Settings.cs +++ b/zaaReloaded2/Controller/Settings.cs @@ -25,6 +25,7 @@ using System.IO; using System.Text.RegularExpressions; using System.Runtime.Serialization; using System.Runtime.Serialization.Formatters.Soap; +using YamlDotNet.Serialization; namespace zaaReloaded2.Controller { @@ -45,9 +46,22 @@ namespace zaaReloaded2.Controller /// SOAP XML that can be deserialized to a Settings object. public static Settings LoadFromFile(string fileName) { + Logger.Info("LoadFromFile: {0}", fileName); StreamReader reader = new StreamReader(fileName); - SoapFormatter formatter = new SoapFormatter(); - Settings settings = formatter.Deserialize(reader.BaseStream) as Settings; + Deserializer deserializer = new DeserializerBuilder().Build(); + Settings settings; + try + { + settings = deserializer.Deserialize(reader); + } + catch (Exception e) + { + Logger.Fatal("LoadFromFile: Exception during deserialization"); + Logger.Fatal(e); + throw; + } + // SoapFormatter formatter = new SoapFormatter(); + // Settings settings = formatter.Deserialize(reader.BaseStream) as Settings; if (settings == null) { throw new InvalidDataException("Datei enthält keine Stil-Daten oder ist beschädigt."); @@ -62,9 +76,16 @@ namespace zaaReloaded2.Controller /// File to write to. public void SaveToFile(string fileName) { - StreamWriter writer = new StreamWriter(fileName); - SoapFormatter formatter = new SoapFormatter(); - formatter.Serialize(writer.BaseStream, this); + Logger.Info("SaveToFile: {0}", fileName); + using (StreamWriter writer = new StreamWriter(fileName)) + { + Serializer serializer = new SerializerBuilder() + //.EnsureRoundtrip() + .Build(); + serializer.Serialize(writer, this); + } + // SoapFormatter formatter = new SoapFormatter(); + // formatter.Serialize(writer.BaseStream, this); } #endregion @@ -238,5 +259,13 @@ namespace zaaReloaded2.Controller static readonly Regex _persistenceHeaderRegex = new Regex(@"^\[(?.+?)]$"); #endregion + + #region Class logger + + private static NLog.Logger Logger { get { return _logger.Value; } } + + private static readonly Lazy _logger = new Lazy(() => NLog.LogManager.GetCurrentClassLogger()); + + #endregion } } diff --git a/zaaReloaded2/Controller/SettingsRepository.cs b/zaaReloaded2/Controller/SettingsRepository.cs index db7f8bc..c209079 100755 --- a/zaaReloaded2/Controller/SettingsRepository.cs +++ b/zaaReloaded2/Controller/SettingsRepository.cs @@ -59,20 +59,13 @@ namespace zaaReloaded2.Controller /// public static SettingsRepository Load() { - string s = UserSettings.Default.SettingsRepository; - if (String.IsNullOrEmpty(s)) + SettingsRepository repo = UserSettings.Default.SettingsRepository; + if (repo == null) { return new SettingsRepository(); } else { - MemoryStream stream = new MemoryStream(); - string encoded = UserSettings.Default.SettingsRepository; - byte[] bytes = Convert.FromBase64String(encoded); - stream.Write(bytes, 0, bytes.Length); - stream.Position = 0; - SoapFormatter serializer = new SoapFormatter(); - SettingsRepository repo = serializer.Deserialize(stream) as SettingsRepository; repo.LoadDefaults(); return repo; } @@ -89,12 +82,7 @@ namespace zaaReloaded2.Controller /// public void Store() { - MemoryStream stream = new MemoryStream(); - SoapFormatter serializer = new SoapFormatter(); - serializer.Serialize(stream, this); - stream.Position = 0; - string encoded = Convert.ToBase64String(stream.ToArray()); - UserSettings.Default.SettingsRepository = encoded; + UserSettings.Default.SettingsRepository = this; } #endregion @@ -195,18 +183,24 @@ namespace zaaReloaded2.Controller private void LoadDefaults() { Assembly myAssembly = this.GetType().Assembly; - SoapFormatter deserializer = new SoapFormatter(); - Stream stream = myAssembly.GetManifestResourceStream("zaaReloaded2.Defaults.ward.zaaReloaded"); - Settings settings = deserializer.Deserialize(stream) as Settings; - settings.Name = Properties.Settings.Default.SettingsNameWard + BUILTIN_LABEL; - settings.Uid = Guid.Parse(DEFAULT_SETTINGS_1_UID); - ReplaceOrAdd(settings); - - stream = myAssembly.GetManifestResourceStream("zaaReloaded2.Defaults.clinic.zaaReloaded"); - settings = deserializer.Deserialize(stream) as Settings; - settings.Name = Properties.Settings.Default.SettingsNameClinic + BUILTIN_LABEL; - settings.Uid = Guid.Parse(DEFAULT_SETTINGS_2_UID); - ReplaceOrAdd(settings); + // SoapFormatter deserializer = new SoapFormatter(); + var deserializer = new YamlDotNet.Serialization.DeserializerBuilder().Build(); + using (Stream stream = myAssembly.GetManifestResourceStream("zaaReloaded2.Defaults.ward.zaaReloaded2")) + { + StreamReader reader = new StreamReader(stream); + Settings settings = deserializer.Deserialize(reader); + settings.Name = Properties.Settings.Default.SettingsNameWard + BUILTIN_LABEL; + settings.Uid = Guid.Parse(DEFAULT_SETTINGS_1_UID); + ReplaceOrAdd(settings); + } + using (Stream stream = myAssembly.GetManifestResourceStream("zaaReloaded2.Defaults.clinic.zaaReloaded2")) + { + StreamReader reader = new StreamReader(stream); + Settings settings = deserializer.Deserialize(reader); + settings.Name = Properties.Settings.Default.SettingsNameClinic + BUILTIN_LABEL; + settings.Uid = Guid.Parse(DEFAULT_SETTINGS_2_UID); + ReplaceOrAdd(settings); + } } private void ReplaceOrAdd(Settings settings) diff --git a/zaaReloaded2/Defaults/clinic.zaaReloaded b/zaaReloaded2/Defaults/clinic.zaaReloaded deleted file mode 100755 index c263e28..0000000 --- a/zaaReloaded2/Defaults/clinic.zaaReloaded +++ /dev/null @@ -1,177 +0,0 @@ - - - -2 - -<_a>-903942278 -<_b>-22298 -<_c>17811 -<_d>139 -<_e>190 -<_f>233 -<_g>83 -<_h>158 -<_i>73 -<_j>21 -<_k>115 - -Kopie von Standard für NepA -IfSpecialItem -None -1 - - - - -zaaReloaded2.Controller.Elements.SelectEachDay -4 -zaaReloaded2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6ec8d075a1ab1383 - - -2 -22 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -zaaReloaded2.Controller.Elements.Items -4 - - - -2 -Klinische Chemie: Na, K, Cl, Mg, Ca, P, CaxP, Alb, Prot, Haptoglobin, LDH, Glukose, Harnsäure - - -2 -Entzündung/Immunsystem: CRP, Pct, C3c, C4, Anti-DNAse B, ASL - - -2 -Kardiale Marker: CK, CK-MB, hsTnT, NT-proBNP - - -2 -Niere: Krea, Hst, eGFR (CKD-EPI), Cystatin C - - -2 -Sammelurin: SU-Prot, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Na, SU-Zeit, SU-Volumen - - -2 -Spot-Urin: U-TPCR, U-ACR, U-Alb, U-Ery, U-Leu, U-Bakt, U-Schwangerschaftstest - - -2 -Leber: GOT, GGT, GPT, AP, Bilirubin, CHE, CDT - - -2 -Blutfette: TG, Chol, LDL, HDL, Lp(a) - - -2 -Hämatologie: Hb, Hkt, Reti, Leu, Thr, MCV, HbA1c, Retikulozyten, Fragmentozyten - - -2 -Diff.-BB: Neu, Lym, Mon, Baso, Eos - - -2 -Gerinnung: Quick, INR, PTT, Fibrinogen, ATIII, Anti-Xa - - -2 -Serum-Elektrophorese: Albumin-Fraktion, a1-Globulin, a2-Globulin, b-Globulin, g-Globulin - - -2 -Hormone: iPTH, TSH, fT3, fT4, Aldosteron, Renin, ARQ - - -2 -Vitamine: B12, Folsäure - - -2 -Eisenhaushalt: Eisen, Ferritin, Transferrin, Tf.-Sätt. - - -2 -BGA: pH, Std.-Bic., BE - - -2 -Hepatitis-Serologie: Anti-HBs, Anti-HBc - - -2 -Medikamente: TAC "(Ziel-Talspiegel: <> µg/l)", CsA (C0) "(Ziel-Talspiegel: <> µg/l)", SIR "(Ziel-Talspiegel: <> µg/l)", Vancomycin, Gentamicin, Tobramicin - - -2 -Tumormarker: PSA, AFP - - -zaaReloaded2.Controller.Elements.CustomText -4 - - - -2 -Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden - - -2 -Virologie (EDTA-Blut): CMV-PCR, BKV-PCR - - -2 -Autoantikörper: ANCA (IF) 1: (Ref. < 1:40), MPO-ANCA (ELISA) IU/ml (Ref. < 9), PR3-ANCA (ELISA) IU/ml (Ref. < 3,5), ANA (IF), AnDNA (ELISA), AnDNA (RIA) - - - diff --git a/zaaReloaded2/Defaults/clinic.zaaReloaded2 b/zaaReloaded2/Defaults/clinic.zaaReloaded2 new file mode 100755 index 0000000..69cdcc1 --- /dev/null +++ b/zaaReloaded2/Defaults/clinic.zaaReloaded2 @@ -0,0 +1,51 @@ +!zaaReloaded2.Controller.Settings,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 +Name: Kopie von Standard für NepA +ReferenceStyle: IfSpecialItem +Elements: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.ElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089 +- !zaaReloaded2.Controller.Elements.SelectEachDay,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Children: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.FormatElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089 + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Klinische Chemie: Na, K, Cl, Mg, Ca, P, CaxP, Alb, Prot, Haptoglobin, LDH, Glukose, Harnsäure' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Entzündung/Immunsystem: CRP, Pct, C3c, C4, Anti-DNAse B, ASL' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Kardiale Marker: CK, CK-MB, hsTnT, NT-proBNP' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Niere: Krea, Hst, eGFR (CKD-EPI), Cystatin C' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Sammelurin: SU-Prot, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Na, SU-Zeit, SU-Volumen' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Spot-Urin: U-TPCR, U-ACR, U-Alb, U-Ery, U-Leu, U-Bakt, U-Schwangerschaftstest' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Leber: GOT, GGT, GPT, AP, Bilirubin, CHE, CDT' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Blutfette: TG, Chol, LDL, HDL, Lp(a)' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Hämatologie: Hb, Hkt, Reti, Leu, Thr, MCV, HbA1c, Retikulozyten, Fragmentozyten' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Diff.-BB: Neu, Lym, Mon, Baso, Eos' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Gerinnung: Quick, INR, PTT, Fibrinogen, ATIII, Anti-Xa' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Serum-Elektrophorese: Albumin-Fraktion, a1-Globulin, a2-Globulin, b-Globulin, g-Globulin' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Hormone: iPTH, TSH, fT3, fT4, Aldosteron, Renin, ARQ' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Vitamine: B12, Folsäure' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Eisenhaushalt: Eisen, Ferritin, Transferrin, Tf.-Sätt.' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'BGA: pH, Std.-Bic., BE' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Hepatitis-Serologie: Anti-HBs, Anti-HBc' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Medikamente: TAC "(Ziel-Talspiegel: <> µg/l)", CsA (C0) "(Ziel-Talspiegel: <> µg/l)", SIR "(Ziel-Talspiegel: <> µg/l)", Vancomycin, Gentamicin, Tobramicin' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Tumormarker: PSA, AFP' + - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden' + - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Virologie (EDTA-Blut): CMV-PCR, BKV-PCR' + - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Autoantikörper: ANCA (IF) 1: (Ref. < 1:40), MPO-ANCA (ELISA) IU/ml (Ref. < 9), PR3-ANCA (ELISA) IU/ml (Ref. < 3,5), ANA (IF), AnDNA (ELISA), AnDNA (RIA)' +Uid: 99b44ee9-2858-4651-84ad-eb7980832352 diff --git a/zaaReloaded2/Defaults/ward.zaaReloaded b/zaaReloaded2/Defaults/ward.zaaReloaded deleted file mode 100755 index d14dbcc..0000000 --- a/zaaReloaded2/Defaults/ward.zaaReloaded +++ /dev/null @@ -1,254 +0,0 @@ - - - -2 - -<_a>1038630179 -<_b>-1437 -<_c>19419 -<_d>151 -<_e>122 -<_f>7 -<_g>44 -<_h>130 -<_i>195 -<_j>52 -<_k>194 - -Station ganz neu -IfSpecialItem -None -4 - - - - - - - - - - -zaaReloaded2.Controller.Elements.TwoColumns -4 -zaaReloaded2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6ec8d075a1ab1383 - - -2 -0 - - -zaaReloaded2.Controller.Elements.SelectFirstDay -4 - - - -2 -22 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -zaaReloaded2.Controller.Elements.NextColumn -4 - - - -2 -0 - - -zaaReloaded2.Controller.Elements.SelectLastDay -4 - - - -2 -22 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -zaaReloaded2.Controller.Elements.Items -4 - - - -2 -Klinische Chemie: Na, K, Cl, Mg, Ca, P, CaxP, Alb, Prot, Haptoglobin, LDH, Glukose, Harnsäure - - -2 -Entzündung/Immunsystem: CRP, Pct, C3c, C4, Anti-DNAse B, ASL - - -2 -Kardiale Marker: CK, CKMB, hsTnT, NT-proBNP - - -2 -Niere: Krea, Hst, eGFR (CKD-EPI), Cystatin C - - -2 -Sammelurin: SU-Prot, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Na, SU-Zeit, SU-Volumen - - -2 -Spot-Urin: U-TPCR, U-ACR, U-Alb, U-Ery, U-Leu, U-Bakt - - -2 -Leber: GOT, GGT, GPT, AP, Bilirubin, CHE - - -2 -Blutfette: TG, Chol, LDL, HDL, Lp(a) - - -2 -Hämatologie: Hb, Hkt, Reti, Leu, Thr, MCV, HbA1c, Retikulozyten, Fragmentozyten - - -2 -Diff.-BB: Neu, Lym, Mon, Baso, Eos - - -2 -Gerinnung: Quick, INR, PTT, Fibrinogen, ATIII, Anti-Xa - - -2 -Serum-Elektrophorese: Albumin-Fraktion, a1-Globulin, a2-Globulin, b-Globulin, g-Globulin - - -2 -Hormone: iPTH, TSH, fT3, fT4 - - -2 -Vitamine: B12, Folsäure - - -2 -Eisenhaushalt: Eisen, Ferritin, Transferrin, Tf.-Sätt. - - -2 -BGA: pH, Std.-Bic., BE - - -2 -Hepatitis-Serologie: Anti-HBs, Anti-HBc - - -2 -Medikamente: TAC "(Ziel-Talspiegel: <> µg/l)", CsA (C0) "(Ziel-Talspiegel: <> µg/l)", SIR "(Ziel-Talspiegel: <> µg/l)", Vancomycin, Gentamicin, Tobramicin - - -zaaReloaded2.Controller.Elements.CustomText -4 - - - -2 -Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden - - -2 -Virologie (EDTA-Blut): CMV-PCR, BKV-PCR - - -2 -Autoantikörper: ANCA (IF), MPO-ANCA (ELISA), PR3-ANCA (ELISA), ANA (IF), AnDNA (ELISA), AnDNA (RIA) - - -2 -Tumormarker: PSA - - - diff --git a/zaaReloaded2/Defaults/ward.zaaReloaded2 b/zaaReloaded2/Defaults/ward.zaaReloaded2 new file mode 100755 index 0000000..eaea8dd --- /dev/null +++ b/zaaReloaded2/Defaults/ward.zaaReloaded2 @@ -0,0 +1,101 @@ +!zaaReloaded2.Controller.Settings,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 +Name: Kopie von Standard für Station +ReferenceStyle: IfSpecialItem +Elements: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.ElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089 +- !zaaReloaded2.Controller.Elements.TwoColumns,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Children: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.FormatElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089 [] +- !zaaReloaded2.Controller.Elements.SelectFirstDay,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Children: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.FormatElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089 + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Klinische Chemie: Na, K, Cl, Mg, Ca, P, CaxP, Alb, Prot, Haptoglobin, LDH, Glukose, Harnsäure' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Entzündung/Immunsystem: CRP, Pct, C3c, C4, Anti-DNAse B, ASL' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Kardiale Marker: CK, CKMB, hsTnT, NT-proBNP' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Niere: Krea, Hst, eGFR (CKD-EPI), Cystatin C' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Sammelurin: SU-Prot, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Na, SU-Zeit, SU-Volumen' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Spot-Urin: U-TPCR, U-ACR, U-Alb, U-Ery, U-Leu, U-Bakt' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Leber: GOT, GGT, GPT, AP, Bilirubin, CHE' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Blutfette: TG, Chol, LDL, HDL, Lp(a)' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Hämatologie: Hb, Hkt, Reti, Leu, Thr, MCV, HbA1c, Retikulozyten, Fragmentozyten' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Diff.-BB: Neu, Lym, Mon, Baso, Eos' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Gerinnung: Quick, INR, PTT, Fibrinogen, ATIII, Anti-Xa' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Serum-Elektrophorese: Albumin-Fraktion, a1-Globulin, a2-Globulin, b-Globulin, g-Globulin' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Hormone: iPTH, TSH, fT3, fT4' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Vitamine: B12, Folsäure' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Eisenhaushalt: Eisen, Ferritin, Transferrin, Tf.-Sätt.' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'BGA: pH, Std.-Bic., BE' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Hepatitis-Serologie: Anti-HBs, Anti-HBc' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Medikamente: TAC "(Ziel-Talspiegel: <> µg/l)", CsA (C0) "(Ziel-Talspiegel: <> µg/l)", SIR "(Ziel-Talspiegel: <> µg/l)", Vancomycin, Gentamicin, Tobramicin' + - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden' + - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Virologie (EDTA-Blut): CMV-PCR, BKV-PCR' + - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Autoantikörper: ANCA (IF), MPO-ANCA (ELISA), PR3-ANCA (ELISA), ANA (IF), AnDNA (ELISA), AnDNA (RIA)' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Tumormarker: PSA' +- !zaaReloaded2.Controller.Elements.NextColumn,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Children: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.FormatElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089 [] +- !zaaReloaded2.Controller.Elements.SelectLastDay,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Children: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.FormatElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089 + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Klinische Chemie: Na, K, Cl, Mg, Ca, P, CaxP, Alb, Prot, Haptoglobin, LDH, Glukose, Harnsäure' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Entzündung/Immunsystem: CRP, Pct, C3c, C4, Anti-DNAse B, ASL' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Kardiale Marker: CK, CKMB, hsTnT, NT-proBNP' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Niere: Krea, Hst, eGFR (CKD-EPI), Cystatin C' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Sammelurin: SU-Prot, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Na, SU-Zeit, SU-Volumen' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Spot-Urin: U-TPCR, U-ACR, U-Alb, U-Ery, U-Leu, U-Bakt' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Leber: GOT, GGT, GPT, AP, Bilirubin, CHE' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Blutfette: TG, Chol, LDL, HDL, Lp(a)' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Hämatologie: Hb, Hkt, Reti, Leu, Thr, MCV, HbA1c, Retikulozyten, Fragmentozyten' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Diff.-BB: Neu, Lym, Mon, Baso, Eos' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Gerinnung: Quick, INR, PTT, Fibrinogen, ATIII, Anti-Xa' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Serum-Elektrophorese: Albumin-Fraktion, a1-Globulin, a2-Globulin, b-Globulin, g-Globulin' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Hormone: iPTH, TSH, fT3, fT4' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Vitamine: B12, Folsäure' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Eisenhaushalt: Eisen, Ferritin, Transferrin, Tf.-Sätt.' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'BGA: pH, Std.-Bic., BE' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Hepatitis-Serologie: Anti-HBs, Anti-HBc' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Medikamente: TAC "(Ziel-Talspiegel: <> µg/l)", CsA (C0) "(Ziel-Talspiegel: <> µg/l)", SIR "(Ziel-Talspiegel: <> µg/l)", Vancomycin, Gentamicin, Tobramicin' + - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden' + - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Virologie (EDTA-Blut): CMV-PCR, BKV-PCR' + - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Autoantikörper: ANCA (IF), MPO-ANCA (ELISA), PR3-ANCA (ELISA), ANA (IF), AnDNA (ELISA), AnDNA (RIA)' + - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + Content: 'Tumormarker: PSA' +Uid: 216d9bbb-94d8-47e5-b13b-59e0edd24d91 diff --git a/zaaReloaded2/UserSettings.cs b/zaaReloaded2/UserSettings.cs index ecd8a00..e296412 100755 --- a/zaaReloaded2/UserSettings.cs +++ b/zaaReloaded2/UserSettings.cs @@ -150,7 +150,7 @@ namespace zaaReloaded2 } } - public string SettingsRepository { get; set; } + public Controller.SettingsRepository SettingsRepository { get; set; } [YamlDotNet.Serialization.YamlIgnore] public bool FirstRun { get { return LastVersionSeen == DEFAULT_VERSION; } } @@ -174,6 +174,11 @@ namespace zaaReloaded2 return UserSettingsFile; } + protected override YamlDotNet.Serialization.SerializerBuilder ConstructSerializerBuilder() + { + return base.ConstructSerializerBuilder().EnsureRoundtrip(); + } + #endregion #region Constructor diff --git a/zaaReloaded2/ViewModels/SettingsRepositoryViewModel.cs b/zaaReloaded2/ViewModels/SettingsRepositoryViewModel.cs index 5c17836..ac59a97 100755 --- a/zaaReloaded2/ViewModels/SettingsRepositoryViewModel.cs +++ b/zaaReloaded2/ViewModels/SettingsRepositoryViewModel.cs @@ -543,7 +543,7 @@ namespace zaaReloaded2.ViewModels /// File filter that is used for the import and export /// of settings. /// - const string FILE_FILTER = "zaaReloaded-Stildatei (*.zaaReloaded)|*.zaaReloaded"; + const string FILE_FILTER = "zaaReloaded-Stildatei (*.zaaReloaded2)|*.zaaReloaded2"; #endregion } diff --git a/zaaReloaded2/app.config b/zaaReloaded2/app.config index ce97849..42952af 100755 --- a/zaaReloaded2/app.config +++ b/zaaReloaded2/app.config @@ -101,7 +101,7 @@ - + diff --git a/zaaReloaded2/packages.config b/zaaReloaded2/packages.config index 1341991..981621f 100755 --- a/zaaReloaded2/packages.config +++ b/zaaReloaded2/packages.config @@ -19,8 +19,8 @@ limitations under the License. --> - + - - + + \ No newline at end of file diff --git a/zaaReloaded2/zaaReloaded2.csproj b/zaaReloaded2/zaaReloaded2.csproj index ba8d856..fd33e25 100755 --- a/zaaReloaded2/zaaReloaded2.csproj +++ b/zaaReloaded2/zaaReloaded2.csproj @@ -134,13 +134,13 @@ --> - - ..\packages\Bovender.0.16.2.0\lib\net40\Bovender.dll + + ..\packages\Bovender.0.17.0.0\lib\net40\Bovender.dll True - ..\packages\NLog.4.3.7\lib\net40\NLog.dll + ..\packages\NLog.4.4.3\lib\net40\NLog.dll True @@ -161,8 +161,8 @@ - - ..\packages\YamlDotNet.Signed.3.9.0\lib\net35\YamlDotNet.dll + + ..\packages\YamlDotNet.Signed.4.1.0\lib\net35\YamlDotNet.dll True @@ -319,8 +319,8 @@ - - + + SettingsSingleFileGenerator