Merge branch 'release-2.1.6'

- VERBESSERT: Troponin T wurde nicht richtig verarbeitet.
- VERBESSERT: Eingebaute Stile überarbeitet.

HISTORY.md

@@ -1,3 +1,55 @@
+Version 2.1.6 (2015-09-25)
+========================================================================
+
+- VERBESSERT: Eingebaute Stile überarbeitet.
+- VERBESSERT: Troponin T wurde nicht richtig verarbeitet.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
+Version 2.1.5. (2015-09-24)
+========================================================================
+
+- VERBESSERT: NT-proBNP wird jetzt korrekt ausgegeben.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
+Version 2.1.4 (2015-09-23)
+========================================================================
+
+- VERBESSERT: Unkonventionell ausgegebene Laborwerte (v.a. Cyclosporin-A vor Gabe) wurden nicht richtig erkannt.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
+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)
+========================================================================
+
+- GEÄNDERT: Sammelurin-Proteinurie als Prot abgekürzt.
+- VERBESSERT: Ambulanzstil überarbeitet.
+- VERBESSERT: Evtl. vorgegebener Kommentartext wird jetzt automatisch markiert, damit er b.B. einfach durch Lostippen überschrieben werden kann.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
+Version 2.1.1 (2015-09-07)
+========================================================================
+
+- VERBESSERT: Fehler bei der Kommentaraufforderung wurden behoben.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
 Version 2.1.0 (2015-09-06)
 ========================================================================
 

Tests/Controller/Comments/CommentPoolTest.cs

@@ -30,6 +30,7 @@ namespace Tests.Controller.Comments
         [Test]
         public void CreateCommentIfDoesNotExist()
         {
+            CommentPool.Default.Reset();
             int n = CommentPool.Default.Count;
             ItemComment i = CommentPool.Default.GetCommentFor("item \"<>\"");
             Assert.AreEqual(n + 1, CommentPool.Default.Count);

Tests/Formatter/FormatterTest.cs

@@ -118,6 +118,23 @@ namespace Tests.Formatter
                 document.Range().Text);
         }
 
+        [Test]
+        public void FormatCyclosporine()
+        {
+            ZaaImporter importer = new ZaaImporter();
+            importer.Import(
+                "(17.09.2015 10:44:00) Cyclosporin-A vor Gabe: 130 µg/l;  CK gesamt: 123 [<= 170] U/l;  Cholesterin: 211");
+            Document document = new Document();
+            f.Formatter formatter = new f.Formatter(document);
+            formatter.Laboratory = importer.Laboratory;
+            formatter.Settings = new zaaReloaded2.Controller.Settings(
+                new List<ElementBase>() { new Items("CsA (C0) \"(Ziel-Talspiegel: <> µg/l)\"") });
+            formatter.Run();
+            Assert.AreEqual(
+                "Laborwerte vom 17.09.2015 10:44:00:\rCsA (C0) 130 µg/l\r\r",
+                document.Range().Text);
+        }
+
         string GetResourceText(string resource)
         {
             try

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,

Tests/SerializationTest.cs

@@ -50,7 +50,7 @@ namespace Tests.Controller
             serializer.Serialize(stream, element);
             stream.Position = 0;
             StreamReader sr = new StreamReader(stream);
-            Console.WriteLine(sr.ReadToEnd());
+            // Console.WriteLine(sr.ReadToEnd());
             stream.Position = 0;
             SelectFirstDay deserialized = serializer.Deserialize(stream) as SelectFirstDay;
             Assert.IsNotNull(deserialized);

Tests/Tests.csproj

@@ -41,8 +41,8 @@
     <AssemblyOriginatorKeyFile>zaaReloaded2.pfx</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Bovender, Version=0.2.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
-      <HintPath>..\packages\Bovender.0.2.0.0\lib\net40\Bovender.dll</HintPath>
+    <Reference Include="Bovender, Version=0.3.3.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Bovender.0.3.3.0\lib\net40\Bovender.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Office.Interop.Word, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">

Tests/ViewModels/ItemCommentViewModelTest.cs

@@ -38,5 +38,39 @@ namespace Tests.ViewModels
             Assert.AreEqual(comment.Suffix, vm.Suffix);
             Assert.AreEqual(comment.Value, vm.Value);
         }
