Merge branch 'release-2.1.13'

- VERBESSERT: Parameter für Aldosteron, Renin und Schwangerschaftstest einprogrammiert.

HISTORY.md

@@ -1,3 +1,53 @@
+Version 2.1.13 (2015-11-12)
+========================================================================
+
+- VERBESSERT: Parameter für Aldosteron, Renin und Schwangerschaftstest einprogrammiert.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
+Version 2.1.12 (2015-11-04)
+========================================================================
+
+- VERBESSERT: Lp(a) zu den bekannten Parametern hinzugefügt.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
+Version 2.1.11 (2015-10-28)
+========================================================================
+
+- VERBESSERT: Ambulanzstil überarbeitet, CK-MB wird jetzt mit ausgegeben.
+- VERBESSERT: Benutzereinstellungen werden nicht mehr jedes Mal zurückgesetzt.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
+Version 2.1.10 (2015-10-24)
+========================================================================
+
+- VERBESSERT: PSA wird jetzt richtig erkannt.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
+Version 2.1.9 (2015-10-18)
+========================================================================
+
+- VERBESSERT: Integritätsprüfung für Updates wurde für besseren Algorithmus (SHA-256) vorbereitet.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
+Version 2.1.8 (2015-10-11)
+========================================================================
+
+- VERBESSERT: Alpha-Fetoprotein (AFP) zu den bekannten Parametern hinzugefügt.
+- VERBESSERT: Einstellungen werden nach Office-Update nicht vergessen.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
 Version 2.1.7 (2015-10-02)
 ========================================================================
 

Tests/Controller/Elements/CloneTest.cs

