From b04dc2cb4bef362a5298b7d05c17b1b0b0f35fd9 Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Fri, 4 Sep 2015 20:19:42 +0200 Subject: [PATCH] Fix column errors in parameters.txt. - VERBESSERT: Bug in der Markierung von speziellen Parametern, um immer Referenzbereiche auszugeben. --- Tests/Tests.csproj | 1 + Tests/Thesaurus/ParametersTest.cs | 56 ++++++++++++++++++++++++++++ publish/zaaReloaded2.iss | 2 +- zaaReloaded2/Defaults/parameters.txt | 46 +++++++++++------------ 4 files changed, 81 insertions(+), 24 deletions(-) create mode 100755 Tests/Thesaurus/ParametersTest.cs diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj index edc784d..98b96b9 100755 --- a/Tests/Tests.csproj +++ b/Tests/Tests.csproj @@ -86,6 +86,7 @@ + diff --git a/Tests/Thesaurus/ParametersTest.cs b/Tests/Thesaurus/ParametersTest.cs new file mode 100755 index 0000000..7bc01f8 --- /dev/null +++ b/Tests/Thesaurus/ParametersTest.cs @@ -0,0 +1,56 @@ +/* ParametersTest.cs + * part of zaaReloaded2 + * + * Copyright 2015 Daniel Kraus + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using NUnit.Framework; +using zaaReloaded2.Thesaurus; + +namespace Tests.Thesaurus +{ + [TestFixture] + class ParametersTest + { + [Test] + public void GetCanonicalName() + { + Assert.AreEqual("CRP", + Parameters.Default.GetCanonicalName("C-reaktives Protein")); + } + + [Test] + public void GetPrecision() + { + Assert.AreEqual(1, + Parameters.Default.GetPrecision("Creatinin")); + } + + [Test] + public void GetForceReferenceDisplay() + { + Assert.IsTrue(Parameters.Default.GetForceReferenceDisplay("Magnesium")); + } + + [Test] + public void GetIsBlacklisted() + { + Assert.IsTrue(Parameters.Default.GetIsBlacklisted("glomerul. Filtrationsr. (MDRD)")); + } + } +} diff --git a/publish/zaaReloaded2.iss b/publish/zaaReloaded2.iss index 0188315..9988d0d 100755 --- a/publish/zaaReloaded2.iss +++ b/publish/zaaReloaded2.iss @@ -3,7 +3,7 @@ ; Apache License Version 2.0 [Setup] -#define DEBUG +; #define DEBUG ; Read the semantic and the installer file version from the VERSION file #define FILE_HANDLE FileOpen("..\zaaReloaded2\VERSION") diff --git a/zaaReloaded2/Defaults/parameters.txt b/zaaReloaded2/Defaults/parameters.txt index 445dabf..83934d3 100755 --- a/zaaReloaded2/Defaults/parameters.txt +++ b/zaaReloaded2/Defaults/parameters.txt @@ -7,19 +7,19 @@ Albumin Alb S "Albumin (PU)" Alb U "Albumin (SU)" Alb SU "Albumin (SU)/die" Alb SU -"Albumin - Fraktion" Albumin-Fraktion S X +"Albumin - Fraktion" Albumin-Fraktion S --- X "Albumin/Creatinin (PU)" ACR U 0 "Alk. Phosphatase" AP S 0 -"Alpha1-Globulin - Fraktion" a1-Globulin S X -"Alpha2-Globulin - Fraktion" a2-Globulin S X +"Alpha1-Globulin - Fraktion" a1-Globulin S --- X +"Alpha2-Globulin - Fraktion" a2-Globulin S --- X Amylase Amylase S "anorg. Phosphat" P S -"Anti-DNAse B" "Anti-DNAse B" S X -Anti-Streptolysin ASL S X +"Anti-DNAse B" "Anti-DNAse B" S --- X +Anti-Streptolysin ASL S --- X "Bakterien (U)" Bakt U Basenabweichung BE BGA Basophile Baso E -"Beta-Globulin - Fraktion" b-Globulin S X +"Beta-Globulin - Fraktion" b-Globulin S --- X "Bilirubin (U)" Bilirubin U "C-reaktives Protein" CRP S Calcium Ca S @@ -27,25 +27,25 @@ Calcium Ca S "Calcium (SU)/die" Ca SU Calcium-Phosphat-Produkt CaxP S Cholesterin Chol S -CK gesamt" CK S X +CK gesamt" CK S --- X "CK MB" CK-MB S Creatinin Krea S 1 "Creatinin (PU)" Krea U 0 "Creatinin (SU)" Krea SU 0 "Creatinin-Clearance (SU)/min" CrCl SU -"Cyclosporin-A vor Gabe" "CsA (C0)" S X -"Cystatin C (Latex Gen. 2)" "Cystatin C" S X -"Cystatin C (N Latex)" "Cystatin C" S X +"Cyclosporin-A vor Gabe" "CsA (C0)" S --- X +"Cystatin C (Latex Gen. 2)" "Cystatin C" S --- X +"Cystatin C (N Latex)" "Cystatin C" S --- X Eisen Fe S Eosinophile Eos E Erythrozyten Ery E "Erythrozyten (U)" Ery U Ferritin Ferr S -Folsäure Folsäure S X +Folsäure Folsäure S --- X FRAGMENTOZYTEN Fragmentozyten E -"freies T3" fT3 S X -"freies T4" fT4 S X -"Gammaglobulin - Fraktion" g-Globulin S X +"freies T3" fT3 S --- X +"freies T4" fT4 S --- X +"Gammaglobulin - Fraktion" g-Globulin S --- X Gesamt-Bilirubin Bilirubin S Gesamt-Eiweiss Protein S "Gesamt-Eiweiss (PU)" Protein U @@ -53,15 +53,15 @@ Gesamt-Eiweiss Protein S "Gesamt-Eiweiss (SU)/die" Proteinurie SU "Gesamt-Eiweiss/Creatinin (PU)" TPCR U 0 GGT GGT S 0 -"glomerul. Filtrationsr. (MDRD)" "eGFR (MDRD)" S --- X +"glomerul. Filtrationsr. (MDRD)" "eGFR (MDRD)" S --- --- X "glomerul. Filtrationsr. CKD-EP" "eGFR (CKD-EPI)" S "glomeruläre Filtrationsrate" GFR SU Glucose Glukose S "Glucose (U)" Glukose U "GOT (ASAT)" GOT S 0 "GPT (ALAT)" GPT S 0 -Haptoglobin Haptoglobin S X -HAPTOGLOBIN Haptoglobin S X +Haptoglobin Haptoglobin S --- X +HAPTOGLOBIN Haptoglobin S --- X "Harnstoff (SU)" Hst SU "Harnstoff (SU)/die" Hst/Tag SU Harnstoff" Hst S @@ -78,14 +78,14 @@ Kalium K S "Kalium (SU)" K U "Kalium (SU)/die" K SU "Ketonkörper (U)" KK U -"Komplementfaktor C3c" C3c S X -"Komplementfaktor C4" C4 S X +"Komplementfaktor C3c" C3c S --- X +"Komplementfaktor C4" C4 S --- X "Lactat Dehydrogenase" LDH S "LDL - Cholesterin" LDL S Leukozyten Leu E "Leukozyten (U)" Leu U Lymphozyten Lym E -Magnesium Mg S X +Magnesium Mg S --- X "MCH (HbE)" MCH E 0 MCHC MCHC E 0 MCV MCV E 0 @@ -104,11 +104,11 @@ pH pH BGA "Plattenepithelien (U)" Plattenep U "PO2 (art.)" pO2 BGA "Protein (U)" Protein U -"PSA ges. (ECL,Elecsys,Roche)" PSA S X +"PSA ges. (ECL,Elecsys,Roche)" PSA S --- X "PTH intakt" iPTH S PTT PTT Z "Ratio int. norm." INR Z -Retikulozyten Retikulozyten E X +Retikulozyten Retikulozyten E --- X "Sammelmenge (U)" Volumen SU "Sammelzeit (U)" Zeit SU "Sauerstoffsättigung (art.)" SO2 BGA @@ -126,5 +126,5 @@ TSH TSH S "Übergangsepithelien (U)" Übergangsep. U "Unreife Granulozyten" Gran E "Urobilinogen (U)" Urobilinogen U -"Vitamin B12" B12 S X +"Vitamin B12" B12 S --- X # vim: tw=160 et nowrap fo-=t