From c92c9396b5b69c24a0effd5995cd37c2c6b7f0a9 Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 9 Dec 2019 11:38:52 +0100 Subject: [PATCH] cb --- .gitignore | 10 + .../SBDUtils/SBDUtils.cs | 6 +- .../SchulbegleitenderDienstCustomerView.xaml | 4 +- .../VertretungsSearchView.xaml.cs | 8 +- BeWo/View/NotizenView.xaml | 6 +- BeWo/View/NotizenView.xaml.cs | 8 +- BeWo/View/StundenplanView.xaml | 2 +- BeWo/ViewModel/CustomerVM.cs | 8 +- BeWo/ViewModel/NotizenEintragVM.cs | 6 +- BeWoPlanerMobil/Views/Shared/_Layout.cshtml | 54 +- ...argeldkasse Anfangsbestand hinzugefügt.txt | 2 +- .../DefaultReports/FLSListReport.Designer.cs | 930 +++++++++--------- .../AdditionalServiceBookingRO.cs | 228 ++++- .../ReportObjects/SbdStundenaufstellungRO.cs | 8 +- Report/ReportObjects/ServicesOverviewRO.cs | 2 +- Service/Plugins/PluginLoader.cs | 10 +- 16 files changed, 766 insertions(+), 526 deletions(-) diff --git a/.gitignore b/.gitignore index 43c12139e..d3cb3a65a 100644 --- a/.gitignore +++ b/.gitignore @@ -405,3 +405,13 @@ /ReportImp/ProBalance/bin/Debug /ReportImp/ProBalance/obj/Debug /ReportImp/ProBalance/obj/Release +/ReportImp/BeWoNordeifel/obj/Debug +/ReportImp/BeWoNordeifel/obj/Release +/ReportImp/HshCologne/obj/Debug +/ReportImp/HshCologne/obj/Release +/ReportImp/IWohl/obj/Debug +/ReportImp/IWohl/obj/Release +/ReportImp/KuhringBetreuung/obj/Debug +/ReportImp/KuhringBetreuung/obj/Release +/ReportImp/LebenshilfeFrankfurtOder/obj/Debug +/ReportImp/LebenshilfeFrankfurtOder/obj/Release diff --git a/BeWo/SchulbegleitenderDienst/SBDUtils/SBDUtils.cs b/BeWo/SchulbegleitenderDienst/SBDUtils/SBDUtils.cs index 5b0b5197f..f85e9e84e 100644 --- a/BeWo/SchulbegleitenderDienst/SBDUtils/SBDUtils.cs +++ b/BeWo/SchulbegleitenderDienst/SBDUtils/SBDUtils.cs @@ -21,11 +21,11 @@ namespace BeWo.SchulbegleitenderDienst.SBDUtils if (viewModel.Customer != null) { - var substitutionNeededDate = DateTime.Now.AddDays(-1 * viewModel.Customer.SubstitutionStartingDayCount); - if (viewModel.Absencetime?.Start.HasValue ?? false) { - substitutionStartingDayCountCondition = viewModel.Customer.SubstitutionNeed != SubstitutionNeed.NoSubstitutionWanted && substitutionNeededDate < viewModel.Absencetime.Start && viewModel.Customer.SubstitutionStartingDayCount > 0; + var substitutionNeededStartDate = viewModel.Absencetime?.Start.Value.AddDays(viewModel.Customer.SubstitutionStartingDayCount - 1); + + substitutionStartingDayCountCondition = viewModel.Customer.SubstitutionNeed != SubstitutionNeed.NoSubstitutionWanted && viewModel.Datum < substitutionNeededStartDate; } } diff --git a/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstCustomerView.xaml b/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstCustomerView.xaml index 6a10261a8..76abc61b4 100644 --- a/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstCustomerView.xaml +++ b/BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstCustomerView.xaml @@ -61,14 +61,14 @@ -