+
+        [Test]
+        public void EnterComment()
+        {
+            ItemComment comment = new ItemComment("TAC", "(Ziel-Talspiegel: ", "", "µg/l)");
+            ItemCommentViewModel vm = new ItemCommentViewModel(comment);
+            vm.Value = "8-10";
+            bool eventRaised = false;
+            vm.RequestCloseView += (sender, args) =>
+            {
+                eventRaised = true;
+            };
+            vm.SaveCommand.Execute(null);
+            Assert.IsTrue(eventRaised, "Event was not raised.");
+            Assert.IsFalse(comment.IsCancelled, "Comment.IsCancelled should be false");
+            Assert.AreEqual("8-10", comment.Value);
+        }
+
+        [Test]
+        public void CancelComment()
+        {
+            ItemComment comment = new ItemComment("TAC", "(Ziel-Talspiegel: ", "default", "µg/l)");
+            ItemCommentViewModel vm = new ItemCommentViewModel(comment);
+            vm.Value = "blabla";
+            bool eventRaised = false;
+            vm.RequestCloseView += (sender, args) =>
+            {
+                eventRaised = true;
+            };
+            vm.CloseViewCommand.Execute(null);
+            Assert.IsTrue(eventRaised, "Event was not raised.");
+            Assert.IsTrue(comment.IsCancelled, "Comment.IsCancelled should be true");
+            Assert.AreEqual("default", comment.Value);
+        }
     }
 }

Tests/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Bovender" version="0.2.0.0" targetFramework="net40" />
+  <package id="Bovender" version="0.3.3.0" targetFramework="net40" />
   <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
   <package id="NUnit" version="2.6.4" targetFramework="net40" />
 </packages>

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.0
-http://zaa.nephrowiki.de/downloads/zaaReloaded-2.1.0.exe
-41976c8ac85092c12139884b175d1e8eadc7636b  publish/release/zaaReloaded-2.1.0.exe
+2.1.6
+http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe
+f9277549cc0d74dafbb39f152719e4fdb2c31d5d  publish/release/zaaReloaded-2.1.6.exe
 

zaaReloaded2/Controller/Comments/ItemComment.cs

@@ -197,9 +197,12 @@ namespace zaaReloaded2.Controller.Comments
         /// </summary>
         protected virtual void OnFillInComment()
         {
+            if (_isFilledIn) return;
+
             EventHandler<ItemCommentEventArgs> h = FillInComment;
             if (h != null)
             {
+                _isFilledIn = true;
                 h(this, new ItemCommentEventArgs(this));
             }
         }
@@ -208,6 +211,7 @@ namespace zaaReloaded2.Controller.Comments
 
         #region Fields
 
+        bool _isFilledIn;
         static readonly Regex _definition =
             new Regex(@"(?<item>[^""]+)""(?<prefix>[^<]+)?<(?<value>[^>]*)>(?<suffix>[^""]+)?""");
 

zaaReloaded2/Defaults/clinic.zaaReloaded

@@ -3,17 +3,17 @@
 <a1:Settings id="ref-1" xmlns:a1="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
 <Uid xsi:type="a2:Guid" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
-<_a>726346026</_a>
-<_b>-9272</_b>
-<_c>16670</_c>
-<_d>156</_d>
-<_e>154</_e>
-<_f>68</_f>
-<_g>185</_g>
-<_h>192</_h>
-<_i>11</_i>
-<_j>64</_j>
-<_k>27</_k>
+<_a>1333827306</_a>
+<_b>-10272</_b>
+<_c>18647</_c>
+<_d>136</_d>
+<_e>197</_e>
+<_f>236</_f>
+<_g>232</_g>
+<_h>219</_h>
+<_i>198</_i>
+<_j>61</_j>
+<_k>115</_k>
 </Uid>
 <Name id="ref-3">Kopie von Standard für NepA</Name>
 <ReferenceStyle xsi:type="a3:ReferenceStyle" xmlns:a3="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Formatter/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">IfSpecialItem</ReferenceStyle>
