Add ability to suppress an item's label.

- Verbessert: Für bestimmte Parameter kann die Beschriftung unterdrückt werden (derzeit implementiert im Urin-Hygienebefund, wo "Keim" und "Multiresistenz" nicht mit ausgegeben werden, sondern nur z.B. "E. coli, 3MRGN" bei entsprechender Vorlage "MSU-Keim, MSU-Multiresistenz").

Tests/Thesaurus/ParametersTest.cs

@@ -52,5 +52,11 @@ namespace Tests.Thesaurus
         {
             Assert.IsTrue(Parameters.Default.GetIsBlacklisted("glomerul. Filtrationsr. (MDRD)"));
         }
+
+        [Test]
+        public void GetSuppressLabel()
+        {
+            Assert.IsTrue(Parameters.Default.GetSuppressLabel("- Multiresistenz"));
+        }
     }
 }

zaaReloaded2/Defaults/parameters.txt

@@ -1,9 +1,9 @@
-# LAURIS-NAME                      "KANONISCHER NAME"   MATERIAL   DEZIMALSTELLEN   "IMMER REFERENZBEREICH"   "BLACKLIST"
+# LAURIS-NAME                      "KANONISCHER NAME"   MATERIAL   DEZIMALSTELLEN   "IMMER REFERENZBEREICH"   "BLACKLIST"  "NO-LABEL"
-# ===========                      ==================   ========   ==============   =======================   ===========
+# ===========                      ==================   ========   ==============   =======================   ===========  ==========
-"- Multiresistenz"                 Multiresistenz       MSU
+"- Multiresistenz"                 Multiresistenz       MSU        ---              ---                       ---          X
 "a1-Microglobulin (SU)"            a1-Microglobulin     SU
 "a1-Microglobulin (SU)/die"        a1-Microglobulin     SU
-"Aerobe Kultur"                    Keim                 MSU
+"Aerobe Kultur"                    Keim                 MSU        ---              ---                       ---          X
 "AFP  (ECL, Elecsys, Roche)"       AFP                  S          ---              X
 "aktuelles Bicarbonat"             Bic                  BGA
 Albumin                            Alb                  S

zaaReloaded2/Formatter/ItemFormatter.cs

@@ -76,6 +76,11 @@ namespace zaaReloaded2.Formatter
         /// </summary>
         public bool IsBlacklisted { get { return LabItem.IsBlacklisted;  } }
 
+        /// <summary>
+        /// Gets whether the Item is marked to suppress its label in the thesaurus.
+        /// </summary>
+        public bool SuppressLabel { get { return LabItem.SuppressLabel; } }
+
         /// <summary>
         /// Gets or sets the item's comment.
         /// </summary>
@@ -194,7 +199,15 @@ namespace zaaReloaded2.Formatter
                 if (comment != String.Empty) comment = " " + comment;
             }
 
-            string name = IncludeMaterial ? LabItem.QualifiedName : LabItem.Name;
+            string name;
+            if (LabItem.SuppressLabel)
+	        {
+                name = String.Empty;
+	        }
+            else
+            {
+                name = (IncludeMaterial ? LabItem.QualifiedName : LabItem.Name) + " ";
+            }
 
 
             string output = 

zaaReloaded2/Importer/ZaaImporter/LaurisItem.cs

@@ -76,6 +76,7 @@ namespace zaaReloaded2.Importer.ZaaImporter
                 Name = parameterDictionary.GetCanonicalName(OriginalName);
                 AlwaysPrintLimits = parameterDictionary.GetForceReferenceDisplay(OriginalName);
                 IsBlacklisted = parameterDictionary.GetIsBlacklisted(OriginalName);
+                SuppressLabel = parameterDictionary.GetSuppressLabel(OriginalName);
                 Material = parameterDictionary.GetMaterial(OriginalName, Material);
                 PreferredPrecision = parameterDictionary.GetPrecision(OriginalName);
             }

zaaReloaded2/LabModel/LabItem.cs

@@ -230,6 +230,11 @@ namespace zaaReloaded2.LabModel
         /// </summary>
         public bool IsBlacklisted { get; protected set; }
 
+        /// <summary>
+        /// Gets whether the item's label should be suppressed.
+        /// </summary>
+        public bool SuppressLabel { get; protected set; }
+
         #endregion
 
         #region Constructors

zaaReloaded2/Thesaurus/Parameters.cs

@@ -126,6 +126,19 @@ namespace zaaReloaded2.Thesaurus
         {
             return LookUpValue(laurisName, 5, false);
         }
+
+        /// <summary>
+        /// Checks whether an item's label should be suppressed or not.
+        /// </summary>
+        /// <param name="laurisName">Laboratory item to lok up;
+        /// this must be an original Lauris string.</param>
+        /// <returns>True if the item should *not* be labelled,
+        /// false if not. Default is false (i.e., labels are .</returns>
+        public bool GetSuppressLabel(string laurisName)
+        {
+            return LookUpValue(laurisName, 6, false);
+        }
+
         #endregion
 
         #region Overrides