From f83c538c94b668e42ffa83dc4daae43e145f166c Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Sun, 18 Nov 2018 19:55:43 +0100 Subject: [PATCH] Adjust settings serialization and deserialization to YamlDotNet 5.2.1. --- .../Controller/Elements/ControlElementBase.cs | 31 ++++- .../Controller/Elements/FormatElementBase.cs | 2 +- zaaReloaded2/Controller/Settings.cs | 45 +++++++- zaaReloaded2/Controller/SettingsRepository.cs | 15 ++- zaaReloaded2/Defaults/clinic.zaaReloaded2 | 54 ++++----- zaaReloaded2/Defaults/ward.zaaReloaded2 | 108 +++++++++--------- .../ViewModels/ControlElementViewModel.cs | 4 - 7 files changed, 159 insertions(+), 100 deletions(-) diff --git a/zaaReloaded2/Controller/Elements/ControlElementBase.cs b/zaaReloaded2/Controller/Elements/ControlElementBase.cs index a44a2b8..599e7f9 100755 --- a/zaaReloaded2/Controller/Elements/ControlElementBase.cs +++ b/zaaReloaded2/Controller/Elements/ControlElementBase.cs @@ -35,7 +35,21 @@ namespace zaaReloaded2.Controller.Elements /// Gets a list of child elements, all of which must be derived /// from FormatElementBase. /// - public IList Children { get; internal set; } + public IList Children + { + get + { + if (_children == null) + { + _children = new List(); + } + return _children; + } + internal set + { + _children = value; + } + } /// /// Informs whether this control element can have child elements. @@ -46,17 +60,16 @@ namespace zaaReloaded2.Controller.Elements #region Constructors - public ControlElementBase() - : this(new List()) - { } + public ControlElementBase() : base() { } public ControlElementBase(IList children) + : this() { Children = children; } - public ControlElementBase(FormatElementBase children) - : this(new List() { children }) + public ControlElementBase(FormatElementBase child) + : this(new List() { child }) { } #endregion @@ -111,5 +124,11 @@ namespace zaaReloaded2.Controller.Elements } #endregion + + #region Fields + + IList _children; + + #endregion } } diff --git a/zaaReloaded2/Controller/Elements/FormatElementBase.cs b/zaaReloaded2/Controller/Elements/FormatElementBase.cs index 421b417..e901f7d 100755 --- a/zaaReloaded2/Controller/Elements/FormatElementBase.cs +++ b/zaaReloaded2/Controller/Elements/FormatElementBase.cs @@ -16,8 +16,8 @@ * limitations under the License. */ -using System; using System.Runtime.Serialization; + namespace zaaReloaded2.Controller.Elements { /// diff --git a/zaaReloaded2/Controller/Settings.cs b/zaaReloaded2/Controller/Settings.cs index 16c6fcf..627a4ae 100755 --- a/zaaReloaded2/Controller/Settings.cs +++ b/zaaReloaded2/Controller/Settings.cs @@ -18,13 +18,11 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; using zaaReloaded2.Formatter; using zaaReloaded2.Controller.Elements; using System.IO; using System.Text.RegularExpressions; using System.Runtime.Serialization; -using System.Runtime.Serialization.Formatters.Soap; using YamlDotNet.Serialization; namespace zaaReloaded2.Controller @@ -35,6 +33,43 @@ namespace zaaReloaded2.Controller [Serializable] public class Settings : ICloneable, ISerializable { + #region Auxiliary factories for YamlDotNet + + public static ISerializer BuildSerializer() + { + SerializerBuilder builder = new SerializerBuilder() + .WithTagMapping("!Settings", typeof(Settings)) + .WithTagMapping("!ElementsList", typeof(List)) + .WithTagMapping("!FormatElementsList", typeof(List)) + .WithTagMapping("!Items", typeof(Items)) + .WithTagMapping("!CustomText", typeof(CustomText)) + .WithTagMapping("!SelectFirstDay", typeof(SelectFirstDay)) + .WithTagMapping("!SelectEachDay", typeof(SelectEachDay)) + .WithTagMapping("!SelectLastDay", typeof(SelectLastDay)) + .WithTagMapping("!TwoColumns", typeof(TwoColumns)) + .WithTagMapping("!NextColumn", typeof(NextColumn)) + .EnsureRoundtrip(); + return builder.Build(); + } + + public static IDeserializer BuildDeserializer() + { + DeserializerBuilder builder = new DeserializerBuilder() + .WithTagMapping("!Settings", typeof(Settings)) + .WithTagMapping("!ElementsList", typeof(List)) + .WithTagMapping("!FormatElementsList", typeof(List)) + .WithTagMapping("!Items", typeof(Items)) + .WithTagMapping("!CustomText", typeof(CustomText)) + .WithTagMapping("!SelectFirstDay", typeof(SelectFirstDay)) + .WithTagMapping("!SelectEachDay", typeof(SelectEachDay)) + .WithTagMapping("!SelectLastDay", typeof(SelectLastDay)) + .WithTagMapping("!TwoColumns", typeof(TwoColumns)) + .WithTagMapping("!NextColumn", typeof(NextColumn)); + return builder.Build(); + } + + #endregion + #region Persistence /// @@ -48,7 +83,7 @@ namespace zaaReloaded2.Controller { Logger.Info("LoadFromFile: {0}", fileName); StreamReader reader = new StreamReader(fileName); - Deserializer deserializer = new DeserializerBuilder().Build(); + IDeserializer deserializer = BuildDeserializer(); Settings settings; try { @@ -81,9 +116,7 @@ namespace zaaReloaded2.Controller Logger.Info("SaveToFile: Settings name: {0}", Name); using (StreamWriter writer = new StreamWriter(fileName)) { - Serializer serializer = new SerializerBuilder() - .EnsureRoundtrip() - .Build(); + ISerializer serializer = BuildSerializer(); serializer.Serialize(writer, this); } Logger.Info("SaveToFile: Successfully saved to file '{0}'", fileName); diff --git a/zaaReloaded2/Controller/SettingsRepository.cs b/zaaReloaded2/Controller/SettingsRepository.cs index 5ee8038..2aa5cc9 100755 --- a/zaaReloaded2/Controller/SettingsRepository.cs +++ b/zaaReloaded2/Controller/SettingsRepository.cs @@ -62,10 +62,12 @@ namespace zaaReloaded2.Controller SettingsRepository repo = UserSettings.Default.SettingsRepository; if (repo == null) { + Logger.Warn("Load: No repository in user settings; creating a new one."); return new SettingsRepository(); } else { + Logger.Warn("Load: Loaded repository from user settings."); repo.LoadDefaults(); return repo; } @@ -183,8 +185,8 @@ namespace zaaReloaded2.Controller private void LoadDefaults() { Assembly myAssembly = this.GetType().Assembly; - // SoapFormatter deserializer = new SoapFormatter(); - var deserializer = new YamlDotNet.Serialization.DeserializerBuilder().Build(); + var deserializer = Settings.BuildDeserializer(); + Logger.Info("LoadDefaults: Loading ward default"); using (Stream stream = myAssembly.GetManifestResourceStream("zaaReloaded2.Defaults.ward.zaaReloaded2")) { StreamReader reader = new StreamReader(stream); @@ -193,6 +195,7 @@ namespace zaaReloaded2.Controller settings.Uid = Guid.Parse(DEFAULT_SETTINGS_1_UID); ReplaceOrAdd(settings); } + Logger.Info("LoadDefaults: Loading clinic default"); using (Stream stream = myAssembly.GetManifestResourceStream("zaaReloaded2.Defaults.clinic.zaaReloaded2")) { StreamReader reader = new StreamReader(stream); @@ -238,5 +241,13 @@ namespace zaaReloaded2.Controller const string DEFAULT_SETTINGS_2_UID = "783C63B5-A964-4368-B2D0-D4595DCCB952"; #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/Defaults/clinic.zaaReloaded2 b/zaaReloaded2/Defaults/clinic.zaaReloaded2 index 2ceb29d..2a3857f 100755 --- a/zaaReloaded2/Defaults/clinic.zaaReloaded2 +++ b/zaaReloaded2/Defaults/clinic.zaaReloaded2 @@ -1,53 +1,53 @@ -!zaaReloaded2.Controller.Settings,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 +!Settings 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 +Elements: !ElementsList +- !SelectEachDay + Children: !FormatElementsList + - !Items 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 + - !Items 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 + - !Items Content: 'Kardiale Marker: CK, CK-MB, hsTnT, NT-proBNP' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items Content: 'Niere: Krea, Hst, eGFR (CKD-EPI), Cystatin C' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items 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 + - !Items 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 + - !Items Content: 'Leber: GOT, GGT, GPT, AP, Bilirubin, CHE, CDT' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items Content: 'Blutfette: TG, Chol, LDL, HDL, Lp(a)' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items 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 + - !Items Content: 'Diff.-BB: Neu, Lym, Mon, Baso, Eos' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items Content: 'Gerinnung: Quick, INR, PTT, Fibrinogen, ATIII, Anti-Xa' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items 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 + - !Items Content: 'Hormone: iPTH, TSH, fT3, fT4, Aldosteron, Renin, ARQ' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items Content: 'Vitamine: B12, Folsäure' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items Content: 'Eisenhaushalt: Eisen, Ferritin, Transferrin, Tf.-Sätt.' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items Content: 'BGA: pH, Std.-Bic., BE' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items Content: 'Hepatitis-Serologie: Anti-HBs, Anti-HBc' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items 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 + - !Items Content: 'Tumormarker: PSA, AFP' - - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !CustomText 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 + - !CustomText Content: 'Virologie (EDTA-Blut): CMV-PCR, BKV-PCR' - - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !CustomText 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)' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items Content: 'MSU: MSU-Keim, MSU-Multiresistenz' Uid: 581d378c-8f7a-4a1c-8490-36e257770a09 diff --git a/zaaReloaded2/Defaults/ward.zaaReloaded2 b/zaaReloaded2/Defaults/ward.zaaReloaded2 index eaea8dd..9c89407 100755 --- a/zaaReloaded2/Defaults/ward.zaaReloaded2 +++ b/zaaReloaded2/Defaults/ward.zaaReloaded2 @@ -1,101 +1,101 @@ -!zaaReloaded2.Controller.Settings,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 +!Settings 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 +Elements: !ElementsList +- !TwoColumns + Children: !FormatElementsList +- !SelectFirstDay + Children: !FormatElementsList + - !Items 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 + - !Items 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 + - !Items Content: 'Kardiale Marker: CK, CKMB, hsTnT, NT-proBNP' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items Content: 'Niere: Krea, Hst, eGFR (CKD-EPI), Cystatin C' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items 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 + - !Items 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 + - !Items Content: 'Leber: GOT, GGT, GPT, AP, Bilirubin, CHE' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items Content: 'Blutfette: TG, Chol, LDL, HDL, Lp(a)' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items 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 + - !Items Content: 'Diff.-BB: Neu, Lym, Mon, Baso, Eos' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items Content: 'Gerinnung: Quick, INR, PTT, Fibrinogen, ATIII, Anti-Xa' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items 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 + - !Items Content: 'Hormone: iPTH, TSH, fT3, fT4' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items Content: 'Vitamine: B12, Folsäure' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items Content: 'Eisenhaushalt: Eisen, Ferritin, Transferrin, Tf.-Sätt.' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items Content: 'BGA: pH, Std.-Bic., BE' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items Content: 'Hepatitis-Serologie: Anti-HBs, Anti-HBc' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items 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 + - !CustomText 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 + - !CustomText Content: 'Virologie (EDTA-Blut): CMV-PCR, BKV-PCR' - - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !CustomText 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 + - !Items 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 +- !NextColumn + Children: !FormatElementsList +- !SelectLastDay + Children: !FormatElementsList + - !Items 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 + - !Items 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 + - !Items Content: 'Kardiale Marker: CK, CKMB, hsTnT, NT-proBNP' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items Content: 'Niere: Krea, Hst, eGFR (CKD-EPI), Cystatin C' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items 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 + - !Items 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 + - !Items Content: 'Leber: GOT, GGT, GPT, AP, Bilirubin, CHE' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items Content: 'Blutfette: TG, Chol, LDL, HDL, Lp(a)' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items 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 + - !Items Content: 'Diff.-BB: Neu, Lym, Mon, Baso, Eos' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items Content: 'Gerinnung: Quick, INR, PTT, Fibrinogen, ATIII, Anti-Xa' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items 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 + - !Items Content: 'Hormone: iPTH, TSH, fT3, fT4' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items Content: 'Vitamine: B12, Folsäure' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items Content: 'Eisenhaushalt: Eisen, Ferritin, Transferrin, Tf.-Sätt.' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items Content: 'BGA: pH, Std.-Bic., BE' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items Content: 'Hepatitis-Serologie: Anti-HBs, Anti-HBc' - - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !Items 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 + - !CustomText 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 + - !CustomText Content: 'Virologie (EDTA-Blut): CMV-PCR, BKV-PCR' - - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 + - !CustomText 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 + - !Items Content: 'Tumormarker: PSA' Uid: 216d9bbb-94d8-47e5-b13b-59e0edd24d91 diff --git a/zaaReloaded2/ViewModels/ControlElementViewModel.cs b/zaaReloaded2/ViewModels/ControlElementViewModel.cs index d4a453f..b840906 100755 --- a/zaaReloaded2/ViewModels/ControlElementViewModel.cs +++ b/zaaReloaded2/ViewModels/ControlElementViewModel.cs @@ -16,12 +16,8 @@ * limitations under the License. */ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using Bovender.Mvvm.ViewModels; using zaaReloaded2.Controller.Elements; -using System.Diagnostics; using System.Collections.ObjectModel; namespace zaaReloaded2.ViewModels