Merge branch 'release-2.1.3'

HISTORY.md

@@ -1,3 +1,12 @@
+Version 2.1.3 (2015-09-18)
+========================================================================
+
+- VERBESSERT: CsA-Talspiegel tauchte nicht in der Ausgabe auf.
+- VERBESSERT: Extreme Werte (mit "<" oder ">") wurden nicht sehr schön formatiert.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
 Version 2.1.2 (2015-09-11)
 ========================================================================
 

Tests/Importer/ZaaImporter/LaurisItemTest.cs

@@ -40,6 +40,7 @@ namespace Tests.Importer.ZaaImporter
             LaurisItem i = new LaurisItem(laurisString);
             Assert.AreEqual(name, i.Name, "Name");
             Assert.AreEqual(unit, i.Unit, "Unit");
+            Assert.IsFalse(i.IsExtreme, "IsExtreme");
             Assert.IsTrue(i.IsNumerical, "IsNumerical");
             Assert.AreEqual(value, i.NumericalValue, "NumericalValue");
             Assert.AreEqual(lowerLimit, i.LowerLimit, "Lower limit");
@@ -50,6 +51,25 @@ namespace Tests.Importer.ZaaImporter
             Assert.IsTrue(i.HasUpperLimit, "HasUpperLimit");
         }
 
+        [TestCase("Folsäure: > 20 [2.0 - 9.1] ng/ml; ", "Folsäure", "> 20", "ng/ml", 2, 9.1, false)]
+        public void ParseLaurisWithGreaterOrLowerValue(
+            string laurisString, string name, string value,
+            string unit, double lowerLimit, double upperLimit, bool isNormal)
+        {
+            LaurisItem i = new LaurisItem(laurisString);
+            Assert.AreEqual(name, i.Name, "Name");
+            Assert.AreEqual(unit, i.Unit, "Unit");
+            Assert.IsTrue(i.IsExtreme, "IsExtreme");
+            Assert.IsFalse(i.IsNumerical, "IsNumerical");
+            Assert.AreEqual(value, i.Value, "Value");
+            Assert.AreEqual(lowerLimit, i.LowerLimit, "Lower limit");
+            Assert.AreEqual(upperLimit, i.UpperLimit, "Upper limit");
+            Assert.AreEqual(isNormal, i.IsNormal, "IsNormal");
+            Assert.IsTrue(i.HasLimits, "HasLimits");
+            Assert.IsTrue(i.HasLowerLimit, "HasLowerLimit");
+            Assert.IsTrue(i.HasUpperLimit, "HasUpperLimit");
+        }
+
         [TestCase("HDL - Cholesterin: 45 [>= 35] mg/dl", "HDL - Cholesterin", 45, "mg/dl", 35, true)]
         public void ParseLaurisWithLowerLimit(
             string laurisString, string name, double value,

www/index.html

@@ -22,9 +22,7 @@
   <![endif]-->
   <title>zaaReloaded2</title>
   <meta name="author" content="Daniel Kraus">
-  <meta name="descrption" content="Add-in für Microsoft Word 2010-2013,
-    das die Zentrale Arztbriefablage um Funktionen für das Formatieren von
-    Laborwerten erweitert.">
+  <meta name="description" content="Add-in für Microsoft Word 2010-2013, das die Zentrale Arztbriefablage um Funktionen für das Formatieren von Laborwerten erweitert.">
   <link rel="icon" type="image/png" href="img/icon.png">
   <style>
     floatbox {

www/versioninfo.txt

@@ -1,4 +1,4 @@
-2.1.2
-http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe
-057270076d9bebb896866e5ce12ad76bb3ea7a7b  publish/release/zaaReloaded-2.1.2.exe
+2.1.3
+http://zaa.nephrowiki.de/downloads/zaaReloaded-2.1.3.exe
+38971b670eb061ada475c7ab2f98a57299f25ff7  publish/release/zaaReloaded-2.1.3.exe
 

zaaReloaded2/Defaults/clinic.zaaReloaded

@@ -150,7 +150,7 @@
 </a4:Items>
 <a4:Items id="ref-26" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
-<Content id="ref-50">Medikamente: TAC &#34;(Ziel-Talspiegel: &#60;&#62; µg/l)&#34;, CSA (C0) &#34;(Ziel-Talspiegel: &#60;&#62; µg/l)&#34;, SIR &#34;(Ziel-Talspiegel: &#60;&#62; µg/l)&#34;, Vancomycin, Gentamicin, Tobramicin</Content>
+<Content id="ref-50">Medikamente: TAC &#34;(Ziel-Talspiegel: &#60;&#62; µg/l)&#34;, CsA (C0) &#34;(Ziel-Talspiegel: &#60;&#62; µg/l)&#34;, SIR &#34;(Ziel-Talspiegel: &#60;&#62; µg/l)&#34;, Vancomycin, Gentamicin, Tobramicin</Content>
 </a4:Items>
 <a2:UnitySerializationHolder id="ref-27" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
 <Data id="ref-51">zaaReloaded2.Controller.Elements.CustomText</Data>

zaaReloaded2/Importer/ZaaImporter/LaurisItem.cs

@@ -203,7 +203,7 @@ namespace zaaReloaded2.Importer.ZaaImporter
         #region Fields
 
         static readonly Regex _numericalRegex = new Regex(
-            @"(?<name>[^:]+):\s*(?<value>[\d,.]+)\s*(?<limits>\[[^\]]+])?\s*(?<unit>[^;]+)?");
+            @"(?<name>[^:]+):\s*(?<value>([\<\>]\s)?[\d,.]+)\s*(?<limits>\[[^\]]+])?\s*(?<unit>[^;]+)?");
         static readonly Regex _categoricalRegex = new Regex(
             @"(?<name>[^:]+):\s*(?<value>[^[;]+)\s*(\[(?<normal>[^\]]+)])?");
         static readonly Regex _limitRegex = new Regex(@"\[(?<limit1>[-\d,.]+)?\s*(?<operator>\S+)\s*(?<limit2>[-\d,.]+)?]");

zaaReloaded2/LabModel/LabItem.cs

@@ -74,6 +74,19 @@ namespace zaaReloaded2.LabModel
             }
         }
 
+        /// <summary>
+        /// Returns whether or not the value is an 'extreme' value,
+        /// i.e. marked with "&gt;" or "&lt;". These values are not
+        /// strictly numeric, and IsNumerical returns false for them.
+        /// </summary>
+        public bool IsExtreme
+        {
+            get
+            {
+                return "<>".Contains(Value.Substring(0, 1));
+            }
+        }
+
         /// <summary>
         /// Gets the normal value of the item. Need not be set. This is
         /// used for items with nominal values (as opposed to numbers).
@@ -130,6 +143,8 @@ namespace zaaReloaded2.LabModel
         {
             get
             {
+                if (IsExtreme) return false;
+
                 if (HasLimits)
                 {
                     if (HasLowerLimit && HasUpperLimit)

zaaReloaded2/VERSION

@@ -1,2 +1,2 @@
-2.1.2
-2.1.2.0
+2.1.3
+2.1.3.0