diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 95fdb68b4..4f09b4632 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -43,12 +43,12 @@ de-DE BeWoPlaner ownSoft GmbH - 2.0.1.226 + 2.0.1.228 true publish.htm false true - 227 + 229 2.0.1.%2a false true diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index b04310a29..1e917648f 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -49,8 +49,8 @@ namespace BeWo public static LoginControl LoginControl; public static MainControl MainControl; - public static string ShortVersion = "3.15"; - public static string Version = "Version 3.15"; + public static string ShortVersion = "3.16"; + public static string Version = "Version 3.16"; public static int RenderTier = 0; @@ -457,6 +457,11 @@ namespace BeWo { AppSettings.ShowKlientenBetreuungszeiten = true; } + val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.FilterGroupServiceCategories); + if (val != null && val.Equals("0")) + { + AppSettings.FilterGroupServiceCategories = false; + } val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowInfoButtonInCalender); if (val != null && val.Equals("1")) { diff --git a/BeWo/Core/Config/AppSettings.cs b/BeWo/Core/Config/AppSettings.cs index aeb8c55a6..384fd8106 100644 --- a/BeWo/Core/Config/AppSettings.cs +++ b/BeWo/Core/Config/AppSettings.cs @@ -26,7 +26,8 @@ namespace BeWo.Core.Config private bool _showExpiredSupportConcepts = true; private bool _showServiceRecordGridControl; - + private bool _filterGroupServiceCategories = true; + private WindowStateType mWindowStateType = WindowStateType.Default; private ServiceRecordTimeInterval mLastSelectedServiceRecordTimeInterval = ServiceRecordTimeInterval.All; @@ -462,5 +463,12 @@ namespace BeWo.Core.Config } public bool ShowKlientenBetreuungszeiten { get; set; } + + public bool FilterGroupServiceCategories + { + get { return _filterGroupServiceCategories; } + + set { _filterGroupServiceCategories = value; } + } } } \ No newline at end of file diff --git a/BeWo/SchulbegleitenderDienst/VertretungsMainViewV2.xaml.cs b/BeWo/SchulbegleitenderDienst/VertretungsMainViewV2.xaml.cs index 366770819..bab3689a0 100644 --- a/BeWo/SchulbegleitenderDienst/VertretungsMainViewV2.xaml.cs +++ b/BeWo/SchulbegleitenderDienst/VertretungsMainViewV2.xaml.cs @@ -294,15 +294,15 @@ namespace BeWo.SchulbegleitenderDienst ClearAllMitarbeiterValues(); - if (ScrollViewerTagesansicht.Visibility == Visibility.Visible) - { - LadeTagesansicht(Datepicker.DateTime.Date); - } - else if (ScrollViewerWochenansicht.Visibility == Visibility.Visible) - { - var x = Datepicker.DateTime.FirstDateOfWeek(Datepicker.DateTime.GetIso8601WeekOfYear()); - LadeWochenansicht(x, x.AddDays(5)); - } + //if (ScrollViewerTagesansicht.Visibility == Visibility.Visible) + //{ + // LadeTagesansicht(Datepicker.DateTime.Date); + //} + //else if (ScrollViewerWochenansicht.Visibility == Visibility.Visible) + //{ + // var x = Datepicker.DateTime.FirstDateOfWeek(Datepicker.DateTime.GetIso8601WeekOfYear()); + // LadeWochenansicht(x, x.AddDays(5)); + //} } } @@ -500,15 +500,15 @@ namespace BeWo.SchulbegleitenderDienst ClearAllKlientValues(); - if(ScrollViewerTagesansicht.Visibility == Visibility.Visible) - { - LadeTagesansicht(Datepicker.DateTime.Date); - } - else if(ScrollViewerWochenansicht.Visibility == Visibility.Visible) - { - var x = Datepicker.DateTime.FirstDateOfWeek(Datepicker.DateTime.GetIso8601WeekOfYear()); - LadeWochenansicht(x, x.AddDays(5)); - } + //if(ScrollViewerTagesansicht.Visibility == Visibility.Visible) + //{ + // LadeTagesansicht(Datepicker.DateTime.Date); + //} + //else if(ScrollViewerWochenansicht.Visibility == Visibility.Visible) + //{ + // var x = Datepicker.DateTime.FirstDateOfWeek(Datepicker.DateTime.GetIso8601WeekOfYear()); + // LadeWochenansicht(x, x.AddDays(5)); + //} } } @@ -1038,11 +1038,11 @@ namespace BeWo.SchulbegleitenderDienst private void CreateModalViewWindow(object obj) { - if (obj is CompactEmployeeDC employee) + if (obj is CompactEmployeeDC employee && employee.EmployeeOid > 0) { VMFactory.CreateEmployeeVMAsync(employee.EmployeeOid, cb => this.Dispatch(() => BeWoUtils.OpenModalViewWindow(cb, this, () => this.Dispatch(ReloadAfterEdit)))); } - else if (obj is CompactCustomerDC customer) + else if (obj is CompactCustomerDC customer && customer.CustomerOid > 0) { VMFactory.CreateCustomerVMAsync(customer.CustomerOid, cb => this.Dispatch(() => BeWoUtils.OpenModalViewWindow(cb, this, () => this.Dispatch(ReloadAfterEdit)))); } diff --git a/BeWo/SchulbegleitenderDienst/VertretungsSearchView.xaml.cs b/BeWo/SchulbegleitenderDienst/VertretungsSearchView.xaml.cs index 0fa487564..cbdfccd2e 100644 --- a/BeWo/SchulbegleitenderDienst/VertretungsSearchView.xaml.cs +++ b/BeWo/SchulbegleitenderDienst/VertretungsSearchView.xaml.cs @@ -217,7 +217,7 @@ namespace BeWo.SchulbegleitenderDienst var c2o = _Tagesansicht.Schools[0]; var schule = c2o.Organisation; - lblSchoolName.Content = String.Format("{0}\n{1}\n{2} {3}", schule.Name, schule.Street, schule.PostalCode, schule.Town); + lblSchoolName.Content = String.Format("{0}\n{1}\n{2} {3} {4}", schule.Name, schule.Street, schule.PostalCode, schule.Town, c2o.Customer2OrganisationNotice); // _Tagesansicht.Schule.Street, _Tagesansicht.Schule.PostalCode, _Tagesansicht.Schule.Town); } diff --git a/BeWo/View/Controls/MultiSupportConceptSelectionControl.xaml.cs b/BeWo/View/Controls/MultiSupportConceptSelectionControl.xaml.cs index d6b13e9e7..7cb7c01f1 100644 --- a/BeWo/View/Controls/MultiSupportConceptSelectionControl.xaml.cs +++ b/BeWo/View/Controls/MultiSupportConceptSelectionControl.xaml.cs @@ -62,6 +62,8 @@ namespace BeWo.View.Controls public event EventHandler> ItemSelected; + public event EventHandler>> ListChanged; + public CompactSupportConceptDC SelectedItem { get @@ -94,6 +96,8 @@ namespace BeWo.View.Controls this.SelectedSupportConcepts.Add(e.Data); this.listBoxSupportConcepts.ScrollIntoView(e.Data); + + FireListChangedEvent(); } } @@ -116,6 +120,7 @@ namespace BeWo.View.Controls this.SelectedSupportConcepts.Add(sc); } } + FireListChangedEvent(); } })); @@ -166,6 +171,15 @@ namespace BeWo.View.Controls if (dc != null) { this.SelectedSupportConcepts.Remove(dc); + FireListChangedEvent(); + } + } + + private void FireListChangedEvent() + { + if (ListChanged != null) + { + ListChanged(this, new EventArgs>(SelectedSupportConcepts)); } } diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordGroupEditView.xaml b/BeWo/View/Detail/Zeiterfassung/ServiceRecordGroupEditView.xaml index e7536b596..f78464cf4 100644 --- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordGroupEditView.xaml +++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordGroupEditView.xaml @@ -84,6 +84,11 @@ +