From d2e236f88afc8c705c05efc2eded41c3c214dda4 Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Fri, 2 Oct 2015 21:18:20 +0200 Subject: [PATCH 1/5] Add AFP to parameters and clinic style. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - VERBESSERT: Alpha-Fetoprotein (AFP) zu den bekannten Parametern hinzugefügt. --- zaaReloaded2/Defaults/clinic.zaaReloaded | 24 ++++++++++++------------ zaaReloaded2/Defaults/parameters.txt | 1 + 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/zaaReloaded2/Defaults/clinic.zaaReloaded b/zaaReloaded2/Defaults/clinic.zaaReloaded index e480e27..65e23f3 100755 --- a/zaaReloaded2/Defaults/clinic.zaaReloaded +++ b/zaaReloaded2/Defaults/clinic.zaaReloaded @@ -3,17 +3,17 @@ 2 -<_a>1333827306 -<_b>-10272 -<_c>18647 -<_d>136 -<_e>197 -<_f>236 -<_g>232 -<_h>219 -<_i>198 -<_j>61 -<_k>115 +<_a>-1270038762 +<_b>9928 +<_c>17935 +<_d>135 +<_e>162 +<_f>115 +<_g>222 +<_h>187 +<_i>100 +<_j>73 +<_k>169 Kopie von Standard für NepA IfSpecialItem @@ -171,7 +171,7 @@ 2 -Tumormarker: PSA +Tumormarker: PSA, AFP diff --git a/zaaReloaded2/Defaults/parameters.txt b/zaaReloaded2/Defaults/parameters.txt index 64bb188..613bbd8 100755 --- a/zaaReloaded2/Defaults/parameters.txt +++ b/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 From 220e98ce1f018ad2ebd6bd196807fa90096a799a Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Tue, 6 Oct 2015 16:16:09 +0200 Subject: [PATCH 2/5] Add tests for cloning of control elements. --- Tests/Controller/Elements/CloneTest.cs | 51 ++++++++++++++++++++++++++ Tests/Tests.csproj | 1 + 2 files changed, 52 insertions(+) create mode 100755 Tests/Controller/Elements/CloneTest.cs diff --git a/Tests/Controller/Elements/CloneTest.cs b/Tests/Controller/Elements/CloneTest.cs new file mode 100755 index 0000000..a6602e3 --- /dev/null +++ b/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 where T : ControlElementBase, new() + { + [Test] + public void CloneControlElement() + { + T original = new T(); + original.Children = new List() + { + 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"); + } + } +} diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj index 08833d6..e555af5 100755 --- a/Tests/Tests.csproj +++ b/Tests/Tests.csproj @@ -82,6 +82,7 @@ + From c94e704b01e2d2d9c20ffbc76580b4664a5d91f6 Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Tue, 6 Oct 2015 16:20:00 +0200 Subject: [PATCH 3/5] Add additional test for cloning of Elements. --- Tests/Controller/SettingsTest.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Tests/Controller/SettingsTest.cs b/Tests/Controller/SettingsTest.cs index 912992c..04e3be3 100755 --- a/Tests/Controller/SettingsTest.cs +++ b/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"); } } } From 796ba7b375a4f2dc319def9c2223f6cb6e9beac9 Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Fri, 9 Oct 2015 22:38:31 +0200 Subject: [PATCH 4/5] Upgrade properties on startup. - VERBESSERT: Einstellungen werden nach Office-Update nicht vergessen. --- zaaReloaded2/ThisAddIn.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/zaaReloaded2/ThisAddIn.cs b/zaaReloaded2/ThisAddIn.cs index 1bdbd4f..a8d5779 100755 --- a/zaaReloaded2/ThisAddIn.cs +++ b/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 = From 9ae32ddaa69f84b63415dc18d3a44625484c2b44 Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Sun, 11 Oct 2015 07:20:28 +0200 Subject: [PATCH 5/5] Prepare release 2.1.8. --- HISTORY.md | 9 +++++++++ www/versioninfo.txt | 4 ++-- zaaReloaded2/VERSION | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 88f3992..f7aa6fe 100644 --- a/HISTORY.md +++ b/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) ======================================================================== diff --git a/www/versioninfo.txt b/www/versioninfo.txt index 46dc8b2..32b0ae9 100644 --- a/www/versioninfo.txt +++ b/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 diff --git a/zaaReloaded2/VERSION b/zaaReloaded2/VERSION index 31cfaf6..72c62e7 100755 --- a/zaaReloaded2/VERSION +++ b/zaaReloaded2/VERSION @@ -1,2 +1,2 @@ -2.1.7 -2.1.7.0 +2.1.8 +2.1.8.0