daniel
/
zaaReloaded2
1
0
Fork 0
Code Issues 4 Pull Requests Activity

Merge branch 'release-2.1.11'

This commit is contained in:
Daniel Kraus 2015-10-28 15:35:10 +01:00
parent d5bb0cd5fb bbd7bd1d7b
commit c8492c6266
8 changed files with 51 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
HISTORY.md
View File

@ -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)
========================================================================

4
www/versioninfo.txt
View File

@ -1,4 +1,4 @@
2.1.9
2.1.11
http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe
119832193e6f201fb1db5edcda0b85e8444e5ec0 publish/release/zaaReloaded-2.1.9.exe
54c8d01edb36b2e4a3214d7f4ab0a2485c88605e publish/release/zaaReloaded-2.1.11.exe

24
zaaReloaded2/Defaults/clinic.zaaReloaded
View File

@ -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>975892959</_a>
<_b>1621</_b>
<_c>18089</_c>
<_d>190</_d>
<_e>209</_e>
<_f>136</_f>
<_g>9</_g>
<_h>91</_h>
<_i>189</_i>
<_j>67</_j>
<_k>208</_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>

12
zaaReloaded2/Properties/Settings.Designer.cs generated
View File

@ -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;
}
}
}
}

3
zaaReloaded2/Properties/Settings.settings
View File

@ -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>

9
zaaReloaded2/ThisAddIn.cs
View File

@ -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 =

4
zaaReloaded2/VERSION
View File

@ -1,2 +1,2 @@
2.1.10
2.1.10.0
2.1.11
2.1.11.0

3
zaaReloaded2/app.config
View File

@ -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>