From dbbade49925dd995eceb3b8abdb36a89007bab92 Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 19 Feb 2024 14:15:43 +0100 Subject: [PATCH] =?UTF-8?q?Sortierung=20der=20Quittierungsbelege,=20Tagesf?= =?UTF-8?q?ahrt=20bei=20HPH=20Bersenbr=C3=BCck.=20Div.=20Bugfixes=20Vertre?= =?UTF-8?q?tungsmanagement=20SHK=20Service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BeWo/Core/BeWoUtils.cs | 3 + .../Detail/Report/ServicesReportView.xaml | 13 +- .../Detail/Report/ServicesReportView.xaml.cs | 46 + .../Detail/Report/ServicesReportViewAlt.xaml | 16 +- .../Report/ServicesReportViewAlt.xaml.cs | 45 +- Data/Access/SearchDAO.cs | 7 +- Host/ReportView.aspx.cs | 2 +- Report/DefaultReportCreator.cs | 1 - Report/Report.csproj | 1 + .../MitarbeiterstundenkontoBerechnung.cs | 23 +- Report/ReportObjects/ServicesOverviewRO.cs | 21 +- .../Mitarbeiterstundenkonto.cs | 2 +- ReportImp/AkggMid/CustomReportCreator.cs | 4 - .../HphServiceRecordStatisticFactory.cs | 8 +- .../Abrechnung/CustomInvoiceCreation.cs | 5 + .../AbrechnungsbogenReisen.cs | 4 + .../ServicesOverviewReport.cs | 24 +- ReportImp/Kette2/QueryListReport.cs | 7 +- ...CustomMitarbeiterstundenkontoBerechnung.cs | 46 +- .../SHKServiceSBD/CustomReportCreator.cs | 53 + .../Mitarbeiterarbeitszeitkonto.designer.cs | 61 +- .../Quittierungsbeleg.Designer.cs | 966 ++++++++++++ ReportImp/SHKServiceSBD/Quittierungsbeleg.cs | 88 ++ .../SHKServiceSBD/Quittierungsbeleg.resx | 1318 +++++++++++++++++ ReportImp/SHKServiceSBD/SHKServiceSBD.csproj | 11 + .../Service/CustomVertretungsManager.cs | 18 +- ...CustomMitarbeiterstundenkontoBerechnung.cs | 11 + .../SpitalstiftungKonstanz.csproj | 3 + .../ReportServiceImp.cs | 2 +- Service/Plugins/PluginLoader.cs | 8 +- Service/SBD/VertretungsManager.cs | 69 +- Shared/BeWoEntityEnums.cs | 7 + 32 files changed, 2783 insertions(+), 110 deletions(-) create mode 100644 ReportImp/SHKServiceSBD/CustomReportCreator.cs create mode 100644 ReportImp/SHKServiceSBD/Quittierungsbeleg.Designer.cs create mode 100644 ReportImp/SHKServiceSBD/Quittierungsbeleg.cs create mode 100644 ReportImp/SHKServiceSBD/Quittierungsbeleg.resx 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 @@ - - +