From 578c126a20e931ca501551f374c38b9c2a6aee3d Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Sat, 24 Oct 2015 10:43:04 +0200 Subject: [PATCH 1/4] Edit versioninfo.txt for 2.1.10. --- www/versioninfo.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/versioninfo.txt b/www/versioninfo.txt index 43dbca0..1b2f3f5 100644 --- a/www/versioninfo.txt +++ b/www/versioninfo.txt @@ -1,4 +1,4 @@ -2.1.9 +2.1.10 http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe -119832193e6f201fb1db5edcda0b85e8444e5ec0 publish/release/zaaReloaded-2.1.9.exe +99f55bd6d15a970a40ad4cf45fe7c631e9b6ecfe publish/release/zaaReloaded-2.1.10.exe From 08640363a2b7b4db8973b8048c429d31197478d2 Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Wed, 28 Oct 2015 08:17:10 +0100 Subject: [PATCH 2/4] Upgrade settings only once. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - VERBESSERT: Benutzereinstellungen werden nicht mehr jedes Mal zurückgesetzt. --- zaaReloaded2/Properties/Settings.Designer.cs | 12 ++++++++++++ zaaReloaded2/Properties/Settings.settings | 3 +++ zaaReloaded2/ThisAddIn.cs | 9 ++++++++- zaaReloaded2/app.config | 3 +++ 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/zaaReloaded2/Properties/Settings.Designer.cs b/zaaReloaded2/Properties/Settings.Designer.cs index 82402a5..53fccbd 100755 --- a/zaaReloaded2/Properties/Settings.Designer.cs +++ b/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; + } + } } } diff --git a/zaaReloaded2/Properties/Settings.settings b/zaaReloaded2/Properties/Settings.settings index c4bb743..d448e89 100755 --- a/zaaReloaded2/Properties/Settings.settings +++ b/zaaReloaded2/Properties/Settings.settings @@ -77,5 +77,8 @@ http://git.bovender.de + + True + \ No newline at end of file diff --git a/zaaReloaded2/ThisAddIn.cs b/zaaReloaded2/ThisAddIn.cs index a8d5779..d901dfc 100755 --- a/zaaReloaded2/ThisAddIn.cs +++ b/zaaReloaded2/ThisAddIn.cs @@ -46,7 +46,14 @@ namespace zaaReloaded2 { Bovender.ExceptionHandler.CentralHandler.ManageExceptionCallback += CentralHandler_ManageExceptionCallback; Bovender.WpfHelpers.RegisterTextBoxSelectAll(); - Properties.Settings.Default.Upgrade(); + + 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 = diff --git a/zaaReloaded2/app.config b/zaaReloaded2/app.config index edf22de..4bf87af 100755 --- a/zaaReloaded2/app.config +++ b/zaaReloaded2/app.config @@ -108,6 +108,9 @@ False + + True + \ No newline at end of file From cb044015d2505a8b18b73add8335c901bf9e6c7c Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Wed, 28 Oct 2015 15:32:35 +0100 Subject: [PATCH 3/4] Fix CK-MB in clinic style. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - VERBESSERT: Ambulanzstil überarbeitet, CK-MB wird jetzt mit ausgegeben. --- zaaReloaded2/Defaults/clinic.zaaReloaded | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/zaaReloaded2/Defaults/clinic.zaaReloaded b/zaaReloaded2/Defaults/clinic.zaaReloaded index 3cb734c..ffe4f81 100755 --- a/zaaReloaded2/Defaults/clinic.zaaReloaded +++ b/zaaReloaded2/Defaults/clinic.zaaReloaded @@ -3,17 +3,17 @@ 2 -<_a>644805186 -<_b>29019 -<_c>17537 -<_d>142 -<_e>99 -<_f>212 -<_g>84 -<_h>166 -<_i>27 -<_j>135 -<_k>172 +<_a>975892959 +<_b>1621 +<_c>18089 +<_d>190 +<_e>209 +<_f>136 +<_g>9 +<_h>91 +<_i>189 +<_j>67 +<_k>208 Kopie von Standard für NepA IfSpecialItem @@ -90,7 +90,7 @@ 2 -Kardiale Marker: CK, CKMB, hsTnT, NT-proBNP +Kardiale Marker: CK, CK-MB, hsTnT, NT-proBNP 2 From bbd7bd1d7be7acc05aa63d743fbaf450f361f438 Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Wed, 28 Oct 2015 15:35:05 +0100 Subject: [PATCH 4/4] Prepare release 2.1.11. --- 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 c8ff365..23e7e2d 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,12 @@ +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) ======================================================================== diff --git a/www/versioninfo.txt b/www/versioninfo.txt index 1b2f3f5..fef5dc1 100644 --- a/www/versioninfo.txt +++ b/www/versioninfo.txt @@ -1,4 +1,4 @@ -2.1.10 +2.1.11 http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe -99f55bd6d15a970a40ad4cf45fe7c631e9b6ecfe publish/release/zaaReloaded-2.1.10.exe +54c8d01edb36b2e4a3214d7f4ab0a2485c88605e publish/release/zaaReloaded-2.1.11.exe diff --git a/zaaReloaded2/VERSION b/zaaReloaded2/VERSION index d5f3771..52c80b6 100755 --- a/zaaReloaded2/VERSION +++ b/zaaReloaded2/VERSION @@ -1,2 +1,2 @@ -2.1.10 -2.1.10.0 +2.1.11 +2.1.11.0