Nutzdatendatei + Auftragsdatei im GkvAbrDetail-Prokotolle wieder drinne

+ xaml formats
This commit is contained in:
2024-11-15 15:52:23 +01:00
parent 2fee29597a
commit a583e35285
4 changed files with 101 additions and 18 deletions

View File

@@ -1,15 +1,22 @@
<Window x:Class="BeWo.View.BeWoWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Title="BeWoPlaner" MinHeight="300" MinWidth="300"
WindowStyle="None"
WindowStartupLocation="CenterOwner"
AllowsTransparency="True"
Background="Transparent"
ResizeMode="CanResizeWithGrip" Closing="Window_Closing" Closed="Window_Closed">
<Window
x:Class="BeWo.View.BeWoWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Title="BeWoPlaner"
MinWidth="300"
MinHeight="300"
AllowsTransparency="True"
Background="Transparent"
Closed="Window_Closed"
Closing="Window_Closing"
ResizeMode="CanResizeWithGrip"
WindowStartupLocation="CenterOwner"
WindowStyle="None">
<Grid>
<GroupBox x:Name="rootGroupBox" Style="{DynamicResource MainContentGroupBoxWithoutMaximizeBtnStyle}" MouseLeftButtonDown="RootGroupBox_OnMouseLeftButtonDown" MouseDoubleClick="RootGroupBox_OnMouseDoubleClick">
</GroupBox>
<GroupBox
x:Name="rootGroupBox"
MouseDoubleClick="RootGroupBox_OnMouseDoubleClick"
MouseLeftButtonDown="RootGroupBox_OnMouseLeftButtonDown"
Style="{DynamicResource MainContentGroupBoxWithoutMaximizeBtnStyle}" />
</Grid>
</Window>

View File

@@ -12,7 +12,7 @@ namespace BeWo.View
{
public static class BeWoWindowBuilder
{
public static BeWoWindow GetTextViewer(string title, string text, bool fixed_size = false, double height = 600, double width = 400)
public static BeWoWindow GetTextViewer(string title, string text, bool fixed_size = false, double height = 600, double width = 600)
{
if (fixed_size)
return GetTextViewer(title, text, height, height, height, width, width, width);
@@ -36,11 +36,12 @@ namespace BeWo.View
return beWoWindow;
}
public static BeWoWindow GetGkvAbrechnungDetailWindow(GkvAbrechnungVM vM, double height = 800, double width = 600)
public static BeWoWindow GetGkvAbrechnungDetailWindow(GkvAbrechnungVM vM, double height = 800, double width = 900)
{
var detail = new GkvAbrechnungDetailControl(vM);
var beWoWindow = GetGenericBeWoWindow("GKV-Abrechnung Nr. " + vM.GkvAbrechnungOid + ": Details", 100, height, 1000, 400, width, 1600);
var detail = new GkvAbrechnungDetailControl(vM, beWoWindow);
beWoWindow.GroupBoxContent = detail;
return beWoWindow;

View File

@@ -352,6 +352,11 @@
FieldName="IKKostentrager"
Header="Kostentrager"
ReadOnly="True" />
<dxg:GridColumn
AllowEditing="False"
FieldName="IKDatenannahmestelle"
Header="Datenannahmestelle"
ReadOnly="True" />
<dxg:GridColumn
AllowEditing="False"
FieldName="Rechnungsnummer"
@@ -412,6 +417,48 @@
FieldName="SentDakotaSuccess"
Header="Sent Dakota"
IsEnabledBinding="{Binding Source=false}" />
<dxg:GridColumn
x:Name="ColumnButtons2"
Width="Auto"
AllowEditing="False"
Header=" ">
<dxg:GridColumn.DisplayTemplate>
<ControlTemplate>
<ControlTemplate.Resources />
<StackPanel Margin="1" Orientation="Horizontal">
<StackPanel.Resources />
<Button
x:Name="btn_auftragsdatei"
Width="17"
Height="15"
Margin="1"
Padding="0"
VerticalAlignment="Center"
Click="btn_auftragsdatei_Click"
Content="¥"
FontFamily="Webdings"
FontSize="9"
Foreground="#BBBBBB"
ToolTip="Auftragsdatei anzeigen" />
<!--<Button Click="btn_nutz_Click" Content="¥" Padding="0" Margin="1" ToolTip="Nutzdatendatei" Foreground="#BBBBBB" FontSize="10" FontFamily="Webdings" x:Name="btn_nutz" Height="17" Width="20" VerticalAlignment="Center" />
<Button Click="btn_auf_Click" Content="¥" Padding="0" Margin="1" ToolTip="Auftragsdatei" Foreground="#BBBBBB" FontSize="10" FontFamily="Webdings" x:Name="btn_auf" Height="17" Width="20" VerticalAlignment="Center" />-->
<Button
x:Name="btn_nutzdatendatei"
Width="17"
Height="15"
Margin="1"
Padding="0"
VerticalAlignment="Center"
Click="btn_nutzdatendatei_Click"
Content="¥"
FontFamily="Webdings"
FontSize="9"
Foreground="#BBBBBB"
ToolTip="Nutzdatendatei anzeigen" />
</StackPanel>
</ControlTemplate>
</dxg:GridColumn.DisplayTemplate>
</dxg:GridColumn>
<dxg:GridColumn
Width="100"
AllowEditing="False"

View File

@@ -1,6 +1,8 @@
using BeWo.Core;
using BeWo.ViewModel;
using BeWo.ViewModel.ListViewModel;
using BS.Shared.DataContracts.GkvAbrechnung;
using BS.Shared.Extensions;
using DevExpress.Xpf.Grid;
using System;
using System.Collections.Generic;
@@ -24,14 +26,18 @@ namespace BeWo.View.Controls
/// </summary>
public partial class GkvAbrechnungDetailControl : UserControl
{
public GkvAbrechnungVM GkvAbrechnungVM { get; set; }
public GkvAbrechnungVM GkvAbrechnungVM { get; set; }
public GkvAbrechnungDetailControl(GkvAbrechnungVM vm)
public Window Window { get; private set; }
public GkvAbrechnungDetailControl(GkvAbrechnungVM vm, Window window)
{
InitializeComponent();
GkvAbrechnungVM = vm;
DataContext = vm;
Window = window;
}
private void Hyperlink_OnRequestNavigate(object sender, RequestNavigateEventArgs e)
@@ -50,5 +56,27 @@ namespace BeWo.View.Controls
}
}
}
private void btn_auftragsdatei_Click(object sender, RoutedEventArgs e)
{
var vm = datagrid_transfer.GetCurrentValue<GkvTransferProtokollDC>();
var window = BeWoWindowBuilder.GetTextViewer("Auftragsdatei", vm.Auftragsdatei);
window.Owner = Window;
window.ShowDialog();
}
private void btn_nutzdatendatei_Click(object sender, RoutedEventArgs e)
{
var vm = datagrid_transfer.GetCurrentValue<GkvTransferProtokollDC>();
var window = BeWoWindowBuilder.GetTextViewer("Nutzdatendatei", vm.Nutzdatendatei);
window.Owner = Window;
window.ShowDialog();
}
}
}