From e3d8f850400e01603f5cda3365b1dde1d77de3c9 Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Tue, 25 Aug 2015 20:38:12 +0200 Subject: [PATCH 01/11] Add favicon link to home page. --- www/favicon.png | Bin 3733 -> 0 bytes www/index.html | 27 ++++++++++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) delete mode 100644 www/favicon.png diff --git a/www/favicon.png b/www/favicon.png deleted file mode 100644 index 9b9024ec964d67a4c552b359a13da8e03064751d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3733 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 diff --git a/www/index.html b/www/index.html index 97d5ec5..a0d402b 100644 --- a/www/index.html +++ b/www/index.html @@ -1,26 +1,27 @@ - - - - + + + + - - - + + + - - - + + + zaaReloaded2 +
From efeab3f70b290d889cf844cd53d6ea7675ad4f28 Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Wed, 26 Aug 2015 20:40:44 +0200 Subject: [PATCH 02/11] Fix ACR and TPCR precision. --- zaaReloaded2/Defaults/parameters.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/zaaReloaded2/Defaults/parameters.txt b/zaaReloaded2/Defaults/parameters.txt index f30528e..3d3c005 100755 --- a/zaaReloaded2/Defaults/parameters.txt +++ b/zaaReloaded2/Defaults/parameters.txt @@ -8,7 +8,7 @@ "Albumin (SU)" Alb SU "Albumin (SU)/die" Alb SU Albumin Alb S -"Albumin/Creatinin (PU)" ACR U +"Albumin/Creatinin (PU)" ACR U 0 "Alk. Phosphatase" AP S 0 Amylase Amylase S "anorg. Phosphat" P S @@ -43,7 +43,7 @@ Gesamt-Bilirubin Bilirubin S "Gesamt-Eiweiss (SU)" Protein SU "Gesamt-Eiweiss (SU)/die" Proteinurie SU Gesamt-Eiweiss Protein S -"Gesamt-Eiweiss/Creatinin (PU)" TPCR U +"Gesamt-Eiweiss/Creatinin (PU)" TPCR U 0 GGT GGT S 0 "glomeruläre Filtrationsrate" GFR SU "glomerul. Filtrationsr. (MDRD)" "eGFR (MDRD)" S --- X @@ -90,6 +90,7 @@ pH pH BGA "Plattenepithelien (U)" Plattenep U "PO2 (art.)" pO2 BGA "Protein (U)" Protein U +"PSA ges. (ECL,Elecsys,Roche)" PSA S "Sammelmenge (U)" Volumen SU "Sammelzeit (U)" Zeit SU "Sauerstoffsättigung (art.)" SO2 BGA From 87af0a568414be1ff5ea5bdf317ef3db471a3be0 Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Wed, 26 Aug 2015 20:42:50 +0200 Subject: [PATCH 03/11] Fix clinic style. --- zaaReloaded2/Defaults/clinic.zaaReloaded | 72 +++++++++++++----------- 1 file changed, 39 insertions(+), 33 deletions(-) diff --git a/zaaReloaded2/Defaults/clinic.zaaReloaded b/zaaReloaded2/Defaults/clinic.zaaReloaded index bbe63c1..e67c6b5 100755 --- a/zaaReloaded2/Defaults/clinic.zaaReloaded +++ b/zaaReloaded2/Defaults/clinic.zaaReloaded @@ -3,17 +3,17 @@ 2 -<_a>-1778735783 -<_b>3723 -<_c>18224 -<_d>191 -<_e>50 -<_f>238 -<_g>43 -<_h>44 -<_i>3 -<_j>227 -<_k>42 +<_a>804500411 +<_b>28316 +<_c>19488 +<_d>162 +<_e>198 +<_f>58 +<_g>243 +<_h>81 +<_i>228 +<_j>147 +<_k>135 Kopie von Standard für NepA IfSpecialItem @@ -29,7 +29,7 @@ 2 -19 +20 @@ -68,92 +68,98 @@ + + -zaaReloaded2.Controller.Elements.Items +zaaReloaded2.Controller.Elements.Items 4 2 -Klinische Chemie: Na, K, Cl, Mg, Ca, P, CaxP, Alb, Prot, Haptoglobin, LDH, Glukose, Harnsäure +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 +Entzündung/Immunsystem: CRP, Pct, C3c, C4, Anti-DNAse B, ASL 2 -Kardiale Marker: CK, CKMB, Trop, NTproBNP +Kardiale Marker: CK, CKMB, Trop, NTproBNP 2 -Niere: Krea, Hst, eGFR (CKD-EPI), Cystatin C +Niere: Krea, Hst, eGFR (CKD-EPI) 2 -Sammelurin: SU-Proteinurie, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Natrium, SU-Zeit, SU-Volumen +Sammelurin: SU-Proteinurie, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Natrium, SU-Zeit, SU-Volumen 2 -Spot-Urin: TPCR, ACR, U-Ery, U-Leu, U-Bakt +Spot-Urin: U-TPCR, U-ACR, U-Ery, U-Leu, U-Bakt 2 -Leber: GOT, GGT, GPT, AP, Bilirubin, CHE +Leber: GOT, GGT, GPT, AP, Bilirubin, CHE 2 -Blutfette: TG, Chol, LDL, HDL, Lp(a) +Blutfette: TG, Chol, LDL, HDL, Lp(a) 2 -Hämatologie: Hb, Hkt, Reti, Leu, Thr, MCV, HbA1c, Retikulozyten, Fragmentozyten +Hämatologie: Hb, Hkt, Reti, Leu, Thr, MCV, HbA1c, Retikulozyten, Fragmentozyten 2 -Gerinnung: Quick, INR, PTT, Fibrinogen, ATIII, Anti-Xa +Gerinnung: Quick, INR, PTT, Fibrinogen, ATIII, Anti-Xa 2 -Diff.-BB: Neu, Lym, Mon, Baso, Eos +Diff.-BB: Neu, Lym, Mon, Baso, Eos 2 -Hormone: iPTH, TSH, fT3, fT4 +Hormone: iPTH, TSH, fT3, fT4 2 -Eisenhaushalt: Eisen, Ferritin, Transferrin, Tf.-Sätt. +Eisenhaushalt: Eisen, Ferritin, Transferrin, Tf.-Sätt. 2 -BGA: pH, Std.-Bic., BE +BGA: pH, Std.-Bic., BE 2 -Hepatitis-Serologie: Anti-HBs, Anti-HBc +Hepatitis-Serologie: Anti-HBs, Anti-HBc 2 -Medikamente: TAC, CSA (C0), SIR, Vancomycin, Gentamicin, Tobramicin +Medikamente: TAC, CSA (C0), SIR, Vancomycin, Gentamicin, Tobramicin -zaaReloaded2.Controller.Elements.CustomText +zaaReloaded2.Controller.Elements.CustomText 4 2 -Virologie (EDTA-Blut): CMV-PCR, BKV-PCR +Virologie (EDTA-Blut): CMV-PCR, BKV-PCR 2 -Autoantikörper: ANCA (IF), MPO-ANCA (ELISA), PR3-ANCA (ELISA), ANA (IF), AnDNA (ELISA), AnDNA (RIA) +Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden 2 -Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden +Autoantikörper: ANCA (IF), MPO-ANCA (ELISA), PR3-ANCA (ELISA), ANA (IF), AnDNA (ELISA), AnDNA (RIA) + +2 +Tumormarker: PSA + From 2e2bac72135fab9c630852f95fc88975c518a00f Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Fri, 28 Aug 2015 10:12:44 +0200 Subject: [PATCH 04/11] Add electrophoresis parameters, update clinic style. --- zaaReloaded2/Defaults/clinic.zaaReloaded | 94 +++++++++++++----------- zaaReloaded2/Defaults/parameters.txt | 7 +- 2 files changed, 56 insertions(+), 45 deletions(-) diff --git a/zaaReloaded2/Defaults/clinic.zaaReloaded b/zaaReloaded2/Defaults/clinic.zaaReloaded index e67c6b5..15d9bbc 100755 --- a/zaaReloaded2/Defaults/clinic.zaaReloaded +++ b/zaaReloaded2/Defaults/clinic.zaaReloaded @@ -3,17 +3,17 @@ 2 -<_a>804500411 -<_b>28316 -<_c>19488 -<_d>162 -<_e>198 -<_f>58 -<_g>243 -<_h>81 -<_i>228 -<_j>147 -<_k>135 +<_a>233768554 +<_b>-10539 +<_c>19865 +<_d>131 +<_e>252 +<_f>97 +<_g>190 +<_h>116 +<_i>107 +<_j>28 +<_k>144 Kopie von Standard für NepA IfSpecialItem @@ -29,7 +29,7 @@ 2 -20 +21 @@ -62,104 +62,110 @@ - - - + + + - + - + + + -zaaReloaded2.Controller.Elements.Items +zaaReloaded2.Controller.Elements.Items 4 2 -Klinische Chemie: Na, K, Cl, Mg, Ca, P, CaxP, Alb, Prot, Haptoglobin, LDH, Glukose, Harnsäure +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 +Entzündung/Immunsystem: CRP, Pct, C3c, C4, Anti-DNAse B, ASL 2 -Kardiale Marker: CK, CKMB, Trop, NTproBNP +Kardiale Marker: CK, CKMB, Trop, NTproBNP 2 -Niere: Krea, Hst, eGFR (CKD-EPI) +Niere: Krea, Hst, eGFR (CKD-EPI) 2 -Sammelurin: SU-Proteinurie, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Natrium, SU-Zeit, SU-Volumen +Sammelurin: SU-Proteinurie, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Natrium, SU-Zeit, SU-Volumen 2 -Spot-Urin: U-TPCR, U-ACR, U-Ery, U-Leu, U-Bakt +Spot-Urin: U-TPCR, U-ACR, U-Ery, U-Leu, U-Bakt 2 -Leber: GOT, GGT, GPT, AP, Bilirubin, CHE +Leber: GOT, GGT, GPT, AP, Bilirubin, CHE 2 -Blutfette: TG, Chol, LDL, HDL, Lp(a) +Blutfette: TG, Chol, LDL, HDL, Lp(a) 2 -Hämatologie: Hb, Hkt, Reti, Leu, Thr, MCV, HbA1c, Retikulozyten, Fragmentozyten +Hämatologie: Hb, Hkt, Reti, Leu, Thr, MCV, HbA1c, Retikulozyten, Fragmentozyten 2 -Gerinnung: Quick, INR, PTT, Fibrinogen, ATIII, Anti-Xa +Diff.-BB: Neu, Lym, Mon, Baso, Eos 2 -Diff.-BB: Neu, Lym, Mon, Baso, Eos +Gerinnung: Quick, INR, PTT, Fibrinogen, ATIII, Anti-Xa 2 -Hormone: iPTH, TSH, fT3, fT4 +Serum-Elektrophorese: Albumin-Fraktion, a1-Globulin, a2-Globulin, b-Globulin, g-Globulin 2 -Eisenhaushalt: Eisen, Ferritin, Transferrin, Tf.-Sätt. +Hormone: iPTH, TSH, fT3, fT4 2 -BGA: pH, Std.-Bic., BE +Eisenhaushalt: Eisen, Ferritin, Transferrin, Tf.-Sätt. 2 -Hepatitis-Serologie: Anti-HBs, Anti-HBc +BGA: pH, Std.-Bic., BE 2 -Medikamente: TAC, CSA (C0), SIR, Vancomycin, Gentamicin, Tobramicin +Hepatitis-Serologie: Anti-HBs, Anti-HBc - -zaaReloaded2.Controller.Elements.CustomText + +2 +Medikamente: TAC, CSA (C0), SIR, Vancomycin, Gentamicin, Tobramicin + + +zaaReloaded2.Controller.Elements.CustomText 4 - -2 -Virologie (EDTA-Blut): CMV-PCR, BKV-PCR - 2 -Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden +Virologie (EDTA-Blut): CMV-PCR, BKV-PCR 2 -Autoantikörper: ANCA (IF), MPO-ANCA (ELISA), PR3-ANCA (ELISA), ANA (IF), AnDNA (ELISA), AnDNA (RIA) +Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden - + 2 -Tumormarker: PSA +Autoantikörper: ANCA (IF), MPO-ANCA (ELISA), PR3-ANCA (ELISA), ANA (IF), AnDNA (ELISA), AnDNA (RIA) + + +2 +Tumormarker: PSA diff --git a/zaaReloaded2/Defaults/parameters.txt b/zaaReloaded2/Defaults/parameters.txt index 3d3c005..31695b0 100755 --- a/zaaReloaded2/Defaults/parameters.txt +++ b/zaaReloaded2/Defaults/parameters.txt @@ -118,4 +118,9 @@ TSH TSH S HAPTOGLOBIN Haptoglobin S FRAGMENTOZYTEN Fragmentozyten E "HBc-Antikörper (gesamt)" Anti-HBc S -HBs-Antikörper Anti-HBs S \ No newline at end of file +HBs-Antikörper Anti-HBs S +"Albumin - Fraktion" Albumin-Fraktion S X +"Alpha1-Globulin - Fraktion" a1-Globulin S X +"Alpha2-Globulin - Fraktion" a2-Globulin S X +"Beta-Globulin - Fraktion" b-Globulin S X +"Gammaglobulin - Fraktion" g-Globulin S X From 8a1e236bd8f6664c33f62267d61dc2493aaaf631 Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Fri, 28 Aug 2015 14:13:49 +0200 Subject: [PATCH 05/11] Amend parameters list. --- zaaReloaded2/Defaults/parameters.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/zaaReloaded2/Defaults/parameters.txt b/zaaReloaded2/Defaults/parameters.txt index 31695b0..d2cdd71 100755 --- a/zaaReloaded2/Defaults/parameters.txt +++ b/zaaReloaded2/Defaults/parameters.txt @@ -22,7 +22,7 @@ Basophile Baso E Calcium Ca S Calcium-Phosphat-Produkt CaxP S Cholesterin Chol S -CK gesamt" CK S +CK gesamt" CK S X "CK MB" CK-MB S "Creatinin (PU)" Krea U 0 "Creatinin (SU)" Krea SU 0 @@ -90,7 +90,7 @@ pH pH BGA "Plattenepithelien (U)" Plattenep U "PO2 (art.)" pO2 BGA "Protein (U)" Protein U -"PSA ges. (ECL,Elecsys,Roche)" PSA S +"PSA ges. (ECL,Elecsys,Roche)" PSA S X "Sammelmenge (U)" Volumen SU "Sammelzeit (U)" Zeit SU "Sauerstoffsättigung (art.)" SO2 BGA @@ -111,12 +111,13 @@ PTT PTT Z "Ratio int. norm." INR Z "Komplementfaktor C3c" C3c S X "Komplementfaktor C4" C4 S X -"Anti-DNAse B" "Anti-DNAse B" S -Anti-Streptolysin ASL S +"Anti-DNAse B" "Anti-DNAse B" S X +Anti-Streptolysin ASL S X "PTH intakt" iPTH S TSH TSH S -HAPTOGLOBIN Haptoglobin S +HAPTOGLOBIN Haptoglobin S X FRAGMENTOZYTEN Fragmentozyten E +Retikulozyten Retikulozyten E X "HBc-Antikörper (gesamt)" Anti-HBc S HBs-Antikörper Anti-HBs S "Albumin - Fraktion" Albumin-Fraktion S X @@ -124,3 +125,4 @@ HBs-Antikörper Anti-HBs S "Alpha2-Globulin - Fraktion" a2-Globulin S X "Beta-Globulin - Fraktion" b-Globulin S X "Gammaglobulin - Fraktion" g-Globulin S X +# vim: tw=160 et nowrap fo-=t From 66ad3886da7e3678d8a8203b083b421b17815d56 Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Fri, 28 Aug 2015 17:18:42 +0200 Subject: [PATCH 06/11] Workaround for commas in Lauris values. - VERBESSERT: Kein Crash mehr, falls sich ein Komma in den Lauris-Block einschleicht. --- Tests/Importer/ZaaImporter/LaurisItemTest.cs | 1 + zaaReloaded2/Importer/ZaaImporter/LaurisItem.cs | 16 +++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Tests/Importer/ZaaImporter/LaurisItemTest.cs b/Tests/Importer/ZaaImporter/LaurisItemTest.cs index 173cd5e..5dd19ca 100755 --- a/Tests/Importer/ZaaImporter/LaurisItemTest.cs +++ b/Tests/Importer/ZaaImporter/LaurisItemTest.cs @@ -30,6 +30,7 @@ namespace Tests.Importer.ZaaImporter { [Test] [TestCase("BE: 5.2 [-2 - 2] mmol/l", "BE", 5.2, "mmol/l", -2, 2, false)] + [TestCase("Comma: 5,2 [-2,1 - 2,3] mmol/l", "Comma", 5.2, "mmol/l", -2.1, 2.3, false)] [TestCase("Natrium: 139 [135 - 145] mmol/l", "Natrium", 139, "mmol/l", 135, 145, true)] [TestCase("Kalium: 5.2 [3.5 - 5] mmol/l", "Kalium", 5.2, "mmol/l", 3.5, 5, false)] public void ParseLaurisWithBothLimits( diff --git a/zaaReloaded2/Importer/ZaaImporter/LaurisItem.cs b/zaaReloaded2/Importer/ZaaImporter/LaurisItem.cs index 2aec4db..7d76f9e 100755 --- a/zaaReloaded2/Importer/ZaaImporter/LaurisItem.cs +++ b/zaaReloaded2/Importer/ZaaImporter/LaurisItem.cs @@ -104,24 +104,25 @@ namespace zaaReloaded2.Importer.ZaaImporter // "Erythrozyten (U): + [negativ]" Match match; Regex numericalRegex = new Regex( - @"(?[^:]+):\s*(?[\d.]+)\s*(?\[[^\]]+])?\s*(?[^;]+)?"); + @"(?[^:]+):\s*(?[\d,.]+)\s*(?\[[^\]]+])?\s*(?[^;]+)?"); Regex categoricalRegex = new Regex( @"(?[^:]+):\s*(?[^[;]+)\s*(\[(?[^\]]+)])?"); if (numericalRegex.IsMatch(LaurisText)) { match = numericalRegex.Match(LaurisText); ParseLimits(match); + Value = match.Groups["value"].Value.Trim().Replace(',', '.'); } else { match = categoricalRegex.Match(LaurisText); Normal = match.Groups["normal"].Value.Trim(); + Value = match.Groups["value"].Value.Trim(); } if (match != null) { OriginalName = match.Groups["name"].Value.Trim(); Name = OriginalName; - Value = match.Groups["value"].Value.Trim(); Unit = match.Groups["unit"].Value.Trim(); } } @@ -135,14 +136,15 @@ namespace zaaReloaded2.Importer.ZaaImporter { if (match.Groups["limits"].Success) { - Regex limitRegex = new Regex(@"\[(?[-\d.]+)?\s*(?\S+)\s*(?[-\d.]+)?]"); + Regex limitRegex = new Regex(@"\[(?[-\d,.]+)?\s*(?\S+)\s*(?[-\d,.]+)?]"); Match limitMatch = limitRegex.Match(match.Groups["limits"].Value); if (limitMatch.Groups["limit1"].Success && limitMatch.Groups["limit2"].Success) { // Use InvariantCulture because Lauris always outputs dots as decimal separator - LowerLimit = Double.Parse(limitMatch.Groups["limit1"].Value, + // Only in rare cases, a comma sneaks in... + LowerLimit = Double.Parse(limitMatch.Groups["limit1"].Value.Replace(',', '.'), CultureInfo.InvariantCulture); - UpperLimit = Double.Parse(limitMatch.Groups["limit2"].Value, + UpperLimit = Double.Parse(limitMatch.Groups["limit2"].Value.Replace(',', '.'), CultureInfo.InvariantCulture); } else @@ -150,11 +152,11 @@ namespace zaaReloaded2.Importer.ZaaImporter switch (limitMatch.Groups["operator"].Value.Trim()) { case "<=": - UpperLimit = Double.Parse(limitMatch.Groups["limit2"].Value, + UpperLimit = Double.Parse(limitMatch.Groups["limit2"].Value.Replace(',', '.'), CultureInfo.InvariantCulture); break; case ">=": - LowerLimit = Double.Parse(limitMatch.Groups["limit2"].Value, + LowerLimit = Double.Parse(limitMatch.Groups["limit2"].Value.Replace(',', '.'), CultureInfo.InvariantCulture); break; default: From 6e969dacd93f9653b374c4e589604bb0291d8dbe Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Fri, 28 Aug 2015 17:21:19 +0200 Subject: [PATCH 07/11] Make regexes in LaurisItem static and readonly. In order to speed parsing up a little bit. --- .../Importer/ZaaImporter/LaurisItem.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/zaaReloaded2/Importer/ZaaImporter/LaurisItem.cs b/zaaReloaded2/Importer/ZaaImporter/LaurisItem.cs index 7d76f9e..2996795 100755 --- a/zaaReloaded2/Importer/ZaaImporter/LaurisItem.cs +++ b/zaaReloaded2/Importer/ZaaImporter/LaurisItem.cs @@ -103,19 +103,15 @@ namespace zaaReloaded2.Importer.ZaaImporter // "HBs-Antigen: neg. ;" // "Erythrozyten (U): + [negativ]" Match match; - Regex numericalRegex = new Regex( - @"(?[^:]+):\s*(?[\d,.]+)\s*(?\[[^\]]+])?\s*(?[^;]+)?"); - Regex categoricalRegex = new Regex( - @"(?[^:]+):\s*(?[^[;]+)\s*(\[(?[^\]]+)])?"); - if (numericalRegex.IsMatch(LaurisText)) + if (_numericalRegex.IsMatch(LaurisText)) { - match = numericalRegex.Match(LaurisText); + match = _numericalRegex.Match(LaurisText); ParseLimits(match); Value = match.Groups["value"].Value.Trim().Replace(',', '.'); } else { - match = categoricalRegex.Match(LaurisText); + match = _categoricalRegex.Match(LaurisText); Normal = match.Groups["normal"].Value.Trim(); Value = match.Groups["value"].Value.Trim(); } @@ -136,8 +132,7 @@ namespace zaaReloaded2.Importer.ZaaImporter { if (match.Groups["limits"].Success) { - Regex limitRegex = new Regex(@"\[(?[-\d,.]+)?\s*(?\S+)\s*(?[-\d,.]+)?]"); - Match limitMatch = limitRegex.Match(match.Groups["limits"].Value); + Match limitMatch = _limitRegex.Match(match.Groups["limits"].Value); if (limitMatch.Groups["limit1"].Success && limitMatch.Groups["limit2"].Success) { // Use InvariantCulture because Lauris always outputs dots as decimal separator @@ -203,6 +198,11 @@ namespace zaaReloaded2.Importer.ZaaImporter #region Fields + static readonly Regex _numericalRegex = new Regex( + @"(?[^:]+):\s*(?[\d,.]+)\s*(?\[[^\]]+])?\s*(?[^;]+)?"); + static readonly Regex _categoricalRegex = new Regex( + @"(?[^:]+):\s*(?[^[;]+)\s*(\[(?[^\]]+)])?"); + static readonly Regex _limitRegex = new Regex(@"\[(?[-\d,.]+)?\s*(?\S+)\s*(?[-\d,.]+)?]"); static readonly Regex _materialRegex = new Regex(@"\((?(SU|PU))\)"); #endregion From 644c9a513bfce01431a18479d9621b9f8613bcc1 Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Sun, 30 Aug 2015 20:36:59 +0200 Subject: [PATCH 08/11] Prevent crash on running NextColumn element. - FEHLERBEHEBUNG: Kein Absturz mehr, wenn zwei Spalten formatiert werden. --- zaaReloaded2/Formatter/Formatter.cs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/zaaReloaded2/Formatter/Formatter.cs b/zaaReloaded2/Formatter/Formatter.cs index 6639198..185e1cd 100755 --- a/zaaReloaded2/Formatter/Formatter.cs +++ b/zaaReloaded2/Formatter/Formatter.cs @@ -121,6 +121,14 @@ namespace zaaReloaded2.Formatter { if (!CanRun) throw new NoLaboratoryDataException("No laboratory data to format."); + // Create undo record and styles prior to iterating over the elements + // because a column switching element might trigger output to the + // document. + Globals.ThisAddIn.Application.UndoRecord.StartCustomRecord( + String.Format("Laborformatierung ({0})", Properties.Settings.Default.AddinName) + ); + CreateStyles(); + int current = 0; while (current < Settings.Elements.Count) { @@ -146,11 +154,6 @@ namespace zaaReloaded2.Formatter } } - // Write everything to the Word document - Globals.ThisAddIn.Application.UndoRecord.StartCustomRecord( - String.Format("Laborformatierung ({0})", Properties.Settings.Default.AddinName) - ); - CreateStyles(); _secondaryBuffer.Flush(); Globals.ThisAddIn.Application.UndoRecord.EndCustomRecord(); } From dca55f6b57203eb14b012864d7dfb966635cd93f Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Sun, 30 Aug 2015 20:39:47 +0200 Subject: [PATCH 09/11] Add precision info for hematology items. --- zaaReloaded2/Defaults/parameters.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zaaReloaded2/Defaults/parameters.txt b/zaaReloaded2/Defaults/parameters.txt index d2cdd71..61b64f1 100755 --- a/zaaReloaded2/Defaults/parameters.txt +++ b/zaaReloaded2/Defaults/parameters.txt @@ -73,10 +73,10 @@ Kalium K S Leukozyten Leu E Lymphozyten Lym E Magnesium Mg S X -"MCH (HbE)" MCH E -MCHC MCHC E -MCV MCV E -"Mittleres Plättchenvolumen" MPV E +"MCH (HbE)" MCH E 0 +MCHC MCHC E 0 +MCV MCV E 0 +"Mittleres Plättchenvolumen" MPV E 0 Monozyten Mon E "Natrium (SU)" Na SU "Natrium (SU)/die" Na SU From d86f910208c177a6b0de723d0713628e1e41d302 Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Sun, 30 Aug 2015 20:54:08 +0200 Subject: [PATCH 10/11] Several fixes in views and view models. --- zaaReloaded2/ViewModels/SettingsRepositoryViewModel.cs | 4 ++++ zaaReloaded2/ViewModels/SettingsViewModel.cs | 4 ++++ zaaReloaded2/Views/ElementPickerView.xaml | 3 ++- zaaReloaded2/Views/ElementView.xaml | 1 + zaaReloaded2/Views/SettingsRepositoryView.xaml | 1 + zaaReloaded2/Views/SettingsView.xaml | 6 ++++-- 6 files changed, 16 insertions(+), 3 deletions(-) diff --git a/zaaReloaded2/ViewModels/SettingsRepositoryViewModel.cs b/zaaReloaded2/ViewModels/SettingsRepositoryViewModel.cs index f96350c..aa2a5f9 100755 --- a/zaaReloaded2/ViewModels/SettingsRepositoryViewModel.cs +++ b/zaaReloaded2/ViewModels/SettingsRepositoryViewModel.cs @@ -273,6 +273,10 @@ namespace zaaReloaded2.ViewModels { _repository = repository; BuildSettingsList(); + if (SettingsList.Count > 0) + { + SettingsList.First().IsSelected = true; + } RequestCloseView += (sender, args) => { _repository.Store(); diff --git a/zaaReloaded2/ViewModels/SettingsViewModel.cs b/zaaReloaded2/ViewModels/SettingsViewModel.cs index f97f969..3b92d07 100755 --- a/zaaReloaded2/ViewModels/SettingsViewModel.cs +++ b/zaaReloaded2/ViewModels/SettingsViewModel.cs @@ -222,6 +222,10 @@ namespace zaaReloaded2.ViewModels vm.PropertyChanged += ElementViewModel_PropertyChanged; Elements.Add(vm); } + if (Elements.Count > 0) + { + Elements.First().IsSelected = true; + } } #endregion diff --git a/zaaReloaded2/Views/ElementPickerView.xaml b/zaaReloaded2/Views/ElementPickerView.xaml index 947a719..3a42d03 100755 --- a/zaaReloaded2/Views/ElementPickerView.xaml +++ b/zaaReloaded2/Views/ElementPickerView.xaml @@ -25,6 +25,7 @@ WindowStyle="ToolWindow" Topmost="True" b:WindowState.CenterScreen="True" b:WindowState.Save="True" Title="Neues Element auswählen" + FocusManager.FocusedElement="{Binding ElementName=treeview}" > @@ -35,7 +36,7 @@