Merge branch 'release-2.1.10'

Prepare release 2.1.10.
Fix definition of PSA.
2015-10-24 10:39:49 +02:00 · 2015-10-24 10:39:40 +02:00 · 2015-10-24 10:37:21 +02:00 · 2015-10-18 21:19:49 +02:00 · 2015-10-18 21:19:19 +02:00 · 2015-10-18 21:19:14 +02:00
9 changed files with 55 additions and 39 deletions
--- a/HISTORY.md
+++ b/HISTORY.md
@ -1,4 +1,20 @@
-Version 2.1.8 (2015-10-09)
+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.
--- a/Tests/Tests.csproj
+++ b/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">
--- a/Tests/packages.config
+++ b/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>
--- a/www/versioninfo.txt
+++ b/www/versioninfo.txt
@ -1,4 +1,4 @@
-2.1.8
+2.1.9
 http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe
-8c4cb2782b2e97bfd645ece175878e99e8a56c37  publish/release/zaaReloaded-2.1.8.exe
+119832193e6f201fb1db5edcda0b85e8444e5ec0  publish/release/zaaReloaded-2.1.9.exe

--- 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>
--- 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
--- a/zaaReloaded2/VERSION
+++ b/zaaReloaded2/VERSION
@ -1,2 +1,2 @@
-2.1.8
-2.1.8.0
+2.1.10
+2.1.10.0
--- a/zaaReloaded2/packages.config
+++ b/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>
--- a/zaaReloaded2/zaaReloaded2.csproj
+++ b/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" />
Author	SHA1	Message	Date
Daniel Kraus	d5bb0cd5fb	Merge branch 'release-2.1.10'	2015-10-24 10:39:49 +02:00
Daniel Kraus	65c6f9335f	Prepare release 2.1.10.	2015-10-24 10:39:40 +02:00
Daniel Kraus	80c8177a58	Fix definition of PSA. - VERBESSERT: PSA wird jetzt richtig erkannt.	2015-10-24 10:37:21 +02:00
Daniel Kraus	684a11a81a	Merge branch 'release-2.1.9' into develop	2015-10-18 21:19:49 +02:00
Daniel Kraus	b62204109f	Merge branch 'release-2.1.9'	2015-10-18 21:19:19 +02:00
Daniel Kraus	f2443d6e93	Prepare release 2.1.9.	2015-10-18 21:19:14 +02:00
Daniel Kraus	0b4763bf99	Update bovender framework to 0.5.0. - VERBESSERT: Integritätsprüfung für Updates wurde für besseren Algorithmus (SHA-256) vorbereitet.	2015-10-18 06:59:14 +02:00
Daniel Kraus	45430302ae	Merge branch 'release-2.1.8' into develop	2015-10-11 07:22:11 +02:00