Merge branch 'release-2.1.13'

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

HISTORY.md

@@ -1,3 +1,28 @@
+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)
 ========================================================================
 

www/versioninfo.txt

@@ -1,4 +1,4 @@
-2.1.9
+2.1.13
 http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe
-119832193e6f201fb1db5edcda0b85e8444e5ec0  publish/release/zaaReloaded-2.1.9.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>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>
+<_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>
@@ -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>

zaaReloaded2/Defaults/parameters.txt

@@ -10,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
@@ -85,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
@@ -109,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,7 +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.10
-2.1.10.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>