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

Merge branch 'release-2.1.2'

Browse Source
This commit is contained in:
Daniel Kraus 2015-09-11 21:14:45 +02:00
commit f382a8738b
23 changed files with 58 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
HISTORY.md
View File

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

4
Tests/Tests.csproj
View File

@ -41,8 +41,8 @@
<AssemblyOriginatorKeyFile>zaaReloaded2.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Bovender, Version=0.2.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<HintPath>..\packages\Bovender.0.2.0.0\lib\net40\Bovender.dll</HintPath>
<Reference Include="Bovender, Version=0.3.1.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<HintPath>..\packages\Bovender.0.3.1.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">

2
Tests/packages.config
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Bovender" version="0.2.0.0" targetFramework="net40" />
<package id="Bovender" version="0.3.1.0" targetFramework="net40" />
<package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
<package id="NUnit" version="2.6.4" targetFramework="net40" />
</packages>

6
www/versioninfo.txt
View File

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

26
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>1589012381</_a>
<_b>-32256</_b>
<_c>16464</_c>
<_d>150</_d>
<_e>15</_e>
<_f>13</_f>
<_g>38</_g>
<_h>102</_h>
<_i>193</_i>
<_j>167</_j>
<_k>220</_k>
<_a>-1928431729</_a>
<_b>-21948</_b>
<_c>18512</_c>
<_d>140</_d>
<_e>76</_e>
<_f>210</_f>
<_g>176</_g>
<_h>1</_h>
<_i>125</_i>
<_j>44</_j>
<_k>143</_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>
@ -98,11 +98,11 @@
</a4:Items>
<a4:Items id="ref-13" 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-37">Sammelurin: SU-Proteinurie, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Natrium, SU-Zeit, SU-Volumen</Content>
<Content id="ref-37">Sammelurin: SU-Prot, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Na, SU-Zeit, SU-Volumen</Content>
</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-Ery, U-Leu, U-Bakt</Content>
<Content id="ref-38">Spot-Urin: U-TPCR, U-ACR, U-Alb, U-Ery, U-Leu, U-Bakt</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>

2
zaaReloaded2/Defaults/parameters.txt
View File

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

2
zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml
View File

@ -32,7 +32,7 @@
settings:WindowState.Save="True"
>
<Window.Resources>
<ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
</Window.Resources>
<DockPanel Margin="10">
<StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,0,0">

2
zaaReloaded2/ExceptionHandler/SubmissionFailureView.xaml
View File

@ -25,7 +25,7 @@
Title="Fehlerbericht versenden"
>
<Window.Resources>
<ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
</Window.Resources>
<StackPanel Margin="10" Orientation="Horizontal">
<TextBlock FontSize="72" FontWeight="Bold" Foreground="Red" Margin="0,0,10,0"

2
zaaReloaded2/ExceptionHandler/SubmissionProcessView.xaml
View File

@ -29,7 +29,7 @@
SizeToContent="WidthAndHeight"
>
<Window.Resources>
<ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
</Window.Resources>
<i:Interaction.Triggers>
<i:EventTrigger SourceObject="{Binding CompletedMessage}" EventName="Sent">

2
zaaReloaded2/ExceptionHandler/SubmissionSuccessView.xaml
View File

@ -25,7 +25,7 @@
Title="Fehlerbericht versenden"
>
<Window.Resources>
<ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
</Window.Resources>
<StackPanel Margin="10" Orientation="Horizontal">
<TextBlock FontSize="48" FontWeight="Bold" Foreground="GreenYellow" Margin="0,0,10,0"

46
zaaReloaded2/ThisAddIn.cs
View File

@ -45,7 +45,7 @@ namespace zaaReloaded2
private void ThisAddIn_Startup(object sender, System.EventArgs e)
{
Bovender.ExceptionHandler.CentralHandler.ManageExceptionCallback += CentralHandler_ManageExceptionCallback;
RegisterTextBoxSelectAll();
Bovender.WpfHelpers.RegisterTextBoxSelectAll();
CheckForUpdates();
_oldCaption = Globals.ThisAddIn.Application.Caption;
Globals.ThisAddIn.Application.Caption =
@ -155,49 +155,5 @@ namespace zaaReloaded2
}
#endregion
/// <summary>
/// Make text boxes select all text on focus.
/// </summary>
/// <remarks>
/// http://stackoverflow.com/a/2553297/270712
/// </remarks>
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();
}
}
}

4
zaaReloaded2/VERSION
View File

@ -1,2 +1,2 @@
2.1.1
2.1.1.0
2.1.2
2.1.2.0

2
zaaReloaded2/Views/AboutView.xaml
View File

@ -25,7 +25,7 @@
Title="Über..."
>
<Window.Resources>
<ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
</Window.Resources>
<StackPanel Margin="20">
<Image Source="/zaaReloaded2;component/Icons/icon.png" Width="64" VerticalAlignment="Center" Margin="0 0 0 10" />

2
zaaReloaded2/Views/ElementPickerView.xaml
View File

@ -28,7 +28,7 @@
FocusManager.FocusedElement="{Binding ElementName=treeview}"
>
<Window.Resources>
<ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
</Window.Resources>
<DockPanel Margin="10">
<Label DockPanel.Dock="Top" Content="Verfügbare Elemente:" Target="{Binding ElementName=ElementsTreeView}" />