@@ -90,19 +90,19 @@
 </a4:Items>
 <a4:Items id="ref-11" 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-35">Kardiale Marker: CK, CKMB, Trop, NTproBNP</Content>
+<Content id="ref-35">Kardiale Marker: CK, CKMB, hsTnT, NT-proBNP</Content>
 </a4:Items>
 <a4:Items id="ref-12" 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-36">Niere: Krea, Hst, eGFR (CKD-EPI)</Content>
+<Content id="ref-36">Niere: Krea, Hst, eGFR (CKD-EPI), Cystatin C</Content>
 </a4:Items>
 <a4:Items id="ref-13" 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-37">Sammelurin: SU-Proteinurie, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Natrium, SU-Zeit, SU-Volumen</Content>
+<Content id="ref-37">Sammelurin: SU-Prot, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Na, SU-Zeit, SU-Volumen</Content>
 </a4:Items>
 <a4:Items id="ref-14" 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-38">Spot-Urin: U-TPCR, U-ACR, U-Ery, U-Leu, U-Bakt</Content>
+<Content id="ref-38">Spot-Urin: U-TPCR, U-ACR, U-Alb, U-Ery, U-Leu, U-Bakt</Content>
 </a4:Items>
 <a4:Items id="ref-15" 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>
@@ -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;*** BITTE ANGEBEN***&#62; µg/l)&#34;, CSA (C0) &#34;(Ziel-Talspiegel: &#60;*** BITTE ANGEBEN***&#62; µg/l)&#34;, SIR &#34;(Ziel-Talspiegel: &#60;*** BITTE ANGEBEN***&#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>
@@ -159,11 +159,11 @@
 </a2:UnitySerializationHolder>
 <a4:CustomText id="ref-28" 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-52">Virologie (EDTA-Blut): CMV-PCR, BKV-PCR</Content>
+<Content id="ref-52">Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden</Content>
 </a4:CustomText>
 <a4:CustomText id="ref-29" 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-53">Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden</Content>
+<Content id="ref-53">Virologie (EDTA-Blut): CMV-PCR, BKV-PCR</Content>
 </a4:CustomText>
 <a4:CustomText id="ref-30" 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>

zaaReloaded2/Defaults/parameters.txt

@@ -27,7 +27,7 @@ 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
@@ -50,7 +50,7 @@ Gesamt-Bilirubin                   Bilirubin            S
 Gesamt-Eiweiss                     Protein              S
 "Gesamt-Eiweiss (PU)"              Protein              U
 "Gesamt-Eiweiss (SU)"              Protein              SU
-"Gesamt-Eiweiss (SU)/die"          Proteinurie          SU
+"Gesamt-Eiweiss (SU)/die"          Prot                 SU
 "Gesamt-Eiweiss/Creatinin (PU)"    TPCR                 U          0
 GGT                                GGT                  S          0
 "glomerul. Filtrationsr. (MDRD)"   "eGFR (MDRD)"        S          ---              ---                       X
@@ -64,7 +64,7 @@ Haptoglobin                        Haptoglobin          S          ---
 HAPTOGLOBIN                        Haptoglobin          S          ---              X
 "Harnstoff (SU)"                   Hst                  SU
 "Harnstoff (SU)/die"               Hst/Tag              SU
-Harnstoff"                         Hst                  S
+Harnstoff                          Hst                  S
 "Harnstoff-Clearance (SU)/min"     HstCl                SU
 Harnsäure                          Harnsäure            S
 "HbA1c (NGSP)"                     HbA1c                E
@@ -121,7 +121,7 @@ Thrombozyten                       Thr                  E
 Transferrin                        Transferrin          S
 "Transferrinsättigung"             Tf.-Sätt.            S
 "Triglyceride"                     TG                   S
-"Troponin T (high sensitive)"      hsTnT                S
+"Troponin (high sensitive)"        hsTnT                S
 TSH                                TSH                  S
 "Übergangsepithelien (U)"          Übergangsep.         U
 "Unreife Granulozyten"             Gran                 E

zaaReloaded2/Defaults/ward.zaaReloaded

@@ -3,21 +3,21 @@
 <a1:Settings id="ref-1" xmlns:a1="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
 <Uid xsi:type="a2:Guid" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
