From 8b8177fcdc7aec0ef9ae65a80fcb2c2d24ee00ff Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 1 Oct 2021 16:49:37 +0200 Subject: [PATCH] cb --- .gitignore | 2 + BeWo/Core/BeWoUtils.cs | 2 +- BeWo/View/Controls/ListboxSelectControl.xaml | 7 +- .../Controls/ListboxSelectControl.xaml.cs | 6 + BeWoAllReports.sln | 32 +- Host/ReportView.aspx.cs | 12 +- Report/AbstractReportCreator.cs | 3 +- Report/DefaultReportCreator.cs | 13 + ReportImp/BellaDonna/BellaDonna.csproj | 10 + ReportImp/BellaDonna/CustomReportCreator.cs | 2 +- ReportImp/BellaDonna/Finanzauswertung.cs | 104 +++ .../BellaDonna/Finanzauswertung.designer.cs | 801 ++++++++++++++++++ ReportImp/BellaDonna/Finanzauswertung.resx | 123 +++ .../Invoicing/DefaultInvoiceCreation.cs | 27 +- ReportImp/BellaDonna/ServiceInvoiceReport.cs | 84 +- .../CustomGroupDurationCalculator.cs | 22 + .../DiakonischesWerkPassau.csproj | 1 + .../Quittierungsbeleg.cs | 1 + .../QuittierungsbelegMitDatum.Designer.cs | 171 ++-- .../QuittierungsbelegMitDatum.cs | 4 +- .../ServiceInvoiceReport.Designer.cs | 480 +++-------- .../ServiceInvoiceReport.resx | 4 +- .../Quittierungsbeleg.Designer.cs | 39 +- .../Quittierungsbeleg.resx | 755 +++++------------ .../logo_mit_schrift.png | Bin 0 -> 12732 bytes .../CustomerDataReport.Designer.cs | 18 +- Service/Plugins/PluginLoader.cs | 4 +- 27 files changed, 1670 insertions(+), 1057 deletions(-) create mode 100644 ReportImp/BellaDonna/Finanzauswertung.cs create mode 100644 ReportImp/BellaDonna/Finanzauswertung.designer.cs create mode 100644 ReportImp/BellaDonna/Finanzauswertung.resx create mode 100644 ReportImp/DiakonischesWerkPassau/Calculations/CustomGroupDurationCalculator.cs create mode 100644 ReportImp/SozialwerkAachenerChristen/logo_mit_schrift.png diff --git a/.gitignore b/.gitignore index bbed8f5b7..8b7e110fe 100644 --- a/.gitignore +++ b/.gitignore @@ -550,3 +550,5 @@ /ReportImp/DiakonischesWerkRegensburg/obj/Debug /ReportImp/DiakonischesWerkRegensburg/obj/Release /ReportImp/CarlSonnenscheinHaus/obj/Debug +/ReportImp/CarlSonnenscheinHaus/obj/Release +/ReportImp/SozialwerkAachenerChristen/obj/Release diff --git a/BeWo/Core/BeWoUtils.cs b/BeWo/Core/BeWoUtils.cs index a17af0c9b..583cbe2da 100644 --- a/BeWo/Core/BeWoUtils.cs +++ b/BeWo/Core/BeWoUtils.cs @@ -129,7 +129,7 @@ namespace BeWo.Core WindowStartupLocation = WindowStartupLocation.CenterOwner, GroupBoxContent = control, Owner = BeWoApp.CurrentBeWo.MainWindow, - rootGroupBox = { Header = "Layout speichern" } + rootGroupBox = { Header = "Bericht auswählen" } }; control.CancelButtonClicked += () => beWoWindow.Close(); diff --git a/BeWo/View/Controls/ListboxSelectControl.xaml b/BeWo/View/Controls/ListboxSelectControl.xaml index 2290b72c1..6420a7a0d 100644 --- a/BeWo/View/Controls/ListboxSelectControl.xaml +++ b/BeWo/View/Controls/ListboxSelectControl.xaml @@ -18,8 +18,9 @@ - -