From 80c8177a58274cbbcc32816e785da5f2e56daafe Mon Sep 17 00:00:00 2001
From: Daniel Kraus <krada@gmx.net>
Date: Sat, 24 Oct 2015 10:34:28 +0200
Subject: [PATCH 1/2] Fix definition of PSA.

- VERBESSERT: PSA wird jetzt richtig erkannt.
---
 zaaReloaded2/Defaults/clinic.zaaReloaded | 54 ++++++++++++------------
 zaaReloaded2/Defaults/parameters.txt     |  2 +-
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/zaaReloaded2/Defaults/clinic.zaaReloaded b/zaaReloaded2/Defaults/clinic.zaaReloaded
index 65e23f3..3cb734c 100755
--- a/zaaReloaded2/Defaults/clinic.zaaReloaded
+++ b/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>-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>
+<_a>644805186</_a>
+<_b>29019</_b>
+<_c>17537</_c>
+<_d>142</_d>
+<_e>99</_e>
+<_f>212</_f>
+<_g>84</_g>
+<_h>166</_h>
+<_i>27</_i>
+<_j>135</_j>
+<_k>172</_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">
@@ -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, AFP</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>
diff --git a/zaaReloaded2/Defaults/parameters.txt b/zaaReloaded2/Defaults/parameters.txt
index 613bbd8..ff3e295 100755
--- a/zaaReloaded2/Defaults/parameters.txt
+++ b/zaaReloaded2/Defaults/parameters.txt
@@ -105,7 +105,7 @@ pH                                 pH                   BGA
 "Plattenepithelien (U)"            Plattenep            U
 "PO2 (art.)"                       pO2                  BGA
 "Protein (U)"                      Protein              U
-"PSA ges. (ECL,Elecsys,Roche)"     PSA                  S          ---              X
+"PSA ges.   (ECL,Elecsys,Roche)"   PSA                  S          ---              X
 "PTH intakt"                       iPTH                 S
 PTT                                PTT                  Z
 "Ratio int. norm."                 INR                  Z

From 65c6f9335f42d556ac535e23d9c9b706883983c9 Mon Sep 17 00:00:00 2001
From: Daniel Kraus <krada@gmx.net>
Date: Sat, 24 Oct 2015 10:39:40 +0200
Subject: [PATCH 2/2] Prepare release 2.1.10.

---
 HISTORY.md           | 10 +++++++++-
 zaaReloaded2/VERSION |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 18f9b0c..c8ff365 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,12 @@
-Version 2.1.9. (2015-10-18)
+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.
diff --git a/zaaReloaded2/VERSION b/zaaReloaded2/VERSION
index 6249f12..d5f3771 100755
--- a/zaaReloaded2/VERSION
+++ b/zaaReloaded2/VERSION
@@ -1,2 +1,2 @@
-2.1.9
-2.1.9.0
+2.1.10
+2.1.10.0