diff --git a/Tests/Thesaurus/ParametersTest.cs b/Tests/Thesaurus/ParametersTest.cs
index 10a823f..1788da2 100755
--- a/Tests/Thesaurus/ParametersTest.cs
+++ b/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"));
+ }
}
}
diff --git a/zaaReloaded2/Defaults/parameters.txt b/zaaReloaded2/Defaults/parameters.txt
index 06bec8c..da6388d 100755
--- a/zaaReloaded2/Defaults/parameters.txt
+++ b/zaaReloaded2/Defaults/parameters.txt
@@ -1,9 +1,9 @@
-# LAURIS-NAME "KANONISCHER NAME" MATERIAL DEZIMALSTELLEN "IMMER REFERENZBEREICH" "BLACKLIST"
-# =========== ================== ======== ============== ======================= ===========
-"- Multiresistenz" Multiresistenz MSU
+# LAURIS-NAME "KANONISCHER NAME" MATERIAL DEZIMALSTELLEN "IMMER REFERENZBEREICH" "BLACKLIST" "NO-LABEL"
+# =========== ================== ======== ============== ======================= =========== ==========
+"- 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
diff --git a/zaaReloaded2/Formatter/ItemFormatter.cs b/zaaReloaded2/Formatter/ItemFormatter.cs
index baa76a9..4e992e9 100755
--- a/zaaReloaded2/Formatter/ItemFormatter.cs
+++ b/zaaReloaded2/Formatter/ItemFormatter.cs
@@ -76,6 +76,11 @@ namespace zaaReloaded2.Formatter
///
public bool IsBlacklisted { get { return LabItem.IsBlacklisted; } }
+ ///
+ /// Gets whether the Item is marked to suppress its label in the thesaurus.
+ ///
+ public bool SuppressLabel { get { return LabItem.SuppressLabel; } }
+
///
/// Gets or sets the item's comment.
///
@@ -194,12 +199,20 @@ 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 =
+ string output =
String.Format(
- "{0} {1}{2}{3}{4}",
+ "{0}{1}{2}{3}{4}",
name,
value,
unit,
diff --git a/zaaReloaded2/Importer/ZaaImporter/LaurisItem.cs b/zaaReloaded2/Importer/ZaaImporter/LaurisItem.cs
index 15b9d50..8abbfe2 100755
--- a/zaaReloaded2/Importer/ZaaImporter/LaurisItem.cs
+++ b/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);
}
diff --git a/zaaReloaded2/LabModel/LabItem.cs b/zaaReloaded2/LabModel/LabItem.cs
index b8f8b67..fe80660 100755
--- a/zaaReloaded2/LabModel/LabItem.cs
+++ b/zaaReloaded2/LabModel/LabItem.cs
@@ -230,6 +230,11 @@ namespace zaaReloaded2.LabModel
///
public bool IsBlacklisted { get; protected set; }
+ ///
+ /// Gets whether the item's label should be suppressed.
+ ///
+ public bool SuppressLabel { get; protected set; }
+
#endregion
#region Constructors
diff --git a/zaaReloaded2/Thesaurus/Parameters.cs b/zaaReloaded2/Thesaurus/Parameters.cs
index f83b57e..65cf23d 100755
--- a/zaaReloaded2/Thesaurus/Parameters.cs
+++ b/zaaReloaded2/Thesaurus/Parameters.cs
@@ -126,6 +126,19 @@ namespace zaaReloaded2.Thesaurus
{
return LookUpValue(laurisName, 5, false);
}
+
+ ///
+ /// Checks whether an item's label should be suppressed or not.
+ ///
+ /// Laboratory item to lok up;
+ /// this must be an original Lauris string.
+ /// True if the item should *not* be labelled,
+ /// false if not. Default is false (i.e., labels are .
+ public bool GetSuppressLabel(string laurisName)
+ {
+ return LookUpValue(laurisName, 6, false);
+ }
+
#endregion
#region Overrides