Merge branch 'feature_rene_13_dakota' of ssh://float.ownsoft.de/git/beyondSoft/BeWo
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
<ErrorReportUrlHistory />
|
||||
<FallbackCulture>de-DE</FallbackCulture>
|
||||
<VerifyUploadedFiles>false</VerifyUploadedFiles>
|
||||
<ProjectView>ShowAllFiles</ProjectView>
|
||||
<ProjectView>ProjectFiles</ProjectView>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<EnableSecurityDebugging>false</EnableSecurityDebugging>
|
||||
|
||||
@@ -259,7 +259,7 @@
|
||||
<dxg:GridColumn
|
||||
Width="Auto"
|
||||
AllowEditing="False"
|
||||
FieldName="ErstelltAm"
|
||||
FieldName="ErstelltAmDate"
|
||||
Header="Erstelldatum"
|
||||
ReadOnly="True">
|
||||
<dxg:GridColumn.EditSettings>
|
||||
@@ -305,8 +305,8 @@
|
||||
x:Name="UrbelegeColumn"
|
||||
Width="Auto"
|
||||
FieldName="UrbelegeGesendet"
|
||||
IsEnabledBinding="{Binding IsUrbelegeEditEnabled}"
|
||||
Header="Urbelege gesendet">
|
||||
Header="Urbelege gesendet"
|
||||
IsEnabledBinding="{Binding IsUrbelegeEditEnabled}">
|
||||
<dxg:GridColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<dxe:CheckEdit Name="PART_Editor" />
|
||||
@@ -317,8 +317,8 @@
|
||||
x:Name="PaidColumn"
|
||||
Width="Auto"
|
||||
FieldName="Bezahlt"
|
||||
IsEnabledBinding="{Binding IsBezahltEditEnabled}"
|
||||
Header="Bezahlt">
|
||||
Header="Bezahlt"
|
||||
IsEnabledBinding="{Binding IsBezahltEditEnabled}">
|
||||
<dxg:GridColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<dxe:CheckEdit Name="PART_Editor" />
|
||||
|
||||
@@ -78,8 +78,6 @@ namespace BeWo.View.Detail.Accounting
|
||||
datagrid_gkvAbrechnungen.Visibility = Visibility.Visible;
|
||||
|
||||
UpdateDataGridFilter();
|
||||
|
||||
gridView.BestFitColumn(ColumnButtons);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -112,6 +110,9 @@ namespace BeWo.View.Detail.Accounting
|
||||
CriteriaOperator.FromLambda<GkvAbrechnungDC>(gkv => gkv.AbrechnungsZeitraumStart <= filter_start && filter_ende <= gkv.AbrechnungsZeitraumEnde));
|
||||
}
|
||||
}
|
||||
|
||||
gridView.BestFitColumns();
|
||||
gridView.BestFitColumn(ColumnButtons);
|
||||
}
|
||||
|
||||
private void NewGkvAbrechnungPopUpViewCancelButtonClicked(object sender, EventArgs e)
|
||||
@@ -252,10 +253,14 @@ namespace BeWo.View.Detail.Accounting
|
||||
private void NewButton_OnClick(object sender, RoutedEventArgs e)
|
||||
{
|
||||
GkvAbrechnungDC gkvAbrechnungDC = new GkvAbrechnungDC();
|
||||
int year = DateTime.Now.Year;
|
||||
int month = DateTime.Now.Month - 1;
|
||||
gkvAbrechnungDC.AbrechnungsZeitraumStart = new DateTime(year, month, 1);
|
||||
gkvAbrechnungDC.AbrechnungsZeitraumEnde = new DateTime(year, month, DateTime.DaysInMonth(year, month));
|
||||
|
||||
var start = DateTime.Today.AddMonths(-1);
|
||||
var first = new DateTime(start.Year, start.Month, 1);
|
||||
var last = first.AddMonths(1).AddDays(-1);
|
||||
|
||||
gkvAbrechnungDC.AbrechnungsZeitraumStart = first;
|
||||
gkvAbrechnungDC.AbrechnungsZeitraumEnde = last;
|
||||
|
||||
GkvAbrechnungVM gkvAbrechnungVM = new GkvAbrechnungVM(gkvAbrechnungDC);
|
||||
_NewGkvAbrechnungPopUpView.Clear();
|
||||
_NewGkvAbrechnungPopUpView.ViewModel = gkvAbrechnungVM;
|
||||
|
||||
@@ -1,119 +1,310 @@
|
||||
<localView:BeWoView x:Class="BeWo.View.Navigation.MainNavigationView"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
|
||||
xmlns:local="clr-namespace:BeWo.Core"
|
||||
xmlns:localView="clr-namespace:BeWo.View"
|
||||
xmlns:localNavView="clr-namespace:BeWo.View.Navigation"
|
||||
Focusable="True" Loaded="OnLoaded">
|
||||
<localView:BeWoView.CommandBindings>
|
||||
<CommandBinding Command="local:BeWoCommands.Excel" Executed="ExcelCommand_Executed" CanExecute="ExcelCommand_CanExecute" />
|
||||
<CommandBinding Command="ApplicationCommands.Open" Executed="OpenCommand_Executed" CanExecute="OpenCommand_CanExecute" />
|
||||
</localView:BeWoView.CommandBindings>
|
||||
<uc:ShadowChrome>
|
||||
<GroupBox x:Name="mainGroup" Style="{StaticResource MainContentGroupBoxStyle}" Header="MainGroup">
|
||||
<GroupBox x:Name="contentGroup" Style="{StaticResource CustomerNavigationStyle}">
|
||||
<GroupBox.Header>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Label Content="Suche" Foreground="#FFFFFFFF" FontSize="14" Margin="0,-5,0,0" />
|
||||
<TextBox Height="20" x:Name="textbox_search" MinWidth="90" Margin="3,-5,0,0" Width="300" TabIndex="0" Template="{DynamicResource SearchTextBoxTemplate}" BorderThickness="0,0,0,0" />
|
||||
<Button x:Name="ReloadButton" Click="ReloadButton_OnClick" Margin="5,-3,0,0" ToolTip="Liste aktualisieren" Width="36" Height="24">
|
||||
<localView:BeWoView
|
||||
x:Class="BeWo.View.Navigation.MainNavigationView"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:local="clr-namespace:BeWo.Core"
|
||||
xmlns:localNavView="clr-namespace:BeWo.View.Navigation"
|
||||
xmlns:localView="clr-namespace:BeWo.View"
|
||||
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
|
||||
Focusable="True"
|
||||
Loaded="OnLoaded">
|
||||
<localView:BeWoView.CommandBindings>
|
||||
<CommandBinding
|
||||
CanExecute="ExcelCommand_CanExecute"
|
||||
Command="local:BeWoCommands.Excel"
|
||||
Executed="ExcelCommand_Executed" />
|
||||
<CommandBinding
|
||||
CanExecute="OpenCommand_CanExecute"
|
||||
Command="ApplicationCommands.Open"
|
||||
Executed="OpenCommand_Executed" />
|
||||
</localView:BeWoView.CommandBindings>
|
||||
<uc:ShadowChrome>
|
||||
<GroupBox
|
||||
x:Name="mainGroup"
|
||||
Header="MainGroup"
|
||||
Style="{StaticResource MainContentGroupBoxStyle}">
|
||||
<GroupBox x:Name="contentGroup" Style="{StaticResource CustomerNavigationStyle}">
|
||||
<GroupBox.Header>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Label
|
||||
Margin="0,-5,0,0"
|
||||
Content="Suche"
|
||||
FontSize="14"
|
||||
Foreground="#FFFFFFFF" />
|
||||
<TextBox
|
||||
x:Name="textbox_search"
|
||||
Width="300"
|
||||
Height="20"
|
||||
MinWidth="90"
|
||||
Margin="3,-5,0,0"
|
||||
BorderThickness="0,0,0,0"
|
||||
TabIndex="0"
|
||||
Template="{DynamicResource SearchTextBoxTemplate}" />
|
||||
<Button
|
||||
x:Name="ReloadButton"
|
||||
Width="36"
|
||||
Height="24"
|
||||
Margin="5,-3,0,0"
|
||||
Click="ReloadButton_OnClick"
|
||||
ToolTip="Liste aktualisieren">
|
||||
<Button.Template>
|
||||
<ControlTemplate TargetType="{x:Type Button}">
|
||||
<Grid>
|
||||
<Image x:Name="imgDisabled" Source="..\..\Ressources\Icons\SymbolRefresh32Disabled.png" />
|
||||
<Image x:Name="imgEnabled" Source="..\..\Ressources\Icons\SymbolRefresh32.png" Opacity="0"/>
|
||||
<Image
|
||||
x:Name="imgEnabled"
|
||||
Opacity="0"
|
||||
Source="..\..\Ressources\Icons\SymbolRefresh32.png" />
|
||||
</Grid>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsMouseOver" Value="true">
|
||||
<Setter Property="Opacity" TargetName="imgEnabled" Value="1"/>
|
||||
<Setter TargetName="imgEnabled" Property="Opacity" Value="1" />
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
</Button.Template>
|
||||
</Button>
|
||||
</StackPanel>
|
||||
</GroupBox.Header>
|
||||
<Grid x:Name="mainContentGrid" Margin="0,3,0,0">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="*" />
|
||||
<RowDefinition Height="Auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="250" />
|
||||
|
||||
</Grid.ColumnDefinitions>
|
||||
<StackPanel Orientation="Vertical" Margin="10,0,0,0">
|
||||
<TextBlock x:Name="searchCountLabel" HorizontalAlignment="Left" Text="{Binding Path=Items.Count, Converter={StaticResource StringFormatConverter}, ConverterParameter=Suchergebnisse: \{0\}, ElementName=objectListBox}" FontFamily="Microsoft Sans Serif" FontSize="14" />
|
||||
<StackPanel Orientation="Horizontal" x:Name="sortPanel">
|
||||
<TextBlock x:Name="sortLabel" HorizontalAlignment="Left" Text="Sortiert nach" FontFamily="Microsoft Sans Serif" FontSize="12" Margin="0,2,0,0" />
|
||||
<ComboBox x:Name="sortCombo" HorizontalAlignment="Left" FontFamily="Microsoft Sans Serif" FontSize="12" Margin="10,0,0,0" MinWidth="100" DisplayMemberPath="DisplayName" SelectionChanged="sortCombo_SelectionChanged" Style="{DynamicResource SortComboBox}" />
|
||||
<ToggleButton Style="{DynamicResource SortDirectionToggleButtonStyle}" x:Name="sortDirectionToggleButton" Click="sortDirectionToggleButton_Click" />
|
||||
<CheckBox FontFamily="Microsoft Sans Serif" FontSize="12" Margin="10,0,0,0" Content=" Archivierte Objekte anzeigen" VerticalAlignment="Center" x:Name="chkShowArchived" Foreground="{DynamicResource MainGroupBoxForegroundBrush}" />
|
||||
<CheckBox FontFamily="Microsoft Sans Serif" FontSize="12" Margin="10,0,0,0" Content=" Gelöschte Objekte anzeigen" VerticalAlignment="Center" x:Name="chkShowDeleted" Foreground="{DynamicResource MainGroupBoxForegroundBrush}" />
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
<ListBox x:Name="objectListBox" IsSynchronizedWithCurrentItem="True" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" MinWidth="200" MinHeight="200" Margin="10,10,0,20" TabIndex="1" AlternationCount="-1" Style="{StaticResource NavigationListStyle}" Background="{x:Null}" MouseDoubleClick="objectListBox_MouseDoubleClick" SelectionChanged="objectListBox_SelectionChanged">
|
||||
<ListBox.ItemsSource>
|
||||
<MultiBinding x:Name="ListBoxMultiBinding" Converter="{StaticResource FilterDCConverter}">
|
||||
<Binding />
|
||||
<Binding ElementName="textbox_search" Path="Text" />
|
||||
<Binding ElementName="chkShowArchived" Path="IsChecked" />
|
||||
<Binding Path="CustomFilter">
|
||||
<Binding.RelativeSource>
|
||||
<RelativeSource Mode="FindAncestor" AncestorType="{x:Type localNavView:MainNavigationView}" />
|
||||
</Binding.RelativeSource>
|
||||
</Binding>
|
||||
<Binding ElementName="chkShowDeleted" Path="IsChecked" />
|
||||
</MultiBinding>
|
||||
</ListBox.ItemsSource>
|
||||
</ListBox>
|
||||
<Grid Grid.Row="0" Grid.RowSpan="2" Grid.Column="3" Margin="20,0,5,0">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
<StackPanel>
|
||||
<TextBlock HorizontalAlignment="Left" Text=" Zuletzt angesehen" FontFamily="Microsoft Sans Serif" FontSize="14" />
|
||||
<Path Data="M 0,0 H 250" Stroke="#FFFB6F0E" StrokeThickness="2" Fill="{DynamicResource LightOrangeBrush}" Margin="0,3,0,0" />
|
||||
<ListBox x:Name="objectHistoryListBox" IsSynchronizedWithCurrentItem="True" MinWidth="200" Margin="0,5,0,20" TabIndex="1" AlternationCount="-1" Style="{StaticResource NavigationListStyle}" Background="{x:Null}" MouseDoubleClick="objectHistoryListBox_MouseDoubleClick" SelectionChanged="objectListBox_SelectionChanged" />
|
||||
</StackPanel>
|
||||
<StackPanel x:Name="stackPanle_details" Visibility="Hidden" Grid.Row="1" Margin="0 10 0 0">
|
||||
<TextBlock HorizontalAlignment="Left" Text="Details
|
||||
" FontFamily="Microsoft Sans Serif" FontSize="14" />
|
||||
<Path Data="M 0,0 H 250" Stroke="#FFFB6F0E" StrokeThickness="2" Fill="{DynamicResource LightOrangeBrush}" Margin="0,3,0,0" />
|
||||
<ContentPresenter x:Name="details_presenter" />
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
<Border Grid.Row="2" Grid.ColumnSpan="3" Grid.Column="0" Height="40" Margin="0,10,0,0" VerticalAlignment="Stretch" Background="#FF000000">
|
||||
<Border.OpacityMask>
|
||||
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
|
||||
<GradientStop Color="#19000000" Offset="0" />
|
||||
<GradientStop Color="#33FFFFFF" Offset="1" />
|
||||
</LinearGradientBrush>
|
||||
</Border.OpacityMask>
|
||||
</Border>
|
||||
<StackPanel Grid.ColumnSpan="3" Grid.Column="0" Grid.Row="2" Orientation="Horizontal" VerticalAlignment="Stretch" Height="40" Margin="5,10,0,0">
|
||||
<Button x:Name="btnNew" Content="Neu" Style="{StaticResource NavigationToolbarButtonStyle}" Margin="3,0,0,0" Click="btnNew_Click" />
|
||||
<Button x:Name="btnImport" Visibility="Collapsed" Content="Importieren" Style="{StaticResource NavigationToolbarButtonStyle}" Margin="3,0,0,0" Click="btnImport_Click" />
|
||||
<Button x:Name="btnCopy" Visibility="Collapsed" Content="Kopieren" Style="{StaticResource NavigationToolbarButtonStyle}" Margin="10,0,0,0" Click="btnCopy_Click" />
|
||||
<Button x:Name="btnEdit" Content="Öffnen" Style="{StaticResource NavigationToolbarButtonStyle}" Margin="10,0,0,0" Click="btnEdit_Click" />
|
||||
<Button x:Name="btnArchive" Content="Archivieren" Style="{StaticResource NavigationToolbarButtonStyle}" Margin="10,0,0,0" Click="btnArchive_Click" />
|
||||
<Button x:Name="btnDelete" Content="Löschen" Style="{StaticResource NavigationToolbarButtonStyle}" Margin="10,0,0,0" Click="btnDelete_Click" />
|
||||
<Button x:Name="btnOpenAi" Visibility="Collapsed" Content="KI" Style="{StaticResource NavigationToolbarButtonStyle}" Margin="10,0,0,0" Click="btnOpenAi_Click" />
|
||||
<TextBlock x:Name="textblock_link" VerticalAlignment="Center" Margin="20 0 0 0" FontSize="16">
|
||||
<Hyperlink x:Name="linkExcelExport" TargetName="newWindow" Foreground="White" RequestNavigate="linkExcelExport_RequestNavigate">Excel Export</Hyperlink>
|
||||
</TextBlock>
|
||||
<TextBlock x:Name="textblock_print" VerticalAlignment="Center" Margin="20 0 0 0" FontSize="16">
|
||||
<Hyperlink x:Name="linkPrint" TargetName="newWindow" Foreground="White" RequestNavigate="linkPrint_RequestNavigate" NavigateUri="http://www.ownsoft.de">Liste drucken</Hyperlink>
|
||||
</StackPanel>
|
||||
</GroupBox.Header>
|
||||
<Grid x:Name="mainContentGrid" Margin="0,3,0,0">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="*" />
|
||||
<RowDefinition Height="Auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="250" />
|
||||
|
||||
</Grid.ColumnDefinitions>
|
||||
<StackPanel Margin="10,0,0,0" Orientation="Vertical">
|
||||
<TextBlock
|
||||
x:Name="searchCountLabel"
|
||||
HorizontalAlignment="Left"
|
||||
FontFamily="Microsoft Sans Serif"
|
||||
FontSize="14"
|
||||
Text="{Binding Path=Items.Count, Converter={StaticResource StringFormatConverter}, ConverterParameter=Suchergebnisse: \{0\}, ElementName=objectListBox}" />
|
||||
<StackPanel x:Name="sortPanel" Orientation="Horizontal">
|
||||
<TextBlock
|
||||
x:Name="sortLabel"
|
||||
Margin="0,2,0,0"
|
||||
HorizontalAlignment="Left"
|
||||
FontFamily="Microsoft Sans Serif"
|
||||
FontSize="12"
|
||||
Text="Sortiert nach" />
|
||||
<ComboBox
|
||||
x:Name="sortCombo"
|
||||
MinWidth="100"
|
||||
Margin="10,0,0,0"
|
||||
HorizontalAlignment="Left"
|
||||
DisplayMemberPath="DisplayName"
|
||||
FontFamily="Microsoft Sans Serif"
|
||||
FontSize="12"
|
||||
SelectionChanged="sortCombo_SelectionChanged"
|
||||
Style="{DynamicResource SortComboBox}" />
|
||||
<ToggleButton
|
||||
x:Name="sortDirectionToggleButton"
|
||||
Click="sortDirectionToggleButton_Click"
|
||||
Style="{DynamicResource SortDirectionToggleButtonStyle}" />
|
||||
<CheckBox
|
||||
x:Name="chkShowArchived"
|
||||
Margin="10,0,0,0"
|
||||
VerticalAlignment="Center"
|
||||
Content=" Archivierte Objekte anzeigen"
|
||||
FontFamily="Microsoft Sans Serif"
|
||||
FontSize="12"
|
||||
Foreground="{DynamicResource MainGroupBoxForegroundBrush}" />
|
||||
<CheckBox
|
||||
x:Name="chkShowDeleted"
|
||||
Margin="10,0,0,0"
|
||||
VerticalAlignment="Center"
|
||||
Content=" Gelöschte Objekte anzeigen"
|
||||
FontFamily="Microsoft Sans Serif"
|
||||
FontSize="12"
|
||||
Foreground="{DynamicResource MainGroupBoxForegroundBrush}" />
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
<ListBox
|
||||
x:Name="objectListBox"
|
||||
Grid.Row="1"
|
||||
Grid.Column="0"
|
||||
Grid.ColumnSpan="2"
|
||||
MinWidth="200"
|
||||
MinHeight="200"
|
||||
Margin="10,10,0,20"
|
||||
AlternationCount="-1"
|
||||
Background="{x:Null}"
|
||||
IsSynchronizedWithCurrentItem="True"
|
||||
MouseDoubleClick="objectListBox_MouseDoubleClick"
|
||||
SelectionChanged="objectListBox_SelectionChanged"
|
||||
Style="{StaticResource NavigationListStyle}"
|
||||
TabIndex="1">
|
||||
<ListBox.ItemsSource>
|
||||
<MultiBinding x:Name="ListBoxMultiBinding" Converter="{StaticResource FilterDCConverter}">
|
||||
<Binding />
|
||||
<Binding ElementName="textbox_search" Path="Text" />
|
||||
<Binding ElementName="chkShowArchived" Path="IsChecked" />
|
||||
<Binding Path="CustomFilter">
|
||||
<Binding.RelativeSource>
|
||||
<RelativeSource AncestorType="{x:Type localNavView:MainNavigationView}" Mode="FindAncestor" />
|
||||
</Binding.RelativeSource>
|
||||
</Binding>
|
||||
<Binding ElementName="chkShowDeleted" Path="IsChecked" />
|
||||
</MultiBinding>
|
||||
</ListBox.ItemsSource>
|
||||
</ListBox>
|
||||
<Grid
|
||||
Grid.Row="0"
|
||||
Grid.RowSpan="2"
|
||||
Grid.Column="3"
|
||||
Margin="20,0,5,0">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
<StackPanel>
|
||||
<TextBlock
|
||||
HorizontalAlignment="Left"
|
||||
FontFamily="Microsoft Sans Serif"
|
||||
FontSize="14"
|
||||
Text=" Zuletzt angesehen" />
|
||||
<Path
|
||||
Margin="0,3,0,0"
|
||||
Data="M 0,0 H 250"
|
||||
Fill="{DynamicResource LightOrangeBrush}"
|
||||
Stroke="#FFFB6F0E"
|
||||
StrokeThickness="2" />
|
||||
<ListBox
|
||||
x:Name="objectHistoryListBox"
|
||||
MinWidth="200"
|
||||
Margin="0,5,0,20"
|
||||
AlternationCount="-1"
|
||||
Background="{x:Null}"
|
||||
IsSynchronizedWithCurrentItem="True"
|
||||
MouseDoubleClick="objectHistoryListBox_MouseDoubleClick"
|
||||
SelectionChanged="objectListBox_SelectionChanged"
|
||||
Style="{StaticResource NavigationListStyle}"
|
||||
TabIndex="1" />
|
||||
</StackPanel>
|
||||
<StackPanel
|
||||
x:Name="stackPanle_details"
|
||||
Grid.Row="1"
|
||||
Margin="0,10,0,0"
|
||||
Visibility="Hidden">
|
||||
<TextBlock
|
||||
HorizontalAlignment="Left"
|
||||
FontFamily="Microsoft Sans Serif"
|
||||
FontSize="14"
|
||||
Text="Details " />
|
||||
<Path
|
||||
Margin="0,3,0,0"
|
||||
Data="M 0,0 H 250"
|
||||
Fill="{DynamicResource LightOrangeBrush}"
|
||||
Stroke="#FFFB6F0E"
|
||||
StrokeThickness="2" />
|
||||
<ContentPresenter x:Name="details_presenter" />
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
<Border
|
||||
Grid.Row="2"
|
||||
Grid.Column="0"
|
||||
Grid.ColumnSpan="3"
|
||||
Height="40"
|
||||
Margin="0,10,0,0"
|
||||
VerticalAlignment="Stretch"
|
||||
Background="#FF000000">
|
||||
<Border.OpacityMask>
|
||||
<LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
|
||||
<GradientStop Offset="0" Color="#19000000" />
|
||||
<GradientStop Offset="1" Color="#33FFFFFF" />
|
||||
</LinearGradientBrush>
|
||||
</Border.OpacityMask>
|
||||
</Border>
|
||||
<StackPanel
|
||||
Grid.Row="2"
|
||||
Grid.Column="0"
|
||||
Grid.ColumnSpan="3"
|
||||
Height="40"
|
||||
Margin="5,10,0,0"
|
||||
VerticalAlignment="Stretch"
|
||||
Orientation="Horizontal">
|
||||
<Button
|
||||
x:Name="btnNew"
|
||||
Margin="3,0,0,0"
|
||||
Click="btnNew_Click"
|
||||
Content="Neu"
|
||||
Style="{StaticResource NavigationToolbarButtonStyle}" />
|
||||
<Button
|
||||
x:Name="btnImport"
|
||||
Margin="3,0,0,0"
|
||||
Click="btnImport_Click"
|
||||
Content="Importieren"
|
||||
Style="{StaticResource NavigationToolbarButtonStyle}"
|
||||
Visibility="Collapsed" />
|
||||
<Button
|
||||
x:Name="btnCopy"
|
||||
Margin="10,0,0,0"
|
||||
Click="btnCopy_Click"
|
||||
Content="Kopieren"
|
||||
Style="{StaticResource NavigationToolbarButtonStyle}"
|
||||
Visibility="Collapsed" />
|
||||
<Button
|
||||
x:Name="btnEdit"
|
||||
Margin="10,0,0,0"
|
||||
Click="btnEdit_Click"
|
||||
Content="Öffnen"
|
||||
Style="{StaticResource NavigationToolbarButtonStyle}" />
|
||||
<Button
|
||||
x:Name="btnArchive"
|
||||
Margin="10,0,0,0"
|
||||
Click="btnArchive_Click"
|
||||
Content="Archivieren"
|
||||
Style="{StaticResource NavigationToolbarButtonStyle}" />
|
||||
<Button
|
||||
x:Name="btnDelete"
|
||||
Margin="10,0,0,0"
|
||||
Click="btnDelete_Click"
|
||||
Content="Löschen"
|
||||
Style="{StaticResource NavigationToolbarButtonStyle}" />
|
||||
<Button
|
||||
x:Name="btnOpenAi"
|
||||
Margin="10,0,0,0"
|
||||
Click="btnOpenAi_Click"
|
||||
Content="KI"
|
||||
Style="{StaticResource NavigationToolbarButtonStyle}"
|
||||
Visibility="Collapsed" />
|
||||
<TextBlock
|
||||
x:Name="textblock_link"
|
||||
Margin="20,0,0,0"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16">
|
||||
<Hyperlink
|
||||
x:Name="linkExcelExport"
|
||||
Foreground="White"
|
||||
RequestNavigate="linkExcelExport_RequestNavigate"
|
||||
TargetName="newWindow">
|
||||
Excel Export
|
||||
</Hyperlink>
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
x:Name="textblock_print"
|
||||
Margin="20,0,0,0"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16">
|
||||
<Hyperlink
|
||||
x:Name="linkPrint"
|
||||
Foreground="White"
|
||||
NavigateUri="http://www.ownsoft.de"
|
||||
RequestNavigate="linkPrint_RequestNavigate"
|
||||
TargetName="newWindow">
|
||||
Liste drucken
|
||||
</Hyperlink>
|
||||
</TextBlock>
|
||||
<!-- ###CB SERIENBRIEF<Button x:Name="MailMergeButton" Content="Serienbrief drucken" Style="{StaticResource NavigationToolbarButtonStyle}" Margin="10,0,0,0" Click="btnMailMerge_Click" /> -->
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
</GroupBox>
|
||||
</uc:ShadowChrome>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
</GroupBox>
|
||||
</uc:ShadowChrome>
|
||||
</localView:BeWoView>
|
||||
@@ -97,14 +97,16 @@ namespace BeWo.ViewModel
|
||||
|
||||
set
|
||||
{
|
||||
if (this.AreDifferent(this._ErstelltAm, value))
|
||||
if (AreDifferent(_ErstelltAm, value))
|
||||
{
|
||||
this._ErstelltAm = value;
|
||||
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.ErstelltAm, value), nameof(ErstelltAm));
|
||||
this.FirePropertyChanged(nameof(ErstelltAm));
|
||||
_ErstelltAm = value;
|
||||
StoreDirtyInformation(AreDifferent(DataContract.ErstelltAm, value), nameof(ErstelltAm));
|
||||
FirePropertyChanged(nameof(ErstelltAm));
|
||||
FirePropertyChanged(nameof(ErstelltAmDate));
|
||||
}
|
||||
}
|
||||
}
|
||||
public DateTime ErstelltAmDate => ErstelltAm.Date;
|
||||
public long? GkvAbrechnungOid
|
||||
{
|
||||
get { return this._GkvAbrechnungOid; }
|
||||
@@ -310,7 +312,7 @@ namespace BeWo.ViewModel
|
||||
get
|
||||
{
|
||||
if (LastTransferProtokoll is GkvTransferProtokollDC last)
|
||||
return last.ErstelltAm;
|
||||
return last.ErstelltAm?.Date;
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -21,6 +21,9 @@ namespace BeWo.Service.DCEntityMapper
|
||||
pDataContract.ActivationType = pEntity.IsActive;
|
||||
pDataContract.DebitorNumber = pEntity.DebitorNumber;
|
||||
pDataContract.BusinessPartnerId = pEntity.BusinessPartnerId;
|
||||
pDataContract.IKDatenannahmestelle = pEntity.IKDatenannahmestelle;
|
||||
pDataContract.IKKostentrager = pEntity.IKKostentrager;
|
||||
pDataContract.IKKrankenkasse = pEntity.IKKrankenkasse;
|
||||
|
||||
if (pEntity.CostBearer != null)
|
||||
{
|
||||
|
||||
@@ -97,7 +97,7 @@ namespace BS.Shared.DataContracts.Compact
|
||||
|
||||
public string DetailDescription => Name;
|
||||
|
||||
public string FilterRelevants => Name + " " + Function + " " + AddressSummaryInfo;
|
||||
public string FilterRelevants => $"{Name} {Function} {AddressSummaryInfo} {IKKrankenkasse} {IKKostentrager} {IKDatenannahmestelle}";
|
||||
|
||||
public string IconPath => @"..\..\Ressources\Icons\OfficeBulidingBlackDisabled.png";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user