From 1136be5b0e7c8afb7bdc4e5cbef640b29b1c37f6 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 5 Aug 2022 13:42:20 +0200 Subject: [PATCH 1/3] cb --- BeWo/Core/Service/GoalService.cs | 4 +- BeWo/View/Detail/SupportConceptView.xaml.cs | 31 +- BeWoAllReports.sln | 81 ++ BeWoPlanerMobil/BeWoPlanerMobil.csproj.user | 2 +- BeWoPlanerMobil/Controllers/ChatController.cs | 29 + ReportImp/AbwMuenster/AbwMuenster.csproj | 3 - ReportImp/AlzeyTeilhabe/AlzeyTeilhabe.csproj | 9 + .../AlzeyTeilhabe/CustomReportCreator.cs | 4 +- .../StundenzettelBi2.Designer.cs | 890 ++++++++++++++++++ ReportImp/AlzeyTeilhabe/StundenzettelBi2.cs | 227 +++++ ReportImp/AlzeyTeilhabe/StundenzettelBi2.resx | 123 +++ .../AutismusKoelnBonn.csproj | 1 - .../BellaDonna/AnzahlUrlaubstage.Designer.cs | 328 +++++++ ReportImp/BellaDonna/AnzahlUrlaubstage.cs | 83 ++ ReportImp/BellaDonna/AnzahlUrlaubstage.resx | 123 +++ ReportImp/BellaDonna/BellaDonna.csproj | 20 + .../BellaDonna/Mitarbeiterstundenkonto.cs | 27 + .../Mitarbeiterstundenkonto.designer.cs | 745 +++++++++++++++ .../BellaDonna/Mitarbeiterstundenkonto.resx | 123 +++ ...koneKKKleveSoziotherapieInvoiceCreation.cs | 92 +- .../LeistungsnachweisSoziotherapie.cs | 20 + ...LeistungsnachweisSoziotherapie.designer.cs | 144 ++- .../LeistungsnachweisSoziotherapie.resx | 8 +- .../Reporting/DkkkReportCreator.cs | 2 +- .../ServicesOverviewReport.Designer.cs | 44 +- .../ServicesOverviewReport.cs | 2 +- .../ServicesOverviewReport.resx | 2 +- .../Calculation/CustomCalculations.cs | 17 +- .../AuswertungSelbstzahler.cs | 10 +- ReportImp/IBPReports/IBPReportCreator.cs | 20 +- .../ServiceInvoiceReport.cs | 4 +- .../Invoicing/HortInvoiceCreation.cs | 6 +- .../PerspektivenEV/PerspektivenEV.csproj | 1 - .../Invoicing/IFSInvoiceCreation.cs | 16 +- .../SeWo/MitarbeiterstundenkontoBerechnung.cs | 5 +- ReportImp/SeWo/Zeitzuschlagsbeleg.Designer.cs | 66 +- ReportImp/SeWo/Zeitzuschlagsbeleg.cs | 7 + .../DownloadServiceImp.cs | 2 +- 38 files changed, 3135 insertions(+), 186 deletions(-) create mode 100644 ReportImp/AlzeyTeilhabe/StundenzettelBi2.Designer.cs create mode 100644 ReportImp/AlzeyTeilhabe/StundenzettelBi2.cs create mode 100644 ReportImp/AlzeyTeilhabe/StundenzettelBi2.resx create mode 100644 ReportImp/BellaDonna/AnzahlUrlaubstage.Designer.cs create mode 100644 ReportImp/BellaDonna/AnzahlUrlaubstage.cs create mode 100644 ReportImp/BellaDonna/AnzahlUrlaubstage.resx create mode 100644 ReportImp/BellaDonna/Mitarbeiterstundenkonto.cs create mode 100644 ReportImp/BellaDonna/Mitarbeiterstundenkonto.designer.cs create mode 100644 ReportImp/BellaDonna/Mitarbeiterstundenkonto.resx diff --git a/BeWo/Core/Service/GoalService.cs b/BeWo/Core/Service/GoalService.cs index 533f43abd..a2925b21c 100644 --- a/BeWo/Core/Service/GoalService.cs +++ b/BeWo/Core/Service/GoalService.cs @@ -41,8 +41,8 @@ namespace BeWo.Core.Service } } - var sortedCategories = allCategories.OrderBy(s => s.TypeDescription).ToList(); - var sortedGoals = pAllGoals.OrderBy(s => s.TypeDescription).ToList(); + var sortedCategories = allCategories.OrderBy(s => s.DisplayName).ToList(); + var sortedGoals = pAllGoals.OrderBy(s => s.DisplayName).ToList(); var allCatList = new List(); var allGoalList = new List(); diff --git a/BeWo/View/Detail/SupportConceptView.xaml.cs b/BeWo/View/Detail/SupportConceptView.xaml.cs index 83b6bf93d..6d671ddda 100644 --- a/BeWo/View/Detail/SupportConceptView.xaml.cs +++ b/BeWo/View/Detail/SupportConceptView.xaml.cs @@ -747,6 +747,8 @@ namespace BeWo.View.Detail cbRelVM.CostBearerContactPerson = e.Data; } + private long newPersonOid = 0; + private void popupedit_costBearerContactPersonSearch_NewClick(object sender, RoutedEventArgs e) { if (ViewModel.IsNew) @@ -756,28 +758,41 @@ namespace BeWo.View.Detail } else { + newPersonOid = 0L; + VMFactory.CreatePersonVMAsync( cb => this.Dispatch( () => BeWoUtils.OpenModalViewWindow(cb, this, () => this.Dispatch( delegate { - var newPerson = new CompactPersonDC(); - var newPersonOid = 0L; + if (newPersonOid > 0) + { + var newPerson = new CompactPersonDC(); - ServiceFacade.DoCustomerServiceSync(s => newPersonOid = s.InsertNewPerson(cb.CommitToDataContract())); - ServiceFacade.DoCustomerServiceSync(s => newPerson = s.LoadPersonCompact(newPersonOid)); + //ServiceFacade.DoCustomerServiceSync(s => newPersonOid = s.InsertNewPerson(cb.CommitToDataContract())); - ((SupportConceptCostBearerRelVM)tabcontrol_costbearers.SelectedItem).CostBearerContactPerson = null; - ((SupportConceptCostBearerRelVM)tabcontrol_costbearers.SelectedItem).CostBearerContactPerson = newPerson; + ServiceFacade.DoCustomerServiceSync(s => newPerson = s.LoadPersonCompact(newPersonOid)); - personsearchview.ObjectList.Add(newPerson); + ((SupportConceptCostBearerRelVM)tabcontrol_costbearers.SelectedItem).CostBearerContactPerson = null; + ((SupportConceptCostBearerRelVM)tabcontrol_costbearers.SelectedItem).CostBearerContactPerson = newPerson; + + personsearchview.ObjectList.Add(newPerson); + } } - ), personSavedOrUpdated: (s, args) => this.Dispatch(delegate { })))); + ), personSavedOrUpdated: personModalPopUp_PersonSavedOrUpdated ))); } } + private void personModalPopUp_PersonSavedOrUpdated(object sender, EventArgs e) + { + if (e.Data != null && e.Data.DataContract.PersonOid.HasValue) + { + newPersonOid = e.Data.DataContract.PersonOid.Value; + } + } + private void popupedit_costBearerContactPersonSearch_PopUpClick(object sender, RoutedEventArgs e) { personsearchview.ItemSelected += personsearchview_CostBearerContactPersonSelected; diff --git a/BeWoAllReports.sln b/BeWoAllReports.sln index a6f62d94d..45890d3ed 100644 --- a/BeWoAllReports.sln +++ b/BeWoAllReports.sln @@ -724,6 +724,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HilfeDaheimHandInHand", "Re EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ToprakGmbH", "ReportImp\ToprakGmbH\ToprakGmbH.csproj", "{12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SozialbueroSchuesslerWilckens", "ReportImp\SozialbueroSchuesslerWilckens\SozialbueroSchuesslerWilckens.csproj", "{03812AB8-2F26-474D-B3CE-E3FC92E7B5B5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ahaEV", "ReportImp\ahaEV\ahaEV.csproj", "{DC0BE99C-95A5-40E1-8700-50A74D075E28}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KontaktVereinFuerPsychosozialeHilfenEV", "ReportImp\KontaktVereinFuerPsychosozialeHilfenEV\KontaktVereinFuerPsychosozialeHilfenEV.csproj", "{B487DD3C-63D3-42A4-90E0-793C799A85A1}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -8795,6 +8801,78 @@ Global {12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}.Release|Mixed Platforms.Build.0 = Release|Any CPU {12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}.Release|x86.ActiveCfg = Release|Any CPU {12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}.Release|x86.Build.0 = Release|Any CPU + {03812AB8-2F26-474D-B3CE-E3FC92E7B5B5}.Debug|.NET.ActiveCfg = Debug|Any CPU + {03812AB8-2F26-474D-B3CE-E3FC92E7B5B5}.Debug|.NET.Build.0 = Debug|Any CPU + {03812AB8-2F26-474D-B3CE-E3FC92E7B5B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {03812AB8-2F26-474D-B3CE-E3FC92E7B5B5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {03812AB8-2F26-474D-B3CE-E3FC92E7B5B5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {03812AB8-2F26-474D-B3CE-E3FC92E7B5B5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {03812AB8-2F26-474D-B3CE-E3FC92E7B5B5}.Debug|x86.ActiveCfg = Debug|Any CPU + {03812AB8-2F26-474D-B3CE-E3FC92E7B5B5}.Debug|x86.Build.0 = Debug|Any CPU + {03812AB8-2F26-474D-B3CE-E3FC92E7B5B5}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU + {03812AB8-2F26-474D-B3CE-E3FC92E7B5B5}.DebugRemote|.NET.Build.0 = Debug|Any CPU + {03812AB8-2F26-474D-B3CE-E3FC92E7B5B5}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU + {03812AB8-2F26-474D-B3CE-E3FC92E7B5B5}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU + {03812AB8-2F26-474D-B3CE-E3FC92E7B5B5}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU + {03812AB8-2F26-474D-B3CE-E3FC92E7B5B5}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU + {03812AB8-2F26-474D-B3CE-E3FC92E7B5B5}.DebugRemote|x86.ActiveCfg = Debug|Any CPU + {03812AB8-2F26-474D-B3CE-E3FC92E7B5B5}.DebugRemote|x86.Build.0 = Debug|Any CPU + {03812AB8-2F26-474D-B3CE-E3FC92E7B5B5}.Release|.NET.ActiveCfg = Release|Any CPU + {03812AB8-2F26-474D-B3CE-E3FC92E7B5B5}.Release|.NET.Build.0 = Release|Any CPU + {03812AB8-2F26-474D-B3CE-E3FC92E7B5B5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {03812AB8-2F26-474D-B3CE-E3FC92E7B5B5}.Release|Any CPU.Build.0 = Release|Any CPU + {03812AB8-2F26-474D-B3CE-E3FC92E7B5B5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {03812AB8-2F26-474D-B3CE-E3FC92E7B5B5}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {03812AB8-2F26-474D-B3CE-E3FC92E7B5B5}.Release|x86.ActiveCfg = Release|Any CPU + {03812AB8-2F26-474D-B3CE-E3FC92E7B5B5}.Release|x86.Build.0 = Release|Any CPU + {DC0BE99C-95A5-40E1-8700-50A74D075E28}.Debug|.NET.ActiveCfg = Debug|Any CPU + {DC0BE99C-95A5-40E1-8700-50A74D075E28}.Debug|.NET.Build.0 = Debug|Any CPU + {DC0BE99C-95A5-40E1-8700-50A74D075E28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DC0BE99C-95A5-40E1-8700-50A74D075E28}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DC0BE99C-95A5-40E1-8700-50A74D075E28}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {DC0BE99C-95A5-40E1-8700-50A74D075E28}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {DC0BE99C-95A5-40E1-8700-50A74D075E28}.Debug|x86.ActiveCfg = Debug|Any CPU + {DC0BE99C-95A5-40E1-8700-50A74D075E28}.Debug|x86.Build.0 = Debug|Any CPU + {DC0BE99C-95A5-40E1-8700-50A74D075E28}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU + {DC0BE99C-95A5-40E1-8700-50A74D075E28}.DebugRemote|.NET.Build.0 = Debug|Any CPU + {DC0BE99C-95A5-40E1-8700-50A74D075E28}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU + {DC0BE99C-95A5-40E1-8700-50A74D075E28}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU + {DC0BE99C-95A5-40E1-8700-50A74D075E28}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU + {DC0BE99C-95A5-40E1-8700-50A74D075E28}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU + {DC0BE99C-95A5-40E1-8700-50A74D075E28}.DebugRemote|x86.ActiveCfg = Debug|Any CPU + {DC0BE99C-95A5-40E1-8700-50A74D075E28}.DebugRemote|x86.Build.0 = Debug|Any CPU + {DC0BE99C-95A5-40E1-8700-50A74D075E28}.Release|.NET.ActiveCfg = Release|Any CPU + {DC0BE99C-95A5-40E1-8700-50A74D075E28}.Release|.NET.Build.0 = Release|Any CPU + {DC0BE99C-95A5-40E1-8700-50A74D075E28}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DC0BE99C-95A5-40E1-8700-50A74D075E28}.Release|Any CPU.Build.0 = Release|Any CPU + {DC0BE99C-95A5-40E1-8700-50A74D075E28}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {DC0BE99C-95A5-40E1-8700-50A74D075E28}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {DC0BE99C-95A5-40E1-8700-50A74D075E28}.Release|x86.ActiveCfg = Release|Any CPU + {DC0BE99C-95A5-40E1-8700-50A74D075E28}.Release|x86.Build.0 = Release|Any CPU + {B487DD3C-63D3-42A4-90E0-793C799A85A1}.Debug|.NET.ActiveCfg = Debug|Any CPU + {B487DD3C-63D3-42A4-90E0-793C799A85A1}.Debug|.NET.Build.0 = Debug|Any CPU + {B487DD3C-63D3-42A4-90E0-793C799A85A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B487DD3C-63D3-42A4-90E0-793C799A85A1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B487DD3C-63D3-42A4-90E0-793C799A85A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {B487DD3C-63D3-42A4-90E0-793C799A85A1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {B487DD3C-63D3-42A4-90E0-793C799A85A1}.Debug|x86.ActiveCfg = Debug|Any CPU + {B487DD3C-63D3-42A4-90E0-793C799A85A1}.Debug|x86.Build.0 = Debug|Any CPU + {B487DD3C-63D3-42A4-90E0-793C799A85A1}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU + {B487DD3C-63D3-42A4-90E0-793C799A85A1}.DebugRemote|.NET.Build.0 = Debug|Any CPU + {B487DD3C-63D3-42A4-90E0-793C799A85A1}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU + {B487DD3C-63D3-42A4-90E0-793C799A85A1}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU + {B487DD3C-63D3-42A4-90E0-793C799A85A1}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU + {B487DD3C-63D3-42A4-90E0-793C799A85A1}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU + {B487DD3C-63D3-42A4-90E0-793C799A85A1}.DebugRemote|x86.ActiveCfg = Debug|Any CPU + {B487DD3C-63D3-42A4-90E0-793C799A85A1}.DebugRemote|x86.Build.0 = Debug|Any CPU + {B487DD3C-63D3-42A4-90E0-793C799A85A1}.Release|.NET.ActiveCfg = Release|Any CPU + {B487DD3C-63D3-42A4-90E0-793C799A85A1}.Release|.NET.Build.0 = Release|Any CPU + {B487DD3C-63D3-42A4-90E0-793C799A85A1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B487DD3C-63D3-42A4-90E0-793C799A85A1}.Release|Any CPU.Build.0 = Release|Any CPU + {B487DD3C-63D3-42A4-90E0-793C799A85A1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {B487DD3C-63D3-42A4-90E0-793C799A85A1}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {B487DD3C-63D3-42A4-90E0-793C799A85A1}.Release|x86.ActiveCfg = Release|Any CPU + {B487DD3C-63D3-42A4-90E0-793C799A85A1}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -9155,6 +9233,9 @@ Global {86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB} = {D8A691C5-146D-4613-86CC-438F02FE9106} {F04B733F-02E2-4112-9094-3E36FD90A6C9} = {D8A691C5-146D-4613-86CC-438F02FE9106} {12BC3B31-7499-44EC-B7B9-E3CEB2D9997B} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {03812AB8-2F26-474D-B3CE-E3FC92E7B5B5} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {DC0BE99C-95A5-40E1-8700-50A74D075E28} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {B487DD3C-63D3-42A4-90E0-793C799A85A1} = {D8A691C5-146D-4613-86CC-438F02FE9106} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9} diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user index aed93f702..a6aaa77b0 100644 --- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user +++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user @@ -8,7 +8,7 @@ - Release|Any CPU + Debug|Any CPU ShowAllFiles 600 MvcControllerEmptyScaffolder diff --git a/BeWoPlanerMobil/Controllers/ChatController.cs b/BeWoPlanerMobil/Controllers/ChatController.cs index ffd5fcac7..7de42604f 100644 --- a/BeWoPlanerMobil/Controllers/ChatController.cs +++ b/BeWoPlanerMobil/Controllers/ChatController.cs @@ -44,6 +44,35 @@ namespace BeWoPlanerMobil.Controllers return serverUrl; } + public ActionResult GetRssFeed() + { + try { + string url = "https://apps.ownsoft.de/news/rss?evplaner[base_cat]=55" + k; + + WebRequest request = WebRequest.Create(url); + + request.Credentials = CredentialCache.DefaultCredentials; + + WebResponse response = request.GetResponse(); + + string responseFromServer = ReadStreamForChatCode(response); + + var definition = new { status = "", URL = "", SYNCTYPE = "" }; + + var jsondaten = JsonConvert.DeserializeAnonymousType(responseFromServer, definition); + + string data = jsondaten.URL; + response.Close(); + + return View(data); + } + catch (Exception) + { + // throw(BeWo.Service.Core.Utils.ThrowBeWoFaultException(e)); + return null; + } + } + private static string ReadStreamForChatCode(WebResponse response) { try diff --git a/ReportImp/AbwMuenster/AbwMuenster.csproj b/ReportImp/AbwMuenster/AbwMuenster.csproj index d74f76b59..c68e53afa 100644 --- a/ReportImp/AbwMuenster/AbwMuenster.csproj +++ b/ReportImp/AbwMuenster/AbwMuenster.csproj @@ -92,8 +92,5 @@ Designer - - - \ No newline at end of file diff --git a/ReportImp/AlzeyTeilhabe/AlzeyTeilhabe.csproj b/ReportImp/AlzeyTeilhabe/AlzeyTeilhabe.csproj index 30d76463a..67c7caa38 100644 --- a/ReportImp/AlzeyTeilhabe/AlzeyTeilhabe.csproj +++ b/ReportImp/AlzeyTeilhabe/AlzeyTeilhabe.csproj @@ -57,6 +57,12 @@ RechnungPa.cs + + Component + + + StundenzettelBi2.cs + Component @@ -95,6 +101,9 @@ RechnungPa.cs Designer + + StundenzettelBi2.cs + StundenzettelBi.cs diff --git a/ReportImp/AlzeyTeilhabe/CustomReportCreator.cs b/ReportImp/AlzeyTeilhabe/CustomReportCreator.cs index dd4014ec3..9f20bc0d7 100644 --- a/ReportImp/AlzeyTeilhabe/CustomReportCreator.cs +++ b/ReportImp/AlzeyTeilhabe/CustomReportCreator.cs @@ -48,7 +48,7 @@ namespace AlzeyTeilhabe private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro, long? serviceCategoryOid) { IBeWoReport report = null; - String kt = ""; + String kt = ""; if (!String.IsNullOrWhiteSpace(ro.Costbearer)) kt = ro.Costbearer.Trim(); @@ -63,7 +63,7 @@ namespace AlzeyTeilhabe } if (kt == "Kreisverwaltung Mainz-Bingen") - report = new AlzeyTeilhabe.StundenzettelBi(); + report = new AlzeyTeilhabe.StundenzettelBi2(); if (report == null) report = new AlzeyTeilhabe.StundenzettelWo(); diff --git a/ReportImp/AlzeyTeilhabe/StundenzettelBi2.Designer.cs b/ReportImp/AlzeyTeilhabe/StundenzettelBi2.Designer.cs new file mode 100644 index 000000000..e1d8622de --- /dev/null +++ b/ReportImp/AlzeyTeilhabe/StundenzettelBi2.Designer.cs @@ -0,0 +1,890 @@ +using BeWo.Report.ReportObjects; +namespace AlzeyTeilhabe +{ + partial class StundenzettelBi2 + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + this.Detail = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); + this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); + this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel29 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel24 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule(); + this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule(); + this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule(); + this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); + this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); + this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldStunden = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldRemainingFLS = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldTotalSum = new DevExpress.XtraReports.UI.CalculatedField(); + this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.ruleLetzteZeile = new DevExpress.XtraReports.UI.FormattingRule(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); + // + // Detail + // + this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTableServiceRecords1}); + this.Detail.HeightF = 60F; + this.Detail.Name = "Detail"; + this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.Detail.StylePriority.UseFont = false; + this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrTableServiceRecords1 + // + this.xrTableServiceRecords1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTableServiceRecords1.Name = "xrTableServiceRecords1"; + this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow2}); + this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(690F, 60F); + this.xrTableServiceRecords1.StylePriority.UseBackColor = false; + this.xrTableServiceRecords1.StylePriority.UseBorders = false; + this.xrTableServiceRecords1.StylePriority.UseFont = false; + this.xrTableServiceRecords1.StylePriority.UseTextAlignment = false; + this.xrTableServiceRecords1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3, + this.xrTableCell4, + this.xrTableCell7, + this.xrTableCell1, + this.xrTableCell11}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.xrTableRow2.StylePriority.UseTextAlignment = false; + this.xrTableRow2.Weight = 1.875D; + // + // xrTableCell3 + // + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.xrTableCell3.StylePriority.UseBorders = false; + this.xrTableCell3.StylePriority.UseFont = false; + this.xrTableCell3.StylePriority.UseTextAlignment = false; + this.xrTableCell3.Text = "Datum"; + this.xrTableCell3.Weight = 0.24385918004234181D; + // + // xrTableCell4 + // + this.xrTableCell4.Multiline = true; + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.xrTableCell4.StylePriority.UseFont = false; + this.xrTableCell4.StylePriority.UseTextAlignment = false; + this.xrTableCell4.Text = "Erbrachte\r\nFLStd."; + this.xrTableCell4.Weight = 0.24385917973591581D; + // + // xrTableCell7 + // + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F); + this.xrTableCell7.StylePriority.UsePadding = false; + this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.Text = "Direkte- u. Mittelbare Leistungen"; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell7.Weight = 0.20728030445393822D; + // + // xrTableCell1 + // + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.xrTableCell1.StylePriority.UsePadding = false; + this.xrTableCell1.Text = "Inhaltliche Beschreibung der erbrachten Leistung *)"; + this.xrTableCell1.Weight = 0.69499866652579412D; + // + // xrTableCell11 + // + this.xrTableCell11.Multiline = true; + this.xrTableCell11.Name = "xrTableCell11"; + this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.xrTableCell11.StylePriority.UseFont = false; + this.xrTableCell11.StylePriority.UseTextAlignment = false; + this.xrTableCell11.Text = "Unterschrift\r\nKlient/Fachkraft"; + this.xrTableCell11.Weight = 0.29263101838991268D; + // + // formattingRuleStartDate + // + this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; + this.formattingRuleStartDate.DataMember = "ServicesDouble"; + this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; + this.formattingRuleStartDate.Name = "formattingRuleStartDate"; + // + // ReportHeader + // + this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel22, + this.xrLabel19, + this.xrLabel17, + this.xrLabel16, + this.xrLabel29, + this.xrLabel26, + this.xrLabel25, + this.xrLabel24, + this.xrLabel23, + this.xrLabel18, + this.xrLabel15, + this.xrLabel14, + this.xrLabel13, + this.xrLabel12, + this.xrLabel1}); + this.ReportHeader.Font = new System.Drawing.Font("Arial", 11F); + this.ReportHeader.HeightF = 240F; + this.ReportHeader.Name = "ReportHeader"; + this.ReportHeader.StylePriority.UseFont = false; + // + // xrLabel22 + // + this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(150F, 55F); + this.xrLabel22.Name = "xrLabel22"; + this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel22.SizeF = new System.Drawing.SizeF(387.5F, 18F); + this.xrLabel22.StylePriority.UseFont = false; + this.xrLabel22.Text = "Verein für Integration und Teilhabe am Leben e. V. "; + // + // xrLabel19 + // + this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0F, 55F); + this.xrLabel19.Name = "xrLabel19"; + this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel19.SizeF = new System.Drawing.SizeF(150F, 25F); + this.xrLabel19.StylePriority.UseFont = false; + this.xrLabel19.Text = "Leistungsanbieter:"; + // + // xrLabel17 + // + this.xrLabel17.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainAttendant")}); + this.xrLabel17.Font = new System.Drawing.Font("Arial", 11F); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(288F, 205F); + this.xrLabel17.Name = "xrLabel17"; + this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel17.SizeF = new System.Drawing.SizeF(282F, 18F); + this.xrLabel17.StylePriority.UseBorders = false; + this.xrLabel17.StylePriority.UseFont = false; + // + // xrLabel16 + // + this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(0F, 205F); + this.xrLabel16.Name = "xrLabel16"; + this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel16.SizeF = new System.Drawing.SizeF(288F, 18F); + this.xrLabel16.StylePriority.UseFont = false; + this.xrLabel16.Text = "Zusätzliche Fachkraft:"; + // + // xrLabel29 + // + this.xrLabel29.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrLabel29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerMonthTotal", "{0:0.00}")}); + this.xrLabel29.Font = new System.Drawing.Font("Arial", 11F); + this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(288F, 180F); + this.xrLabel29.Name = "xrLabel29"; + this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel29.SizeF = new System.Drawing.SizeF(282F, 18F); + this.xrLabel29.StylePriority.UseBorders = false; + this.xrLabel29.StylePriority.UseFont = false; + // + // xrLabel26 + // + this.xrLabel26.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrLabel26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSTotal", "{0:0.00}")}); + this.xrLabel26.Font = new System.Drawing.Font("Arial", 11F); + this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(288F, 155F); + this.xrLabel26.Name = "xrLabel26"; + this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel26.SizeF = new System.Drawing.SizeF(282F, 18F); + this.xrLabel26.StylePriority.UseBorders = false; + this.xrLabel26.StylePriority.UseFont = false; + // + // xrLabel25 + // + this.xrLabel25.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrLabel25.Font = new System.Drawing.Font("Arial", 11F); + this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(200F, 130F); + this.xrLabel25.Name = "xrLabel25"; + this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel25.SizeF = new System.Drawing.SizeF(369.9999F, 18F); + this.xrLabel25.StylePriority.UseBorders = false; + this.xrLabel25.StylePriority.UseFont = false; + this.xrLabel25.Text = "[ApprovedStartDate] - [ApprovedEndDate]"; + // + // xrLabel24 + // + this.xrLabel24.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrLabel24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerFirstName")}); + this.xrLabel24.Font = new System.Drawing.Font("Arial", 11F); + this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(200F, 105F); + this.xrLabel24.Name = "xrLabel24"; + this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel24.SizeF = new System.Drawing.SizeF(369.9999F, 18F); + this.xrLabel24.StylePriority.UseBorders = false; + this.xrLabel24.StylePriority.UseFont = false; + // + // xrLabel23 + // + this.xrLabel23.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrLabel23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerLastName")}); + this.xrLabel23.Font = new System.Drawing.Font("Arial", 11F); + this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(200F, 79.99998F); + this.xrLabel23.Name = "xrLabel23"; + this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel23.SizeF = new System.Drawing.SizeF(369.9999F, 18F); + this.xrLabel23.StylePriority.UseBorders = false; + this.xrLabel23.StylePriority.UseFont = false; + // + // xrLabel18 + // + this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0F, 180F); + this.xrLabel18.Name = "xrLabel18"; + this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel18.SizeF = new System.Drawing.SizeF(288F, 25F); + this.xrLabel18.StylePriority.UseFont = false; + this.xrLabel18.Text = "Fachleistungsstunden pro Monat:"; + // + // xrLabel15 + // + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 155F); + this.xrLabel15.Name = "xrLabel15"; + this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel15.SizeF = new System.Drawing.SizeF(288F, 25F); + this.xrLabel15.StylePriority.UseFont = false; + this.xrLabel15.Text = "Bewilligte Fachleistungsstunden gesamt:"; + // + // xrLabel14 + // + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 130F); + this.xrLabel14.Name = "xrLabel14"; + this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel14.SizeF = new System.Drawing.SizeF(200F, 25F); + this.xrLabel14.StylePriority.UseFont = false; + this.xrLabel14.Text = "Bewilligungszeitraum:"; + // + // xrLabel13 + // + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 105F); + this.xrLabel13.Name = "xrLabel13"; + this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel13.SizeF = new System.Drawing.SizeF(200F, 25F); + this.xrLabel13.StylePriority.UseFont = false; + this.xrLabel13.Text = "Vorname Klient/in:"; + // + // xrLabel12 + // + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 79.99998F); + this.xrLabel12.Name = "xrLabel12"; + this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel12.SizeF = new System.Drawing.SizeF(200F, 25F); + this.xrLabel12.StylePriority.UseFont = false; + this.xrLabel12.Text = "Name Klient/in:"; + // + // xrLabel1 + // + this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline)))); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel1.Multiline = true; + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(667F, 43.75F); + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.StylePriority.UseTextAlignment = false; + this.xrLabel1.Text = "Leistungsnachweis / Quittungsbeleg ambulante Eingliederungshilfe\r\n[Month] [Year]"; + this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + // + // formattingRuleServiceDesc + // + this.formattingRuleServiceDesc.Condition = "[StartDate2] < [StartDate]"; + this.formattingRuleServiceDesc.DataMember = "ServicesDouble"; + this.formattingRuleServiceDesc.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; + this.formattingRuleServiceDesc.Name = "formattingRuleServiceDesc"; + // + // formattingRuleCostBearer + // + this.formattingRuleCostBearer.Condition = "[StartDate2] < [StartDate]"; + this.formattingRuleCostBearer.DataMember = "ServicesDouble"; + this.formattingRuleCostBearer.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; + this.formattingRuleCostBearer.Name = "formattingRuleCostBearer"; + // + // formattingRuleEmployeeName + // + this.formattingRuleEmployeeName.Condition = "[StartDate2] < [StartDate]"; + this.formattingRuleEmployeeName.DataMember = "ServicesDouble"; + this.formattingRuleEmployeeName.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; + this.formattingRuleEmployeeName.Name = "formattingRuleEmployeeName"; + // + // topMarginBand1 + // + this.topMarginBand1.Font = new System.Drawing.Font("Times New Roman", 9.75F); + this.topMarginBand1.HeightF = 50F; + this.topMarginBand1.Name = "topMarginBand1"; + this.topMarginBand1.StylePriority.UseFont = false; + // + // bottomMarginBand1 + // + this.bottomMarginBand1.HeightF = 30F; + this.bottomMarginBand1.Name = "bottomMarginBand1"; + // + // ReportFooter + // + this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel21, + this.xrLabel20, + this.xrLabel10, + this.xrLabel11, + this.xrLabel9, + this.xrLabel8, + this.xrLabel7, + this.xrLabel6, + this.xrLabel4, + this.xrLabel3, + this.xrLabel2, + this.xrLabel5}); + this.ReportFooter.Font = new System.Drawing.Font("Arial", 11F); + this.ReportFooter.HeightF = 249.1668F; + this.ReportFooter.Name = "ReportFooter"; + this.ReportFooter.StylePriority.UseFont = false; + // + // xrLabel21 + // + this.xrLabel21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "fieldRemainingFLS", "{0:0.00}")}); + this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(392.6668F, 145.9373F); + this.xrLabel21.Name = "xrLabel21"; + this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel21.SizeF = new System.Drawing.SizeF(130.7083F, 19.79172F); + this.xrLabel21.StylePriority.UseFont = false; + this.xrLabel21.StylePriority.UseTextAlignment = false; + this.xrLabel21.Text = "Zusätzliche Fachkraft:"; + this.xrLabel21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + // + // xrLabel20 + // + this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(0.0002034505F, 145.9374F); + this.xrLabel20.Name = "xrLabel20"; + this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel20.SizeF = new System.Drawing.SizeF(392.6667F, 19.79166F); + this.xrLabel20.StylePriority.UseFont = false; + this.xrLabel20.Text = "Übertrag Folgemonat (noch verfügbare FLStd.)"; + // + // xrLabel10 + // + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(267.167F, 86.04166F); + this.xrLabel10.Name = "xrLabel10"; + this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel10.SizeF = new System.Drawing.SizeF(125.5F, 19.79172F); + this.xrLabel10.StylePriority.UseFont = false; + this.xrLabel10.StylePriority.UseTextAlignment = false; + this.xrLabel10.Text = "Vergütungssatz"; + this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + // + // xrLabel11 + // + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(392.6668F, 86.04166F); + this.xrLabel11.Name = "xrLabel11"; + this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(125.5F, 19.79172F); + this.xrLabel11.StylePriority.UseFont = false; + this.xrLabel11.StylePriority.UseTextAlignment = false; + this.xrLabel11.Text = "Rechnungsbetrag"; + this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + // + // xrLabel9 + // + this.xrLabel9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "fieldTotalSum", "{0:0.00} €")}); + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(392.6668F, 105.8333F); + this.xrLabel9.Name = "xrLabel9"; + this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel9.SizeF = new System.Drawing.SizeF(125.5F, 19.79172F); + this.xrLabel9.StylePriority.UseFont = false; + this.xrLabel9.StylePriority.UseTextAlignment = false; + this.xrLabel9.Text = "Zusätzliche Fachkraft:"; + this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + // + // xrLabel8 + // + this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RateFactor", "{0:0.00} €")}); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(267.167F, 105.8333F); + this.xrLabel8.Name = "xrLabel8"; + this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(125.5F, 19.79172F); + this.xrLabel8.StylePriority.UseFont = false; + this.xrLabel8.StylePriority.UseTextAlignment = false; + this.xrLabel8.Text = "Zusätzliche Fachkraft:"; + this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + // + // xrLabel7 + // + this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "fieldBillableFLS", "{0:0.00}")}); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(194.7919F, 105.8333F); + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(72.37503F, 19.79172F); + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.Text = "Zusätzliche Fachkraft:"; + // + // xrLabel6 + // + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0.0002034505F, 105.8334F); + this.xrLabel6.Name = "xrLabel6"; + this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel6.SizeF = new System.Drawing.SizeF(194.7917F, 19.79166F); + this.xrLabel6.StylePriority.UseFont = false; + this.xrLabel6.Text = "Anzahl FLStd."; + // + // xrLabel4 + // + this.xrLabel4.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0.0002034505F, 56.20834F); + this.xrLabel4.Name = "xrLabel4"; + this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(686.9999F, 18F); + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.Text = "Berechnung der erbrachten Fachleistungsstunden"; + // + // xrLabel3 + // + this.xrLabel3.CanShrink = true; + this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbsenceTimes")}); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0.0002034505F, 20.16668F); + this.xrLabel3.Name = "xrLabel3"; + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(689.9999F, 23F); + this.xrLabel3.Text = "xrLabel3"; + // + // xrTable1 + // + this.xrTable1.BorderColor = System.Drawing.Color.Black; + this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow1}); + this.xrTable1.SizeF = new System.Drawing.SizeF(200F, 40F); + this.xrTable1.StylePriority.UseFont = false; + this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell5, + this.xrTableCell6}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.xrTableRow1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableRow1.Weight = 2D; + // + // xrTableCell5 + // + this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell5.Multiline = true; + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.StylePriority.UseBorders = false; + this.xrTableCell5.StylePriority.UseFont = false; + this.xrTableCell5.StylePriority.UsePadding = false; + this.xrTableCell5.StylePriority.UseTextAlignment = false; + this.xrTableCell5.Text = "Summe\r\nFLStd."; + this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell5.Weight = 0.12626259807949769D; + // + // xrTableCell6 + // + this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "fieldBillableFLS", "{0:0.00}")}); + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.StylePriority.UseBorders = false; + this.xrTableCell6.StylePriority.UseFont = false; + this.xrTableCell6.StylePriority.UsePadding = false; + this.xrTableCell6.StylePriority.UseTextAlignment = false; + this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell6.Weight = 0.12626260328760389D; + // + // xrLabel2 + // + this.xrLabel2.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(346.1668F, 231.1668F); + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(340.8333F, 17.99997F); + this.xrLabel2.StylePriority.UseBorders = false; + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.Text = "Unterschrift Rechnungsstelle / Fachkraft"; + // + // xrLabel5 + // + this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0.0002034505F, 231.1668F); + this.xrLabel5.Name = "xrLabel5"; + this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(117.2917F, 17.99997F); + this.xrLabel5.StylePriority.UseBorders = false; + this.xrLabel5.StylePriority.UseFont = false; + this.xrLabel5.Text = "Datum"; + // + // fieldAbrechenbareMinuten + // + this.fieldAbrechenbareMinuten.DataMember = "Services"; + this.fieldAbrechenbareMinuten.Expression = "Iif([IsBillable], [Minutes], 0)"; + this.fieldAbrechenbareMinuten.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldAbrechenbareMinuten.Name = "fieldAbrechenbareMinuten"; + // + // fieldBillableFLS + // + this.fieldBillableFLS.Expression = "[TotalFLMBillable] / 60"; + this.fieldBillableFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldBillableFLS.Name = "fieldBillableFLS"; + // + // fieldAbrechenbareFLS + // + this.fieldAbrechenbareFLS.Expression = "([TotalFLMBillable] / 60) * 1.2"; + this.fieldAbrechenbareFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldAbrechenbareFLS.Name = "fieldAbrechenbareFLS"; + // + // fieldStunden + // + this.fieldStunden.DataMember = "Services"; + this.fieldStunden.Expression = "[Minutes] / 60"; + this.fieldStunden.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldStunden.Name = "fieldStunden"; + // + // fieldRemainingFLS + // + this.fieldRemainingFLS.Expression = "[ApprovedFLSPerMonthTotal] - [TotalFLMBillable] / 60"; + this.fieldRemainingFLS.Name = "fieldRemainingFLS"; + // + // fieldTotalSum + // + this.fieldTotalSum.Expression = "Round([TotalFLMBillable] / 60, 2) * [RateFactor]"; + this.fieldTotalSum.Name = "fieldTotalSum"; + // + // DetailReport + // + this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail1, + this.GroupFooter1}); + this.DetailReport.DataMember = "Services"; + this.DetailReport.DataSource = this.bindingSource1; + this.DetailReport.Level = 0; + this.DetailReport.Name = "DetailReport"; + // + // Detail1 + // + this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable3}); + this.Detail1.HeightF = 20F; + this.Detail1.Name = "Detail1"; + // + // xrTable3 + // + this.xrTable3.BorderColor = System.Drawing.Color.Black; + this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable3.Name = "xrTable3"; + this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow4}); + this.xrTable3.SizeF = new System.Drawing.SizeF(690F, 20F); + this.xrTable3.StylePriority.UseFont = false; + this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrTableRow4 + // + this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell13, + this.xrTableCell14, + this.xrTableCell12, + this.xrTableCell16, + this.xrTableCell17}); + this.xrTableRow4.Name = "xrTableRow4"; + this.xrTableRow4.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.xrTableRow4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableRow4.Weight = 1D; + // + // xrTableCell13 + // + this.xrTableCell13.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDateString", "{0:dd.MM.yyyy}")}); + this.xrTableCell13.FormattingRules.Add(this.ruleLetzteZeile); + this.xrTableCell13.Name = "xrTableCell13"; + this.xrTableCell13.StylePriority.UseBorders = false; + this.xrTableCell13.StylePriority.UseFont = false; + this.xrTableCell13.StylePriority.UsePadding = false; + this.xrTableCell13.StylePriority.UseTextAlignment = false; + this.xrTableCell13.Text = "xrTableCell13"; + this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell13.Weight = 0.12626259807949769D; + // + // xrTableCell14 + // + this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.TimeRangeString", "{0:0.00}")}); + this.xrTableCell14.FormattingRules.Add(this.ruleLetzteZeile); + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.StylePriority.UseBorders = false; + this.xrTableCell14.StylePriority.UseFont = false; + this.xrTableCell14.StylePriority.UsePadding = false; + this.xrTableCell14.StylePriority.UseTextAlignment = false; + this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell14.Weight = 0.12626260328760389D; + // + // xrTableCell12 + // + this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.ServiceDescription")}); + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F); + this.xrTableCell12.StylePriority.UsePadding = false; + this.xrTableCell12.StylePriority.UseTextAlignment = false; + this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell12.Weight = 0.10732320624148885D; + // + // xrTableCell16 + // + this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice")}); + this.xrTableCell16.Multiline = true; + this.xrTableCell16.Name = "xrTableCell16"; + this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F); + this.xrTableCell16.StylePriority.UsePadding = false; + this.xrTableCell16.StylePriority.UseTextAlignment = false; + this.xrTableCell16.Text = "xrTableCell2"; + this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell16.Weight = 0.35984842044580151D; + // + // xrTableCell17 + // + this.xrTableCell17.Name = "xrTableCell17"; + this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F); + this.xrTableCell17.StylePriority.UseFont = false; + this.xrTableCell17.StylePriority.UsePadding = false; + this.xrTableCell17.StylePriority.UseTextAlignment = false; + this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell17.Weight = 0.151515094482292D; + // + // GroupFooter1 + // + this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable1}); + this.GroupFooter1.HeightF = 40F; + this.GroupFooter1.Name = "GroupFooter1"; + // + // ruleLetzteZeile + // + this.ruleLetzteZeile.Condition = "[IstSonntag]"; + this.ruleLetzteZeile.DataMember = "Services"; + this.ruleLetzteZeile.Formatting.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.ruleLetzteZeile.Name = "ruleLetzteZeile"; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // + // StundenzettelBi2 + // + this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail, + this.ReportHeader, + this.topMarginBand1, + this.bottomMarginBand1, + this.ReportFooter, + this.DetailReport}); + this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { + this.fieldAbrechenbareMinuten, + this.fieldBillableFLS, + this.fieldAbrechenbareFLS, + this.fieldStunden, + this.fieldRemainingFLS, + this.fieldTotalSum}); + this.DataSource = this.bindingSource1; + this.Font = new System.Drawing.Font("Arial", 11F); + this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { + this.formattingRuleStartDate, + this.formattingRuleServiceDesc, + this.formattingRuleCostBearer, + this.formattingRuleEmployeeName, + this.ruleLetzteZeile}); + this.Margins = new System.Drawing.Printing.Margins(70, 60, 50, 30); + this.PageHeight = 1169; + this.PageWidth = 827; + this.PaperKind = System.Drawing.Printing.PaperKind.A4; + this.SnapGridSize = 9F; + this.Version = "17.1"; + ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); + + } + + #endregion + + private DevExpress.XtraReports.UI.DetailBand Detail; + private System.Windows.Forms.BindingSource bindingSource1; + private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRTable xrTableServiceRecords1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; + private DevExpress.XtraReports.UI.FormattingRule formattingRuleStartDate; + private DevExpress.XtraReports.UI.FormattingRule formattingRuleServiceDesc; + private DevExpress.XtraReports.UI.FormattingRule formattingRuleCostBearer; + private DevExpress.XtraReports.UI.FormattingRule formattingRuleEmployeeName; + private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; + private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; + private DevExpress.XtraReports.UI.XRLabel xrLabel12; + private DevExpress.XtraReports.UI.XRLabel xrLabel18; + private DevExpress.XtraReports.UI.XRLabel xrLabel15; + private DevExpress.XtraReports.UI.XRLabel xrLabel14; + private DevExpress.XtraReports.UI.XRLabel xrLabel13; + private DevExpress.XtraReports.UI.XRLabel xrLabel29; + private DevExpress.XtraReports.UI.XRLabel xrLabel26; + private DevExpress.XtraReports.UI.XRLabel xrLabel25; + private DevExpress.XtraReports.UI.XRLabel xrLabel24; + private DevExpress.XtraReports.UI.XRLabel xrLabel23; + private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; + private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareMinuten; + private DevExpress.XtraReports.UI.XRLabel xrLabel5; + private DevExpress.XtraReports.UI.CalculatedField fieldBillableFLS; + private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareFLS; + private DevExpress.XtraReports.UI.XRLabel xrLabel2; + private DevExpress.XtraReports.UI.XRLabel xrLabel17; + private DevExpress.XtraReports.UI.XRLabel xrLabel16; + private DevExpress.XtraReports.UI.XRLabel xrLabel22; + private DevExpress.XtraReports.UI.XRLabel xrLabel19; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.CalculatedField fieldStunden; + private DevExpress.XtraReports.UI.XRTable xrTable1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRLabel xrLabel3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.XRLabel xrLabel21; + private DevExpress.XtraReports.UI.XRLabel xrLabel20; + private DevExpress.XtraReports.UI.XRLabel xrLabel10; + private DevExpress.XtraReports.UI.XRLabel xrLabel11; + private DevExpress.XtraReports.UI.XRLabel xrLabel9; + private DevExpress.XtraReports.UI.XRLabel xrLabel8; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; + private DevExpress.XtraReports.UI.XRLabel xrLabel6; + private DevExpress.XtraReports.UI.XRLabel xrLabel4; + private DevExpress.XtraReports.UI.CalculatedField fieldRemainingFLS; + private DevExpress.XtraReports.UI.CalculatedField fieldTotalSum; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport; + private DevExpress.XtraReports.UI.DetailBand Detail1; + private DevExpress.XtraReports.UI.XRTable xrTable3; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; + private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; + private DevExpress.XtraReports.UI.FormattingRule ruleLetzteZeile; + } +} diff --git a/ReportImp/AlzeyTeilhabe/StundenzettelBi2.cs b/ReportImp/AlzeyTeilhabe/StundenzettelBi2.cs new file mode 100644 index 000000000..f2fe9435d --- /dev/null +++ b/ReportImp/AlzeyTeilhabe/StundenzettelBi2.cs @@ -0,0 +1,227 @@ +using System; +using System.Collections; +using System.ComponentModel; +using DevExpress.XtraReports.UI; +using BeWo.Report.ReportObjects; +using BeWo.Report; +using System.Collections.Generic; +using BeWo.Service.DCEntityMapper; +using BS.Shared; +using BS.Shared.Extensions; + +namespace AlzeyTeilhabe +{ + public partial class StundenzettelBi2 : DevExpress.XtraReports.UI.XtraReport, IBeWoReport + { + // NUR für Kostenträger Kreisverwaltung Mainz-Bingen + public StundenzettelBi2() + { + InitializeComponent(); + } + + public void SetReportDataSource(ServicesOverviewRO pRO) + { + if (pRO.Services != null) + { + List servicesBillable = new List(); + + foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services) + { + if (s.IsBillable) + { + if (s.ServiceDescription.Contains("DL")) + s.ServiceDescription = "DL"; + else if (s.ServiceDescription.Contains("ML")) + s.ServiceDescription = "ML"; + + servicesBillable.Add(s); + } + + } + + pRO.Services = servicesBillable; + } + decimal stundensatz = GetStundensatz(pRO); + + pRO.RateFactor = stundensatz; + + var list = ErstelleEintraege(pRO); + + List services = new List(); + + foreach (var item in list) + { + ServicesOverviewRO.ServiceDetail firstRecord = null; + + int count = 1; + foreach (var record in item.AlleEintraege) + { + record.IstSonntag = count == item.AlleEintraege.Count; + + record.TimeRangeString = ""; + record.StartDateString = ""; + record.ServiceDescription = String.Format("{0} {1:0.0#}", record.ServiceDescription, record.Minutes / 60); + + if (firstRecord == null) + { + firstRecord = record; + } + else + { + firstRecord.Minutes += record.Minutes; + } + + count++; + } + if (firstRecord != null) + { + firstRecord.StartDateString = String.Format("{0:dd.MM.yyyy}", firstRecord.StartDate); + firstRecord.TimeRangeString = String.Format("{0:0.0#}", firstRecord.Minutes / 60); + + } + + services.AddRange(item.AlleEintraege); + + + } + pRO.Services = services; + //var count = 1; + //var detailCount = 1; + + //foreach (var te in list) + //{ + + // if (count > 1) + // { + // tableSpalte1und2.InsertRowBelow(tableSpalte1und2.Rows[tableSpalte1und2.Rows.Count - 1]); + // } + + // var gesamtRow = tableSpalte1und2.Rows[tableSpalte1und2.Rows.Count - 1]; + + // gesamtRow.Cells[0].Text = String.Format("{0:dd.MM.yyyy}", te.Tag); + // gesamtRow.Cells[1].Text = String.Format("{0:0.0#}", te.StundenGesamt); + + + // var alleRecords = new List(); + + // if (te.DirekteLeistung != null) + // { + // alleRecords.Add(te.DirekteLeistung); + // } + // alleRecords.AddRange(te.MittelbareLeistungen); + + + // float height = 0; + // foreach (var s in alleRecords) + // { + // if (detailCount > 1) + // { + // tableDetails.InsertRowBelow(tableDetails.Rows[tableDetails.Rows.Count - 1]); + // } + // var detailRow = tableDetails.Rows[tableDetails.Rows.Count - 1]; + + // detailRow.Cells[0].Text = String.Format("{0} {1:0.0#}", s.ServiceDescription, s.Minutes / 60); + // detailRow.Cells[1].Text = s.Notice; + + // height += detailRow.HeightF; + // detailCount++; + // } + // gesamtRow.HeightF = height; + + + + // count++; + //} + this.bindingSource1.DataSource = pRO; + } + + private List ErstelleEintraege(ServicesOverviewRO pRO) + { + var records = new List(); + + Dictionary tag2Eintrag = new Dictionary(); + + foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services) + { + String key = String.Format("{0:yyyyMMdd}", s.StartDate); + + if (!tag2Eintrag.ContainsKey(key)) + { + var te = new TabellenEintrag { Tag = s.StartDate, MittelbareLeistungen = new List() }; + records.Add(te); + tag2Eintrag.Add(key, te); + } + + var eintrag = tag2Eintrag[key]; + + eintrag.StundenGesamt += (decimal)s.Minutes / 60; + + if (s.ServiceDescription.Contains("DL")) + { + if (eintrag.DirekteLeistung == null) + { + eintrag.DirekteLeistung = s; + } + else + { + eintrag.DirekteLeistung.Minutes += s.Minutes; + eintrag.DirekteLeistung.Notice = String.Format("{0}\n{1}", eintrag.DirekteLeistung.Notice, s.Notice); + } + } + else + { + eintrag.MittelbareLeistungen.Add(s); + } + + } + + return records; + } + + private decimal GetStundensatz(ServicesOverviewRO pRO) + { + if (pRO.CostBearer2SupportConceptList != null && pRO.CostBearer2SupportConceptList.Count > 0) + { + var c2s = pRO.CostBearer2SupportConceptList[0]; + + var crpList = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(c2s.CostBearer.CostRatePeriods); + + var cp = crpList.GetCostRatePeriodForDate(CostRatePeriodType.HourlyRate, pRO.StartDate); + + if (cp != null && cp.CostRateValue.HasValue) + { + return cp.CostRateValue.Value; + } + } + + return 0; + } + } + + public class TabellenEintrag + { + public DateTime Tag { get; set; } + + public decimal StundenGesamt { get; set; } + + public ServicesOverviewRO.ServiceDetail DirekteLeistung { get; set; } + + public List MittelbareLeistungen { get; set; } + + public List AlleEintraege + { + get + { + var alleRecords = new List(); + + if (DirekteLeistung != null) + { + alleRecords.Add(DirekteLeistung); + } + alleRecords.AddRange(MittelbareLeistungen); + + return alleRecords; + } + } + } +} diff --git a/ReportImp/AlzeyTeilhabe/StundenzettelBi2.resx b/ReportImp/AlzeyTeilhabe/StundenzettelBi2.resx new file mode 100644 index 000000000..19e908bd3 --- /dev/null +++ b/ReportImp/AlzeyTeilhabe/StundenzettelBi2.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 21, 17 + + \ No newline at end of file diff --git a/ReportImp/AutismusKoelnBonn/AutismusKoelnBonn.csproj b/ReportImp/AutismusKoelnBonn/AutismusKoelnBonn.csproj index aa3512c9f..85b399488 100644 --- a/ReportImp/AutismusKoelnBonn/AutismusKoelnBonn.csproj +++ b/ReportImp/AutismusKoelnBonn/AutismusKoelnBonn.csproj @@ -121,7 +121,6 @@ InvoiceCustomerReport.cs Designer - Quittierungsbeleg.cs Designer diff --git a/ReportImp/BellaDonna/AnzahlUrlaubstage.Designer.cs b/ReportImp/BellaDonna/AnzahlUrlaubstage.Designer.cs new file mode 100644 index 000000000..895b29458 --- /dev/null +++ b/ReportImp/BellaDonna/AnzahlUrlaubstage.Designer.cs @@ -0,0 +1,328 @@ +using BeWo.Report.ReportObjects; +namespace BellaDonna +{ + partial class AnzahlUrlaubstage + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + this.Detail = new DevExpress.XtraReports.UI.DetailBand(); + this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); + this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblHeader = new DevExpress.XtraReports.UI.XRLabel(); + this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.Title = new DevExpress.XtraReports.UI.XRControlStyle(); + this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle(); + this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle(); + this.DataField = new DevExpress.XtraReports.UI.XRControlStyle(); + this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); + this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); + // + // Detail + // + this.Detail.HeightF = 0F; + this.Detail.Name = "Detail"; + this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // Detail1 + // + this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTableDetail}); + this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Detail1.HeightF = 25F; + this.Detail1.Name = "Detail1"; + this.Detail1.StylePriority.UseFont = false; + // + // xrTableDetail + // + this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTableDetail.Name = "xrTableDetail"; + this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRowDetail}); + this.xrTableDetail.SizeF = new System.Drawing.SizeF(550F, 25F); + this.xrTableDetail.StylePriority.UseBorders = false; + this.xrTableDetail.StylePriority.UsePadding = false; + // + // xrTableRowDetail + // + this.xrTableRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3, + this.xrTableCell7, + this.xrTableCell6}); + this.xrTableRowDetail.Name = "xrTableRowDetail"; + this.xrTableRowDetail.Weight = 1D; + // + // xrTableCell3 + // + this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field2")}); + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.StylePriority.UseFont = false; + this.xrTableCell3.Text = "xrTableCell3"; + this.xrTableCell3.Weight = 0.295420948255445D; + // + // xrTableCell7 + // + this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field3")}); + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Text = "xrTableCell7"; + this.xrTableCell7.Weight = 0.29542094825544496D; + // + // xrTableCell6 + // + this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Rows.Field5")}); + this.xrTableCell6.Multiline = true; + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.xrTableCell6.StylePriority.UsePadding = false; + this.xrTableCell6.StylePriority.UseTextAlignment = false; + this.xrTableCell6.Text = "xrTableCell6"; + this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell6.Weight = 0.22156571119158369D; + // + // DetailReport + // + this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail1, + this.GroupFooter1}); + this.DetailReport.DataMember = "Rows"; + this.DetailReport.DataSource = this.bindingSource1; + this.DetailReport.Level = 0; + this.DetailReport.Name = "DetailReport"; + // + // xrTableHeader + // + this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableHeader.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 40.00003F); + this.xrTableHeader.Name = "xrTableHeader"; + this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRowHeader}); + this.xrTableHeader.SizeF = new System.Drawing.SizeF(550F, 25F); + this.xrTableHeader.StylePriority.UseBorders = false; + this.xrTableHeader.StylePriority.UseFont = false; + this.xrTableHeader.StylePriority.UsePadding = false; + // + // xrTableRowHeader + // + this.xrTableRowHeader.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell5, + this.xrTableCell2, + this.xrTableCell1}); + this.xrTableRowHeader.Name = "xrTableRowHeader"; + this.xrTableRowHeader.Weight = 1D; + // + // xrTableCell5 + // + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Text = "Vorname"; + this.xrTableCell5.Weight = 0.29542097488921715D; + // + // xrTableCell2 + // + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Text = "Nachname"; + this.xrTableCell2.Weight = 0.29542097488921704D; + // + // xrTableCell1 + // + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.xrTableCell1.StylePriority.UsePadding = false; + this.xrTableCell1.StylePriority.UseTextAlignment = false; + this.xrTableCell1.Text = "Anzahl Urlaubstage"; + this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell1.Weight = 0.22156573116691275D; + // + // lblHeader + // + this.lblHeader.Font = new System.Drawing.Font("Arial", 12F); + this.lblHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10F); + this.lblHeader.Multiline = true; + this.lblHeader.Name = "lblHeader"; + this.lblHeader.SizeF = new System.Drawing.SizeF(677F, 25F); + this.lblHeader.StyleName = "Title"; + this.lblHeader.StylePriority.UseFont = false; + this.lblHeader.Text = "Urlaubstage 2022"; + // + // GroupFooter1 + // + this.GroupFooter1.HeightF = 0F; + this.GroupFooter1.Name = "GroupFooter1"; + this.GroupFooter1.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand; + // + // ReportHeader + // + this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTableHeader, + this.lblHeader}); + this.ReportHeader.HeightF = 65.00003F; + this.ReportHeader.Name = "ReportHeader"; + // + // Title + // + this.Title.BackColor = System.Drawing.Color.White; + this.Title.BorderColor = System.Drawing.SystemColors.ControlText; + this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.Title.BorderWidth = 1F; + this.Title.Font = new System.Drawing.Font("Times New Roman", 24F); + this.Title.ForeColor = System.Drawing.Color.Black; + this.Title.Name = "Title"; + // + // FieldCaption + // + this.FieldCaption.BackColor = System.Drawing.Color.White; + this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText; + this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.FieldCaption.BorderWidth = 1F; + this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold); + this.FieldCaption.ForeColor = System.Drawing.Color.Black; + this.FieldCaption.Name = "FieldCaption"; + // + // PageInfo + // + this.PageInfo.BackColor = System.Drawing.Color.White; + this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText; + this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.PageInfo.BorderWidth = 1F; + this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F); + this.PageInfo.ForeColor = System.Drawing.Color.Black; + this.PageInfo.Name = "PageInfo"; + // + // DataField + // + this.DataField.BackColor = System.Drawing.Color.White; + this.DataField.BorderColor = System.Drawing.SystemColors.ControlText; + this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.DataField.BorderWidth = 1F; + this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F); + this.DataField.ForeColor = System.Drawing.SystemColors.ControlText; + this.DataField.Name = "DataField"; + // + // fieldFLS + // + this.fieldFLS.DataMember = "FLSReportGroups"; + this.fieldFLS.Expression = "[TotalFLM] / 60"; + this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldFLS.Name = "fieldFLS"; + // + // topMarginBand1 + // + this.topMarginBand1.HeightF = 50F; + this.topMarginBand1.Name = "topMarginBand1"; + // + // bottomMarginBand1 + // + this.bottomMarginBand1.HeightF = 50F; + this.bottomMarginBand1.Name = "bottomMarginBand1"; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.QueryRO); + // + // AnzahlUrlaubstage + // + this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail, + this.DetailReport, + this.ReportHeader, + this.topMarginBand1, + this.bottomMarginBand1}); + this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { + this.fieldFLS}); + this.DataSource = this.bindingSource1; + this.Margins = new System.Drawing.Printing.Margins(75, 75, 50, 50); + this.PageHeight = 1169; + this.PageWidth = 827; + this.PaperKind = System.Drawing.Printing.PaperKind.A4; + this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] { + this.Title, + this.FieldCaption, + this.PageInfo, + this.DataField}); + this.Version = "17.1"; + ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); + + } + + #endregion + + private DevExpress.XtraReports.UI.DetailBand Detail; + private System.Windows.Forms.BindingSource bindingSource1; + private DevExpress.XtraReports.UI.DetailBand Detail1; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport; + private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; + private DevExpress.XtraReports.UI.XRControlStyle Title; + private DevExpress.XtraReports.UI.XRControlStyle FieldCaption; + private DevExpress.XtraReports.UI.XRControlStyle PageInfo; + private DevExpress.XtraReports.UI.XRControlStyle DataField; + private DevExpress.XtraReports.UI.XRTable xrTableHeader; + private DevExpress.XtraReports.UI.XRTableRow xrTableRowHeader; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRTable xrTableDetail; + private DevExpress.XtraReports.UI.XRTableRow xrTableRowDetail; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.CalculatedField fieldFLS; + private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; + private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; + private DevExpress.XtraReports.UI.XRLabel lblHeader; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; + } +} diff --git a/ReportImp/BellaDonna/AnzahlUrlaubstage.cs b/ReportImp/BellaDonna/AnzahlUrlaubstage.cs new file mode 100644 index 000000000..b77b93bf0 --- /dev/null +++ b/ReportImp/BellaDonna/AnzahlUrlaubstage.cs @@ -0,0 +1,83 @@ +using System; +using BeWo.Report.ReportObjects; +using BeWo.Report; +using DevExpress.XtraReports.UI; +using System.Data; +using BeWo.Data.Entities; +using BeWo.Data.Access; + +namespace BellaDonna +{ + public partial class AnzahlUrlaubstage : DevExpress.XtraReports.UI.XtraReport, IBeWoReport + { + public AnzahlUrlaubstage() + { + InitializeComponent(); + + } + + public void SetReportDataSource(QueryRO pRO) + { + InitTable(pRO); + this.bindingSource1.DataSource = pRO; + } + + private void InitTable(QueryRO ro) + { + + foreach (var row in ro.Rows) + { + long eoid = Int64.Parse(row.Field1.ToString()); + int year = Int32.Parse(row.Field4.ToString()); + lblHeader.Text = String.Format("Urlaubstage {0}", year); + + + Employee emp = DAOFactory.GenericDAO.LoadByID(eoid); + + int tage = 0; + foreach (var item in emp.AbsenceTimes) + { + if (item.AbsenceReason.Description.ToLower().Contains("urlaub")) + { + DateTime start = new DateTime(year, 1, 1); + DateTime end = new DateTime(year, 12, 31); + + if (item.End.HasValue && item.End.Value < end) + { + end = item.End.Value; + } + if (item.Start.HasValue && item.Start.Value > start) + { + start = item.Start.Value; + } + + if (end >= start && end >= new DateTime(year, 1, 1) && start <= new DateTime(year, 12, 31)) + { + DateTime dt = start; + + while (dt <= end) + { + if (dt.DayOfWeek != DayOfWeek.Sunday && dt.DayOfWeek != DayOfWeek.Saturday && !IstFeiertag(dt)) + { + tage++; + } + dt = dt.AddDays(1); + } + + } + } + } + + row.Field5 = String.Format("{0:0.##}", tage); + } + + } + + private bool IstFeiertag(DateTime dt) + { + var berechnung = new MitarbeiterstundenkontoBerechnung(); + + return berechnung.IstFeiertag(dt); + } + } +} diff --git a/ReportImp/BellaDonna/AnzahlUrlaubstage.resx b/ReportImp/BellaDonna/AnzahlUrlaubstage.resx new file mode 100644 index 000000000..d25f3eba2 --- /dev/null +++ b/ReportImp/BellaDonna/AnzahlUrlaubstage.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + \ No newline at end of file diff --git a/ReportImp/BellaDonna/BellaDonna.csproj b/ReportImp/BellaDonna/BellaDonna.csproj index 6a58284c5..b0e724027 100644 --- a/ReportImp/BellaDonna/BellaDonna.csproj +++ b/ReportImp/BellaDonna/BellaDonna.csproj @@ -48,6 +48,12 @@ + + Component + + + AnzahlUrlaubstage.cs + Component @@ -57,6 +63,12 @@ + + Component + + + Mitarbeiterstundenkonto.cs + Component @@ -109,10 +121,18 @@ + + AnzahlUrlaubstage.cs + Designer + Finanzauswertung.cs Designer + + Mitarbeiterstundenkonto.cs + Designer + Quittierungsbeleg.cs diff --git a/ReportImp/BellaDonna/Mitarbeiterstundenkonto.cs b/ReportImp/BellaDonna/Mitarbeiterstundenkonto.cs new file mode 100644 index 000000000..e9760c7c5 --- /dev/null +++ b/ReportImp/BellaDonna/Mitarbeiterstundenkonto.cs @@ -0,0 +1,27 @@ +using System; +using BeWo.Report.ReportObjects; +using BS.Shared.Core; + + +namespace BeWo.Report.DefaultReports +{ + [IDSpecificClass(Identifier = "Mitarbeiterstundenkonto")] + public partial class Mitarbeiterstundenkonto : DevExpress.XtraReports.UI.XtraReport, IBeWoReport + { + + + public Mitarbeiterstundenkonto() + { + InitializeComponent(); + } + + public void SetReportDataSource(MitarbeiterstundenkontoRO pRO) + { + var msb = new MitarbeiterstundenkontoBerechnung(); + msb.CreateReport(pRO); + + this.bindingSource1.DataSource = pRO; + } + + } +} diff --git a/ReportImp/BellaDonna/Mitarbeiterstundenkonto.designer.cs b/ReportImp/BellaDonna/Mitarbeiterstundenkonto.designer.cs new file mode 100644 index 000000000..805726bfc --- /dev/null +++ b/ReportImp/BellaDonna/Mitarbeiterstundenkonto.designer.cs @@ -0,0 +1,745 @@ +using BeWo.Report.ReportObjects; +namespace BeWo.Report.DefaultReports +{ + partial class Mitarbeiterstundenkonto + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + this.Detail = new DevExpress.XtraReports.UI.DetailBand(); + this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); + this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); + this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellSollGesamt = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellFLSSollGesamt = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellFLSPlusMinusGesamt = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellRelationGesamt = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.lblMonat = new DevExpress.XtraReports.UI.XRLabel(); + this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand(); + this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); + this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo(); + this.Title = new DevExpress.XtraReports.UI.XRControlStyle(); + this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle(); + this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle(); + this.DataField = new DevExpress.XtraReports.UI.XRControlStyle(); + this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); + this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); + ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); + // + // Detail + // + this.Detail.HeightF = 0F; + this.Detail.Name = "Detail"; + this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // Detail1 + // + this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTableDetail}); + this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Detail1.HeightF = 25F; + this.Detail1.Name = "Detail1"; + this.Detail1.StylePriority.UseFont = false; + // + // xrTableDetail + // + this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableDetail.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTableDetail.Name = "xrTableDetail"; + this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRowDetail}); + this.xrTableDetail.SizeF = new System.Drawing.SizeF(1075F, 25F); + this.xrTableDetail.StylePriority.UseBorders = false; + this.xrTableDetail.StylePriority.UseFont = false; + this.xrTableDetail.StylePriority.UsePadding = false; + this.xrTableDetail.StylePriority.UseTextAlignment = false; + this.xrTableDetail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrTableRowDetail + // + this.xrTableRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3, + this.xrTableCell19, + this.xrTableCell20, + this.xrTableCell28, + this.xrTableCell16, + this.xrTableCell27, + this.xrTableCell22, + this.xrTableCell23, + this.xrTableCell21, + this.xrTableCell25, + this.xrTableCell24, + this.xrTableCell26, + this.xrTableCell6}); + this.xrTableRowDetail.Name = "xrTableRowDetail"; + this.xrTableRowDetail.Weight = 1D; + // + // xrTableCell3 + // + this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FullName")}); + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.xrTableCell3.StylePriority.UseFont = false; + this.xrTableCell3.StylePriority.UsePadding = false; + this.xrTableCell3.StylePriority.UseTextAlignment = false; + this.xrTableCell3.Text = "xrTableCell3"; + this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell3.Weight = 0.15329125338142471D; + // + // xrTableCell19 + // + this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollMax", "{0:0.00}")}); + this.xrTableCell19.Name = "xrTableCell19"; + this.xrTableCell19.Text = "xrTableCell19"; + this.xrTableCell19.Weight = 0.081154151689479551D; + // + // xrTableCell20 + // + this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UrlaubUndKrankheit", "{0:0.00}")}); + this.xrTableCell20.Name = "xrTableCell20"; + this.xrTableCell20.Text = "xrTableCell20"; + this.xrTableCell20.Weight = 0.094679933071566441D; + // + // xrTableCell28 + // + this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollOhneUrlaubKrankheit", "{0:0.00}")}); + this.xrTableCell28.Name = "xrTableCell28"; + this.xrTableCell28.Text = "xrTableCell28"; + this.xrTableCell28.Weight = 0.0721370604147881D; + // + // xrTableCell16 + // + this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsSoll", "{0:0.00}")}); + this.xrTableCell16.Name = "xrTableCell16"; + this.xrTableCell16.Text = "xrTableCell16"; + this.xrTableCell16.Weight = 0.063119927862939587D; + // + // xrTableCell27 + // + this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsIst", "{0:0.00}")}); + this.xrTableCell27.Name = "xrTableCell27"; + this.xrTableCell27.Text = "xrTableCell27"; + this.xrTableCell27.Weight = 0.063119927862939615D; + // + // xrTableCell22 + // + this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsDiff", "{0:0.00}")}); + this.xrTableCell22.Name = "xrTableCell22"; + this.xrTableCell22.Text = "xrTableCell22"; + this.xrTableCell22.Weight = 0.063119927862939587D; + // + // xrTableCell23 + // + this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenGesamtIst", "{0:0.00}")}); + this.xrTableCell23.Name = "xrTableCell23"; + this.xrTableCell23.Text = "xrTableCell23"; + this.xrTableCell23.Weight = 0.063119927862939559D; + // + // xrTableCell21 + // + this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.RelationFlsZuMittelbar", "{0:0.00}")}); + this.xrTableCell21.Name = "xrTableCell21"; + this.xrTableCell21.Text = "xrTableCell21"; + this.xrTableCell21.Weight = 0.063119927862939615D; + // + // xrTableCell25 + // + this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Ueberstunden", "{0:0.00}")}); + this.xrTableCell25.Name = "xrTableCell25"; + this.xrTableCell25.Text = "xrTableCell25"; + this.xrTableCell25.Weight = 0.063119927862939587D; + // + // xrTableCell24 + // + this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenVormonat", "{0:0.00}")}); + this.xrTableCell24.Name = "xrTableCell24"; + this.xrTableCell24.Text = "xrTableCell24"; + this.xrTableCell24.Weight = 0.0631199278629396D; + // + // xrTableCell26 + // + this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenGesamt", "{0:0.00}")}); + this.xrTableCell26.Name = "xrTableCell26"; + this.xrTableCell26.Text = "xrTableCell26"; + this.xrTableCell26.Weight = 0.063119927862939573D; + // + // DetailReport + // + this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail1, + this.GroupHeader1, + this.GroupFooter1}); + this.DetailReport.DataMember = "EmployeeDetailList"; + this.DetailReport.DataSource = this.bindingSource1; + this.DetailReport.Level = 0; + this.DetailReport.Name = "DetailReport"; + // + // GroupHeader1 + // + this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTableHeader}); + this.GroupHeader1.HeightF = 70F; + this.GroupHeader1.Name = "GroupHeader1"; + this.GroupHeader1.RepeatEveryPage = true; + // + // xrTableHeader + // + this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableHeader.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold); + this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTableHeader.Name = "xrTableHeader"; + this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRowHeader}); + this.xrTableHeader.SizeF = new System.Drawing.SizeF(1075F, 70F); + this.xrTableHeader.StylePriority.UseBorders = false; + this.xrTableHeader.StylePriority.UseFont = false; + this.xrTableHeader.StylePriority.UsePadding = false; + this.xrTableHeader.StylePriority.UseTextAlignment = false; + this.xrTableHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrTableRowHeader + // + this.xrTableRowHeader.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell5, + this.xrTableCell4, + this.xrTableCell2, + this.xrTableCell9, + this.xrTableCell8, + this.xrTableCell10, + this.xrTableCell7, + this.xrTableCell11, + this.xrTableCell12, + this.xrTableCell13, + this.xrTableCell14, + this.xrTableCell15, + this.xrTableCell1}); + this.xrTableRowHeader.Name = "xrTableRowHeader"; + this.xrTableRowHeader.Weight = 2.8D; + // + // xrTableCell5 + // + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.xrTableCell5.StylePriority.UsePadding = false; + this.xrTableCell5.StylePriority.UseTextAlignment = false; + this.xrTableCell5.Text = "Name"; + this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell5.Weight = 0.15329125016467182D; + // + // xrTableCell4 + // + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.Text = "Reguläre SOLL Stunden"; + this.xrTableCell4.Weight = 0.081154192324637608D; + // + // xrTableCell2 + // + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Text = "Fehlzeiten Urlaub Krankheit(Tage)"; + this.xrTableCell2.Weight = 0.094679896646570338D; + // + // xrTableCell9 + // + this.xrTableCell9.Multiline = true; + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Text = "Tatsächliche SOLL Stunden"; + this.xrTableCell9.Weight = 0.072137063712635591D; + // + // xrTableCell8 + // + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Text = "FLS Stunden SOLL"; + this.xrTableCell8.Weight = 0.063119927721024038D; + // + // xrTableCell10 + // + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.StylePriority.UseBackColor = false; + this.xrTableCell10.Text = "FLS IST lfd. Monat"; + this.xrTableCell10.Weight = 0.063119927721024D; + // + // xrTableCell7 + // + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Text = "FLS Plus/Minus lfd. Monat"; + this.xrTableCell7.Weight = 0.06311992757910842D; + // + // xrTableCell11 + // + this.xrTableCell11.Multiline = true; + this.xrTableCell11.Name = "xrTableCell11"; + this.xrTableCell11.StylePriority.UseBackColor = false; + this.xrTableCell11.Text = "Gesamt-\r\nstunden lfd. Monat"; + this.xrTableCell11.Weight = 0.063119927721024011D; + // + // xrTableCell12 + // + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.Text = "Relation FLS IST zu Mittelbare IST (in %)"; + this.xrTableCell12.Weight = 0.063119929511863376D; + // + // xrTableCell13 + // + this.xrTableCell13.Name = "xrTableCell13"; + this.xrTableCell13.Text = "Überstd. neu"; + this.xrTableCell13.Weight = 0.063119928687401447D; + // + // xrTableCell14 + // + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.StylePriority.UseBackColor = false; + this.xrTableCell14.Text = "Überstd. Vormonat"; + this.xrTableCell14.Weight = 0.063119928275170531D; + // + // xrTableCell15 + // + this.xrTableCell15.Name = "xrTableCell15"; + this.xrTableCell15.Text = "Überstd. Gesamt"; + this.xrTableCell15.Weight = 0.0631199213956443D; + // + // GroupFooter1 + // + this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable1}); + this.GroupFooter1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.GroupFooter1.HeightF = 48.95833F; + this.GroupFooter1.Name = "GroupFooter1"; + this.GroupFooter1.StylePriority.UseFont = false; + // + // xrTable1 + // + this.xrTable1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow1}); + this.xrTable1.SizeF = new System.Drawing.SizeF(1075F, 25F); + this.xrTable1.StylePriority.UseBorders = false; + this.xrTable1.StylePriority.UseFont = false; + this.xrTable1.StylePriority.UsePadding = false; + this.xrTable1.StylePriority.UseTextAlignment = false; + this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell35, + this.xrTableCell37, + this.xrTableCell39, + this.cellSollGesamt, + this.cellFLSSollGesamt, + this.cellFLSIstGesamt, + this.cellFLSPlusMinusGesamt, + this.cellGesamtGesamt, + this.cellRelationGesamt, + this.xrTableCell47, + this.xrTableCell48, + this.xrTableCell51, + this.xrTableCell17}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 1D; + // + // xrTableCell35 + // + this.xrTableCell35.Name = "xrTableCell35"; + this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.xrTableCell35.StylePriority.UseFont = false; + this.xrTableCell35.StylePriority.UsePadding = false; + this.xrTableCell35.StylePriority.UseTextAlignment = false; + this.xrTableCell35.Text = "Gesamt"; + this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell35.Weight = 0.15329126714047708D; + // + // xrTableCell37 + // + this.xrTableCell37.Name = "xrTableCell37"; + this.xrTableCell37.Weight = 0.081154151689479551D; + // + // xrTableCell39 + // + this.xrTableCell39.Name = "xrTableCell39"; + this.xrTableCell39.Weight = 0.094679919312514085D; + // + // cellSollGesamt + // + this.cellSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SollGesamt", "{0:0.00}")}); + this.cellSollGesamt.Name = "cellSollGesamt"; + this.cellSollGesamt.Text = "cellSollGesamt"; + this.cellSollGesamt.Weight = 0.0721370604147881D; + // + // cellFLSSollGesamt + // + this.cellFLSSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsSollGesamt", "{0:0.00}")}); + this.cellFLSSollGesamt.Name = "cellFLSSollGesamt"; + this.cellFLSSollGesamt.Text = "cellFLSSollGesamt"; + this.cellFLSSollGesamt.Weight = 0.063119927862939587D; + // + // cellFLSIstGesamt + // + this.cellFLSIstGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsIstGesamt", "{0:0.00}")}); + this.cellFLSIstGesamt.Name = "cellFLSIstGesamt"; + this.cellFLSIstGesamt.Text = "cellFLSIstGesamt"; + this.cellFLSIstGesamt.Weight = 0.063119927862939615D; + // + // cellFLSPlusMinusGesamt + // + this.cellFLSPlusMinusGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsDiffGesamt", "{0:0.00}")}); + this.cellFLSPlusMinusGesamt.Name = "cellFLSPlusMinusGesamt"; + this.cellFLSPlusMinusGesamt.Text = "cellFLSPlusMinusGesamt"; + this.cellFLSPlusMinusGesamt.Weight = 0.063119927862939587D; + // + // cellGesamtGesamt + // + this.cellGesamtGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "StundenGesamt", "{0:0.00}")}); + this.cellGesamtGesamt.Name = "cellGesamtGesamt"; + this.cellGesamtGesamt.Text = "cellGesamtGesamt"; + this.cellGesamtGesamt.Weight = 0.063119927862939573D; + // + // cellRelationGesamt + // + this.cellRelationGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RelationFlsZuMittelbar", "{0:0.00}")}); + this.cellRelationGesamt.Name = "cellRelationGesamt"; + this.cellRelationGesamt.Text = "cellRelationGesamt"; + this.cellRelationGesamt.Weight = 0.0631199278629396D; + // + // xrTableCell47 + // + this.xrTableCell47.Name = "xrTableCell47"; + this.xrTableCell47.Weight = 0.063119927862939587D; + // + // xrTableCell48 + // + this.xrTableCell48.Name = "xrTableCell48"; + this.xrTableCell48.Weight = 0.063119927862939587D; + // + // xrTableCell51 + // + this.xrTableCell51.Name = "xrTableCell51"; + this.xrTableCell51.Weight = 0.063119927862939573D; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); + // + // ReportHeader + // + this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblMonat}); + this.ReportHeader.HeightF = 35F; + this.ReportHeader.Name = "ReportHeader"; + // + // lblMonat + // + this.lblMonat.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "Stundenkonto {0:MMMM yyyy}")}); + this.lblMonat.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); + this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.lblMonat.Multiline = true; + this.lblMonat.Name = "lblMonat"; + this.lblMonat.SizeF = new System.Drawing.SizeF(1007F, 25F); + this.lblMonat.StyleName = "Title"; + this.lblMonat.StylePriority.UseFont = false; + // + // pageFooterBand1 + // + this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrPageInfo2, + this.xrPageInfo1}); + this.pageFooterBand1.HeightF = 48F; + this.pageFooterBand1.Name = "pageFooterBand1"; + // + // xrPageInfo2 + // + this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F); + this.xrPageInfo2.Format = "Seite {0} von {1}"; + this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(935F, 25F); + this.xrPageInfo2.Name = "xrPageInfo2"; + this.xrPageInfo2.SizeF = new System.Drawing.SizeF(139.9999F, 23F); + this.xrPageInfo2.StyleName = "PageInfo"; + this.xrPageInfo2.StylePriority.UseFont = false; + this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + // + // xrPageInfo1 + // + this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F); + this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); + this.xrPageInfo1.Name = "xrPageInfo1"; + this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime; + this.xrPageInfo1.SizeF = new System.Drawing.SizeF(260.0001F, 23F); + this.xrPageInfo1.StyleName = "PageInfo"; + this.xrPageInfo1.StylePriority.UseFont = false; + // + // Title + // + this.Title.BackColor = System.Drawing.Color.White; + this.Title.BorderColor = System.Drawing.SystemColors.ControlText; + this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.Title.BorderWidth = 1F; + this.Title.Font = new System.Drawing.Font("Times New Roman", 24F); + this.Title.ForeColor = System.Drawing.Color.Black; + this.Title.Name = "Title"; + // + // FieldCaption + // + this.FieldCaption.BackColor = System.Drawing.Color.White; + this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText; + this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.FieldCaption.BorderWidth = 1F; + this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold); + this.FieldCaption.ForeColor = System.Drawing.Color.Black; + this.FieldCaption.Name = "FieldCaption"; + // + // PageInfo + // + this.PageInfo.BackColor = System.Drawing.Color.White; + this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText; + this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.PageInfo.BorderWidth = 1F; + this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F); + this.PageInfo.ForeColor = System.Drawing.Color.Black; + this.PageInfo.Name = "PageInfo"; + // + // DataField + // + this.DataField.BackColor = System.Drawing.Color.White; + this.DataField.BorderColor = System.Drawing.SystemColors.ControlText; + this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.DataField.BorderWidth = 1F; + this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F); + this.DataField.ForeColor = System.Drawing.SystemColors.ControlText; + this.DataField.Name = "DataField"; + // + // fieldFLS + // + this.fieldFLS.DataMember = "FLSReportGroups"; + this.fieldFLS.Expression = "[TotalFLM] / 60"; + this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldFLS.Name = "fieldFLS"; + // + // topMarginBand1 + // + this.topMarginBand1.HeightF = 50F; + this.topMarginBand1.Name = "topMarginBand1"; + // + // bottomMarginBand1 + // + this.bottomMarginBand1.HeightF = 30F; + this.bottomMarginBand1.Name = "bottomMarginBand1"; + // + // xrTableCell1 + // + this.xrTableCell1.Multiline = true; + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Text = "Urlaubstage\r\nGesamt\r\nim Jahr"; + this.xrTableCell1.Weight = 0.0631199213956443D; + // + // xrTableCell6 + // + this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UrlaubGesamtImAktuellenJahr")}); + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Text = "xrTableCell6"; + this.xrTableCell6.Weight = 0.063119927862939573D; + // + // xrTableCell17 + // + this.xrTableCell17.Name = "xrTableCell17"; + this.xrTableCell17.Weight = 0.063119927862939573D; + // + // Mitarbeiterstundenkonto + // + this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail, + this.DetailReport, + this.ReportHeader, + this.pageFooterBand1, + this.topMarginBand1, + this.bottomMarginBand1}); + this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { + this.fieldFLS}); + this.DataSource = this.bindingSource1; + this.Landscape = true; + this.Margins = new System.Drawing.Printing.Margins(50, 40, 50, 30); + this.PageHeight = 827; + this.PageWidth = 1169; + this.PaperKind = System.Drawing.Printing.PaperKind.A4; + this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] { + this.Title, + this.FieldCaption, + this.PageInfo, + this.DataField}); + this.Version = "17.1"; + ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); + + } + + #endregion + + private DevExpress.XtraReports.UI.DetailBand Detail; + private System.Windows.Forms.BindingSource bindingSource1; + private DevExpress.XtraReports.UI.DetailBand Detail1; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport; + private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; + private DevExpress.XtraReports.UI.XRLabel lblMonat; + private DevExpress.XtraReports.UI.PageFooterBand pageFooterBand1; + private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2; + private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1; + private DevExpress.XtraReports.UI.XRControlStyle Title; + private DevExpress.XtraReports.UI.XRControlStyle FieldCaption; + private DevExpress.XtraReports.UI.XRControlStyle PageInfo; + private DevExpress.XtraReports.UI.XRControlStyle DataField; + private DevExpress.XtraReports.UI.CalculatedField fieldFLS; + private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; + private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; + private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1; + private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; + private DevExpress.XtraReports.UI.XRTable xrTable1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell35; + private DevExpress.XtraReports.UI.XRTableCell cellSollGesamt; + private DevExpress.XtraReports.UI.XRTableCell cellFLSSollGesamt; + private DevExpress.XtraReports.UI.XRTableCell cellFLSIstGesamt; + private DevExpress.XtraReports.UI.XRTableCell cellFLSPlusMinusGesamt; + private DevExpress.XtraReports.UI.XRTableCell cellGesamtGesamt; + private DevExpress.XtraReports.UI.XRTableCell cellRelationGesamt; + private DevExpress.XtraReports.UI.XRTable xrTableDetail; + private DevExpress.XtraReports.UI.XRTableRow xrTableRowDetail; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell28; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell27; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell22; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell25; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell24; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell26; + private DevExpress.XtraReports.UI.XRTable xrTableHeader; + private DevExpress.XtraReports.UI.XRTableRow xrTableRowHeader; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell37; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell39; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell47; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell48; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell51; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; + } +} diff --git a/ReportImp/BellaDonna/Mitarbeiterstundenkonto.resx b/ReportImp/BellaDonna/Mitarbeiterstundenkonto.resx new file mode 100644 index 000000000..d25f3eba2 --- /dev/null +++ b/ReportImp/BellaDonna/Mitarbeiterstundenkonto.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + \ No newline at end of file diff --git a/ReportImp/DiakonieKKKleve/Invoicing/DiakoneKKKleveSoziotherapieInvoiceCreation.cs b/ReportImp/DiakonieKKKleve/Invoicing/DiakoneKKKleveSoziotherapieInvoiceCreation.cs index c1275eb25..0cf19ed20 100644 --- a/ReportImp/DiakonieKKKleve/Invoicing/DiakoneKKKleveSoziotherapieInvoiceCreation.cs +++ b/ReportImp/DiakonieKKKleve/Invoicing/DiakoneKKKleveSoziotherapieInvoiceCreation.cs @@ -68,12 +68,12 @@ namespace DiakonieKKKleve.Invoicing { var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc); - if (iServiceRecord.CostBearer.Name.Contains("Techniker Krankenkasse")) - { - ii.RateFactor = null; - ii.AmountTotal = ii.AmountPerUnit * ii.UnitCount; - ii.GrossAmountTotal = ii.AmountTotal; - } + //if (iServiceRecord.CostBearer.Name.Contains("Techniker Krankenkasse")) + // { + // ii.RateFactor = null; + // ii.AmountTotal = ii.AmountPerUnit * ii.UnitCount; + // ii.GrossAmountTotal = ii.AmountTotal; + //} if (ii.ItemDescription.ToLower().Contains("probe")) { @@ -109,14 +109,14 @@ namespace DiakonieKKKleve.Invoicing { var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc); - if (iServiceRecord.CostBearer.Name.Contains("Techniker Krankenkasse")) - { - ii.UnitCount = ii.UnitCount * ii.RateFactor / 100; - ii.AmountTotal = ii.AmountPerUnit * ii.UnitCount; - ii.GrossAmountTotal = ii.AmountTotal; - ii.RateFactor = null; - ii.UnitDescription = "Mittelbare Leistung (Verwaltung)"; - } + //if (iServiceRecord.CostBearer.Name.Contains("Techniker Krankenkasse")) + // { + // ii.UnitCount = ii.UnitCount * ii.RateFactor / 100; + // ii.AmountTotal = ii.AmountPerUnit * ii.UnitCount; + // ii.GrossAmountTotal = ii.AmountTotal; + // ii.RateFactor = null; + // ii.UnitDescription = "Mittelbare Leistung (Verwaltung)"; + //} return ii; } @@ -125,14 +125,14 @@ namespace DiakonieKKKleve.Invoicing Calculations calc) { var list = new List(); - if (scap.CostBearer2SupportConcept.CostBearer.Organisation.Name.Contains("Techniker Krankenkasse")) - { - list = (List)CreateInvoiceItemsTKK(serviceRecordsInPeriod, invoicePeriod, scap, calc); - } - else - { + //if (scap.CostBearer2SupportConcept.CostBearer.Organisation.Name.Contains("Techniker Krankenkasse")) + //{ + // list = (List)CreateInvoiceItemsTKK(serviceRecordsInPeriod, invoicePeriod, scap, calc); + //} + //else + //{ list = (List)base.CreateInvoiceItems(serviceRecordsInPeriod, invoicePeriod, scap, calc); - } + //} var ii = CreateHausbesuchspauschale(serviceRecordsInPeriod, invoicePeriod, scap); list.AddRange(ii); @@ -140,32 +140,32 @@ namespace DiakonieKKKleve.Invoicing return list; } - public virtual IList CreateInvoiceItemsTKK(List serviceRecordsInPeriod, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, Calculations calc) - { - var list = new List(); - foreach (ServiceRecordDC iServiceRecord in serviceRecordsInPeriod) - { - if (iServiceRecord.ServiceDescription.Category.IsBillable) - { - if (!iServiceRecord.AlreadyAccounted) - { - InvoiceItem invoiceItem = CreateInvoiceItem(iServiceRecord, scap, calc); - if (invoiceItem != null) - { - list.Add(invoiceItem); - } - InvoiceItem invoiceItemFactor = CreateInvoiceItemFactor(iServiceRecord, scap, calc); - if (invoiceItemFactor != null) - { - list.Add(invoiceItemFactor); - } - } - iServiceRecord.AlreadyAccounted = true; - } - } + //public virtual IList CreateInvoiceItemsTKK(List serviceRecordsInPeriod, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, Calculations calc) + //{ + // var list = new List(); + // foreach (ServiceRecordDC iServiceRecord in serviceRecordsInPeriod) + // { + // if (iServiceRecord.ServiceDescription.Category.IsBillable) + // { + // if (!iServiceRecord.AlreadyAccounted) + // { + // InvoiceItem invoiceItem = CreateInvoiceItem(iServiceRecord, scap, calc); + // if (invoiceItem != null) + // { + // list.Add(invoiceItem); + // } + // InvoiceItem invoiceItemFactor = CreateInvoiceItemFactor(iServiceRecord, scap, calc); + // if (invoiceItemFactor != null) + // { + // list.Add(invoiceItemFactor); + // } + // } + // iServiceRecord.AlreadyAccounted = true; + // } + // } - return CreateSummaryInvoiceItems(list, invoicePeriod, scap, calc); - } + // return CreateSummaryInvoiceItems(list, invoicePeriod, scap, calc); + //} public virtual IList CreateHausbesuchspauschale(List serviceRecordsInPeriod, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap) { diff --git a/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.cs b/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.cs index 42969ee99..327431eef 100644 --- a/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.cs +++ b/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.cs @@ -8,6 +8,7 @@ using BeWo.Report; using System.Collections.Generic; using BeWo.Data.Access; using BeWo.Data.Entities; +using BeWo.Service.DCEntityMapper; namespace BeWo.DiakonieKKKleve { @@ -26,6 +27,25 @@ namespace BeWo.DiakonieKKKleve { foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services) { + var serviceRecord = DAOFactory.GenericDAO.LoadByID(s.ServiceRecordOid); + + var srDc = MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDC(serviceRecord); + + s.GoalList = String.Empty; + if (srDc.Goals != null && srDc.Goals.Count > 0) + { + + foreach (var goal in srDc.Goals) + { + if (!String.IsNullOrEmpty(goal.Abbreviation)) + { + if (s.GoalList.Length > 0) + s.GoalList += ", "; + s.GoalList += goal.Abbreviation; + } + } + } + if (s.ServiceDescription.Contains("Video")) { s.ServiceDescription = "V"; diff --git a/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.designer.cs b/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.designer.cs index ee3f5be2c..e9f375577 100644 --- a/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.designer.cs +++ b/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.designer.cs @@ -30,6 +30,7 @@ namespace BeWo.DiakonieKKKleve private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LeistungsnachweisSoziotherapie)); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -56,7 +57,7 @@ namespace BeWo.DiakonieKKKleve this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule(); this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule(); @@ -64,7 +65,6 @@ namespace BeWo.DiakonieKKKleve this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); - this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); @@ -88,6 +88,12 @@ namespace BeWo.DiakonieKKKleve this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldArt = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldGroup = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -129,6 +135,7 @@ namespace BeWo.DiakonieKKKleve this.xrTableCell11, this.xrTableCell7, this.xrTableCell16, + this.xrTableCell19, this.xrTableCell14, this.xrTableCell5}); this.xrTableRow2.Name = "xrTableRow2"; @@ -168,42 +175,43 @@ namespace BeWo.DiakonieKKKleve // this.xrTableCell11.Multiline = true; this.xrTableCell11.Name = "xrTableCell11"; - this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); this.xrTableCell11.StylePriority.UseFont = false; + this.xrTableCell11.StylePriority.UsePadding = false; this.xrTableCell11.StylePriority.UseTextAlignment = false; this.xrTableCell11.Text = "Anzahl\r\nEinheiten*\r\nEinzeln"; - this.xrTableCell11.Weight = 0.21947322627465268D; + this.xrTableCell11.Weight = 0.20728026932304136D; // // xrTableCell7 // this.xrTableCell7.Multiline = true; this.xrTableCell7.Name = "xrTableCell7"; this.xrTableCell7.Text = "Anzahl\r\nEinheiten*\r\nGruppe"; - this.xrTableCell7.Weight = 0.21947323646722164D; + this.xrTableCell7.Weight = 0.20728026091063453D; // // xrTableCell16 // this.xrTableCell16.Name = "xrTableCell16"; this.xrTableCell16.Text = "Leistungsform"; - this.xrTableCell16.Weight = 0.29263096229337826D; + this.xrTableCell16.Weight = 0.280438005341767D; // // xrTableCell14 // this.xrTableCell14.Name = "xrTableCell14"; this.xrTableCell14.Text = "Handzeichen Soziothera-peut/in"; - this.xrTableCell14.Weight = 0.36578870400304608D; + this.xrTableCell14.Weight = 0.25605209371119086D; // // xrTableCell5 // this.xrTableCell5.Name = "xrTableCell5"; this.xrTableCell5.Text = "Datum, Unterschrift versicherte Person"; - this.xrTableCell5.Weight = 0.48151942592111374D; + this.xrTableCell5.Weight = 0.43274761671964435D; // // DetailReport // this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { this.Detail1, - this.GroupHeader1}); + this.GroupHeader1, + this.GroupFooter1}); this.DetailReport.DataMember = "Services"; this.DetailReport.DataSource = this.bindingSource1; this.DetailReport.Level = 0; @@ -247,6 +255,7 @@ namespace BeWo.DiakonieKKKleve this.xrTableCell2, this.xrTableCell8, this.xrTableCell10, + this.xrTableCell20, this.xrTableCell18, this.xrTableCell9}); this.xrTableRow6.Name = "xrTableRow6"; @@ -305,30 +314,29 @@ namespace BeWo.DiakonieKKKleve this.xrTableCell2.StylePriority.UseTextAlignment = false; this.xrTableCell2.Text = "xrTableCell2"; this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell2.Weight = 0.1136363732196215D; + this.xrTableCell2.Weight = 0.1073232412993016D; // // xrTableCell8 // this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldGroup", "{0:0.00}")}); this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.Weight = 0.11363637936198562D; + this.xrTableCell8.Weight = 0.10732324744166573D; // // xrTableCell10 // this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.ServiceDescription")}); this.xrTableCell10.Name = "xrTableCell10"; - this.xrTableCell10.Weight = 0.15151516425749251D; + this.xrTableCell10.Weight = 0.14520203233717263D; // // xrTableCell18 // this.xrTableCell18.Name = "xrTableCell18"; - this.xrTableCell18.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F); this.xrTableCell18.StylePriority.UsePadding = false; this.xrTableCell18.StylePriority.UseTextAlignment = false; this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell18.Weight = 0.18939395719588026D; + this.xrTableCell18.Weight = 0.13257577011985949D; // // xrTableCell9 // @@ -338,7 +346,7 @@ namespace BeWo.DiakonieKKKleve this.xrTableCell9.StylePriority.UsePadding = false; this.xrTableCell9.StylePriority.UseTextAlignment = false; this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell9.Weight = 0.24931568999505721D; + this.xrTableCell9.Weight = 0.22406316231377763D; // // GroupHeader1 // @@ -350,9 +358,17 @@ namespace BeWo.DiakonieKKKleve this.GroupHeader1.RepeatEveryPage = true; this.GroupHeader1.StylePriority.UseFont = false; // - // bindingSource1 + // GroupFooter1 // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.cellGesamt, + this.xrLabel8, + this.xrLabel6, + this.xrLabel11}); + this.GroupFooter1.Font = new System.Drawing.Font("Arial", 11F); + this.GroupFooter1.HeightF = 122.5208F; + this.GroupFooter1.Name = "GroupFooter1"; + this.GroupFooter1.StylePriority.UseFont = false; // // formattingRuleStartDate // @@ -397,37 +413,22 @@ namespace BeWo.DiakonieKKKleve // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel3, - this.xrLabel11, - this.xrLabel8, - this.xrLabel6, - this.cellGesamt}); + this.xrLabel10, + this.xrLabel7, + this.xrLabel4}); this.ReportFooter.Font = new System.Drawing.Font("Arial", 11F); - this.ReportFooter.HeightF = 140.125F; + this.ReportFooter.HeightF = 77.97917F; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; - // - // xrLabel3 - // - this.xrLabel3.Font = new System.Drawing.Font("Arial", 9F); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0.0005086263F, 122.125F); - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(1085.229F, 17.99998F); - this.xrLabel3.StylePriority.UseBorders = false; - this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.Text = "* Hinweis: 1 Einheit bei Einzeltherapie umfasst 60 Minuten, im Gruppenkontext 90 " + - "Minuten. Die Einzeltherapie kann auch in Teileinheiten erbracht werden (bspw. 0," + - "5 oder 1,5)."; // // xrLabel11 // this.xrLabel11.Borders = DevExpress.XtraPrinting.BorderSide.Right; this.xrLabel11.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(168.6445F, 0F); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(200F, 0F); this.xrLabel11.Name = "xrLabel11"; this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 0, 0, 100F); - this.xrLabel11.SizeF = new System.Drawing.SizeF(281.3553F, 24.24997F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(249.9996F, 24.24997F); this.xrLabel11.StylePriority.UseBorders = false; this.xrLabel11.StylePriority.UseFont = false; this.xrLabel11.StylePriority.UsePadding = false; @@ -437,7 +438,7 @@ namespace BeWo.DiakonieKKKleve // // xrLabel8 // - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(630.0005F, 36.41669F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(630.0004F, 36.41668F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel8.SizeF = new System.Drawing.SizeF(386.3333F, 17.99997F); @@ -448,7 +449,7 @@ namespace BeWo.DiakonieKKKleve // xrLabel6 // this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(630.0001F, 82.02082F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(630F, 82.02082F); this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel6.SizeF = new System.Drawing.SizeF(467.4581F, 17.99997F); @@ -463,7 +464,7 @@ namespace BeWo.DiakonieKKKleve this.cellGesamt.LocationFloat = new DevExpress.Utils.PointFloat(449.9998F, 0F); this.cellGesamt.Name = "cellGesamt"; this.cellGesamt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); - this.cellGesamt.SizeF = new System.Drawing.SizeF(90.00092F, 24.24997F); + this.cellGesamt.SizeF = new System.Drawing.SizeF(85F, 24.25F); this.cellGesamt.StylePriority.UseBorders = false; this.cellGesamt.StylePriority.UseBorderWidth = false; this.cellGesamt.StylePriority.UseFont = false; @@ -648,6 +649,60 @@ namespace BeWo.DiakonieKKKleve this.fieldGroup.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldGroup.Name = "fieldGroup"; // + // xrLabel4 + // + this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(100.4163F, 0F); + this.xrLabel4.Multiline = true; + this.xrLabel4.Name = "xrLabel4"; + this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(413.1665F, 77.97917F); + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.Text = "1 Soziotherapeutische Dokumentation\r\n2 Verordnung Formular 26 & 27, Erstellung So" + + "ziotherapieplan\r\n3 Arbeiten im sozialen Umfeld\r\n4 Motivation- (Antrieb) relevant" + + "es Training"; + // + // xrLabel7 + // + this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(100F, 20F); + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.Text = "Schlüssel:"; + // + // xrLabel10 + // + this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(570.1245F, 0F); + this.xrLabel10.Multiline = true; + this.xrLabel10.Name = "xrLabel10"; + this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel10.SizeF = new System.Drawing.SizeF(538.8751F, 77.97917F); + this.xrLabel10.StylePriority.UseFont = false; + this.xrLabel10.Text = resources.GetString("xrLabel10.Text"); + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // + // xrTableCell19 + // + this.xrTableCell19.Name = "xrTableCell19"; + this.xrTableCell19.Text = "Schlüssel"; + this.xrTableCell19.Weight = 0.19508730895313436D; + // + // xrTableCell20 + // + this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.GoalList")}); + this.xrTableCell20.Name = "xrTableCell20"; + this.xrTableCell20.StylePriority.UseTextAlignment = false; + this.xrTableCell20.Text = "xrTableCell20"; + this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell20.Weight = 0.10101011051826002D; + // // LeistungsnachweisSoziotherapie // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -739,9 +794,14 @@ namespace BeWo.DiakonieKKKleve private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; - private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.CalculatedField fieldArt; private DevExpress.XtraReports.UI.CalculatedField fieldGroup; + private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; + private DevExpress.XtraReports.UI.XRLabel xrLabel10; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; + private DevExpress.XtraReports.UI.XRLabel xrLabel4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; } } diff --git a/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.resx b/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.resx index 19e908bd3..243072933 100644 --- a/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.resx +++ b/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.resx @@ -118,6 +118,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 21, 17 + 22, 16 + + 5 Training zur handlungsrelevanten Willensbildung +6 Anleitung z. Verbesserung d. Krankheitswahrnehmung +7 Hilfe in Krisensituationen +8 Koordination von Behandlungsmaßnahmen & Leistungen - Absprache Verordner + \ No newline at end of file diff --git a/ReportImp/DiakonieKKKleve/Reporting/DkkkReportCreator.cs b/ReportImp/DiakonieKKKleve/Reporting/DkkkReportCreator.cs index f5d51191f..a888c747d 100644 --- a/ReportImp/DiakonieKKKleve/Reporting/DkkkReportCreator.cs +++ b/ReportImp/DiakonieKKKleve/Reporting/DkkkReportCreator.cs @@ -47,7 +47,7 @@ namespace DiakonieKKKleve.Reporting return base.CreateServiceOverviewReportForCustomers(customerOids, month, year, orgaOid, null, serviceCategoryOid, startDay, endDay, false); } - List lROs = ServicesOverviewRO.Create(month, year, orgaOid, empOid, startDay, endDay); + List lROs = ServicesOverviewRO.Create(month, year, orgaOid, empOid, startDay, endDay, serviceCategoryOid); if (lROs.Count > 0) { diff --git a/ReportImp/DiakonieLandshut/ServicesOverviewReport.Designer.cs b/ReportImp/DiakonieLandshut/ServicesOverviewReport.Designer.cs index e6e0ec3e7..3cf574b68 100644 --- a/ReportImp/DiakonieLandshut/ServicesOverviewReport.Designer.cs +++ b/ReportImp/DiakonieLandshut/ServicesOverviewReport.Designer.cs @@ -72,6 +72,7 @@ namespace DiakonieLandshut this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule(); this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.picMasterHoss = new DevExpress.XtraReports.UI.XRPictureBox(); this.picMasterDeuringerKoesler = new DevExpress.XtraReports.UI.XRPictureBox(); this.picMasterScheugenpflug = new DevExpress.XtraReports.UI.XRPictureBox(); this.picMasterRau = new DevExpress.XtraReports.UI.XRPictureBox(); @@ -105,9 +106,8 @@ namespace DiakonieLandshut this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.PageHeader = new DevExpress.XtraReports.UI.PageHeaderBand(); - this.picMasterHoß = new DevExpress.XtraReports.UI.XRPictureBox(); - this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -529,7 +529,7 @@ namespace DiakonieLandshut // topMarginBand1 // this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.picMasterHoß, + this.picMasterHoss, this.picMasterDeuringerKoesler, this.picMasterScheugenpflug, this.picMasterRau, @@ -548,6 +548,15 @@ namespace DiakonieLandshut this.topMarginBand1.Name = "topMarginBand1"; this.topMarginBand1.StylePriority.UseFont = false; // + // picMasterHoss + // + this.picMasterHoss.Image = ((System.Drawing.Image)(resources.GetObject("picMasterHoss.Image"))); + this.picMasterHoss.LocationFloat = new DevExpress.Utils.PointFloat(180F, 108.4379F); + this.picMasterHoss.Name = "picMasterHoss"; + this.picMasterHoss.SizeF = new System.Drawing.SizeF(41.62585F, 41.56215F); + this.picMasterHoss.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + this.picMasterHoss.Visible = false; + // // picMasterDeuringerKoesler // this.picMasterDeuringerKoesler.Image = ((System.Drawing.Image)(resources.GetObject("picMasterDeuringerKoesler.Image"))); @@ -861,24 +870,6 @@ namespace DiakonieLandshut this.PageHeader.Name = "PageHeader"; this.PageHeader.StylePriority.UseFont = false; // - // picMasterHoß - // - this.picMasterHoß.Image = ((System.Drawing.Image)(resources.GetObject("picMasterHoß.Image"))); - this.picMasterHoß.LocationFloat = new DevExpress.Utils.PointFloat(180F, 108.4379F); - this.picMasterHoß.Name = "picMasterHoß"; - this.picMasterHoß.SizeF = new System.Drawing.SizeF(41.62585F, 41.56215F); - this.picMasterHoß.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - this.picMasterHoß.Visible = false; - // - // xrLabel3 - // - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 120F); - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(288F, 24.99998F); - this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.Text = "Kostenträger:"; - // // xrLabel4 // this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -891,6 +882,15 @@ namespace DiakonieLandshut this.xrLabel4.StylePriority.UseFont = false; this.xrLabel4.Text = "xrLabel26"; // + // xrLabel3 + // + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 120F); + this.xrLabel3.Name = "xrLabel3"; + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(288F, 24.99998F); + this.xrLabel3.StylePriority.UseFont = false; + this.xrLabel3.Text = "Kostenträger:"; + // // Stundenzettel // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1007,7 +1007,7 @@ namespace DiakonieLandshut private DevExpress.XtraReports.UI.XRPictureBox picMasterRau; private DevExpress.XtraReports.UI.XRPictureBox picMasterScheugenpflug; private DevExpress.XtraReports.UI.XRPictureBox picMasterDeuringerKoesler; - private DevExpress.XtraReports.UI.XRPictureBox picMasterHoß; + private DevExpress.XtraReports.UI.XRPictureBox picMasterHoss; private DevExpress.XtraReports.UI.XRLabel xrLabel4; private DevExpress.XtraReports.UI.XRLabel xrLabel3; } diff --git a/ReportImp/DiakonieLandshut/ServicesOverviewReport.cs b/ReportImp/DiakonieLandshut/ServicesOverviewReport.cs index bd90356b1..e67191b92 100644 --- a/ReportImp/DiakonieLandshut/ServicesOverviewReport.cs +++ b/ReportImp/DiakonieLandshut/ServicesOverviewReport.cs @@ -150,7 +150,7 @@ namespace DiakonieLandshut } else if (maLastName.Contains("Hoss") || maLastName.Contains("Hoß")) { - xrBox.Image = xrPictureBox2.Image; + xrBox.Image = picMasterHoss.Image; } } else diff --git a/ReportImp/DiakonieLandshut/ServicesOverviewReport.resx b/ReportImp/DiakonieLandshut/ServicesOverviewReport.resx index 635ea860d..87af84434 100644 --- a/ReportImp/DiakonieLandshut/ServicesOverviewReport.resx +++ b/ReportImp/DiakonieLandshut/ServicesOverviewReport.resx @@ -121,7 +121,7 @@ 21, 17 - + iVBORw0KGgoAAAANSUhEUgAAAqUAAAKMCAYAAADSe8HMAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO wwAADsMBx2+oZAAA/7JJREFUeF7s/QdcW9mdN/7/n+fZXlK2JbubTZ5t2dRp9nhcsem9SSAheu+9d1Ek diff --git a/ReportImp/FeidPartnerReports/Calculation/CustomCalculations.cs b/ReportImp/FeidPartnerReports/Calculation/CustomCalculations.cs index dcacdd292..264f4a893 100644 --- a/ReportImp/FeidPartnerReports/Calculation/CustomCalculations.cs +++ b/ReportImp/FeidPartnerReports/Calculation/CustomCalculations.cs @@ -87,7 +87,17 @@ namespace FeidPartnerReports.Calculation { if (relDC.StartDate.HasValue && relDC.EndDate.HasValue) { - return GetApprovedHoursForPeriod(relDC.StartDate.Value, relDC.EndDate.Value, GetApprovedHoursPerMonth(relDC)); + decimal total = 0; + foreach (var scap in relDC.ApprovalPeriodList) + { + var approvedPerMonth = GetApprovedHoursPerMonth(scap); + var approved = GetApprovedHoursForPeriod(scap.StartDate.Value, scap.EndDate.Value, approvedPerMonth); + + total += approved; + } + return total; + + //return GetApprovedHoursForPeriod(relDC.StartDate.Value, relDC.EndDate.Value, GetApprovedHoursPerMonth(relDC)); } return base.GetApprovedHoursTotal(relDC, useIsCalculationWithFactor); } @@ -109,12 +119,15 @@ namespace FeidPartnerReports.Calculation } - public decimal GetApprovedHoursPerMonth(SupportConceptCostBearerRelDC c2s) + public decimal GetApprovedHoursPerMonthGehtNicht(SupportConceptCostBearerRelDC c2s) { decimal total = 0; foreach (var scap in c2s.ApprovalPeriodList) { total += GetApprovedHoursPerMonth(scap); + + + } return total; diff --git a/ReportImp/HphBersenbrueckFreizeitUndReisen/AuswertungSelbstzahler.cs b/ReportImp/HphBersenbrueckFreizeitUndReisen/AuswertungSelbstzahler.cs index b781a47f3..5c371b684 100644 --- a/ReportImp/HphBersenbrueckFreizeitUndReisen/AuswertungSelbstzahler.cs +++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/AuswertungSelbstzahler.cs @@ -790,11 +790,11 @@ namespace HphBersenbrueckFreizeitUndReisen } else { - if (!preisFuerEinzelbetreuung.HasValue) - { - preisFuerEinzelbetreuung = GetPreisVonServiceDescription(sr.ServiceDescription, sr.Start.Value); - } - preis = preisFuerEinzelbetreuung.Value; + //if (!preisFuerEinzelbetreuung.HasValue) + //{ + + //} + preis = GetPreisVonServiceDescription(sr.ServiceDescription, sr.Start.Value) ?? 0; if (liegtImBerichtszeitraun) { diff --git a/ReportImp/IBPReports/IBPReportCreator.cs b/ReportImp/IBPReports/IBPReportCreator.cs index 03e193392..dfb500d19 100644 --- a/ReportImp/IBPReports/IBPReportCreator.cs +++ b/ReportImp/IBPReports/IBPReportCreator.cs @@ -76,14 +76,28 @@ namespace BeWo.IBPReports public override XtraReport CreateSettlementReport(string dcId, long? invoiceBaseOid) { - if (invoiceBaseOid.HasValue && invoiceBaseOid.Value > 0) + long oid = 0; + long? ibOid = null; + if (string.IsNullOrEmpty(dcId) && invoiceBaseOid.HasValue) { - var ib = DAOFactory.GenericDAO.LoadByID(invoiceBaseOid.Value); + ibOid = invoiceBaseOid.Value; + } + else + { + Int64.TryParse(dcId, out oid); + var si = DAOFactory.GenericDAO.LoadByID(oid); + ibOid = si.InvoiceBase.Oid; + } + + if (ibOid.HasValue && ibOid.Value > 0) + { + var ib = DAOFactory.GenericDAO.LoadByID(ibOid.Value); if (ib.CostBearer2SupportConcept.CostBearer.Organisation.Name.Contains("LWL")) - return base.CreateSettlementReport(dcId, invoiceBaseOid, true); + return base.CreateSettlementReport(null, ibOid, true); } return base.CreateSettlementReport(dcId, invoiceBaseOid, false); + } } } diff --git a/ReportImp/LandshuterNetzwerk/ServiceInvoiceReport.cs b/ReportImp/LandshuterNetzwerk/ServiceInvoiceReport.cs index c9fb8b972..395307f34 100644 --- a/ReportImp/LandshuterNetzwerk/ServiceInvoiceReport.cs +++ b/ReportImp/LandshuterNetzwerk/ServiceInvoiceReport.cs @@ -82,7 +82,7 @@ namespace LandshuterNetzwerk } pRO.Notice = "Betreutes Einzelwohnen - eigene Wohnung"; - + if (team.Contains("Landshut")) { lblNameStandort.Text = "Ambulant Begleitetes Wohnen\nLandshut"; @@ -92,7 +92,7 @@ Bahnhofplatz 1a 84032 Landshut Tel: 0871/96367- 0 Fax: 0871/96367-118 -bew@landshuter-netzwerk.de +abw@landshuter-netzwerk.de www.landshuter-netzwerk.de"; } else if (team.Contains("Dingolfing-Landau")) diff --git a/ReportImp/LebenshilfeFrankfurtOder/Invoicing/HortInvoiceCreation.cs b/ReportImp/LebenshilfeFrankfurtOder/Invoicing/HortInvoiceCreation.cs index 053bbc626..782146b5d 100644 --- a/ReportImp/LebenshilfeFrankfurtOder/Invoicing/HortInvoiceCreation.cs +++ b/ReportImp/LebenshilfeFrankfurtOder/Invoicing/HortInvoiceCreation.cs @@ -276,10 +276,10 @@ namespace LebenshilfeFrankfurtOder.Invoicing var list = new List(); foreach (ServiceRecordDC iServiceRecord in serviceRecordsInPeriod) { - if (!iServiceRecord.ServiceDescription.Name.Contains("Ferien")) + if (!iServiceRecord.ServiceDescription.Name.Contains("Ferien") && !iServiceRecord.AlreadyAccounted) { - - InvoiceItem invoiceItem = CreateInvoiceItem(iServiceRecord, scap, calc); + iServiceRecord.AlreadyAccounted = true; + InvoiceItem invoiceItem = CreateInvoiceItem(iServiceRecord, scap, calc); if (invoiceItem != null) { invoiceItem.Notice = iServiceRecord.ServiceDescription.Name; diff --git a/ReportImp/PerspektivenEV/PerspektivenEV.csproj b/ReportImp/PerspektivenEV/PerspektivenEV.csproj index b0159395a..fce22cfc8 100644 --- a/ReportImp/PerspektivenEV/PerspektivenEV.csproj +++ b/ReportImp/PerspektivenEV/PerspektivenEV.csproj @@ -129,7 +129,6 @@ InvoiceCustomerReport.cs Designer - Quittierungsbeleg.cs Designer diff --git a/ReportImp/PraxisPusteblume/Invoicing/IFSInvoiceCreation.cs b/ReportImp/PraxisPusteblume/Invoicing/IFSInvoiceCreation.cs index 37a3bd7f2..e648986df 100644 --- a/ReportImp/PraxisPusteblume/Invoicing/IFSInvoiceCreation.cs +++ b/ReportImp/PraxisPusteblume/Invoicing/IFSInvoiceCreation.cs @@ -39,12 +39,18 @@ namespace PraxisPusteblume.Invoicing foreach (var data in splitList) { - var invoice = CreateSingleInvoice(invoiceCounter, costBearer, invoicePeriod, iSupportConcept2ServiceRecords.Key, data.ServiceRecords); - invoice.InvoiceBase.InvoiceId = data.InvoiceId; - invoice.InvoiceBase.InvoiceTypeText = data.Title; - invoiceList.Add(invoice); + iSupportConcept2ServiceRecords.Key.IsApproved = true; - invoiceCounter++; + var invoice = CreateSingleInvoice(invoiceCounter, costBearer, invoicePeriod, iSupportConcept2ServiceRecords.Key, data.ServiceRecords); + if (invoice != null) + { + invoice.InvoiceBase.InvoiceId = data.InvoiceId; + invoice.InvoiceBase.InvoiceTypeText = data.Title; + invoiceList.Add(invoice); + + invoiceCounter++; + } + } } diff --git a/ReportImp/SeWo/MitarbeiterstundenkontoBerechnung.cs b/ReportImp/SeWo/MitarbeiterstundenkontoBerechnung.cs index 0c70574f6..d5c169e05 100644 --- a/ReportImp/SeWo/MitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/SeWo/MitarbeiterstundenkontoBerechnung.cs @@ -121,7 +121,10 @@ namespace BeWo.SeWo { return true; } - + if (item.ServiceDescription.Name.ToLower().Contains("corona")) + { + return true; + } return false; } diff --git a/ReportImp/SeWo/Zeitzuschlagsbeleg.Designer.cs b/ReportImp/SeWo/Zeitzuschlagsbeleg.Designer.cs index a717e5fe6..c5c2b1fed 100644 --- a/ReportImp/SeWo/Zeitzuschlagsbeleg.Designer.cs +++ b/ReportImp/SeWo/Zeitzuschlagsbeleg.Designer.cs @@ -33,6 +33,8 @@ namespace BeWo.SeWo this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.lblNotGesamt = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.lblRufGesamt = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); @@ -619,8 +621,6 @@ namespace BeWo.SeWo this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.lblNotGesamt = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.table1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); @@ -661,6 +661,31 @@ namespace BeWo.SeWo this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // + // lblNotGesamt + // + this.lblNotGesamt.LocationFloat = new DevExpress.Utils.PointFloat(982.0001F, 40F); + this.lblNotGesamt.Multiline = true; + this.lblNotGesamt.Name = "lblNotGesamt"; + this.lblNotGesamt.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblNotGesamt.SizeF = new System.Drawing.SizeF(76.99988F, 20F); + this.lblNotGesamt.StylePriority.UseBorders = false; + this.lblNotGesamt.StylePriority.UseFont = false; + this.lblNotGesamt.StylePriority.UseTextAlignment = false; + this.lblNotGesamt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrLabel15 + // + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(862.0003F, 40F); + this.xrLabel15.Multiline = true; + this.xrLabel15.Name = "xrLabel15"; + this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel15.SizeF = new System.Drawing.SizeF(119.9998F, 20F); + this.xrLabel15.StylePriority.UseBorders = false; + this.xrLabel15.StylePriority.UseFont = false; + this.xrLabel15.StylePriority.UseTextAlignment = false; + this.xrLabel15.Text = "SeWo Notdienst:"; + this.xrLabel15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // // xrLabel9 // this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(694.0004F, 40.00003F); @@ -713,11 +738,13 @@ namespace BeWo.SeWo // // xrLabel12 // - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(526.0005F, 40.00003F); + this.xrLabel12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FirstName")}); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(574.0001F, 40.00003F); this.xrLabel12.Multiline = true; this.xrLabel12.Name = "xrLabel12"; this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel12.SizeF = new System.Drawing.SizeF(167.9998F, 20F); + this.xrLabel12.SizeF = new System.Drawing.SizeF(120.0004F, 20F); this.xrLabel12.StylePriority.UseBorders = false; this.xrLabel12.StylePriority.UseFont = false; this.xrLabel12.StylePriority.UseTextAlignment = false; @@ -778,15 +805,15 @@ namespace BeWo.SeWo // // xrLabel8 // - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(358.0002F, 40.00003F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(358.0003F, 40.00003F); this.xrLabel8.Multiline = true; this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(167.9998F, 20F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(215.9998F, 20F); this.xrLabel8.StylePriority.UseBorders = false; this.xrLabel8.StylePriority.UseFont = false; this.xrLabel8.StylePriority.UseTextAlignment = false; - this.xrLabel8.Text = "Überstundenauszahlung:"; + this.xrLabel8.Text = " Fehlzeiten (Urlaub/Krankheit):"; this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // // xrLabel6 @@ -5077,31 +5104,6 @@ namespace BeWo.SeWo // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO.EmployeeDetail); // - // lblNotGesamt - // - this.lblNotGesamt.LocationFloat = new DevExpress.Utils.PointFloat(982.0001F, 40F); - this.lblNotGesamt.Multiline = true; - this.lblNotGesamt.Name = "lblNotGesamt"; - this.lblNotGesamt.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblNotGesamt.SizeF = new System.Drawing.SizeF(76.99988F, 20F); - this.lblNotGesamt.StylePriority.UseBorders = false; - this.lblNotGesamt.StylePriority.UseFont = false; - this.lblNotGesamt.StylePriority.UseTextAlignment = false; - this.lblNotGesamt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // - // xrLabel15 - // - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(862.0003F, 40F); - this.xrLabel15.Multiline = true; - this.xrLabel15.Name = "xrLabel15"; - this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel15.SizeF = new System.Drawing.SizeF(119.9998F, 20F); - this.xrLabel15.StylePriority.UseBorders = false; - this.xrLabel15.StylePriority.UseFont = false; - this.xrLabel15.StylePriority.UseTextAlignment = false; - this.xrLabel15.Text = "SeWo Notdienst:"; - this.xrLabel15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // // Zeitzuschlagsbeleg // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { diff --git a/ReportImp/SeWo/Zeitzuschlagsbeleg.cs b/ReportImp/SeWo/Zeitzuschlagsbeleg.cs index e5f89e3c5..fae526358 100644 --- a/ReportImp/SeWo/Zeitzuschlagsbeleg.cs +++ b/ReportImp/SeWo/Zeitzuschlagsbeleg.cs @@ -34,6 +34,13 @@ namespace BeWo.SeWo public void SetReportDataSource(DateTime monat, MitarbeiterstundenkontoRO.EmployeeDetail ed) { + ed.FirstName = ""; + + if (ed.Custom9 > 0 || ed.Custom8 > 0) + { + ed.FirstName = String.Format("{0:0.##} / {1:0.##}", ed.Custom9, ed.Custom8); + } + _vs = PluginLoader.FindClass(); InitTable(monat); FillTableData(monat, ed); diff --git a/Service/ServiceImplementations/DownloadServiceImp.cs b/Service/ServiceImplementations/DownloadServiceImp.cs index 9e3bbe933..d1777a505 100644 --- a/Service/ServiceImplementations/DownloadServiceImp.cs +++ b/Service/ServiceImplementations/DownloadServiceImp.cs @@ -832,7 +832,7 @@ namespace BeWo.Service.ServiceImplementations if (string.IsNullOrEmpty(urlneu)) { //urlneu = "http://bsnewsmaster.beyondsoft.de/news_rss.php?ClientOID=236180486&CategoryOID=2002858128"; - urlneu = "http://apps.ownsoft.de/news/rss?evplaner[base_cat]=55"; + urlneu = "https://apps.ownsoft.de/news/rss?evplaner[base_cat]=55"; } RssFeed feed = new RssFeed(); From 682e4b922215fde3e95d1ca8353007dd4e570a90 Mon Sep 17 00:00:00 2001 From: Lyndon Jetten Date: Wed, 10 Aug 2022 14:13:29 +0200 Subject: [PATCH 2/3] MoK: - Nach Mitarbeitern, Ressourcen, und Klienten filtern - Ziele in Modal-Popup mit PartialView gepackt --- BeWoPlanerMobil/BeWoPlanerMobil.csproj | 6 +- BeWoPlanerMobil/BeWoPlanerMobil.csproj.user | 4 +- BeWoPlanerMobil/Controllers/MainController.cs | 194 +++++++++------- .../Controllers/SchedulerController.cs | 59 +++-- BeWoPlanerMobil/Models/MainModel.cs | 12 + BeWoPlanerMobil/Scripts/utils/list-utils.js | 14 +- .../Scripts/utils/resources-list-utils.js | 15 +- BeWoPlanerMobil/Scripts/view-scripts/main.js | 47 +--- .../Scripts/view-scripts/report.js | 10 +- BeWoPlanerMobil/Util/GoalTreeItem.cs | 2 +- BeWoPlanerMobil/Views/Main/Main.cshtml | 34 --- .../Views/Main/SingleBookingPartial.cshtml | 104 +++++---- BeWoPlanerMobil/Views/Report/Report.cshtml | 27 ++- .../Scheduler/AppointmentFormPartial.cshtml | 12 +- .../AppointmentIntervalFinderPartial.cshtml | 20 +- .../Scheduler/OneDaySchedulerPartial.cshtml | 209 +++++++++--------- .../Views/Scheduler/Scheduler.cshtml | 4 +- BeWoPlanerMobil/Views/Shared/_Layout.cshtml | 14 +- Data/ICF/ICFDAO.cs | 3 + .../OperationsServiceImp.cs | 1 + Shared/Core/Utils.cs | 2 +- Shared/DataContracts/RatingTypeDC.cs | 6 +- 22 files changed, 412 insertions(+), 387 deletions(-) diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj b/BeWoPlanerMobil/BeWoPlanerMobil.csproj index 27a337e2c..47908e450 100644 --- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj +++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj @@ -17,7 +17,7 @@ BeWoPlanerMobil v4.7.2 false - true + false @@ -1335,7 +1335,6 @@ - Designer @@ -1374,6 +1373,7 @@ + @@ -1573,7 +1573,7 @@ False 8808 / - http://localhost:8808/ + http://localhost/BeWoPlanerMobil False False diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user index aed93f702..2c93437fb 100644 --- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user +++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user @@ -1,14 +1,14 @@  - true + false false - Release|Any CPU + Debug|Any CPU ShowAllFiles 600 MvcControllerEmptyScaffolder diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs index 384a51bee..9ffe0eb87 100644 --- a/BeWoPlanerMobil/Controllers/MainController.cs +++ b/BeWoPlanerMobil/Controllers/MainController.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Diagnostics; using System.Drawing; using System.Linq; @@ -40,7 +41,7 @@ namespace BeWoPlanerMobil.Controllers return null; } - if(((MainModel) Session[ModelSessionConstants.MainModelKey])?.Employee == null) + if(((MainModel) Session[ModelSessionConstants.MainModelKey])?.Employee is null) { _Model = new MainModel { Employee = MobileSessionFacade.LoggedInEmployee }; Session[ModelSessionConstants.MainModelKey] = _Model; @@ -63,7 +64,7 @@ namespace BeWoPlanerMobil.Controllers { var mandator = (MandatorDC) HttpContext.Session["mandator"]; - if(mandator == null) + if(mandator is null) { mandator = OperationsService.GetMandator(); HttpContext.Session["mandator"] = mandator; @@ -152,12 +153,12 @@ namespace BeWoPlanerMobil.Controllers Model.ShowDistanceField = UserSettingsUtils.GetSettingValueAsBool(mandatorSettings, SettingsKeys.ShowDistanceFields); Model.Dokutypes = ValueListService.GetAllValueListEntrysByType(ValueListEntryType.DocumentType); - if (Model.Dokutypes != null) + if(!(Model.Dokutypes is null)) { Model.Dokutypes = Model.Dokutypes.OrderBy(s => s.ValueListEntryOid).ToArray(); } - if(MainModel.AllEmployees == null) + if(MainModel.AllEmployees is null) { MainModel.AllEmployees = EmployeeService.GetAllActiveEmployeesCompact().OrderBy(e => e.LastName).ToList(); } @@ -192,38 +193,38 @@ namespace BeWoPlanerMobil.Controllers { var endDate = MainModel.GetEndDateOfSupportConcept(supportConcept); - return endDate == null || endDate.Value >= DateTime.Now.Date; + return endDate is null || endDate.Value >= DateTime.Now.Date; }).ToList(); } - if(Model.ServiceCategories == null) + if(Model.ServiceCategories is null) { Model.ServiceCategories = new List(); } - if(Model.SelectedConceptCostBearerRelations == null) + if(Model.SelectedConceptCostBearerRelations is null) { Model.SelectedConceptCostBearerRelations = new List(); } - if (Model.SelectedEmployee == null) + if(Model.SelectedEmployee is null) { Model.SelectedEmployee = MobileSessionFacade.LoggedInCompactEmployee; } Model.IsServiceRecordNoticeMandatory = UserSettingsUtils.GetSettingValueAsBool(mandatorSettings, SettingsKeys.IsServiceRecordNoticeMandatory); - var isInList = Model.SelectedSupportConceptListObject != null && Model.SupportConceptListObjects.Contains(Model.SelectedSupportConceptListObject); + var isInList = !(Model.SelectedSupportConceptListObject is null) && Model.SupportConceptListObjects.Contains(Model.SelectedSupportConceptListObject); - if(Model.SelectedSupportConceptListObject == null || !isInList) + if(Model.SelectedSupportConceptListObject is null || !isInList) { - if (Model.SelectedSupportConceptListObject != null && !isInList) + if(!(Model.SelectedSupportConceptListObject is null) && !isInList) { Log.Info($"Model.SelectedSupportConceptListObject.Oid = {Model.SelectedSupportConceptListObject.CostBearer2SupportConceptOid} is not in list !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); - StringBuilder sb = new StringBuilder(); - foreach (var o in Model.SupportConceptListObjects) + var sb = new StringBuilder(); + foreach(var o in Model.SupportConceptListObjects) { if (sb.Length > 0) { @@ -235,7 +236,7 @@ namespace BeWoPlanerMobil.Controllers Log.Info($"Model.SupportConceptListObjects Oids = {sb}"); } - //Log.Info(String.Format("Main() Set CostBearer2SupportConceptOid = -1: Model.SelectedSupportConceptListObject == null {0}, isInList {1}", Model.SelectedSupportConceptListObject == null, isInList)); + //Log.Info(String.Format("Main() Set CostBearer2SupportConceptOid = -1: Model.SelectedSupportConceptListObject is null {0}, isInList {1}", Model.SelectedSupportConceptListObject is null, isInList)); Model.SelectedSupportConceptListObject = Model.SupportConceptListObjects.FirstOrDefault(f => f.CostBearer2SupportConceptOid == "-1") ?? Model.SupportConceptListObjects.First(); Model.CostBearer2SupportConceptOid = -1; @@ -243,7 +244,7 @@ namespace BeWoPlanerMobil.Controllers Model.HasAnyRatingTypes = OperationsService.GetAllRatingTypes().Any(); } - if(Model.CostBearer2SupportConceptOid != null) + if(!(Model.CostBearer2SupportConceptOid is null)) { LoadRecordsToModel(); } @@ -252,7 +253,7 @@ namespace BeWoPlanerMobil.Controllers Model.IsZeiterfassungInStdMin = UserSettingsUtils.GetSettingValueAsBool(mandatorSettings, SettingsKeys.IsZeiterfassungInStdMin); } - catch (Exception e) + catch(Exception e) { Log.Error(e.Message, e); } @@ -263,7 +264,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public void LoadGoalRatings() { - if(Model == null) + if(Model is null) { return; } @@ -276,7 +277,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public string RateSelectedGoal(long? ratingTypeOid, long? goalOid) { - if(Model == null || ratingTypeOid == null || goalOid == null) + if(Model is null || ratingTypeOid is null || goalOid is null) { return _LeerzeichenFuerGetMethoden; } @@ -289,6 +290,15 @@ namespace BeWoPlanerMobil.Controllers goal.RatingTypeOid = ratingTypeOid; + if(Model.IsInEditingMode && Model.SelectedGoals.Any(a => a.ValueListEntryOid.HasValue && a.ValueListEntryOid.Value == goal.ValueListEntryOid)) + { + var selectedGoal = Model.SelectedGoals.FirstOrDefault(a => a.ValueListEntryOid.HasValue && a.ValueListEntryOid.Value == goal.ValueListEntryOid); + if(!(selectedGoal is null)) + { + selectedGoal.RatingTypeOid = ratingTypeOid; + } + } + return SerializeObject(new GoalRating(rating?.DisplayName ?? string.Empty, goal.ValueListEntryOid ?? 0)); } @@ -299,7 +309,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public ActionResult SetShowExpiredSupportConcepts(FormCollection pCollection) { - if (Model == null) + if(Model is null) { return Logout(); } @@ -317,21 +327,19 @@ namespace BeWoPlanerMobil.Controllers return base.Logout(); } - // Wird beim Neuladen der Seite ausgeführt per Get-Aufruf [Authorize] - public string LoadGoals() + public void LoadGoals() { - if((!Model.CostBearer2SupportConceptOid.HasValue || Model.CostBearer2SupportConceptOid.Value > 0) && Model.SelectedSupportConcept == null) + if((!Model.CostBearer2SupportConceptOid.HasValue || Model.CostBearer2SupportConceptOid.Value > 0) && Model.SelectedSupportConcept is null) { Logout(); - return null; } var supportConcept = Model.SupportConcepts.FirstOrDefault(sc => sc.CostBearerRelations.Any(sc2Cb => sc2Cb.CostBearer2SupportConceptOid.HasValue && sc2Cb.CostBearer2SupportConceptOid.Value.Equals(Model.CostBearer2SupportConceptOid.Value))); - if (supportConcept == null) + if (supportConcept is null) { - return null; + return; } Model.SelectedSupportConcept = supportConcept; @@ -343,14 +351,15 @@ namespace BeWoPlanerMobil.Controllers _ParentGoals = new Dictionary(); foreach (var oid in missingParents) { - LoadMissingParents(oid.Value); + if(oid.HasValue) + { + LoadMissingParents(oid.Value); + } } var allGoals = selectedGoals.Union(_ParentGoals.Values).ToList(); - var goalTree = BuildGoalTree(allGoals); - - return SerializeObject(goalTree); + Model.GoalTree = BuildGoalTree(allGoals); } private List BuildGoalTree(IReadOnlyCollection goals) @@ -368,7 +377,7 @@ namespace BeWoPlanerMobil.Controllers goalTreeDic.Add(ziel.ValueListEntryOid.Value, treeItem); - if(ziel.ParentOid == null) + if(ziel.ParentOid is null) { goalTree.Add(treeItem); } @@ -438,9 +447,24 @@ namespace BeWoPlanerMobil.Controllers } */ + goalTree = goalTree.OrderBy(o => o.ValueListEntryOid).ToList(); + foreach(var item in goalTree) + { + SortGoals(item); + } + return goalTree; } + private void SortGoals(GoalTreeItem goalTreeItem) + { + goalTreeItem.Children = goalTreeItem.Children.OrderBy(s => s.ValueListEntryOid).ToList(); + foreach(var test in goalTreeItem.Children) + { + SortGoals(test); + } + } + private void LoadMissingParents(long pParentOid) { while(true) @@ -467,7 +491,7 @@ namespace BeWoPlanerMobil.Controllers { try { - if (Model == null) + if (Model is null) { Logout(); return _LeerzeichenFuerGetMethoden; @@ -613,7 +637,7 @@ namespace BeWoPlanerMobil.Controllers { try { - if (Model == null) + if (Model is null) { Logout(); return _LeerzeichenFuerGetMethoden; @@ -692,7 +716,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public string LoadServiceCategories(long pServiceCategoryOid) { - if (Model == null) + if (Model is null) { Logout(); return _LeerzeichenFuerGetMethoden; @@ -719,7 +743,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public string LoadTextbausteineForServiceCategory(long pServiceCategoryOid) { - if (Model == null) + if (Model is null) { Logout(); return _LeerzeichenFuerGetMethoden; @@ -747,7 +771,7 @@ namespace BeWoPlanerMobil.Controllers } Model.Textbausteine = textbausteine.Where( - w => (w.ServiceCategory == null || w.ServiceCategory.ServiceCategoryOid == pServiceCategoryOid) && !string.IsNullOrEmpty(w.Text) + w => (w.ServiceCategory is null || w.ServiceCategory.ServiceCategoryOid == pServiceCategoryOid) && !string.IsNullOrEmpty(w.Text) && (w.IsOnlyForEmployee && w.Employee.EmployeeOid.Equals(Model.Employee.EmployeeOid) || !w.IsOnlyForEmployee)).OrderBy(t => t.Text).ToList(); Model.Textbausteine.AddRangeIfElementsNotIn(Utils.GetParentTextModules(Model.Textbausteine)); @@ -764,7 +788,7 @@ namespace BeWoPlanerMobil.Controllers } } - var test = newItems.Where(item => item.ParentOid == null).ToList(); + var test = newItems.Where(item => item.ParentOid is null).ToList(); if(test.Count == 0) { @@ -817,7 +841,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public string LoadCompleteTextbausteinByOid(long pTextbausteinOid) { - if (Model == null) + if(Model is null) { Logout(); return _LeerzeichenFuerGetMethoden; @@ -825,7 +849,7 @@ namespace BeWoPlanerMobil.Controllers var textModule = Model.Textbausteine.FirstOrDefault(f => f.TextModuleOid.HasValue && f.TextModuleOid.Value == pTextbausteinOid); - return textModule == null ? null : string.IsNullOrWhiteSpace(textModule.Text) ? textModule.Name : textModule.Text; + return textModule is null ? null : string.IsNullOrWhiteSpace(textModule.Text) ? textModule.Name : textModule.Text; } [HttpPost] @@ -834,7 +858,7 @@ namespace BeWoPlanerMobil.Controllers { try { - if(Model == null) + if(Model is null) { return Logout(); } @@ -929,13 +953,13 @@ namespace BeWoPlanerMobil.Controllers Model.NewServiceRecord = Model.GetServiceRecord(selectedRecordOid.Value); } - if(Model.NewServiceRecord == null) + if(Model.NewServiceRecord is null) { return RedirectToActionPermanent("Main"); } Model.NewServiceRecord.IP = Request.UserHostAddress; - + // ToDo: Funktioniert noch nicht zu 100 % Model.NewServiceRecord.Goals = Model.SelectedGoals; Model.NewServiceRecord.Start = zeitenFeld[0]; Model.NewServiceRecord.End = zeitenFeld[1]; @@ -1151,7 +1175,7 @@ namespace BeWoPlanerMobil.Controllers { cb2ScOids.Add(scdc.CostBearerRelations.ElementAt(0).CostBearer2SupportConceptOid.Value); - if(org == null) + if(org is null) { org = scdc.CostBearerRelations.ElementAt(0).CostBearer; if(org != null) @@ -1161,7 +1185,7 @@ namespace BeWoPlanerMobil.Controllers } else { - if(scdc.CostBearerRelations.ElementAt(0).CostBearer == null || !org.Equals(scdc.CostBearerRelations.ElementAt(0).CostBearer)) + if(scdc.CostBearerRelations.ElementAt(0).CostBearer is null || !org.Equals(scdc.CostBearerRelations.ElementAt(0).CostBearer)) { roundDuration = false; } @@ -1228,7 +1252,7 @@ namespace BeWoPlanerMobil.Controllers item.GroupOid = Model.NewServiceRecord.GroupOid; item.GroupRoundedDuration = groupDuration; - if(item.CostBearer != null && item.CostBearer.CostBearerOid == null && item.SupportConcept != null && item.SupportConcept.CostBearerList.Count > 0) + if(item.CostBearer != null && item.CostBearer.CostBearerOid is null && item.SupportConcept != null && item.SupportConcept.CostBearerList.Count > 0) { item.CostBearer.CostBearerOid = item.SupportConcept.CostBearerList[0].CostBearerOid; } @@ -1472,7 +1496,7 @@ namespace BeWoPlanerMobil.Controllers { try { - if (Model == null) + if (Model is null) { return Logout(); } @@ -1486,6 +1510,9 @@ namespace BeWoPlanerMobil.Controllers LoadGoalRatings(); + // ToDo: Hier LoadGoals aufrufen! + LoadGoals(); + return ResetEditingMode(); } catch (Exception e) @@ -1498,12 +1525,12 @@ namespace BeWoPlanerMobil.Controllers private void LoadServiceCategoriesToModel(long? cb2ScOid) { - if (cb2ScOid == null) + if (cb2ScOid is null) { - Log.Info("cb2ScOid == null !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); + Log.Info("cb2ScOid is null !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); } - if (cb2ScOid == null && Model.IsInGroupBookingMode) + if (cb2ScOid is null && Model.IsInGroupBookingMode) { Model.ServiceCategories = CreateServiceCategoryModels(OperationsService.GetAllServiceDescriptions()); @@ -1544,14 +1571,14 @@ namespace BeWoPlanerMobil.Controllers } else { - Log.Info("Model.SelectedSupportConcept == null !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); + Log.Info("Model.SelectedSupportConcept is null !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); } - if (Model.SelectedSupportConceptListObject == null || + if (Model.SelectedSupportConceptListObject is null || Model.SelectedSupportConceptListObject.CostBearer2SupportConceptOid == "-1") { - Log.Info($"LoadServiceCategoriesToModel() Model.SelectedSupportConceptListObject == null {Model.SelectedSupportConceptListObject == null}, Model.SelectedSupportConceptListObject.CostBearer2SupportConceptOid == {Model.SelectedSupportConceptListObject?.CostBearer2SupportConceptOid}"); + Log.Info($"LoadServiceCategoriesToModel() Model.SelectedSupportConceptListObject is null {Model.SelectedSupportConceptListObject is null}, Model.SelectedSupportConceptListObject.CostBearer2SupportConceptOid == {Model.SelectedSupportConceptListObject?.CostBearer2SupportConceptOid}"); } if (Model.ServiceCategories != null) @@ -1564,7 +1591,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public ActionResult DeleteServiceRecord(FormCollection formCollection) { - if (Model == null) + if (Model is null) { return Logout(); } @@ -1592,14 +1619,14 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public string UpdateGoals(string pGoalOids) { - if (Model == null) + if (Model is null) { Logout(); return _LeerzeichenFuerGetMethoden; } var sc = Model.SelectedSupportConcept; - if (sc == null) + if (sc is null) { return _LeerzeichenFuerGetMethoden; } @@ -1616,7 +1643,14 @@ namespace BeWoPlanerMobil.Controllers var goals = sc.Goals.Where(w => w.ValueListEntryOid.HasValue && selectedGoalOids.Contains(w.ValueListEntryOid.Value)).ToList(); - Model.SelectedGoals = goals; + // ToDo: Hier liegt der Bug! + // ToDo: vorhandene Bewertungen beachten! + var stillSelectedGoals = Model.SelectedGoals.Where(s => goals.Any(a => a.ValueListEntryOid.HasValue && a.ValueListEntryOid.Value == s.ValueListEntryOid)).ToList(); + + Model.SelectedGoals = stillSelectedGoals; + Model.SelectedGoals.AddRangeIfElementsNotIn(goals); + + //Model.SelectedGoals = goals; return _LeerzeichenFuerGetMethoden; } @@ -1624,7 +1658,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public string SetServiceDescription(long pServiceDescriptionOid) { - if (Model == null) + if (Model is null) { Logout(); return _LeerzeichenFuerGetMethoden; @@ -1638,7 +1672,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public ActionResult LoadServiceRecords(FormCollection formCollection) { - if (Model == null) + if (Model is null) { return Logout(); } @@ -1658,7 +1692,7 @@ namespace BeWoPlanerMobil.Controllers private void LoadRecordsToModel() { - if (Model == null) + if (Model is null) { Logout(); return; @@ -1693,7 +1727,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public ActionResult SelectRecordToEdit(FormCollection formCollection) { - if(Model == null) + if(Model is null) { return Logout(); } @@ -1711,7 +1745,7 @@ namespace BeWoPlanerMobil.Controllers var selectedServiceRecord = Model.GetServiceRecord(serviceRecordOid); - if(selectedServiceRecord == null) + if(selectedServiceRecord is null) { return RedirectToActionPermanent("Main"); } @@ -1759,7 +1793,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public string GetSelectedRecordInformation() { - if (Model == null) + if (Model is null) { Logout(); return _LeerzeichenFuerGetMethoden; @@ -1778,7 +1812,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public string GetSelectedRecordInformationWithOid(long oid) { - if (Model == null) + if (Model is null) { Logout(); return _LeerzeichenFuerGetMethoden; @@ -1792,7 +1826,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public string CheckRights(string von, string bis, bool inEditMode, string dateString, string startString, string endString) { - if (Model == null) + if (Model is null) { Logout(); return _LeerzeichenFuerGetMethoden; @@ -1834,7 +1868,7 @@ namespace BeWoPlanerMobil.Controllers checkServiceRecord = Model.ServiceRecords.FirstOrDefault(f => f.ServiceRecordOid.HasValue && f.ServiceRecordOid.Value.Equals(Model.SelectedServiceRecordOid)); } - if (checkServiceRecord == null) + if (checkServiceRecord is null) { checkServiceRecord = new ServiceRecordDC(); } @@ -2101,7 +2135,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public string ValidateServiceRecordDeletion(string serviceRecordOidString) { - if(Model == null) + if(Model is null) { Logout(); return _LeerzeichenFuerGetMethoden; @@ -2118,7 +2152,7 @@ namespace BeWoPlanerMobil.Controllers var serviceRecord = Model.GetServiceRecord(serviceRecordOid); - if(serviceRecord == null) + if(serviceRecord is null) { return _LeerzeichenFuerGetMethoden; } @@ -2155,7 +2189,7 @@ namespace BeWoPlanerMobil.Controllers { try { - if (Model == null) + if (Model is null) { Logout(); return _LeerzeichenFuerGetMethoden; @@ -2169,7 +2203,7 @@ namespace BeWoPlanerMobil.Controllers Log.Info("Error in SetServiceRecordEmployee:"); Log.Error(e.Message, e); - if (MainModel.AllEmployees == null) + if (MainModel.AllEmployees is null) { Log.Info("Weitere Infos: AllEmployees = null!"); } @@ -2221,7 +2255,7 @@ namespace BeWoPlanerMobil.Controllers return RedirectToActionPermanent("PreselectCustomer", "Customer", new {Model.SelectedSupportConcept.Customer.CustomerOid}); } - if(Model?.SelectedSupportConcept == null && (CustomerModel)Session[ModelSessionConstants.CustomerModelKey] != null) + if(Model?.SelectedSupportConcept is null && (CustomerModel)Session[ModelSessionConstants.CustomerModelKey] != null) { var customerModel = (CustomerModel) Session[ModelSessionConstants.CustomerModelKey]; customerModel.SelectedCustomerOid = null; @@ -2257,7 +2291,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public ActionResult SetGroupBookingMode(FormCollection pFormCollection) { - if (Model == null) + if (Model is null) { return Logout(); } @@ -2277,7 +2311,7 @@ namespace BeWoPlanerMobil.Controllers /// Bei false wird davon ausgegangen, dass man von der Gruppenbuchung in eine Einzelbuchung wechselt und der vorher ausgewählte Mitarbeiter und Hilfeplan wird automatisch ausgewählt. private void ResetGroupBookingMode(bool pIsInGroupBookingMode) { - if (Model == null) + if (Model is null) { Logout(); return; @@ -2335,7 +2369,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public ActionResult ResetEditingMode() { - if (Model == null) + if (Model is null) { return Logout(); } @@ -2368,7 +2402,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public string AddSupportConceptCostBearerRelationsToGroupBooking(string pRelOids, string pGroupOids) { - if(Model == null) + if(Model is null) { Logout(); return _LeerzeichenFuerGetMethoden; @@ -2387,7 +2421,7 @@ namespace BeWoPlanerMobil.Controllers rawGroupOids.DoForEach(s => { var group = Model.GroupsOfPeople.FirstOrDefault(f => f.GroupOfPeopleOid.HasValue && f.GroupOfPeopleOid.Value.Equals(long.Parse(s))); - if(group == null) + if(group is null) { return; } @@ -2438,7 +2472,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public string RemoveSupportConceptCostBearerRelationFromGroupBooking(string pRelOid) { - if(Model == null) + if(Model is null) { Logout(); return _LeerzeichenFuerGetMethoden; @@ -2465,7 +2499,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public string AddEmployeesToGroupBooking(string pEmployeeOids) { - if(Model == null) + if(Model is null) { Logout(); return _LeerzeichenFuerGetMethoden; @@ -2493,7 +2527,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public string GetSignatureImage(long serviceRecordOid, long signatureOid) { - if(Model == null) + if(Model is null) { Logout(); return _LeerzeichenFuerGetMethoden; @@ -2519,7 +2553,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public ActionResult SetSupportConceptFilter(FormCollection formCollection) { - if(Model == null) + if(Model is null) { return Logout(); } @@ -2540,7 +2574,7 @@ namespace BeWoPlanerMobil.Controllers [HttpPost] public ActionResult CreateOrUpdateGroupBooking(FormCollection formCollection) { - if(Model == null) + if(Model is null) { return Logout(); } @@ -2658,7 +2692,7 @@ namespace BeWoPlanerMobil.Controllers dauer = (int)(zeitenFeld[1] - zeitenFeld[0]).TotalMinutes; } - if(Model.NewServiceRecord == null) + if(Model.NewServiceRecord is null) { return RedirectToActionPermanent("Main"); } diff --git a/BeWoPlanerMobil/Controllers/SchedulerController.cs b/BeWoPlanerMobil/Controllers/SchedulerController.cs index 92ec69f0b..d7d68f15b 100644 --- a/BeWoPlanerMobil/Controllers/SchedulerController.cs +++ b/BeWoPlanerMobil/Controllers/SchedulerController.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; -using System.Web; using System.Web.Mvc; using BeWoPlanerMobil.Models; @@ -33,7 +32,7 @@ namespace BeWoPlanerMobil.Controllers return null; } - if (((SchedulerModel) Session[ModelSessionConstants.SchedulerModelKey])?.Employee == null) + if (((SchedulerModel) Session[ModelSessionConstants.SchedulerModelKey])?.Employee is null) { _Model = new SchedulerModel { Employee = MobileSessionFacade.LoggedInEmployee }; Session[ModelSessionConstants.SchedulerModelKey] = _Model; @@ -76,7 +75,7 @@ namespace BeWoPlanerMobil.Controllers private void LoadAppointmentsForDate() { - if(Model?.Employee.EmployeeOid == null) + if(Model?.Employee.EmployeeOid is null) { return; } @@ -99,7 +98,11 @@ namespace BeWoPlanerMobil.Controllers end = sunday; } - var appointments = KalenderService.LoadFilteredAppointmentsMitAufgaben(AbstractModel.HasRightToSeeAllEmployeeAppointments, Model.Employee.EmployeeOid.Value, start.Date, end, new List(), new List(), new List(), false, false, false, false, true, true).ToList(); + var selectedCustomers = Model.SelectedCustomers?.Select(s => s.CustomerOid).ToList() ?? new List(); + var selectedEmployees = Model.SelectedEmployees?.Select(s => s.EmployeeOid).ToList() ?? new List(); + var selectedResources = Model.SelectedResources?.Where(w => w.ResourceOid.HasValue).Select(s => s.ResourceOid.Value).ToList() ?? new List(); + + var appointments = KalenderService.LoadFilteredAppointmentsMitAufgaben(AbstractModel.HasRightToSeeAllEmployeeAppointments, Model.Employee.EmployeeOid.Value, start.Date, end, selectedEmployees, selectedCustomers, selectedResources, false, false, false, false, true, true).ToList(); var tasks = appointments.Where(w => w.IsTask).ToList(); @@ -127,7 +130,7 @@ namespace BeWoPlanerMobil.Controllers (date.InBetween(w.StartDate.Value, w.EndDate.Value, false) || date.CompareShortDates(w.StartDate.Value)) // Einzeltermine oder Ausnahmen und gelöschte Ausnahmen - && (w.RecurrenceInfo == null || w.RecurrenceInfo != null && (w.Type == 3 || w.Type == 4)) + && (w.RecurrenceInfo is null || w.RecurrenceInfo != null && (w.Type == 3 || w.Type == 4)) ).ToList(); @@ -239,7 +242,7 @@ namespace BeWoPlanerMobil.Controllers { try { - if (Model == null) + if (Model is null) { Logout(); } @@ -258,12 +261,12 @@ namespace BeWoPlanerMobil.Controllers var isSuccessfulStartTime = DateTime.TryParseExact(rawStartTime, "HH:mm", null, DateTimeStyles.None, out var startTime); var isSuccessfulEndTime = DateTime.TryParseExact(rawEndTime, "HH:mm", null, DateTimeStyles.None, out var endTime); - if(rawStartTime == null) + if(rawStartTime is null) { rawStartTime = "00:00"; } - if (rawEndTime == null) + if (rawEndTime is null) { rawEndTime = "00:00"; } @@ -346,7 +349,7 @@ namespace BeWoPlanerMobil.Controllers [HttpPost] public ActionResult NavigateToPreviousDate() { - if (Model == null) + if (Model is null) { Logout(); } @@ -366,7 +369,7 @@ namespace BeWoPlanerMobil.Controllers [HttpPost] public ActionResult NavigateToNextDate() { - if(Model == null) + if(Model is null) { Logout(); } @@ -385,7 +388,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] [HttpPost] public ActionResult SelectSchedulerDate(FormCollection formCollection) { - if (Model == null) + if (Model is null) { Logout(); } @@ -447,7 +450,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public JsonResult CheckForOverlappingAppointments(string startDateRaw, string endDateRaw, string startTimeRaw, string endTimeRaw) { - if (Model == null) + if (Model is null) { Logout(); return null; @@ -480,7 +483,7 @@ namespace BeWoPlanerMobil.Controllers // TODO: Serientermine überprüfen if(Model.Appointments != null) { - foreach(var appointment in Model.Appointments.Where(app => app.SchedulerAppointmentOid == null && app.IsTask == false)) + foreach(var appointment in Model.Appointments.Where(app => app.SchedulerAppointmentOid is null && app.IsTask == false)) { } @@ -493,7 +496,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public string SelectResourcesForAppointment(string resourceOids) { - if(Model == null) + if(Model is null) { Logout(); return _LeerzeichenFuerGetMethoden; @@ -513,7 +516,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public string SelectEmployeesForAppointment(string oidString) { - if (Model == null) + if (Model is null) { Logout(); return _LeerzeichenFuerGetMethoden; @@ -529,7 +532,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public string SelectCustomersForAppointment(string oidString) { - if (Model == null) + if (Model is null) { Logout(); return _LeerzeichenFuerGetMethoden; @@ -582,7 +585,7 @@ namespace BeWoPlanerMobil.Controllers [HttpPost] public ActionResult ChangeSchedulerView(FormCollection formCollection) { - if(Model == null) + if(Model is null) { return Logout(); } @@ -598,7 +601,7 @@ namespace BeWoPlanerMobil.Controllers [HttpPost] public ActionResult FindFreeIntervals(FormCollection formCollection) { - if(Model == null) + if(Model is null) { return Logout(); } @@ -628,7 +631,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public string SelectEmployeesForIntervalFinder(string oidString) { - if (Model == null) + if (Model is null) { Logout(); return _LeerzeichenFuerGetMethoden; @@ -644,7 +647,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public string SelectCustomersForIntervalFinder(string oidString) { - if (Model == null) + if (Model is null) { Logout(); return _LeerzeichenFuerGetMethoden; @@ -660,7 +663,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public string SelectResourcesForIntervalFinder(string resourceOids) { - if (Model == null) + if (Model is null) { Logout(); return _LeerzeichenFuerGetMethoden; @@ -681,7 +684,7 @@ namespace BeWoPlanerMobil.Controllers [HttpPost] public ActionResult SetIsInIntervalFinderMode(FormCollection formCollection) { - if(Model == null) + if(Model is null) { return Logout(); } @@ -704,7 +707,7 @@ namespace BeWoPlanerMobil.Controllers [HttpPost] public ActionResult SelectIntervalForForm(FormCollection formCollection) { - if(Model == null) + if(Model is null) { return Logout(); } @@ -754,7 +757,7 @@ namespace BeWoPlanerMobil.Controllers [Authorize] public string ResetIntervalFinder() { - if(Model == null) + if(Model is null) { return _LeerzeichenFuerGetMethoden; } @@ -765,5 +768,13 @@ namespace BeWoPlanerMobil.Controllers return _LeerzeichenFuerGetMethoden; } + + [Authorize] + public ActionResult FetchAppointments() + { + LoadAppointmentsForDate(); + + return PartialView("OneDaySchedulerPartial", Model); + } } } diff --git a/BeWoPlanerMobil/Models/MainModel.cs b/BeWoPlanerMobil/Models/MainModel.cs index 1b59f3513..e09a7afcd 100644 --- a/BeWoPlanerMobil/Models/MainModel.cs +++ b/BeWoPlanerMobil/Models/MainModel.cs @@ -1,6 +1,9 @@ using System; using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Collections.Specialized; using System.ComponentModel.DataAnnotations; +using System.Diagnostics; using System.Linq; using System.Web.Mvc; using BeWo.View.Navigation.Filter; @@ -212,6 +215,13 @@ namespace BeWoPlanerMobil.Models set => _SelectedGoals = value; } + private string GetRatingName(ValueListEntryDC ratedValueListEntry) + { + var rating = GoalRatingTypes.FirstOrDefault(f => f.RatingTypeOid.HasValue && f.RatingTypeOid.Value.Equals(ratedValueListEntry.RatingTypeOid)); + + return rating?.DisplayName ?? "NULL"; + } + public ServiceRecordDC NewServiceRecord { get; set; } public long? ServiceRecordOidToDelete { get; set; } @@ -572,6 +582,8 @@ namespace BeWoPlanerMobil.Models } public bool HasAnyRatingTypes { get; set; } + + public List GoalTree { get; set; } = new List(); } public class CustomSelectListItem diff --git a/BeWoPlanerMobil/Scripts/utils/list-utils.js b/BeWoPlanerMobil/Scripts/utils/list-utils.js index 79c45b955..1350c6ca7 100644 --- a/BeWoPlanerMobil/Scripts/utils/list-utils.js +++ b/BeWoPlanerMobil/Scripts/utils/list-utils.js @@ -1,4 +1,4 @@ -function changeItemListSelection(url, popupId, listId, itemIdPrefix, isCustomer, checkBoxIdSuffix) { +function changeItemListSelection(url, popupId, listId, itemIdPrefix, isCustomer, checkBoxIdSuffix, filterAppointmentsUrl) { try { if (url === undefined || url === null) { return; @@ -12,7 +12,9 @@ }); $.get(url, { oidString: oidStr }).done(function (jsonResult) { - updateSelectedList(jsonResult, listId, itemIdPrefix, isCustomer, popupId, checkBoxIdSuffix, url); + updateSelectedList(jsonResult, listId, itemIdPrefix, isCustomer, popupId, checkBoxIdSuffix, url, filterAppointmentsUrl); + + $("#one-day-scheduler-partial-container").load(filterAppointmentsUrl); }); } catch(error) { logError(error.message); @@ -20,7 +22,7 @@ } // Col-Value berechnen -function updateSelectedList(jsonResult, listId, itemIdPrefix, isCustomer, popupId, checkBoxIdSuffix, url) { +function updateSelectedList(jsonResult, listId, itemIdPrefix, isCustomer, popupId, checkBoxIdSuffix, url, filterAppointmentsUrl) { try { if(isEmptyOrSpaces(jsonResult)) { return; @@ -48,7 +50,7 @@ function updateSelectedList(jsonResult, listId, itemIdPrefix, isCustomer, popupI var id = itemIdPrefix + oid; - var removeParams = oid + ", '" + checkBoxIdSuffix + "', " + isCustomer + ", '" + url + "', '" + popupId + "', '" + listId + "', '" + itemIdPrefix + "'"; + var removeParams = oid + ", '" + checkBoxIdSuffix + "', " + isCustomer + ", '" + url + "', '" + popupId + "', '" + listId + "', '" + itemIdPrefix + "', '" + filterAppointmentsUrl + "'"; var html = "
" + @@ -76,7 +78,7 @@ function updateSelectedList(jsonResult, listId, itemIdPrefix, isCustomer, popupI } } -function removeSelectedItem(itemOid, itemSuffix, isCustomer, url, popupId, listId, itemIdPrefix) { +function removeSelectedItem(itemOid, itemSuffix, isCustomer, url, popupId, listId, itemIdPrefix, filterAppointmentsUrl) { try { var prefix = isCustomer ? "customer-" : "employee-"; @@ -86,7 +88,7 @@ function removeSelectedItem(itemOid, itemSuffix, isCustomer, url, popupId, listI checkBox.prop("checked", false); } - changeItemListSelection(url, popupId, listId, itemIdPrefix, isCustomer, itemSuffix); + changeItemListSelection(url, popupId, listId, itemIdPrefix, isCustomer, itemSuffix, filterAppointmentsUrl); } catch(error) { logError(error); } diff --git a/BeWoPlanerMobil/Scripts/utils/resources-list-utils.js b/BeWoPlanerMobil/Scripts/utils/resources-list-utils.js index 1e72f871b..c87864adc 100644 --- a/BeWoPlanerMobil/Scripts/utils/resources-list-utils.js +++ b/BeWoPlanerMobil/Scripts/utils/resources-list-utils.js @@ -1,4 +1,4 @@ -function changeResourceSelection(popupId, url, listId, listItemIdPrefix, checkBoxIdPrefix) { +function changeResourceSelection(popupId, url, listId, listItemIdPrefix, checkBoxIdPrefix, filterAppointmentsUrl) { var selectedOids = []; var oidString = ""; @@ -13,11 +13,13 @@ } $.get(url, { resourceOids: oidString }).done(function (jsonResult) { - updateSelectedResourceList(jsonResult, listId, listItemIdPrefix, popupId, checkBoxIdPrefix, url); + updateSelectedResourceList(jsonResult, listId, listItemIdPrefix, popupId, checkBoxIdPrefix, url, filterAppointmentsUrl); + + $("#one-day-scheduler-partial-container").load(filterAppointmentsUrl); }); } -function updateSelectedResourceList(jsonResult, listId, listItemIdPrefix, popupId, checkBoxIdPrefix, url) { +function updateSelectedResourceList(jsonResult, listId, listItemIdPrefix, popupId, checkBoxIdPrefix, url, filterAppointmentsUrl) { var list = $("#" + listId); list.empty(); @@ -41,7 +43,7 @@ function updateSelectedResourceList(jsonResult, listId, listItemIdPrefix, popupI "
" + "

" + customListItem.Name + "

" + "

" + - "" + + "" + "
" + "" + "" + @@ -51,7 +53,8 @@ function updateSelectedResourceList(jsonResult, listId, listItemIdPrefix, popupI }); } -function removeSelectedResource(listItemId, checkBoxId, popupId, url, listId) { +// ToDo: FetchAppointments-Url hinzufügen +function removeSelectedResource(listItemId, checkBoxId, popupId, url, listId, fetchAppointmentsUrl) { $("#" + listItemId).remove(); var checkbox = $("#" + checkBoxId); @@ -60,5 +63,5 @@ function removeSelectedResource(listItemId, checkBoxId, popupId, url, listId) { checkbox.prop("checked", false); } - changeResourceSelection(popupId, url, listId); + changeResourceSelection(popupId, url, listId, null, null, fetchAppointmentsUrl); } diff --git a/BeWoPlanerMobil/Scripts/view-scripts/main.js b/BeWoPlanerMobil/Scripts/view-scripts/main.js index 1e55196fd..06d5103ef 100644 --- a/BeWoPlanerMobil/Scripts/view-scripts/main.js +++ b/BeWoPlanerMobil/Scripts/view-scripts/main.js @@ -440,53 +440,8 @@ function validateForm(form) { } } -var treeHtml = ""; - -function buildGoalsTree(treeData) { - var container = $("#goals-container"); - - container.empty(); - treeHtml = ""; - - $.each(treeData, function(index) { - buildGoaldTreeBranch(treeData[index]); - }); - - container.append(treeHtml); -} - -function buildGoaldTreeBranch(goalItem) { - var goalOid = goalItem.ValueListEntryOid; - var goalHeader = goalItem.Header; - var isChecked = getSelectedGoalOids() !== null && isInArray(goalOid, getSelectedGoalOids()) ? "checked" : ""; - var ratingName = goalItem.RatingName; - - if(!goalItem.IsLeaf) { - treeHtml += - '
' + - '
' + goalHeader + "
" + - '
'; - - $.each(goalItem.Children, function(index) { - buildGoaldTreeBranch(goalItem.Children[index]); - }); - - treeHtml += - "
" + - "
"; - } else { - treeHtml += - '
' + - '' + - '" + - "" + ratingName + "" + - "
"; - } -} - function showGoalRatingPopup(goalOid) { try { - console.log("jquery version " + $().jquery); $("#goal-rating-popup").modal("show"); $("#goal-to-rate-oid").val(goalOid); } catch (error) { @@ -540,7 +495,7 @@ function checkChildNodes(parentOid) { } function getCheckedGoals() { - var rootElement = $("#goals-container"); + var rootElement = $("#goals-tree"); var checkboxes = rootElement.find("input"); var selectedGoals = ""; diff --git a/BeWoPlanerMobil/Scripts/view-scripts/report.js b/BeWoPlanerMobil/Scripts/view-scripts/report.js index c1cd7d48e..c903ea9e7 100644 --- a/BeWoPlanerMobil/Scripts/view-scripts/report.js +++ b/BeWoPlanerMobil/Scripts/view-scripts/report.js @@ -177,7 +177,7 @@ function getSignatures(signatureOidStrings, containerId) { if(isUndefinedOrNull(json) || !checkJson(json)) { if(!checkJson(json)) { hideSpinner(); - logError("Fehler loadConfirmationReceiptSignatures: " + json); + logError("Fehler loadConfirmationReceiptSignatures: <" + json + ">"); } } @@ -236,10 +236,10 @@ function hideSignatureContainer() { $("#report-form-container").show(); } -function showSignaturePad(overwrite, signatureOidsString, canSign, cardBodyId, customerOid, numberOfEntries, customerName, timeSpan, isEmployeeSignature) { +function showSignaturePad(overwrite, signatureOidsString, canSign, cardBodyId, customerOid, numberOfEntries, customerName, timeSpan, isEmployeeSignature, employeeName) { try { cardHeaderButtonClick(cardBodyId); - + $("#report-form-container").hide(); $("#report-signature-container-div").addClass("d-block"); @@ -252,7 +252,9 @@ function showSignaturePad(overwrite, signatureOidsString, canSign, cardBodyId, c var leistungPlural = entryCount > 1 ? "en" : ""; - $("#report-info-column-h4").html("Unterschrift" + plural + " für " + numberOfEntries + " erbrachte Leistung" + leistungPlural + " von " + customerName + " (" + timeSpan + ")"); + var signatureGiverName = isEmployeeSignature ? employeeName : customerName; + + $("#report-info-column-h4").html("Unterschrift" + plural + " von " + signatureGiverName + " für " + numberOfEntries + " erbrachte Leistung" + leistungPlural + " von " + customerName + " (" + timeSpan + ")"); if(overwrite) { $("#overwriting-signature-alert").addClass("d-block"); diff --git a/BeWoPlanerMobil/Util/GoalTreeItem.cs b/BeWoPlanerMobil/Util/GoalTreeItem.cs index 647d7035c..94b799771 100644 --- a/BeWoPlanerMobil/Util/GoalTreeItem.cs +++ b/BeWoPlanerMobil/Util/GoalTreeItem.cs @@ -16,6 +16,6 @@ namespace BeWoPlanerMobil.Util public long? TopmostParentOid { get; set; } - public string RatingName { get; set; } = "Bewerten";//string.Empty; + public string RatingName { get; set; } = "Bewerten"; } } diff --git a/BeWoPlanerMobil/Views/Main/Main.cshtml b/BeWoPlanerMobil/Views/Main/Main.cshtml index d27e0bc53..b5f7eb097 100644 --- a/BeWoPlanerMobil/Views/Main/Main.cshtml +++ b/BeWoPlanerMobil/Views/Main/Main.cshtml @@ -117,13 +117,6 @@ } - @if(Model?.SelectedSupportConcept != null && Model.SelectedSupportConcept.Goals.Any()) - { - - initializeGoalsTreeView(); - - } - setInputFilter(); @if(Model.IsInGroupBookingMode) @@ -248,12 +241,6 @@ return @(Model != null && Model.IsServiceRecordNoticeMandatory ? "true" : "false"); } - function initializeGoalsTreeView() { - $.get("@Url.Action("LoadGoals")").done(function(jsonGoals) { - buildGoalsTree($.parseJSON(jsonGoals)); - }); - } - function getSelectedGoalOids() { return @Html.Raw(Json.Encode(Model.SelectedGoals.Select(s => s.ValueListEntryOid.Value).ToArray())); } @@ -372,27 +359,6 @@ - - - -
diff --git a/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml b/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml index e2fb60d53..651003fc0 100644 --- a/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml +++ b/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml @@ -5,9 +5,9 @@
- @if (Model != null) + @if(Model != null) { - using (Html.BeginForm("SelectSupportConcept", "Main", FormMethod.Post, new { Id = "selectSupportConceptForm" })) + using(Html.BeginForm("SelectSupportConcept", "Main", FormMethod.Post, new { Id = "selectSupportConceptForm" })) { var selectedSuportConceptTimeSpanColorClass = Model.SelectedSupportConceptListObject.IsAboutToExpire ? "text-bewo-is-about-to-expire" : Model.SelectedSupportConceptListObject.ExpiresInThreeMonthsOrLess ? "text-bewo-expires-in-three-months" : "text-dark";
@@ -25,7 +25,7 @@
- @if (Model.CostBearer2SupportConceptOid != null && Model.CostBearer2SupportConceptOid > 0) + @if(Model.CostBearer2SupportConceptOid != null && Model.CostBearer2SupportConceptOid > 0) {
- @if (Model.SelectedSupportConcept != null && Model.SelectedSupportConcept.Goals.Any()) + @if(Model.SelectedSupportConcept != null && Model.SelectedSupportConcept.Goals.Any()) {
- +
@@ -151,7 +151,7 @@
- @if (Model.IsEndDateVisible) + @if(Model.IsEndDateVisible) {
@@ -200,7 +200,7 @@
- @if (Model.IsZeiterfassungInStdMin) + @if(Model.IsZeiterfassungInStdMin) {
@@ -219,7 +219,7 @@ }
- @if (Model.ShowDistanceField) + @if(Model.ShowDistanceField) {
@@ -230,7 +230,7 @@
} - @if (AbstractModel.HasRightToSeeTextModules) + @if(AbstractModel.HasRightToSeeTextModules) {
@@ -241,7 +241,7 @@ }
- @if (Model.NumberOfDokuTypes == 0) + @if(Model.NumberOfDokuTypes == 0) {
@@ -251,7 +251,7 @@ else {
    - @for (var i = 0; i < Model.Dokutypes.Length; i++) + @for(var i = 0; i < Model.Dokutypes.Length; i++) { var currentDokuType = Model.Dokutypes[i]; @@ -263,7 +263,7 @@ }
- @for (var i = 0; i < Model.Dokutypes.Length; i++) + @for(var i = 0; i < Model.Dokutypes.Length; i++) { var textareaName = i + 1 < 1 ? "Dokumentation" : "Dokumentation" + (i + 1); @@ -282,9 +282,9 @@
- @if (Model.IsInEditingMode) + @if(Model.IsInEditingMode) { - using (Html.BeginForm("ResetEditingMode", "Main", FormMethod.Post)) + using(Html.BeginForm("ResetEditingMode", "Main", FormMethod.Post)) { } @@ -305,29 +305,29 @@
- @if (Model != null) + @if(Model != null) { - if (Model.SelectedSupportConcept != null || Model.CostBearer2SupportConceptOid == -2) + if(Model.SelectedSupportConcept != null || Model.CostBearer2SupportConceptOid == -2) {
- @using (Html.BeginForm("LoadServiceRecords", "Main", FormMethod.Post, new { id = "selectServiceRecordForm" })) + @using(Html.BeginForm("LoadServiceRecords", "Main", FormMethod.Post, new { id = "selectServiceRecordForm" })) { @@ -338,9 +338,9 @@
@{ - foreach (var serviceRecord in Model.ServiceRecords) + foreach(var serviceRecord in Model.ServiceRecords) { - if (serviceRecord.Start == null || serviceRecord.End == null) + if(serviceRecord.Start == null || serviceRecord.End == null) { continue; } @@ -352,7 +352,7 @@ var duration = (end - start).TotalMinutes; var roundedDuration = MobileUtils.GetDecimalValueWithMaxDecimal(serviceRecord.RoundedDuration, 2); - if (serviceRecord.ServiceDescription.Category.Percentage > 0 && serviceRecord.ServiceDescription.Category.Percentage < 100) + if(serviceRecord.ServiceDescription.Category.Percentage > 0 && serviceRecord.ServiceDescription.Category.Percentage < 100) { roundedDuration = roundedDuration * serviceRecord.ServiceDescription.Category.Percentage / 100; } @@ -361,13 +361,13 @@ var goalsString = string.Empty; - if (serviceRecord.Goals != null && serviceRecord.Goals.Count > 0) + if(serviceRecord.Goals != null && serviceRecord.Goals.Count > 0) { - foreach (var goal in serviceRecord.Goals) + foreach(var goal in serviceRecord.Goals) { goalsString += goal.TypeDescription; - if (serviceRecord.Goals.IndexOf(goal) < serviceRecord.Goals.Count - 1) + if(serviceRecord.Goals.IndexOf(goal) < serviceRecord.Goals.Count - 1) { goalsString += ", "; } @@ -392,9 +392,9 @@
- @if (Model.HasRightToEditServiceRecord(serviceRecord)) + @if(Model.HasRightToEditServiceRecord(serviceRecord)) { - using (Html.BeginForm("SelectRecordToEdit", "Main", FormMethod.Post)) + using(Html.BeginForm("SelectRecordToEdit", "Main", FormMethod.Post)) {
} - @if (Model.ShowSignature && !serviceRecord.SignatureOid.HasValue) + @if(Model.ShowSignature && !serviceRecord.SignatureOid.HasValue) {
} - else if (Model.ShowSignature && serviceRecord.SignatureOid.HasValue) + else if(Model.ShowSignature && serviceRecord.SignatureOid.HasValue) {
- @if (Model.ShowDistanceField && serviceRecord.DistanceInMeter != null && serviceRecord.DistanceInMeter.Value > 0) + @if(Model.ShowDistanceField && serviceRecord.DistanceInMeter != null && serviceRecord.DistanceInMeter.Value > 0) {
@@ -450,7 +450,7 @@
} - @if (serviceRecord.Goals != null && serviceRecord.Goals.Count > 0) + @if(serviceRecord.Goals != null && serviceRecord.Goals.Count > 0) {
@@ -496,7 +496,7 @@ @{ var header1 = "Dokumentation"; - if (Model.NumberOfDokuTypes >= 1) + if(Model.NumberOfDokuTypes >= 1) { header1 = Model.Dokutypes[0].TypeDescription; } @@ -510,20 +510,20 @@
- for (var i = 1; i < serviceRecord.NoticeList.Count; i++) + for(var i = 1; i < serviceRecord.NoticeList.Count; i++) { var notice = serviceRecord.NoticeList[i]; - if (string.IsNullOrWhiteSpace(notice) || Model.NumberOfDokuTypes <= i) + if(string.IsNullOrWhiteSpace(notice) || Model.NumberOfDokuTypes <= i) { continue; } var header = $"Dokumentation {i + 1}"; - if (Model.NumberOfDokuTypes >= 2) + if(Model.NumberOfDokuTypes >= 2) { - if (Model.NumberOfDokuTypes <= i) + if(Model.NumberOfDokuTypes <= i) { continue; } @@ -560,4 +560,26 @@ }
+ + +
\ No newline at end of file diff --git a/BeWoPlanerMobil/Views/Report/Report.cshtml b/BeWoPlanerMobil/Views/Report/Report.cshtml index 034b6d225..711ea87a5 100644 --- a/BeWoPlanerMobil/Views/Report/Report.cshtml +++ b/BeWoPlanerMobil/Views/Report/Report.cshtml @@ -200,17 +200,20 @@ var canCustomerSign = customerSignatureState != SignatureState.All; var canEmployeeSign = employeeSignatureState != SignatureState.All; + var employeeName = Model.Employee.ToString(); + //overwrite, signatureOidsString, canSign, cardBodyId, customerOid, numberOfEntries, customerName, timeSpan, isEmployeeSignature var methodName = "showSignaturePad(" + - $"{result.HasCustomerSignature.ToString().ToLower()}, " + - $"'{customerSignatureOidsString}', " + - $"{canCustomerSign.ToString().ToLower()}, " + - $"'#collapse-result-{result.Identifier}', " + - $"{result.CustomerOid}, " + - $"{result.Items.Count}, " + - $"'{result.CustomerName}', " + - $"'{Model.ConfirmationReceiptObject.TimeSpanString}', " + - "false)" ; + $"{result.HasCustomerSignature.ToString().ToLower()}, " + + $"'{customerSignatureOidsString}', " + + $"{canCustomerSign.ToString().ToLower()}, " + + $"'#collapse-result-{result.Identifier}', " + + $"{result.CustomerOid}, " + + $"{result.Items.Count}, " + + $"'{result.CustomerName}', " + + $"'{Model.ConfirmationReceiptObject.TimeSpanString}', " + + "false, " + + $"'{employeeName}')" ; //overwrite, signatureOidsString, canSign, cardBodyId, customerOid, numberOfEntries, customerName, timeSpan, isEmployeeSignature var overwrite_ssp = (employeeSignatureState == SignatureState.All).ToString().ToLower(); @@ -222,7 +225,9 @@ var customerName_ssp = result.CustomerName; var timeSpan_ssp = Model.ConfirmationReceiptObject.TimeSpanString; - var employeeMethodName = $"showSignaturePad({overwrite_ssp}, '{signatureOidsString_ssp}', {canSign_ssp}, '{cardBodyId_ssp}', {customerOid_ssp}, {numberOfEntries_ssp}, '{customerName_ssp}', '{timeSpan_ssp}', true)"; + + + var employeeMethodName = $"showSignaturePad({overwrite_ssp}, '{signatureOidsString_ssp}', {canSign_ssp}, '{cardBodyId_ssp}', {customerOid_ssp}, {numberOfEntries_ssp}, '{customerName_ssp}', '{timeSpan_ssp}', true, '{employeeName}')"; var employeeBtnColor = "transparent"; var customerBtnColor = "transparent"; @@ -269,10 +274,12 @@
diff --git a/BeWoPlanerMobil/Views/Scheduler/AppointmentFormPartial.cshtml b/BeWoPlanerMobil/Views/Scheduler/AppointmentFormPartial.cshtml index ba5f675a1..8f9707650 100644 --- a/BeWoPlanerMobil/Views/Scheduler/AppointmentFormPartial.cshtml +++ b/BeWoPlanerMobil/Views/Scheduler/AppointmentFormPartial.cshtml @@ -126,7 +126,7 @@ @selectedEmployee.DetailDescription

-
@@ -159,7 +159,9 @@ var url = Url.Action("SelectCustomersForAppointment", "Scheduler"); var oid = selectedCustomer.CustomerOid; - var onClickParams = $"{oid}, '-checkbox', true, '{url}', 'customers-popup', 'selected-customers-list', 'related-customer-'"; + var filterAppointmentsUrl = Url.Action("FetchAppointments", "Scheduler"); + + var onClickParams = $"{oid}, '-checkbox', true, '{url}', 'customers-popup', 'selected-customers-list', 'related-customer-', '{filterAppointmentsUrl}'"; }
@@ -366,7 +370,7 @@ var checkedValue = Model.SelectedResourcesForIntervalFinder.Contains(resource) ? "checked" : string.Empty;
- +
} @@ -411,8 +415,10 @@ var checkedValue = Model.SelectedEmployeesForIntervalFinder.Contains(employee) ? "checked" : string.Empty; var url = Url.Action("SelectEmployeesForIntervalFinder", "Scheduler"); + + var filterAppointmentsUrl = Url.Action("FetchAppointments", "Scheduler"); - var onClickParams = $"'{url}', 'employees-interval-finder-popup', 'selected-employees-interval-finder-list', 'related-employee-interval-finder-', false, '-interval-finder-checkbox'"; + var onClickParams = $"'{url}', 'employees-interval-finder-popup', 'selected-employees-interval-finder-list', 'related-employee-interval-finder-', false, '-interval-finder-checkbox', '{filterAppointmentsUrl}'";
@@ -457,7 +463,9 @@ var url = Url.Action("SelectCustomersForIntervalFinder", "Scheduler"); - var onClickParams = $"'{url}', 'customers-interval-finder-popup', 'selected-customers-interval-finder-list', 'related-customer-interval-finder-', true, '-interval-finder-checkbox'"; + var filterAppointmentsUrl = Url.Action("FetchAppointments", "Scheduler"); + + var onClickParams = $"'{url}', 'customers-interval-finder-popup', 'selected-customers-interval-finder-list', 'related-customer-interval-finder-', true, '-interval-finder-checkbox', '{filterAppointmentsUrl}'";
diff --git a/BeWoPlanerMobil/Views/Scheduler/OneDaySchedulerPartial.cshtml b/BeWoPlanerMobil/Views/Scheduler/OneDaySchedulerPartial.cshtml index e0d0320a3..cba13f903 100644 --- a/BeWoPlanerMobil/Views/Scheduler/OneDaySchedulerPartial.cshtml +++ b/BeWoPlanerMobil/Views/Scheduler/OneDaySchedulerPartial.cshtml @@ -1,19 +1,107 @@ @model BeWoPlanerMobil.Models.SchedulerModel @* Ganztagestermine in eine Liste mit weniger Margin und Padding *@ - -@if (Model.AppointmentListItems.Any(a => a.AllDay)) -{ - foreach (var appointment in Model.AppointmentListItems.Where(a => a.AllDay)) +
+ @if(Model.AppointmentListItems.Any(a => a.AllDay)) { -
-
-
+ foreach(var appointment in Model.AppointmentListItems.Where(a => a.AllDay)) + { +
+
+
+ +
+
+ +
+
+
+
+
+ @if(appointment.HasEmployeesCustomersOrResources && !appointment.IsTask) + { +
+ @if(!string.IsNullOrWhiteSpace(appointment.EmployeeListInfo)) + { +
+ + @appointment.EmployeeListInfo +
+ } + @if(!string.IsNullOrWhiteSpace(appointment.CustomerListInfo)) + { +
+ + @appointment.CustomerListInfo +
+ } + @if(!string.IsNullOrWhiteSpace(appointment.ResourceListInfo)) + { +
+ + @appointment.ResourceListInfo +
+ } +
+
+ } + + @if(Model.HasRightToEditAppointment(appointment.Oid) && !appointment.IsTask && appointment.Oid.HasValue) + { + using(Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post)) + { +
+
+ + +
+
+ } + } +

@appointment.Description

+
+
+
+
+ } + +
+ } + + @foreach(var appointment in Model.AppointmentListItems.Where(a => !a.AllDay)) + { +
+
+
-
-
-
-
-
- @if (appointment.HasEmployeesCustomersOrResources && !appointment.IsTask) - { -
- @if (!string.IsNullOrWhiteSpace(appointment.EmployeeListInfo)) - { -
- - @appointment.EmployeeListInfo -
- } - @if (!string.IsNullOrWhiteSpace(appointment.CustomerListInfo)) - { -
- - @appointment.CustomerListInfo -
- } - @if (!string.IsNullOrWhiteSpace(appointment.ResourceListInfo)) - { -
- - @appointment.ResourceListInfo -
- } -
-
- } - - @if (Model.HasRightToEditAppointment(appointment.Oid) && !appointment.IsTask && appointment.Oid.HasValue) - { - using (Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post)) - { -
-
- - -
-
- } - } -

@appointment.Description

-
-
-
-
-} \ No newline at end of file +
\ No newline at end of file diff --git a/BeWoPlanerMobil/Views/Scheduler/Scheduler.cshtml b/BeWoPlanerMobil/Views/Scheduler/Scheduler.cshtml index fa8241f03..49f77068d 100644 --- a/BeWoPlanerMobil/Views/Scheduler/Scheduler.cshtml +++ b/BeWoPlanerMobil/Views/Scheduler/Scheduler.cshtml @@ -118,7 +118,7 @@ listCol = "col-md-12"; } } -
+
@if (Model.IsInIntervalFinderMode) { @@ -144,7 +144,7 @@ } else { - @Html.Partial("OneDaySchedulerPartial", Model) + Html.RenderAction("FetchAppointments", Model); }
diff --git a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml index 697fe7ac7..7996a6df0 100644 --- a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml +++ b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml @@ -38,13 +38,13 @@ - + - + - @Html.DevExpress().GetStyleSheets( + @*@Html.DevExpress().GetStyleSheets( new StyleSheet { ExtensionSuite = ExtensionSuite.NavigationAndLayout }, new StyleSheet { ExtensionSuite = ExtensionSuite.Editors }, new StyleSheet { ExtensionSuite = ExtensionSuite.HtmlEditor }, @@ -70,9 +70,9 @@ new Script { ExtensionSuite = ExtensionSuite.TreeList }, new Script { ExtensionSuite = ExtensionSuite.Spreadsheet }, new Script { ExtensionSuite = ExtensionSuite.SpellChecker } - ) + )*@ - + *@