-<_a>726346026</_a>
-<_b>-9272</_b>
-<_c>16670</_c>
-<_d>156</_d>
-<_e>154</_e>
-<_f>68</_f>
-<_g>185</_g>
-<_h>192</_h>
-<_i>11</_i>
-<_j>64</_j>
-<_k>27</_k>
+<_a>1038630179</_a>
+<_b>-1437</_b>
+<_c>19419</_c>
+<_d>151</_d>
+<_e>122</_e>
+<_f>7</_f>
+<_g>44</_g>
+<_h>130</_h>
+<_i>195</_i>
+<_j>52</_j>
+<_k>194</_k>
 </Uid>
-<Name id="ref-3">neu fuer Station</Name>
-<ReferenceStyle xsi:type="a3:ReferenceStyle" xmlns:a3="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Formatter/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">IfSpecialOrAbnormal</ReferenceStyle>
-<AbnormalStyle xsi:type="a3:AbnormalStyle" xmlns:a3="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Formatter/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">Bold</AbnormalStyle>
+<Name id="ref-3">Station ganz neu</Name>
+<ReferenceStyle xsi:type="a3:ReferenceStyle" xmlns:a3="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Formatter/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">IfSpecialItem</ReferenceStyle>
+<AbnormalStyle xsi:type="a3:AbnormalStyle" xmlns:a3="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Formatter/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">None</AbnormalStyle>
 <ElementsCount>4</ElementsCount>
 <Element0Type href="#ref-4"/>
 <Element0Object href="#ref-5"/>
@@ -167,19 +167,19 @@
 </a4:Items>
 <a4:Items id="ref-18" 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-44">Kardiale Marker: CK, CKMB, Trop, NTproBNP</Content>
+<Content id="ref-44">Kardiale Marker: CK, CKMB, hsTnT, NT-proBNP</Content>
 </a4:Items>
 <a4:Items id="ref-19" 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-45">Niere: Krea, Hst, eGFR (CKD-EPI)</Content>
+<Content id="ref-45">Niere: Krea, Hst, eGFR (CKD-EPI), Cystatin C</Content>
 </a4:Items>
 <a4:Items id="ref-20" 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-46">Sammelurin: SU-Proteinurie, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Natrium, SU-Zeit, SU-Volumen</Content>
+<Content id="ref-46">Sammelurin: SU-Prot, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Na, SU-Zeit, SU-Volumen</Content>
 </a4:Items>
 <a4:Items id="ref-21" 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-47">Spot-Urin: U-TPCR, U-ACR, U-Ery, U-Leu, U-Bakt</Content>
+<Content id="ref-47">Spot-Urin: U-TPCR, U-ACR, U-Alb, U-Ery, U-Leu, U-Bakt</Content>
 </a4:Items>
 <a4:Items id="ref-22" 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>
@@ -227,7 +227,7 @@
 </a4:Items>
 <a4:Items id="ref-33" 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-59">Medikamente: TAC &#34;(Ziel-Talspiegel: &#60;*** BITTE ANGEBEN***&#62; µg/l)&#34;, CSA (C0) &#34;(Ziel-Talspiegel: &#60;*** BITTE ANGEBEN***&#62; µg/l)&#34;, SIR &#34;(Ziel-Talspiegel: &#60;*** BITTE ANGEBEN***&#62; µg/l)&#34;, Vancomycin, Gentamicin, Tobramicin</Content>
+<Content id="ref-59">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-34" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
 <Data id="ref-60">zaaReloaded2.Controller.Elements.CustomText</Data>
@@ -236,11 +236,11 @@
 </a2:UnitySerializationHolder>
 <a4:CustomText id="ref-35" 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-61">Virologie (EDTA-Blut): CMV-PCR, BKV-PCR</Content>
+<Content id="ref-61">Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden</Content>
 </a4:CustomText>
 <a4:CustomText id="ref-36" 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-62">Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden</Content>
+<Content id="ref-62">Virologie (EDTA-Blut): CMV-PCR, BKV-PCR</Content>
 </a4:CustomText>
 <a4:CustomText id="ref-37" 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>

zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml

