diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 2be9f4505..2204004c0 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -962,12 +962,14 @@ BSLogoControl.xaml + + @@ -984,6 +986,7 @@ + diff --git a/BeWo/BeWo.csproj.user b/BeWo/BeWo.csproj.user index 060d57d23..3eff8c8d2 100644 --- a/BeWo/BeWo.csproj.user +++ b/BeWo/BeWo.csproj.user @@ -9,7 +9,7 @@ de-DE false - ShowAllFiles + ProjectFiles false diff --git a/BeWo/BeWoApp.xaml b/BeWo/BeWoApp.xaml index 238b75a16..8ae49c75d 100644 --- a/BeWo/BeWoApp.xaml +++ b/BeWo/BeWoApp.xaml @@ -88,7 +88,13 @@ + + + + + + diff --git a/BeWo/View/BeWoWindowBuilder.cs b/BeWo/View/BeWoWindowBuilder.cs index 4ded5d01a..9e593b68c 100644 --- a/BeWo/View/BeWoWindowBuilder.cs +++ b/BeWo/View/BeWoWindowBuilder.cs @@ -36,11 +36,11 @@ namespace BeWo.View return beWoWindow; } - public static BeWoWindow GetGkvAbrechnungDetailWindow(GkvAbrechnungVM vM, double height = 600, double width = 1200) + public static BeWoWindow GetGkvAbrechnungDetailWindow(GkvAbrechnungVM vM, double height = 800, double width = 600) { var detail = new GkvAbrechnungDetailControl(vM); - var beWoWindow = GetGenericBeWoWindow("GKV-Abrechnung Nr. " + vM.GkvAbrechnungOid + ": Details", 100, height, 1000, 100, width, 1600); + var beWoWindow = GetGenericBeWoWindow("GKV-Abrechnung Nr. " + vM.GkvAbrechnungOid + ": Details", 100, height, 1000, 400, width, 1600); beWoWindow.GroupBoxContent = detail; return beWoWindow; diff --git a/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml b/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml index ac2e66522..0cafc0443 100644 --- a/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml +++ b/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml @@ -1,143 +1,452 @@ - + - + - + - + - - - + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + - - + + - - - - - - - + + + + + + - + - + - - + + - + - + - - - - - - - - - - - - + + + + + + + + + + + + - + - - - - - - + + + + + + - + - - + + - + diff --git a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml.cs b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml.cs index ee893de17..6ef06881f 100644 --- a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml.cs +++ b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml.cs @@ -90,7 +90,7 @@ namespace BeWo.View.Controls.Wohnhilfe } else { - IsLarge = false; + //IsLarge = false; } } } diff --git a/BeWo/View/Controls/YearMonthFilter.xaml b/BeWo/View/Controls/YearMonthFilter.xaml index 8bd21459e..06d9c2196 100644 --- a/BeWo/View/Controls/YearMonthFilter.xaml +++ b/BeWo/View/Controls/YearMonthFilter.xaml @@ -1,19 +1,49 @@ - - - - - - - - + + + + + + + + - - + + - - - - - - + + + + + + \ No newline at end of file diff --git a/BeWo/View/Controls/YearMonthFilter.xaml.cs b/BeWo/View/Controls/YearMonthFilter.xaml.cs index e6a53cf2c..8b054451a 100644 --- a/BeWo/View/Controls/YearMonthFilter.xaml.cs +++ b/BeWo/View/Controls/YearMonthFilter.xaml.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; +using System.Windows; using System.Windows.Controls; using BS.Shared.Core; @@ -14,7 +15,16 @@ namespace BeWo.View /// public partial class YearMonthFilter : UserControl { - public YearMonthFilter() + public bool FilterMonth + { + get { return (bool)GetValue(FilterMonthProperty); } + set { SetValue(FilterMonthProperty, value); } + } + + public static readonly DependencyProperty FilterMonthProperty = + DependencyProperty.Register("FilterMonth", typeof(bool), typeof(YearMonthFilter), new PropertyMetadata(true)); + + public YearMonthFilter() { this.InitializeComponent(); this.InitDateCombos(); @@ -55,7 +65,7 @@ namespace BeWo.View private void FireFilterSpanChanged() { - if (this.FilterSpanChanged != null) + if (this.FilterSpanChanged != null && IsLoaded) { this.FilterSpanChanged(this, new EventArgs(this.FilterSpan)); } diff --git a/BeWo/View/CostRatePeriodControl.xaml b/BeWo/View/CostRatePeriodControl.xaml index 0af2808e4..eddfc5910 100644 --- a/BeWo/View/CostRatePeriodControl.xaml +++ b/BeWo/View/CostRatePeriodControl.xaml @@ -1,28 +1,52 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml index 5193e2929..39b3164a2 100644 --- a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml +++ b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml @@ -1,102 +1,298 @@ - + - - + + - - - + + + - - - - + + - + + + - - - - + + + + - - - + + + - - Groß + Groß --> + + diff --git a/BeWo/View/Detail/OrganisationView.xaml b/BeWo/View/Detail/OrganisationView.xaml index b6ea9cd47..d933cc4b4 100644 --- a/BeWo/View/Detail/OrganisationView.xaml +++ b/BeWo/View/Detail/OrganisationView.xaml @@ -1,59 +1,130 @@ - + - - - - - - - - + @@ -77,10 +77,10 @@ - + VirtualizingStackPanel.IsVirtualizing="False" > - - + + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - - + + - - + + @@ -89,34 +108,66 @@ - + - + - + - - + + - @@ -242,46 +381,106 @@ --> - + - + -