2
zaaReloaded2/Views/ElementView.xaml
View File

@ -29,7 +29,7 @@
FocusManager.FocusedElement="{Binding ElementName=ContentTextBox}"
>
<Window.Resources>
<ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
</Window.Resources>
<DockPanel Margin="10">
<Label DockPanel.Dock="Top" Content="Inhalt:" Target="{Binding ElementName=ContentTextBox}" />

2
zaaReloaded2/Views/FirstRunView.xaml
View File

@ -29,7 +29,7 @@
Title="Willkommen bei zaaReloaded"
>
<Window.Resources>
<ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
</Window.Resources>
<StackPanel Margin="10">
<TextBlock FontWeight="Bold" FontSize="20" Margin="0 0 0 5">

2
zaaReloaded2/Views/IoErrorView.xaml
View File

@ -28,7 +28,7 @@
Title="Import/Export-Fehler"
>
<Window.Resources>
<ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
</Window.Resources>
<DockPanel Margin="10">
<TextBlock DockPanel.Dock="Left" Margin="0 0 20 0" LineHeight="72" LineStackingStrategy="BlockLineHeight"

20
zaaReloaded2/Views/ItemCommentView.xaml
View File

@ -23,28 +23,26 @@
xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
WindowStyle="ToolWindow" Topmost="True"
SizeToContent="WidthAndHeight"
SizeToContent="WidthAndHeight" MaxWidth="500"
b:WindowState.CenterScreen="True" b:WindowState.Save="True"
Title="Kommentar angeben"
FocusManager.FocusedElement="{Binding ElementName=ValueTextBox}"
>
<Window.Resources>
<ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
</Window.Resources>
<DockPanel Margin="10">
<Label DockPanel.Dock="Top" Content="{Binding Item}"
FontSize="16" FontWeight="Bold"
FontSize="16" FontWeight="Bold" Margin="0 0 0 10"
Target="{Binding ElementName=ValueTextBox}" Padding="0" />
<UniformGrid DockPanel.Dock="Bottom" HorizontalAlignment="Right" Columns="2" Rows="1" Margin="0 10 0 0">
<UniformGrid DockPanel.Dock="Bottom" HorizontalAlignment="Right" Columns="2" Rows="1" Margin="0 15 0 0">
<Button Content="OK" Command="{Binding SaveCommand}" IsDefault="True" Margin="0 0 5 0" />
<Button Content="Abbrechen" Command="{Binding CloseViewCommand}" IsCancel="True" Margin="5 0 0 0" />
</UniformGrid>
<DockPanel Margin="0 10 0 10">
<TextBlock DockPanel.Dock="Left" Text="{Binding Prefix}" VerticalAlignment="Center" />
<TextBlock DockPanel.Dock="Right" Text="{Binding Suffix}" VerticalAlignment="Center" />
<TextBox Text="{Binding Value,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
MinWidth="120" MaxWidth="240" VerticalAlignment="Center"
x:Name="ValueTextBox" Margin="5 0 5 0" />
</DockPanel>
<TextBlock DockPanel.Dock="Left" Text="{Binding Prefix}" VerticalAlignment="Center" />
<TextBlock DockPanel.Dock="Right" Text="{Binding Suffix}" VerticalAlignment="Center" />
<TextBox Text="{Binding Value,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
MinWidth="120" MaxWidth="240" VerticalAlignment="Center"
x:Name="ValueTextBox" Margin="5 0 5 0" />
</DockPanel>
</Window>

2
zaaReloaded2/Views/PreferencesView.xaml
View File

@ -28,7 +28,7 @@
Title="Einstellungen"
>
<Window.Resources>
<ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
</Window.Resources>
<DockPanel Margin="10">
<UniformGrid DockPanel.Dock="Bottom" Columns="2" Rows="1"

2
zaaReloaded2/Views/SettingsRepositoryView.xaml
View File

@ -31,7 +31,7 @@
FocusManager.FocusedElement="{Binding ElementName=settingsList}"
>
<Window.Resources>
<ResourceDictionary Source="/zaaReloaded2;component/style.xaml" />
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
</Window.Resources>
<i:Interaction.Triggers>
<i:EventTrigger SourceObject="{Binding EditSettingsMessage}" EventName="Sent">

2
zaaReloaded2/Views/SettingsView.xaml
View File

@ -31,7 +31,7 @@
FocusManager.FocusedElement="{Binding ElementName=NameTextBox}"
>
<Window.Resources>
<ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
</Window.Resources>
<i:Interaction.Triggers>
<i:EventTrigger SourceObject="{Binding AddElementMessage}" EventName="Sent">

2
zaaReloaded2/packages.config
View File

@ -19,6 +19,6 @@
limitations under the License.
-->
<packages>
<package id="Bovender" version="0.2.0.0" targetFramework="net40" />
<package id="Bovender" version="0.3.1.0" targetFramework="net40" />
<package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
</packages>

5
zaaReloaded2/zaaReloaded2.csproj
View File

@ -134,8 +134,9 @@
-->
<ItemGroup>
<Reference Include="Accessibility" />
<Reference Include="Bovender">
<HintPath>..\packages\Bovender.0.2.0.0\lib\net40\Bovender.dll</HintPath>
<Reference Include="Bovender, Version=0.3.1.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<HintPath>..\packages\Bovender.0.3.1.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" />
<Reference Include="PresentationCore" />