@@ -32,7 +32,7 @@
         settings:WindowState.Save="True"
         >
     <Window.Resources>
-        <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
+        <ResourceDictionary Source="/Bovender;component/Style.xaml" />
     </Window.Resources>
     <DockPanel Margin="10">
         <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,0,0">

zaaReloaded2/ExceptionHandler/SubmissionFailureView.xaml

@@ -25,7 +25,7 @@
         Title="Fehlerbericht versenden"
         >
     <Window.Resources>
-        <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
+        <ResourceDictionary Source="/Bovender;component/Style.xaml" />
     </Window.Resources>
     <StackPanel Margin="10" Orientation="Horizontal">
         <TextBlock FontSize="72" FontWeight="Bold" Foreground="Red" Margin="0,0,10,0"

zaaReloaded2/ExceptionHandler/SubmissionProcessView.xaml

@@ -29,7 +29,7 @@
         SizeToContent="WidthAndHeight"
         >
     <Window.Resources>
-        <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
+        <ResourceDictionary Source="/Bovender;component/Style.xaml" />
     </Window.Resources>
     <i:Interaction.Triggers>
         <i:EventTrigger SourceObject="{Binding CompletedMessage}" EventName="Sent">

zaaReloaded2/ExceptionHandler/SubmissionSuccessView.xaml

@@ -25,7 +25,7 @@
         Title="Fehlerbericht versenden"
         >
     <Window.Resources>
-        <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
+        <ResourceDictionary Source="/Bovender;component/Style.xaml" />
     </Window.Resources>
     <StackPanel Margin="10" Orientation="Horizontal">
         <TextBlock FontSize="48" FontWeight="Bold" Foreground="GreenYellow" Margin="0,0,10,0"

zaaReloaded2/Formatter/DanielsStyle.cs

@@ -69,9 +69,10 @@ namespace zaaReloaded2.Formatter
             find.Execute2007(FindText: "Assistent der Klinik", ReplaceWith: "Internist/Nephrologe", Replace: WdReplace.wdReplaceAll);
             find.Execute2007(FindText: "Professor Dr.", ReplaceWith: "Prof. Dr.", Replace: WdReplace.wdReplaceAll);
             find.Execute2007(FindText: "mmHg", ReplaceWith: "mm Hg", Replace: WdReplace.wdReplaceAll);
-            find.Execute2007(FindText: "RR", ReplaceWith: "", Replace: WdReplace.wdReplaceAll, MatchCase: true, MatchWholeWord: true);
-            find.Execute2007(FindText: "HF", ReplaceWith: "", Replace: WdReplace.wdReplaceAll, MatchCase: true, MatchWholeWord: true);
+            find.Execute2007(FindText: "RR ", ReplaceWith: "", Replace: WdReplace.wdReplaceAll, MatchCase: true, MatchWholeWord: true);
+            find.Execute2007(FindText: "HF ", ReplaceWith: "", Replace: WdReplace.wdReplaceAll, MatchCase: true, MatchWholeWord: true);
             find.Execute2007(FindText: "TAC-Spiegel", ReplaceWith: "Tacrolimus-Talspiegel", Replace: WdReplace.wdReplaceAll);
+            find.Execute2007(FindText: "ammelruin", ReplaceWith: "ammelurin", Replace: WdReplace.wdReplaceAll);
             find.Execute2007(FindText: "4-7", ReplaceWith: "4 bis 7", Replace: WdReplace.wdReplaceAll);
             find.Execute2007(FindText: "5-8", ReplaceWith: "5 bis 8", Replace: WdReplace.wdReplaceAll);
             find.Execute2007(FindText: "8-10", ReplaceWith: "8 bis 10", Replace: WdReplace.wdReplaceAll);

zaaReloaded2/Formatter/DocumentWriter.cs

@@ -250,7 +250,6 @@ namespace zaaReloaded2.Formatter
         // The splitting pattern must not contain subgroups!
         static readonly Regex _markupRegex = new Regex(@"(<[^ >]+>)");
         static readonly Regex _styleRegex = new Regex(@"<style:(?<style>[^>]+)>");
-        static Range _highlightStart;
 
         #endregion
 

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/Importer/ZaaImporter/LaurisTimePoint.cs

