Merge branch 'release-2.1.8'

HISTORY.md

@@ -1,3 +1,12 @@
+Version 2.1.8 (2015-10-09)
+========================================================================
+
+- 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

@@ -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" />

www/versioninfo.txt

@@ -1,4 +1,4 @@
-2.1.7
+2.1.8
 http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe
-e142c709482684790e8f5779b4313647d90e44fa  publish/release/zaaReloaded-2.1.7.exe
+8c4cb2782b2e97bfd645ece175878e99e8a56c37  publish/release/zaaReloaded-2.1.8.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>-1270038762</_a>
+<_b>9928</_b>
+<_c>17935</_c>
+<_d>135</_d>
+<_e>162</_e>
+<_f>115</_f>
+<_g>222</_g>
+<_h>187</_h>
+<_i>100</_i>
+<_j>73</_j>
+<_k>169</_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>
@@ -171,7 +171,7 @@
 </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">
 <Version>2</Version>
-<Content id="ref-55">Tumormarker: PSA</Content>
+<Content id="ref-55">Tumormarker: PSA, AFP</Content>
 </a4:Items>
 </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

zaaReloaded2/ThisAddIn.cs

@@ -46,6 +46,7 @@ namespace zaaReloaded2
         {
             Bovender.ExceptionHandler.CentralHandler.ManageExceptionCallback += CentralHandler_ManageExceptionCallback;
             Bovender.WpfHelpers.RegisterTextBoxSelectAll();
+            Properties.Settings.Default.Upgrade();
             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.8
+2.1.8.0