diff --git a/HISTORY.md b/HISTORY.md
index 9a38157..edfaa13 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,13 @@
+Version 2.1.2 (2015-09-11)
+========================================================================
+
+- GEÄNDERT: Sammelurin-Proteinurie als Prot abgekürzt.
+- VERBESSERT: Ambulanzstil überarbeitet.
+- VERBESSERT: Evtl. vorgegebener Kommentartext wird jetzt automatisch markiert, damit er b.B. einfach durch Lostippen überschrieben werden kann.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
+
Version 2.1.1 (2015-09-07)
========================================================================
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 98b96b9..3d79c04 100755
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -41,8 +41,8 @@
zaaReloaded2.pfx
-
- ..\packages\Bovender.0.2.0.0\lib\net40\Bovender.dll
+
+ ..\packages\Bovender.0.3.1.0\lib\net40\Bovender.dll
True
diff --git a/Tests/packages.config b/Tests/packages.config
index e9b2d17..f7121cb 100755
--- a/Tests/packages.config
+++ b/Tests/packages.config
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/www/versioninfo.txt b/www/versioninfo.txt
index a8c140b..27cd807 100644
--- a/www/versioninfo.txt
+++ b/www/versioninfo.txt
@@ -1,4 +1,4 @@
-2.1.1
-http://zaa.nephrowiki.de/downloads/zaaReloaded-2.1.1.exe
-c92e8d47387961f965ca16c52f2ce1f8642df42d publish/release/zaaReloaded-2.1.1.exe
+2.1.2
+http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe
+057270076d9bebb896866e5ce12ad76bb3ea7a7b publish/release/zaaReloaded-2.1.2.exe
diff --git a/zaaReloaded2/Defaults/clinic.zaaReloaded b/zaaReloaded2/Defaults/clinic.zaaReloaded
index 3c40ff4..2f8f010 100755
--- a/zaaReloaded2/Defaults/clinic.zaaReloaded
+++ b/zaaReloaded2/Defaults/clinic.zaaReloaded
@@ -3,17 +3,17 @@
2
-<_a>1589012381
-<_b>-32256
-<_c>16464
-<_d>150
-<_e>15
-<_f>13
-<_g>38
-<_h>102
-<_i>193
-<_j>167
-<_k>220
+<_a>-1928431729
+<_b>-21948
+<_c>18512
+<_d>140
+<_e>76
+<_f>210
+<_g>176
+<_h>1
+<_i>125
+<_j>44
+<_k>143
Kopie von Standard für NepA
IfSpecialItem
@@ -98,11 +98,11 @@
2
-Sammelurin: SU-Proteinurie, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Natrium, SU-Zeit, SU-Volumen
+Sammelurin: SU-Prot, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Na, SU-Zeit, SU-Volumen
2
-Spot-Urin: U-TPCR, U-ACR, U-Ery, U-Leu, U-Bakt
+Spot-Urin: U-TPCR, U-ACR, U-Alb, U-Ery, U-Leu, U-Bakt
2
diff --git a/zaaReloaded2/Defaults/parameters.txt b/zaaReloaded2/Defaults/parameters.txt
index 83934d3..a28147e 100755
--- a/zaaReloaded2/Defaults/parameters.txt
+++ b/zaaReloaded2/Defaults/parameters.txt
@@ -50,7 +50,7 @@ Gesamt-Bilirubin Bilirubin S
Gesamt-Eiweiss Protein S
"Gesamt-Eiweiss (PU)" Protein U
"Gesamt-Eiweiss (SU)" Protein SU
-"Gesamt-Eiweiss (SU)/die" Proteinurie SU
+"Gesamt-Eiweiss (SU)/die" Prot SU
"Gesamt-Eiweiss/Creatinin (PU)" TPCR U 0
GGT GGT S 0
"glomerul. Filtrationsr. (MDRD)" "eGFR (MDRD)" S --- --- X
diff --git a/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml b/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml
index f69b532..e503838 100755
--- a/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml
+++ b/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml
@@ -32,7 +32,7 @@
settings:WindowState.Save="True"
>
-
+
diff --git a/zaaReloaded2/ExceptionHandler/SubmissionFailureView.xaml b/zaaReloaded2/ExceptionHandler/SubmissionFailureView.xaml
index 0f707b4..fbaecfb 100755
--- a/zaaReloaded2/ExceptionHandler/SubmissionFailureView.xaml
+++ b/zaaReloaded2/ExceptionHandler/SubmissionFailureView.xaml
@@ -25,7 +25,7 @@
Title="Fehlerbericht versenden"
>
-
+
-
+
diff --git a/zaaReloaded2/ExceptionHandler/SubmissionSuccessView.xaml b/zaaReloaded2/ExceptionHandler/SubmissionSuccessView.xaml
index 29702d6..c02b4c4 100755
--- a/zaaReloaded2/ExceptionHandler/SubmissionSuccessView.xaml
+++ b/zaaReloaded2/ExceptionHandler/SubmissionSuccessView.xaml
@@ -25,7 +25,7 @@
Title="Fehlerbericht versenden"
>
-
+
- /// Make text boxes select all text on focus.
- ///
- ///
- /// http://stackoverflow.com/a/2553297/270712
- ///
- void RegisterTextBoxSelectAll()
- {
- // Select the text in a TextBox when it receives focus.
- EventManager.RegisterClassHandler(typeof(TextBox), TextBox.PreviewMouseLeftButtonDownEvent,
- new MouseButtonEventHandler(SelectivelyIgnoreMouseButton));
- EventManager.RegisterClassHandler(typeof(TextBox), TextBox.GotKeyboardFocusEvent,
- new RoutedEventHandler(SelectAllText));
- EventManager.RegisterClassHandler(typeof(TextBox), TextBox.MouseDoubleClickEvent,
- new RoutedEventHandler(SelectAllText));
- }
-
- void SelectivelyIgnoreMouseButton(object sender, MouseButtonEventArgs e)
- {
- // Find the TextBox
- DependencyObject parent = e.OriginalSource as UIElement;
- while (parent != null && !(parent is TextBox))
- parent = VisualTreeHelper.GetParent(parent);
-
- if (parent != null)
- {
- var textBox = (TextBox)parent;
- if (!textBox.IsKeyboardFocusWithin)
- {
- // If the text box is not yet focused, give it the focus and
- // stop further processing of this click event.
- textBox.Focus();
- e.Handled = true;
- }
- }
- }
-
- void SelectAllText(object sender, RoutedEventArgs e)
- {
- var textBox = e.OriginalSource as TextBox;
- if (textBox != null)
- textBox.SelectAll();
- }
}
}
diff --git a/zaaReloaded2/VERSION b/zaaReloaded2/VERSION
index 06c850b..c9ed563 100755
--- a/zaaReloaded2/VERSION
+++ b/zaaReloaded2/VERSION
@@ -1,2 +1,2 @@
-2.1.1
-2.1.1.0
+2.1.2
+2.1.2.0
diff --git a/zaaReloaded2/Views/AboutView.xaml b/zaaReloaded2/Views/AboutView.xaml
index 149c863..dab444c 100755
--- a/zaaReloaded2/Views/AboutView.xaml
+++ b/zaaReloaded2/Views/AboutView.xaml
@@ -25,7 +25,7 @@
Title="Über..."
>
-
+
diff --git a/zaaReloaded2/Views/ElementPickerView.xaml b/zaaReloaded2/Views/ElementPickerView.xaml
index 3a42d03..f4670e0 100755
--- a/zaaReloaded2/Views/ElementPickerView.xaml
+++ b/zaaReloaded2/Views/ElementPickerView.xaml
@@ -28,7 +28,7 @@
FocusManager.FocusedElement="{Binding ElementName=treeview}"
>
-
+
diff --git a/zaaReloaded2/Views/ElementView.xaml b/zaaReloaded2/Views/ElementView.xaml
index 71bdd5a..352e3df 100755
--- a/zaaReloaded2/Views/ElementView.xaml
+++ b/zaaReloaded2/Views/ElementView.xaml
@@ -29,7 +29,7 @@
FocusManager.FocusedElement="{Binding ElementName=ContentTextBox}"
>
-
+
diff --git a/zaaReloaded2/Views/FirstRunView.xaml b/zaaReloaded2/Views/FirstRunView.xaml
index ec6e0f2..ead7c8d 100755
--- a/zaaReloaded2/Views/FirstRunView.xaml
+++ b/zaaReloaded2/Views/FirstRunView.xaml
@@ -29,7 +29,7 @@
Title="Willkommen bei zaaReloaded"
>
-
+
diff --git a/zaaReloaded2/Views/IoErrorView.xaml b/zaaReloaded2/Views/IoErrorView.xaml
index b5aa8bf..56b7981 100755
--- a/zaaReloaded2/Views/IoErrorView.xaml
+++ b/zaaReloaded2/Views/IoErrorView.xaml
@@ -28,7 +28,7 @@
Title="Import/Export-Fehler"
>
-
+
-
+
-
+
-
-
-
-
-
+
+
+
diff --git a/zaaReloaded2/Views/PreferencesView.xaml b/zaaReloaded2/Views/PreferencesView.xaml
index 4992843..47bbd86 100755
--- a/zaaReloaded2/Views/PreferencesView.xaml
+++ b/zaaReloaded2/Views/PreferencesView.xaml
@@ -28,7 +28,7 @@
Title="Einstellungen"
>
-
+
-
+
diff --git a/zaaReloaded2/Views/SettingsView.xaml b/zaaReloaded2/Views/SettingsView.xaml
index e62519a..7ddf011 100755
--- a/zaaReloaded2/Views/SettingsView.xaml
+++ b/zaaReloaded2/Views/SettingsView.xaml
@@ -31,7 +31,7 @@
FocusManager.FocusedElement="{Binding ElementName=NameTextBox}"
>
-
+
diff --git a/zaaReloaded2/packages.config b/zaaReloaded2/packages.config
index b4b16d9..5c131d6 100755
--- a/zaaReloaded2/packages.config
+++ b/zaaReloaded2/packages.config
@@ -19,6 +19,6 @@
limitations under the License.
-->
-
+
\ No newline at end of file
diff --git a/zaaReloaded2/zaaReloaded2.csproj b/zaaReloaded2/zaaReloaded2.csproj
index 12ef7b9..1bd5d8d 100755
--- a/zaaReloaded2/zaaReloaded2.csproj
+++ b/zaaReloaded2/zaaReloaded2.csproj
@@ -134,8 +134,9 @@
-->
-
- ..\packages\Bovender.0.2.0.0\lib\net40\Bovender.dll
+
+ ..\packages\Bovender.0.3.1.0\lib\net40\Bovender.dll
+ True