@@ -196,11 +196,12 @@ namespace zaaReloaded2.Importer.ZaaImporter
 
         void ParseParagraph(string paragraph)
         {
-            if (_timeStampRegex.IsMatch(paragraph))
+            Match m = _timeStampRegex.Match(paragraph);
+            if (m.Success)
             {
                 DateTime dt;
                 if (DateTime.TryParseExact(
-                    _timeStampRegex.Match(paragraph).Groups["datetime"].Value,
+                    m.Groups["datetime"].Value,
                     "dd.MM.yyyy HH:mm",
                     CultureInfo.InvariantCulture,
                     DateTimeStyles.AllowWhiteSpaces,
@@ -208,8 +209,24 @@ namespace zaaReloaded2.Importer.ZaaImporter
                 {
                     TimeStamp = dt;
                 }
+
+                // Put the remainder of the line back to the
+                // 'paragraph' parameter to deal with exceptional
+                // lines such as 
+                // "(17.09.2015 10:44:00) Cyclosporin-A vor Gabe: 130 µg/l;"
+                // We need to add a dummy caption because this is
+                // the normal format of a paragraph generated from Lauris.
+                if (m.Groups["tail"].Success)
+                {
+                    paragraph = "DUMMY CAPTION: " + m.Groups["tail"].Value;
+                }
+                else
+                {
+                    paragraph = String.Empty;
+                }
             }
-            else
+
+            if (!String.IsNullOrEmpty(paragraph))
             {
                 LaurisParagraph lp = new LaurisParagraph(
                         paragraph,
@@ -236,7 +253,7 @@ namespace zaaReloaded2.Importer.ZaaImporter
         /// paragraph of a LaurisText.
         /// </summary>
         static readonly Regex _timeStampRegex = new Regex(
-            @"^(Labor:?)?\s*\(?\s*(?<datetime>\d\d\.\d\d\.\d\d\d\d\s+\d\d:\d\d)");
+            @"^(Labor:?)?\s*\(?\s*(?<datetime>\d\d\.\d\d\.\d\d\d\d\s+\d\d:\d\d)(:00\)\s*(?<tail>.+)?)?$");
         IList<String> _paragraphs;
         Parameters _parameterDictionary;
         Units _unitDictionary;

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/ThisAddIn.cs

@@ -45,7 +45,7 @@ namespace zaaReloaded2
         private void ThisAddIn_Startup(object sender, System.EventArgs e)
         {
             Bovender.ExceptionHandler.CentralHandler.ManageExceptionCallback += CentralHandler_ManageExceptionCallback;
-            RegisterTextBoxSelectAll();
+            Bovender.WpfHelpers.RegisterTextBoxSelectAll();
             CheckForUpdates();
             _oldCaption = Globals.ThisAddIn.Application.Caption;
             Globals.ThisAddIn.Application.Caption = 
@@ -155,49 +155,5 @@ namespace zaaReloaded2
         }
         
         #endregion
-
-        /// <summary>
-        /// Make text boxes select all text on focus.
-        /// </summary>
-        /// <remarks>
-        /// http://stackoverflow.com/a/2553297/270712
-        /// </remarks>
-        void RegisterTextBoxSelectAll()
-        {
-            // Select the text in a TextBox when it receives focus.
-            EventManager.RegisterClassHandler(typeof(TextBox), TextBox.PreviewMouseLeftButtonDownEvent,
-                new MouseButtonEventHandler(SelectivelyIgnoreMouseButton));
-            EventManager.RegisterClassHandler(typeof(TextBox), TextBox.GotKeyboardFocusEvent,
-                new RoutedEventHandler(SelectAllText));
-            EventManager.RegisterClassHandler(typeof(TextBox), TextBox.MouseDoubleClickEvent,
-                new RoutedEventHandler(SelectAllText));
-        }
-
-        void SelectivelyIgnoreMouseButton(object sender, MouseButtonEventArgs e)
-        {
-            // Find the TextBox
-            DependencyObject parent = e.OriginalSource as UIElement;
-            while (parent != null && !(parent is TextBox))
-                parent = VisualTreeHelper.GetParent(parent);
-
-            if (parent != null)
-            {
-                var textBox = (TextBox)parent;
-                if (!textBox.IsKeyboardFocusWithin)
-                {
-                    // If the text box is not yet focused, give it the focus and
-                    // stop further processing of this click event.
-                    textBox.Focus();
-                    e.Handled = true;
-                }
-            }
-        }
-
-        void SelectAllText(object sender, RoutedEventArgs e)
-        {
-            var textBox = e.OriginalSource as TextBox;
-            if (textBox != null)
-                textBox.SelectAll();
-        }
     }
 }

zaaReloaded2/VERSION

@@ -1,2 +1,2 @@
-2.1.0
-2.1.0.0
+2.1.6
+2.1.6.0

zaaReloaded2/ViewModels/ItemCommentViewModel.cs

@@ -41,7 +41,7 @@ namespace zaaReloaded2.ViewModels
         {
             get
             {
-                return _itemComment.Value;
+                return _value;
             }
             set
             {
@@ -56,7 +56,7 @@ namespace zaaReloaded2.ViewModels
 
         #region Commands
 
-        DelegatingCommand SaveCommand
+        public DelegatingCommand SaveCommand
         {
             get
             {

zaaReloaded2/Views/AboutView.xaml

@@ -25,7 +25,7 @@
         Title="Über..."
         >
     <Window.Resources>
-        <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
+        <ResourceDictionary Source="/Bovender;component/Style.xaml" />
     </Window.Resources>
     <StackPanel Margin="20">
         <Image Source="/zaaReloaded2;component/Icons/icon.png" Width="64" VerticalAlignment="Center" Margin="0 0 0 10" />

zaaReloaded2/Views/ElementPickerView.xaml

@@ -28,7 +28,7 @@
         FocusManager.FocusedElement="{Binding ElementName=treeview}"
         >
     <Window.Resources>
-        <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
+        <ResourceDictionary Source="/Bovender;component/Style.xaml" />
     </Window.Resources>
     <DockPanel Margin="10">
         <Label DockPanel.Dock="Top" Content="Verfügbare Elemente:" Target="{Binding ElementName=ElementsTreeView}" />

zaaReloaded2/Views/ElementView.xaml

@@ -29,7 +29,7 @@
         FocusManager.FocusedElement="{Binding ElementName=ContentTextBox}"
         >
     <Window.Resources>
-        <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
+        <ResourceDictionary Source="/Bovender;component/Style.xaml" />
     </Window.Resources>
     <DockPanel Margin="10">
         <Label DockPanel.Dock="Top" Content="Inhalt:" Target="{Binding ElementName=ContentTextBox}" />

zaaReloaded2/Views/FirstRunView.xaml

@@ -29,7 +29,7 @@
         Title="Willkommen bei zaaReloaded"
         >
     <Window.Resources>
-         <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
+         <ResourceDictionary Source="/Bovender;component/Style.xaml" />
     </Window.Resources>
     <StackPanel Margin="10">
         <TextBlock FontWeight="Bold" FontSize="20" Margin="0 0 0 5">

zaaReloaded2/Views/IoErrorView.xaml

@@ -28,7 +28,7 @@
         Title="Import/Export-Fehler"
         >
     <Window.Resources>
-        <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
+        <ResourceDictionary Source="/Bovender;component/Style.xaml" />
     </Window.Resources>
     <DockPanel Margin="10">
         <TextBlock DockPanel.Dock="Left" Margin="0 0 20 0" LineHeight="72" LineStackingStrategy="BlockLineHeight"

zaaReloaded2/Views/ItemCommentView.xaml

@@ -23,28 +23,26 @@
         xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
         ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
         WindowStyle="ToolWindow" Topmost="True"
-        SizeToContent="WidthAndHeight"
+        SizeToContent="WidthAndHeight" MaxWidth="500"
         b:WindowState.CenterScreen="True" b:WindowState.Save="True"
         Title="Kommentar angeben"
         FocusManager.FocusedElement="{Binding ElementName=ValueTextBox}"
         >
     <Window.Resources>
-        <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
+        <ResourceDictionary Source="/Bovender;component/Style.xaml" />
     </Window.Resources>
     <DockPanel Margin="10">
         <Label DockPanel.Dock="Top" Content="{Binding Item}"
-               FontSize="16" FontWeight="Bold"
+               FontSize="16" FontWeight="Bold" Margin="0 0 0 10"
                Target="{Binding ElementName=ValueTextBox}" Padding="0" />
-        <UniformGrid DockPanel.Dock="Bottom" HorizontalAlignment="Right" Columns="2" Rows="1" Margin="0 10 0 0">
+        <UniformGrid DockPanel.Dock="Bottom" HorizontalAlignment="Right" Columns="2" Rows="1" Margin="0 15 0 0">
             <Button Content="OK" Command="{Binding SaveCommand}" IsDefault="True" Margin="0 0 5 0" />
             <Button Content="Abbrechen" Command="{Binding CloseViewCommand}" IsCancel="True" Margin="5 0 0 0" />
         </UniformGrid>
-        <DockPanel Margin="0 10 0 10">
-            <TextBlock DockPanel.Dock="Left" Text="{Binding Prefix}" VerticalAlignment="Center" />
-            <TextBlock DockPanel.Dock="Right" Text="{Binding Suffix}" VerticalAlignment="Center" />
-            <TextBox Text="{Binding Value,Mode=TwoWay,UpdateSourceTrigger=LostFocus}"
-                     MinWidth="120" MaxWidth="240" VerticalAlignment="Center"
-                     x:Name="ValueTextBox" Margin="5 0 5 0" />
-        </DockPanel>
+        <TextBlock DockPanel.Dock="Left" Text="{Binding Prefix}" VerticalAlignment="Center" />
+        <TextBlock DockPanel.Dock="Right" Text="{Binding Suffix}" VerticalAlignment="Center" />
+        <TextBox Text="{Binding Value,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+                    MinWidth="120" MaxWidth="240" VerticalAlignment="Center"
+                    x:Name="ValueTextBox" Margin="5 0 5 0" />
     </DockPanel>
 </Window>

zaaReloaded2/Views/PreferencesView.xaml

@@ -28,7 +28,7 @@
         Title="Einstellungen"
         >
     <Window.Resources>
-         <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
+         <ResourceDictionary Source="/Bovender;component/Style.xaml" />
     </Window.Resources>
     <DockPanel Margin="10">
         <UniformGrid DockPanel.Dock="Bottom" Columns="2" Rows="1"

zaaReloaded2/Views/SettingsRepositoryView.xaml

@@ -31,7 +31,7 @@
         FocusManager.FocusedElement="{Binding ElementName=settingsList}"
         >
     <Window.Resources>
-        <ResourceDictionary Source="/zaaReloaded2;component/style.xaml" />
+        <ResourceDictionary Source="/Bovender;component/Style.xaml" />
     </Window.Resources>
     <i:Interaction.Triggers>
         <i:EventTrigger SourceObject="{Binding EditSettingsMessage}" EventName="Sent">

zaaReloaded2/Views/SettingsView.xaml

@@ -31,7 +31,7 @@
         FocusManager.FocusedElement="{Binding ElementName=NameTextBox}"
         >
     <Window.Resources>
-         <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
+         <ResourceDictionary Source="/Bovender;component/Style.xaml" />
     </Window.Resources>
     <i:Interaction.Triggers>
         <i:EventTrigger SourceObject="{Binding AddElementMessage}" EventName="Sent">

zaaReloaded2/packages.config

@@ -19,6 +19,6 @@
 	limitations under the License.
 -->
 <packages>
-  <package id="Bovender" version="0.2.0.0" targetFramework="net40" />
+  <package id="Bovender" version="0.3.3.0" targetFramework="net40" />
   <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
 </packages>

zaaReloaded2/zaaReloaded2.csproj

@@ -134,8 +134,9 @@
   -->
   <ItemGroup>
     <Reference Include="Accessibility" />
-    <Reference Include="Bovender">
-      <HintPath>..\packages\Bovender.0.2.0.0\lib\net40\Bovender.dll</HintPath>
+    <Reference Include="Bovender, Version=0.3.3.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Bovender.0.3.3.0\lib\net40\Bovender.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="PresentationCore" />