diff --git a/BeWo/Core/BeWoUtils.cs b/BeWo/Core/BeWoUtils.cs index a20ed2db1..7e53f1ffc 100644 --- a/BeWo/Core/BeWoUtils.cs +++ b/BeWo/Core/BeWoUtils.cs @@ -1646,6 +1646,9 @@ namespace BeWo.Core public static void OpenMailClient(string mailAddress, string subject = "", string body = "") { + //mailAddress = "cb@ownsoft.de"; + //subject = "Betreff"; + var mailCmd = string.Format(@"mailto:{0}?subject={1}&body={2}", mailAddress, subject, body); System.Diagnostics.Process.Start(mailCmd); diff --git a/BeWo/View/Detail/Report/ServicesReportView.xaml b/BeWo/View/Detail/Report/ServicesReportView.xaml index c58d0cd9b..758ac6d8c 100644 --- a/BeWo/View/Detail/Report/ServicesReportView.xaml +++ b/BeWo/View/Detail/Report/ServicesReportView.xaml @@ -46,6 +46,7 @@ + @@ -103,21 +104,25 @@ + + - - - - diff --git a/BeWo/View/Detail/Report/ServicesReportView.xaml.cs b/BeWo/View/Detail/Report/ServicesReportView.xaml.cs index efb639618..34be5fde2 100644 --- a/BeWo/View/Detail/Report/ServicesReportView.xaml.cs +++ b/BeWo/View/Detail/Report/ServicesReportView.xaml.cs @@ -70,6 +70,7 @@ namespace BeWo.View.Detail.Report InitDateCombos(); InitServiceCategoryCombo(); InitFilterCombos(); + InitSortCombos(); RefreshStatusGrid(); //CreateTestdaten(); //if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ViewAll) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View)) @@ -292,6 +293,22 @@ namespace BeWo.View.Detail.Report } + private void InitSortCombos() + { + var list = new List(); + + list.Add(new QBSortOrderItem(QBSortOrderEnum.NachKlient)); + list.Add(new QBSortOrderItem(QBSortOrderEnum.NachHauptbetreuung)); + list.Add(new QBSortOrderItem(QBSortOrderEnum.NachTeam)); + + + SortComboBox.DisplayMemberPath = "Name"; + SortComboBox.ItemsSource = list; + SortComboBox.SelectedIndex = 1; + + + } + private void FilterComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e) { popupedit_customer.Visibility = Visibility.Collapsed; @@ -1226,6 +1243,35 @@ namespace BeWo.View.Detail.Report } } + public class QBSortOrderItem + { + public QBSortOrderItem(QBSortOrderEnum e) + { + SortOrderEnum = e; + } + + public QBSortOrderEnum SortOrderEnum { get; set; } + + public String Name + { + get + { + switch (SortOrderEnum) + { + case QBSortOrderEnum.NachKlient: + return Translator.Translate("Nach Klienten"); + case QBSortOrderEnum.NachHauptbetreuung: + return Translator.Translate("Nach Hauptbetreuung"); + case QBSortOrderEnum.NachTeam: + return Translator.Translate("Nach Teams"); + + } + + return ""; + } + } + } + //public class QuittierungsCheckView //{ // public string Klient { get; set; } diff --git a/BeWo/View/Detail/Report/ServicesReportViewAlt.xaml b/BeWo/View/Detail/Report/ServicesReportViewAlt.xaml index 417291760..d92279e70 100644 --- a/BeWo/View/Detail/Report/ServicesReportViewAlt.xaml +++ b/BeWo/View/Detail/Report/ServicesReportViewAlt.xaml @@ -44,6 +44,7 @@ + @@ -95,21 +96,24 @@ - - +