@@ -0,0 +1,51 @@
+/* CloneTest.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.Controller.Elements;
+
+namespace Tests.Controller.Elements
+{
+    [TestFixture(typeof(SelectFirstDay))]
+    [TestFixture(typeof(SelectLastDay))]
+    [TestFixture(typeof(SelectEachDay))]
+    class CloneTest<T> where T : ControlElementBase, new()
+    {
+        [Test]
+        public void CloneControlElement()
+        {
+            T original = new T();
+            original.Children = new List<FormatElementBase>()
+            {
+                new Items("hello"),
+                new Items("world")
+            };
+            T clone = original.Clone() as T;
+            for (int i = 0; i < original.Children.Count; i++)
+			{
+                Assert.AreEqual(original.Children[i].Content, clone.Children[i].Content);
+			}
+            clone.Children[1].Content = "something else";
+            Assert.AreNotEqual(clone.Children[1].Content, original.Children[1].Content,
+                "Clone's child #1 should have different content than original's child #1");
+        }
+    }
+}

Tests/Controller/SettingsTest.cs

@@ -49,6 +49,11 @@ namespace Tests.Controller
                 ((Items)source.Elements[1]).Content,
                 ((Items)clone.Elements[1]).Content,
                 "Items content");
+            ((Items)clone.Elements[1]).Content = "something else";
+            Assert.AreNotEqual(
+                ((Items)source.Elements[1]).Content,
+                ((Items)clone.Elements[1]).Content,
+                "Items content should be different");
         }
     }
 }

Tests/Tests.csproj

@@ -41,8 +41,8 @@
     <AssemblyOriginatorKeyFile>zaaReloaded2.pfx</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Bovender, Version=0.4.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
-      <HintPath>..\packages\Bovender.0.4.0.0\lib\net40\Bovender.dll</HintPath>
+    <Reference Include="Bovender, Version=0.5.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Bovender.0.5.0.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">
@@ -82,6 +82,7 @@
   <ItemGroup>
     <Compile Include="Controller\Comments\CommentPoolTest.cs" />
     <Compile Include="Controller\Comments\ItemCommentTest.cs" />
+    <Compile Include="Controller\Elements\CloneTest.cs" />
     <Compile Include="SerializationTest.cs" />
     <Compile Include="Controller\SettingsRepositoryTest.cs" />
     <Compile Include="Controller\SettingsTest.cs" />

Tests/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Bovender" version="0.4.0.0" targetFramework="net40" />
+  <package id="Bovender" version="0.5.0.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/versioninfo.txt

@@ -1,4 +1,4 @@
-2.1.7
+2.1.13
 http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe
-e142c709482684790e8f5779b4313647d90e44fa  publish/release/zaaReloaded-2.1.7.exe
+8dc26f4c80bb91a9384c6cf3818b411e3056bb15b00c334eac5edafa764a52f0  publish/release/zaaReloaded-2.1.13.exe
 

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>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>
+<_a>1024466373</_a>
+<_b>-13000</_b>
+<_c>18257</_c>
+<_d>175</_d>
+<_e>25</_e>
+<_f>195</_f>
+<_g>192</_g>
+<_h>189</_h>
+<_i>241</_i>
+<_j>139</_j>
+<_k>63</_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>
@@ -66,13 +66,13 @@
 <Child16Object href="#ref-25"/>
 <Child17Type href="#ref-8"/>
 <Child17Object href="#ref-26"/>
-<Child18Type href="#ref-27"/>
-<Child18Object href="#ref-28"/>
-<Child19Type href="#ref-27"/>
+<Child18Type href="#ref-8"/>
+<Child18Object href="#ref-27"/>
+<Child19Type href="#ref-28"/>
 <Child19Object href="#ref-29"/>
-<Child20Type href="#ref-27"/>
+<Child20Type href="#ref-28"/>
 <Child20Object href="#ref-30"/>
-<Child21Type href="#ref-8"/>
+<Child21Type href="#ref-28"/>
 <Child21Object href="#ref-31"/>
 </a4:SelectEachDay>
 <a2:UnitySerializationHolder id="ref-8" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
@@ -90,7 +90,7 @@
 </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, hsTnT, NT-proBNP</Content>
+<Content id="ref-35">Kardiale Marker: CK, CK-MB, 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>
@@ -102,7 +102,7 @@
 </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-Alb, 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, U-Schwangerschaftstest</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>
@@ -130,7 +130,7 @@
 </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-45">Hormone: iPTH, TSH, fT3, fT4</Content>
+<Content id="ref-45">Hormone: iPTH, TSH, fT3, fT4, Aldosteron, Renin, ARQ</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>
@@ -152,26 +152,26 @@
 <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>
 </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>
+<a4:Items id="ref-27" 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-51">Tumormarker: PSA, AFP</Content>
+</a4:Items>
+<a2:UnitySerializationHolder id="ref-28" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
+<Data id="ref-52">zaaReloaded2.Controller.Elements.CustomText</Data>
 <UnityType>4</UnityType>
 <AssemblyName href="#ref-7"/>
 </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">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">Virologie (EDTA-Blut): CMV-PCR, BKV-PCR</Content>
+<Content id="ref-53">Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden</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>
-<Content id="ref-54">Autoantikörper: ANCA (IF), MPO-ANCA (ELISA), PR3-ANCA (ELISA), ANA (IF), AnDNA (ELISA), AnDNA (RIA)</Content>
+<Content id="ref-54">Virologie (EDTA-Blut): CMV-PCR, BKV-PCR</Content>
 </a4:CustomText>
-<a4:Items id="ref-31" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
+<a4:CustomText id="ref-31" 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-55">Tumormarker: PSA</Content>
-</a4:Items>
+<Content id="ref-55">Autoantikörper: ANCA (IF), MPO-ANCA (ELISA), PR3-ANCA (ELISA), ANA (IF), AnDNA (ELISA), AnDNA (RIA)</Content>
+</a4:CustomText>
 </SOAP-ENV:Body>
 </SOAP-ENV:Envelope>

zaaReloaded2/Defaults/parameters.txt

@@ -2,6 +2,7 @@
 # ===========                      ==================   ========   ==============   =======================   ===========
 "a1-Microglobulin (SU)"            a1-Microglobulin     SU
 "a1-Microglobulin (SU)/die"        a1-Microglobulin     SU
+"AFP  (ECL, Elecsys, Roche)"       AFP                  S          ---              X
 "aktuelles Bicarbonat"             Bic                  BGA
 Albumin                            Alb                  S
 "Albumin (PU)"                     Alb                  U
@@ -9,6 +10,8 @@ Albumin                            Alb                  S
 "Albumin (SU)/die"                 Alb                  SU
 "Albumin - Fraktion"               Albumin-Fraktion     S          ---              X
 "Albumin/Creatinin (PU)"           ACR                  U          0
+Aldosteron                         Aldosteron           S          ---              X
+Aldosteron-Renin-Quotient          ARQ                  S          ---              X
 "Alk. Phosphatase"                 AP                   S          0
 "Alpha1-Globulin - Fraktion"       a1-Globulin          S          ---              X
 "Alpha2-Globulin - Fraktion"       a2-Globulin          S          ---              X
@@ -84,6 +87,7 @@ Kalium                             K                    S
 "LDL - Cholesterin"                LDL                  S
 Leukozyten                         Leu                  E
 "Leukozyten (U)"                   Leu                  U
+"Lipoprotein (a) (Gen. 2)"         Lp(a)                S          0                X
 Lymphozyten                        Lym                  E
 Magnesium                          Mg                   S          ---              X
 "MCH (HbE)"                        MCH                  E          0
@@ -108,10 +112,12 @@ pH                                 pH                   BGA
 "PTH intakt"                       iPTH                 S
 PTT                                PTT                  Z
 "Ratio int. norm."                 INR                  Z
+Plasma-Renin-Konzentration         Renin                S          ---              X
 Retikulozyten                      Retikulozyten        E          ---              X
 "Sammelmenge (U)"                  Volumen              SU
 "Sammelzeit (U)"                   Zeit                 SU
 "Sauerstoffsättigung (art.)"       SO2                  BGA
+"Schwangerschaftstest (U)"         Schwangerschaftstest U
 Sirolimus                          SIR                  S
 "spezifisches Gewicht (U)"         "spez. Gew."         U
 "Standard Bicarbonat"              "Std.-Bic."          BGA

zaaReloaded2/Properties/Settings.Designer.cs

@@ -264,5 +264,17 @@ namespace zaaReloaded2.Properties {
                 return ((string)(this["Repository"]));
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        public bool NeedUpgrade {
+            get {
+                return ((bool)(this["NeedUpgrade"]));
+            }
+            set {
+                this["NeedUpgrade"] = value;
+            }
+        }
     }
 }

zaaReloaded2/Properties/Settings.settings

@@ -77,5 +77,8 @@
     <Setting Name="Repository" Type="System.String" Scope="Application">
       <Value Profile="(Default)">http://git.bovender.de</Value>
     </Setting>
+    <Setting Name="NeedUpgrade" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

zaaReloaded2/ThisAddIn.cs

@@ -46,6 +46,14 @@ namespace zaaReloaded2
         {
             Bovender.ExceptionHandler.CentralHandler.ManageExceptionCallback += CentralHandler_ManageExceptionCallback;
             Bovender.WpfHelpers.RegisterTextBoxSelectAll();
+
+            if (Properties.Settings.Default.NeedUpgrade)
+            {
+                Properties.Settings.Default.Upgrade();
+                Properties.Settings.Default.NeedUpgrade = false;
+                Properties.Settings.Default.Save();
+            }
+
             CheckForUpdates();
             _oldCaption = Globals.ThisAddIn.Application.Caption;
             Globals.ThisAddIn.Application.Caption = 

zaaReloaded2/VERSION

@@ -1,2 +1,2 @@
-2.1.7
-2.1.7.0
+2.1.13
+2.1.13.0

zaaReloaded2/app.config

@@ -108,6 +108,9 @@
             <setting name="FirstRunWizardShown" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="NeedUpgrade" serializeAs="String">
+                <value>True</value>
+            </setting>
         </zaaReloaded2.Properties.Settings>
     </userSettings>
 </configuration>

zaaReloaded2/packages.config

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

zaaReloaded2/zaaReloaded2.csproj

@@ -134,8 +134,8 @@
   -->
   <ItemGroup>
     <Reference Include="Accessibility" />
-    <Reference Include="Bovender, Version=0.4.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
-      <HintPath>..\packages\Bovender.0.4.0.0\lib\net40\Bovender.dll</HintPath>
+    <Reference Include="Bovender, Version=0.5.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Bovender.0.5.0.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" />