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 e6cca3a77ca1b184869b1170ebda77704cd5da7b Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Wed, 10 Aug 2022 11:49:56 +0200 Subject: [PATCH 2/3] =?UTF-8?q?MH:=20Rechnungsanpassung=20Autismus=20leben?= =?UTF-8?q?=20+=20automatischen=20Pausenabzug=20f=C3=BCr=20Frommen=20entfe?= =?UTF-8?q?rnt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ReportImp/AutismusLeben/AutismusLeben.csproj | 10 + .../InvoiceCustomerReport.Designer.cs | 1053 +++++++++++++++++ .../AutismusLeben/InvoiceCustomerReport.cs | 63 + .../AutismusLeben/InvoiceCustomerReport.resx | 653 ++++++++++ .../ServiceInvoiceReport.Designer.cs | 552 +++++---- .../SettlementReport.Designer.cs | 20 +- ReportImp/AutismusLeben/SettlementReport.cs | 169 ++- ...CustomMitarbeiterstundenkontoBerechnung.cs | 8 +- 8 files changed, 2140 insertions(+), 388 deletions(-) create mode 100644 ReportImp/AutismusLeben/InvoiceCustomerReport.Designer.cs create mode 100644 ReportImp/AutismusLeben/InvoiceCustomerReport.cs create mode 100644 ReportImp/AutismusLeben/InvoiceCustomerReport.resx diff --git a/ReportImp/AutismusLeben/AutismusLeben.csproj b/ReportImp/AutismusLeben/AutismusLeben.csproj index 8e69d2f42..c7e20cff3 100644 --- a/ReportImp/AutismusLeben/AutismusLeben.csproj +++ b/ReportImp/AutismusLeben/AutismusLeben.csproj @@ -93,6 +93,12 @@ SettlementReport.cs + + Component + + + SettlementReport2.cs + Component @@ -145,6 +151,10 @@ SettlementReport.cs Designer + + SettlementReport2.cs + Designer + Teamstundenkonto.cs diff --git a/ReportImp/AutismusLeben/InvoiceCustomerReport.Designer.cs b/ReportImp/AutismusLeben/InvoiceCustomerReport.Designer.cs new file mode 100644 index 000000000..034f15311 --- /dev/null +++ b/ReportImp/AutismusLeben/InvoiceCustomerReport.Designer.cs @@ -0,0 +1,1053 @@ +using BeWo.Report.ReportObjects; +namespace AutismusLeben +{ + partial class InvoiceCustomerReport + { + /// + /// 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(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InvoiceCustomerReport)); + this.Detail = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); + this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); + this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); + this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblNotice = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); + this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrLabel31 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel30 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel29 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel_RecipientDivision = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel_RecipientStreet = new DevExpress.XtraReports.UI.XRLabel(); + this.RecipientPostCodeAndTown = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblCustomerInformation = new DevExpress.XtraReports.UI.XRLabel(); + this.lblAktenzeichen = new DevExpress.XtraReports.UI.XRLabel(); + this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLine2 = new DevExpress.XtraReports.UI.XRLine(); + this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).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; + // + // xrTable1 + // + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow9}); + this.xrTable1.SizeF = new System.Drawing.SizeF(700.9999F, 25F); + this.xrTable1.StylePriority.UseFont = false; + // + // xrTableRow9 + // + this.xrTableRow9.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell6, + this.xrTableCell7, + this.xrTableCell9, + this.xrTableCell14, + this.xrTableCell10, + this.xrTableCell12}); + this.xrTableRow9.Name = "xrTableRow9"; + this.xrTableRow9.Weight = 1D; + // + // 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, "InvoiceItems.AccountingPeriodStart")}); + this.xrTableCell6.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell6.StylePriority.UseBorders = false; + this.xrTableCell6.StylePriority.UseFont = false; + this.xrTableCell6.StylePriority.UsePadding = false; + this.xrTableCell6.StylePriority.UseTextAlignment = false; + this.xrTableCell6.Text = "xrTableCell6"; + this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell6.Weight = 1D; + // + // xrTableCell7 + // + this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.AccountingPeriodEnd")}); + this.xrTableCell7.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell7.StylePriority.UseBorders = false; + this.xrTableCell7.StylePriority.UseFont = false; + this.xrTableCell7.StylePriority.UsePadding = false; + this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.Text = "xrTableCell7"; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell7.Weight = 1D; + // + // xrTableCell9 + // + this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.ItemDescription")}); + this.xrTableCell9.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell9.StylePriority.UseBorders = false; + this.xrTableCell9.StylePriority.UseFont = false; + this.xrTableCell9.StylePriority.UsePadding = false; + this.xrTableCell9.StylePriority.UseTextAlignment = false; + this.xrTableCell9.Text = "xrTableCell9"; + this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell9.Weight = 2.3350077713203072D; + // + // xrTableCell14 + // + this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.UnitPrice")}); + this.xrTableCell14.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell14.StylePriority.UseBorders = false; + this.xrTableCell14.StylePriority.UseFont = false; + this.xrTableCell14.StylePriority.UsePadding = false; + this.xrTableCell14.StylePriority.UseTextAlignment = false; + this.xrTableCell14.Text = "xrTableCell14"; + this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell14.Weight = 0.81217660612832132D; + // + // xrTableCell10 + // + this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.UnitCount", "{0:0.##}")}); + this.xrTableCell10.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell10.StylePriority.UseBorders = false; + this.xrTableCell10.StylePriority.UseFont = false; + this.xrTableCell10.StylePriority.UsePadding = false; + this.xrTableCell10.StylePriority.UseTextAlignment = false; + this.xrTableCell10.Text = "xrTableCell10"; + this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell10.Weight = 0.6539656324947265D; + // + // xrTableCell12 + // + this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.AmountSum")}); + this.xrTableCell12.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F); + this.xrTableCell12.StylePriority.UseBorders = false; + this.xrTableCell12.StylePriority.UseFont = false; + this.xrTableCell12.StylePriority.UsePadding = false; + this.xrTableCell12.StylePriority.UseTextAlignment = false; + this.xrTableCell12.Text = "xrTableCell12"; + this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell12.Weight = 1.0152204985905673D; + // + // ReportHeader + // + this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel21, + this.xrLabel22, + this.lblCustomerInformation, + this.lblAktenzeichen, + this.xrLabel31, + this.xrLabel30, + this.xrLabel29, + this.xrLabel28, + this.xrLabel1, + this.xrLabel20, + this.xrLabel19, + this.xrLabel18, + this.xrLabel17, + this.xrLabel16, + this.xrLabel11, + this.xrLabel7, + this.xrLabel13, + this.xrLabel9, + this.xrLabel14, + this.xrLabel15, + this.xrLabel_RecipientContactPerson, + this.xrLabel_RecipientDivision, + this.xrLabel_RecipientStreet, + this.RecipientPostCodeAndTown, + this.xrTable3}); + this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F); + this.ReportHeader.HeightF = 388.4582F; + this.ReportHeader.Name = "ReportHeader"; + this.ReportHeader.StylePriority.UseFont = false; + // + // xrTable3 + // + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 363.4582F); + this.xrTable3.Name = "xrTable3"; + this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow10}); + this.xrTable3.SizeF = new System.Drawing.SizeF(700.9999F, 25F); + this.xrTable3.StylePriority.UseFont = false; + // + // xrTableRow10 + // + this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell15, + this.xrTableCell16, + this.xrTableCell17, + this.xrTableCell18, + this.xrTableCell19, + this.xrTableCell20}); + this.xrTableRow10.Name = "xrTableRow10"; + this.xrTableRow10.Weight = 1D; + // + // xrTableCell15 + // + this.xrTableCell15.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell15.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell15.Name = "xrTableCell15"; + this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell15.StylePriority.UseBorders = false; + this.xrTableCell15.StylePriority.UseFont = false; + this.xrTableCell15.StylePriority.UsePadding = false; + this.xrTableCell15.StylePriority.UseTextAlignment = false; + this.xrTableCell15.Text = "Von"; + this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell15.Weight = 1D; + // + // xrTableCell16 + // + this.xrTableCell16.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell16.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell16.Name = "xrTableCell16"; + this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell16.StylePriority.UseBorders = false; + this.xrTableCell16.StylePriority.UseFont = false; + this.xrTableCell16.StylePriority.UsePadding = false; + this.xrTableCell16.StylePriority.UseTextAlignment = false; + this.xrTableCell16.Text = "Bis"; + this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell16.Weight = 1D; + // + // xrTableCell17 + // + this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell17.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell17.Name = "xrTableCell17"; + this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell17.StylePriority.UseBorders = false; + this.xrTableCell17.StylePriority.UseFont = false; + this.xrTableCell17.StylePriority.UsePadding = false; + this.xrTableCell17.StylePriority.UseTextAlignment = false; + this.xrTableCell17.Text = "Posten"; + this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell17.Weight = 2.3350077713203934D; + // + // xrTableCell18 + // + this.xrTableCell18.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell18.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell18.Name = "xrTableCell18"; + this.xrTableCell18.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell18.StylePriority.UseBorders = false; + this.xrTableCell18.StylePriority.UseFont = false; + this.xrTableCell18.StylePriority.UsePadding = false; + this.xrTableCell18.StylePriority.UseTextAlignment = false; + this.xrTableCell18.Text = "Satz"; + this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell18.Weight = 0.81217660612829246D; + // + // xrTableCell19 + // + this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell19.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell19.Name = "xrTableCell19"; + this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell19.StylePriority.UseBorders = false; + this.xrTableCell19.StylePriority.UseFont = false; + this.xrTableCell19.StylePriority.UsePadding = false; + this.xrTableCell19.StylePriority.UseTextAlignment = false; + this.xrTableCell19.Text = "Anzahl"; + this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell19.Weight = 0.6539656324946691D; + // + // xrTableCell20 + // + this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell20.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell20.Name = "xrTableCell20"; + this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F); + this.xrTableCell20.StylePriority.UseBorders = false; + this.xrTableCell20.StylePriority.UseFont = false; + this.xrTableCell20.StylePriority.UsePadding = false; + this.xrTableCell20.StylePriority.UseTextAlignment = false; + this.xrTableCell20.Text = "Betrag"; + this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell20.Weight = 1.0152204985905673D; + // + // ruleRateFactorNull + // + this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?"; + this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; + this.ruleRateFactorNull.Name = "ruleRateFactorNull"; + // + // ReportFooter + // + this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel8, + this.lblNotice, + this.xrTable4}); + this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F); + this.ReportFooter.HeightF = 247.5417F; + this.ReportFooter.KeepTogether = true; + this.ReportFooter.Name = "ReportFooter"; + this.ReportFooter.StylePriority.UseFont = false; + // + // xrLabel8 + // + this.xrLabel8.CanShrink = true; + this.xrLabel8.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 75F); + 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(677F, 18.04168F); + this.xrLabel8.StylePriority.UseFont = false; + this.xrLabel8.Text = "[Notice]"; + // + // lblNotice + // + this.lblNotice.CanShrink = true; + this.lblNotice.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Italic); + this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 46.54166F); + this.lblNotice.Name = "lblNotice"; + this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblNotice.SizeF = new System.Drawing.SizeF(250F, 28.45834F); + this.lblNotice.StylePriority.UseFont = false; + this.lblNotice.Text = "Abschließende Bemerkungen:"; + // + // xrTable4 + // + this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(595.5899F, 0F); + this.xrTable4.Name = "xrTable4"; + this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow11}); + this.xrTable4.SizeF = new System.Drawing.SizeF(105.41F, 25F); + // + // xrTableRow11 + // + this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell23}); + this.xrTableRow11.Name = "xrTableRow11"; + this.xrTableRow11.Weight = 1D; + // + // xrTableCell23 + // + this.xrTableCell23.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell23.BorderWidth = 2F; + this.xrTableCell23.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold); + this.xrTableCell23.Name = "xrTableCell23"; + this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F); + this.xrTableCell23.StylePriority.UseBorders = false; + this.xrTableCell23.StylePriority.UseBorderWidth = false; + this.xrTableCell23.StylePriority.UseFont = false; + this.xrTableCell23.StylePriority.UsePadding = false; + this.xrTableCell23.StylePriority.UseTextAlignment = false; + this.xrTableCell23.Text = "[TotalClaim]"; + this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell23.Weight = 3.5162395387911158D; + // + // topMarginBand1 + // + this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrPictureBox2}); + this.topMarginBand1.HeightF = 166.4583F; + this.topMarginBand1.Name = "topMarginBand1"; + // + // bottomMarginBand1 + // + this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrPictureBox1, + this.xrLabel27, + this.xrLabel26, + this.xrLabel25, + this.xrLabel2, + this.xrLabel3, + this.xrLabel4, + this.xrLabel5, + this.xrLabel6, + this.xrLine2, + this.xrLabel10}); + this.bottomMarginBand1.HeightF = 100F; + this.bottomMarginBand1.Name = "bottomMarginBand1"; + // + // DetailReport + // + this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail1}); + this.DetailReport.DataMember = "InvoiceItems"; + this.DetailReport.DataSource = this.bindingSource1; + this.DetailReport.Level = 0; + this.DetailReport.Name = "DetailReport"; + // + // Detail1 + // + this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable1}); + this.Detail1.Font = new System.Drawing.Font("Verdana", 9.75F); + this.Detail1.HeightF = 25F; + this.Detail1.Name = "Detail1"; + this.Detail1.StylePriority.UseFont = false; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO); + // + // xrPictureBox2 + // + this.xrPictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox2.Image"))); + this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(444.7083F, 22.50001F); + this.xrPictureBox2.Name = "xrPictureBox2"; + this.xrPictureBox2.SizeF = new System.Drawing.SizeF(232.2917F, 143.9583F); + this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // + // xrLabel31 + // + this.xrLabel31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); + this.xrLabel31.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(541.7501F, 119.0001F); + this.xrLabel31.Name = "xrLabel31"; + this.xrLabel31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel31.SizeF = new System.Drawing.SizeF(159.2502F, 17.00001F); + this.xrLabel31.StylePriority.UseFont = false; + this.xrLabel31.Text = "201 5900 4337"; + // + // xrLabel30 + // + this.xrLabel30.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(541.7501F, 102F); + this.xrLabel30.Name = "xrLabel30"; + this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel30.SizeF = new System.Drawing.SizeF(159.2502F, 16.99999F); + this.xrLabel30.StylePriority.UseFont = false; + this.xrLabel30.Text = "201 5900 4337"; + // + // xrLabel29 + // + this.xrLabel29.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(541.7501F, 85.00004F); + this.xrLabel29.Name = "xrLabel29"; + this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel29.SizeF = new System.Drawing.SizeF(159.2502F, 17F); + this.xrLabel29.StylePriority.UseFont = false; + this.xrLabel29.Text = "info@autismusleben.de"; + // + // xrLabel28 + // + this.xrLabel28.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(541.7501F, 68F); + this.xrLabel28.Name = "xrLabel28"; + this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel28.SizeF = new System.Drawing.SizeF(159.2502F, 17F); + this.xrLabel28.StylePriority.UseFont = false; + this.xrLabel28.Text = "0241 559272-210"; + // + // xrLabel1 + // + this.xrLabel1.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(541.7501F, 51.00002F); + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(159.2502F, 17F); + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.Text = "[CreatorFirstName] [CreatorLastName]"; + // + // xrLabel20 + // + this.xrLabel20.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(541.75F, 34.00002F); + this.xrLabel20.Name = "xrLabel20"; + this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel20.SizeF = new System.Drawing.SizeF(159.25F, 17F); + this.xrLabel20.StylePriority.UseFont = false; + this.xrLabel20.Text = "11601"; + // + // xrLabel19 + // + this.xrLabel19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")}); + this.xrLabel19.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(541.75F, 17.00001F); + this.xrLabel19.Name = "xrLabel19"; + this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel19.SizeF = new System.Drawing.SizeF(159.25F, 17F); + this.xrLabel19.StylePriority.UseFont = false; + // + // xrLabel18 + // + this.xrLabel18.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(457.7083F, 119.0001F); + this.xrLabel18.Name = "xrLabel18"; + this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel18.SizeF = new System.Drawing.SizeF(84.04175F, 17.00001F); + this.xrLabel18.StylePriority.UseFont = false; + this.xrLabel18.Text = "Datum:"; + // + // xrLabel17 + // + this.xrLabel17.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(457.7083F, 102F); + this.xrLabel17.Name = "xrLabel17"; + this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel17.SizeF = new System.Drawing.SizeF(84.04175F, 17F); + this.xrLabel17.StylePriority.UseFont = false; + this.xrLabel17.Text = "Steuernr:"; + // + // xrLabel16 + // + this.xrLabel16.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(457.7083F, 85.00004F); + this.xrLabel16.Name = "xrLabel16"; + this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel16.SizeF = new System.Drawing.SizeF(84.04175F, 17F); + this.xrLabel16.StylePriority.UseFont = false; + this.xrLabel16.Text = "E-Mail:"; + // + // xrLabel11 + // + this.xrLabel11.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(457.7083F, 68F); + this.xrLabel11.Name = "xrLabel11"; + this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(84.04175F, 17F); + this.xrLabel11.StylePriority.UseFont = false; + this.xrLabel11.Text = "Telefon:"; + // + // xrLabel7 + // + this.xrLabel7.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(457.7083F, 51.00002F); + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(84.04175F, 16.99999F); + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.Text = "Bearbeiter:"; + // + // xrLabel13 + // + this.xrLabel13.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(457.7083F, 34.00002F); + this.xrLabel13.Name = "xrLabel13"; + this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel13.SizeF = new System.Drawing.SizeF(84.04175F, 17F); + this.xrLabel13.StylePriority.UseFont = false; + this.xrLabel13.Text = "Kunden Nr.:"; + // + // xrLabel9 + // + this.xrLabel9.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(457.7083F, 17.00001F); + this.xrLabel9.Name = "xrLabel9"; + this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel9.SizeF = new System.Drawing.SizeF(84.04175F, 17F); + this.xrLabel9.StylePriority.UseFont = false; + this.xrLabel9.Text = "Rechnung Nr.:"; + // + // xrLabel14 + // + this.xrLabel14.Font = new System.Drawing.Font("Arial", 7F); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel14.Name = "xrLabel14"; + this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel14.SizeF = new System.Drawing.SizeF(369.0833F, 17F); + this.xrLabel14.StylePriority.UseFont = false; + this.xrLabel14.Text = "Autismus leben gemeinnützige GmbH, Augustastraße 78, 52070 Aachen"; + // + // xrLabel15 + // + this.xrLabel15.CanShrink = true; + this.xrLabel15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientOrganisation")}); + this.xrLabel15.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17.00004F); + this.xrLabel15.Name = "xrLabel15"; + this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel15.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrLabel15.SizeF = new System.Drawing.SizeF(292F, 17F); + this.xrLabel15.StylePriority.UseFont = false; + // + // xrLabel_RecipientContactPerson + // + this.xrLabel_RecipientContactPerson.CanShrink = true; + this.xrLabel_RecipientContactPerson.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0F, 34.00002F); + this.xrLabel_RecipientContactPerson.Name = "xrLabel_RecipientContactPerson"; + this.xrLabel_RecipientContactPerson.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel_RecipientContactPerson.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrLabel_RecipientContactPerson.SizeF = new System.Drawing.SizeF(292F, 17F); + this.xrLabel_RecipientContactPerson.StylePriority.UseFont = false; + this.xrLabel_RecipientContactPerson.Text = "[RecipientFirstName] [RecipientLastName]"; + // + // xrLabel_RecipientDivision + // + this.xrLabel_RecipientDivision.CanShrink = true; + this.xrLabel_RecipientDivision.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0F, 51.00002F); + this.xrLabel_RecipientDivision.Name = "xrLabel_RecipientDivision"; + this.xrLabel_RecipientDivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel_RecipientDivision.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrLabel_RecipientDivision.SizeF = new System.Drawing.SizeF(292F, 17F); + this.xrLabel_RecipientDivision.StylePriority.UseFont = false; + this.xrLabel_RecipientDivision.Text = "[RecipientDivision]"; + // + // xrLabel_RecipientStreet + // + this.xrLabel_RecipientStreet.CanShrink = true; + this.xrLabel_RecipientStreet.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0.0003814697F, 68.00003F); + this.xrLabel_RecipientStreet.Name = "xrLabel_RecipientStreet"; + this.xrLabel_RecipientStreet.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel_RecipientStreet.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrLabel_RecipientStreet.SizeF = new System.Drawing.SizeF(292F, 17F); + this.xrLabel_RecipientStreet.StylePriority.UseFont = false; + this.xrLabel_RecipientStreet.Text = "[RecipientStreet]"; + // + // RecipientPostCodeAndTown + // + this.RecipientPostCodeAndTown.CanShrink = true; + this.RecipientPostCodeAndTown.Font = new System.Drawing.Font("Arial", 10F); + this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0F, 85.00007F); + this.RecipientPostCodeAndTown.Name = "RecipientPostCodeAndTown"; + this.RecipientPostCodeAndTown.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.RecipientPostCodeAndTown.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.RecipientPostCodeAndTown.SizeF = new System.Drawing.SizeF(292F, 17F); + this.RecipientPostCodeAndTown.StylePriority.UseFont = false; + this.RecipientPostCodeAndTown.Text = "[RecipientPostCode] [RecipientTown]"; + // + // xrLabel21 + // + this.xrLabel21.BackColor = System.Drawing.Color.Transparent; + this.xrLabel21.CanShrink = true; + this.xrLabel21.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(0.0003814697F, 270.4791F); + this.xrLabel21.Name = "xrLabel21"; + this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel21.SizeF = new System.Drawing.SizeF(701F, 20F); + this.xrLabel21.StylePriority.UseBackColor = false; + this.xrLabel21.StylePriority.UseFont = false; + this.xrLabel21.Text = "Rechnung Nr. [InvoiceNumber]"; + this.xrLabel21.WordWrap = false; + // + // xrLabel22 + // + this.xrLabel22.BackColor = System.Drawing.Color.Transparent; + this.xrLabel22.CanShrink = true; + this.xrLabel22.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(0.0003814697F, 290.4792F); + this.xrLabel22.Name = "xrLabel22"; + this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel22.SizeF = new System.Drawing.SizeF(701F, 20.00003F); + this.xrLabel22.StylePriority.UseBackColor = false; + this.xrLabel22.StylePriority.UseFont = false; + this.xrLabel22.Text = "Abrechnungszeitraum: [AccountingPeriod]"; + this.xrLabel22.WordWrap = false; + // + // lblCustomerInformation + // + this.lblCustomerInformation.BackColor = System.Drawing.Color.Transparent; + this.lblCustomerInformation.CanShrink = true; + this.lblCustomerInformation.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.lblCustomerInformation.LocationFloat = new DevExpress.Utils.PointFloat(0.0003814697F, 314.6458F); + this.lblCustomerInformation.Multiline = true; + this.lblCustomerInformation.Name = "lblCustomerInformation"; + this.lblCustomerInformation.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblCustomerInformation.SizeF = new System.Drawing.SizeF(701F, 20F); + this.lblCustomerInformation.StylePriority.UseBackColor = false; + this.lblCustomerInformation.StylePriority.UseFont = false; + this.lblCustomerInformation.Text = "[CustomerLastName], [CustomerFirstName]; Geburtsdatum: [CustomerBirthdate!dd.MM.y" + + "yyy]"; + this.lblCustomerInformation.WordWrap = false; + // + // lblAktenzeichen + // + this.lblAktenzeichen.BackColor = System.Drawing.Color.Transparent; + this.lblAktenzeichen.CanShrink = true; + this.lblAktenzeichen.Font = new System.Drawing.Font("Arial", 10F); + this.lblAktenzeichen.LocationFloat = new DevExpress.Utils.PointFloat(0.0003814697F, 334.6458F); + this.lblAktenzeichen.Multiline = true; + this.lblAktenzeichen.Name = "lblAktenzeichen"; + this.lblAktenzeichen.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblAktenzeichen.SizeF = new System.Drawing.SizeF(701F, 20F); + this.lblAktenzeichen.StylePriority.UseBackColor = false; + this.lblAktenzeichen.StylePriority.UseFont = false; + this.lblAktenzeichen.Text = "Aktenzeichen LVR: [CustomerReferenceNumber]"; + this.lblAktenzeichen.WordWrap = false; + // + // xrPictureBox1 + // + this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(579.0043F, 40.69711F); + this.xrPictureBox1.Name = "xrPictureBox1"; + this.xrPictureBox1.SizeF = new System.Drawing.SizeF(112.9958F, 35.41743F); + this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // + // xrLabel27 + // + this.xrLabel27.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel27.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold); + this.xrLabel27.ForeColor = System.Drawing.Color.Black; + this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(578.5879F, 22.98705F); + this.xrLabel27.Multiline = true; + this.xrLabel27.Name = "xrLabel27"; + this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel27.SizeF = new System.Drawing.SizeF(92.99542F, 17.70833F); + this.xrLabel27.StylePriority.UseBorders = false; + this.xrLabel27.StylePriority.UseFont = false; + this.xrLabel27.StylePriority.UseForeColor = false; + this.xrLabel27.StylePriority.UseTextAlignment = false; + this.xrLabel27.Text = "Mitgliedschaft"; + this.xrLabel27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrLabel26 + // + this.xrLabel26.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel26.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold); + this.xrLabel26.ForeColor = System.Drawing.Color.Black; + this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(332.3747F, 22.98705F); + this.xrLabel26.Multiline = true; + this.xrLabel26.Name = "xrLabel26"; + this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel26.SizeF = new System.Drawing.SizeF(233.4166F, 17.70833F); + this.xrLabel26.StylePriority.UseBorders = false; + this.xrLabel26.StylePriority.UseFont = false; + this.xrLabel26.StylePriority.UseForeColor = false; + this.xrLabel26.StylePriority.UseTextAlignment = false; + this.xrLabel26.Text = "Bankverbindung "; + this.xrLabel26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrLabel25 + // + this.xrLabel25.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel25.Font = new System.Drawing.Font("Arial", 8F); + this.xrLabel25.ForeColor = System.Drawing.Color.Black; + this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(332.3747F, 40.69711F); + this.xrLabel25.Multiline = true; + this.xrLabel25.Name = "xrLabel25"; + this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel25.SizeF = new System.Drawing.SizeF(233.4166F, 17.70833F); + this.xrLabel25.StylePriority.UseBorders = false; + this.xrLabel25.StylePriority.UseFont = false; + this.xrLabel25.StylePriority.UseForeColor = false; + this.xrLabel25.StylePriority.UseTextAlignment = false; + this.xrLabel25.Text = "IBAN:\tDE59 3905 0000 1073 5187 95"; + this.xrLabel25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrLabel2 + // + this.xrLabel2.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel2.Font = new System.Drawing.Font("Arial", 8F); + this.xrLabel2.ForeColor = System.Drawing.Color.Black; + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(332.3747F, 58.40614F); + this.xrLabel2.Multiline = true; + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(233.4166F, 17.70833F); + this.xrLabel2.StylePriority.UseBorders = false; + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.StylePriority.UseForeColor = false; + this.xrLabel2.StylePriority.UseTextAlignment = false; + this.xrLabel2.Text = "BIC:\tAACSDE33"; + this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrLabel3 + // + this.xrLabel3.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel3.Font = new System.Drawing.Font("Arial", 8F); + this.xrLabel3.ForeColor = System.Drawing.Color.Black; + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(217.7082F, 58.40366F); + this.xrLabel3.Multiline = true; + this.xrLabel3.Name = "xrLabel3"; + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(114.6666F, 17.70833F); + this.xrLabel3.StylePriority.UseBorders = false; + this.xrLabel3.StylePriority.UseFont = false; + this.xrLabel3.StylePriority.UseForeColor = false; + this.xrLabel3.StylePriority.UseTextAlignment = false; + this.xrLabel3.Text = "HRB 23508"; + this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrLabel4 + // + this.xrLabel4.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel4.Font = new System.Drawing.Font("Arial", 8F); + this.xrLabel4.ForeColor = System.Drawing.Color.Black; + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(217.7082F, 40.69538F); + 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(114.6666F, 17.70833F); + this.xrLabel4.StylePriority.UseBorders = false; + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.StylePriority.UseForeColor = false; + this.xrLabel4.StylePriority.UseTextAlignment = false; + this.xrLabel4.Text = "Amtsgericht Aachen"; + this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrLabel5 + // + this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel5.Font = new System.Drawing.Font("Arial", 8F); + this.xrLabel5.ForeColor = System.Drawing.Color.Black; + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(26.99991F, 58.40614F); + this.xrLabel5.Multiline = true; + this.xrLabel5.Name = "xrLabel5"; + this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(190.7083F, 17.70833F); + this.xrLabel5.StylePriority.UseBorders = false; + this.xrLabel5.StylePriority.UseFont = false; + this.xrLabel5.StylePriority.UseForeColor = false; + this.xrLabel5.StylePriority.UseTextAlignment = false; + this.xrLabel5.Text = "Geschäftsführerin: Sonja Howe"; + this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrLabel6 + // + this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel6.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold); + this.xrLabel6.ForeColor = System.Drawing.Color.Black; + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(26.99991F, 22.98705F); + this.xrLabel6.Multiline = true; + this.xrLabel6.Name = "xrLabel6"; + this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel6.SizeF = new System.Drawing.SizeF(190.7083F, 17.70833F); + this.xrLabel6.StylePriority.UseBorders = false; + this.xrLabel6.StylePriority.UseFont = false; + this.xrLabel6.StylePriority.UseForeColor = false; + this.xrLabel6.StylePriority.UseTextAlignment = false; + this.xrLabel6.Text = "Autismus leben "; + this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrLine2 + // + this.xrLine2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(237)))), ((int)(((byte)(127)))), ((int)(((byte)(49))))); + this.xrLine2.LineDirection = DevExpress.XtraReports.UI.LineDirection.Vertical; + this.xrLine2.LineWidth = 2; + this.xrLine2.LocationFloat = new DevExpress.Utils.PointFloat(8.999908F, 13.17705F); + this.xrLine2.Name = "xrLine2"; + this.xrLine2.SizeF = new System.Drawing.SizeF(7.541609F, 73.6459F); + this.xrLine2.StylePriority.UseForeColor = false; + // + // xrLabel10 + // + this.xrLabel10.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel10.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold); + this.xrLabel10.ForeColor = System.Drawing.Color.Black; + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(26.99991F, 40.69538F); + 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(190.7083F, 17.70833F); + this.xrLabel10.StylePriority.UseBorders = false; + this.xrLabel10.StylePriority.UseFont = false; + this.xrLabel10.StylePriority.UseForeColor = false; + this.xrLabel10.StylePriority.UseTextAlignment = false; + this.xrLabel10.Text = "gemeinnützige GmbH"; + this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // InvoiceCustomerReport + // + this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail, + this.ReportHeader, + this.ReportFooter, + this.topMarginBand1, + this.bottomMarginBand1, + this.DetailReport}); + this.DataSource = this.bindingSource1; + this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; + this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { + this.ruleRateFactorNull}); + this.Margins = new System.Drawing.Printing.Margins(75, 51, 166, 100); + this.PageHeight = 1169; + this.PageWidth = 827; + this.PaperKind = System.Drawing.Printing.PaperKind.A4; + this.Version = "17.1"; + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).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.ReportFooterBand ReportFooter; + private DevExpress.XtraReports.UI.XRLabel lblNotice; + private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull; + private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; + private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; + private DevExpress.XtraReports.UI.XRTable xrTable1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow9; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; + private DevExpress.XtraReports.UI.XRTable xrTable3; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; + private DevExpress.XtraReports.UI.XRLabel xrLabel8; + private DevExpress.XtraReports.UI.XRTable xrTable4; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow11; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport; + private DevExpress.XtraReports.UI.DetailBand Detail1; + private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2; + private DevExpress.XtraReports.UI.XRLabel xrLabel31; + private DevExpress.XtraReports.UI.XRLabel xrLabel30; + private DevExpress.XtraReports.UI.XRLabel xrLabel29; + private DevExpress.XtraReports.UI.XRLabel xrLabel28; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRLabel xrLabel20; + private DevExpress.XtraReports.UI.XRLabel xrLabel19; + private DevExpress.XtraReports.UI.XRLabel xrLabel18; + private DevExpress.XtraReports.UI.XRLabel xrLabel17; + private DevExpress.XtraReports.UI.XRLabel xrLabel16; + private DevExpress.XtraReports.UI.XRLabel xrLabel11; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; + private DevExpress.XtraReports.UI.XRLabel xrLabel13; + private DevExpress.XtraReports.UI.XRLabel xrLabel9; + private DevExpress.XtraReports.UI.XRLabel xrLabel14; + private DevExpress.XtraReports.UI.XRLabel xrLabel15; + private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientContactPerson; + private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientDivision; + private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientStreet; + private DevExpress.XtraReports.UI.XRLabel RecipientPostCodeAndTown; + private DevExpress.XtraReports.UI.XRLabel xrLabel21; + private DevExpress.XtraReports.UI.XRLabel xrLabel22; + private DevExpress.XtraReports.UI.XRLabel lblCustomerInformation; + private DevExpress.XtraReports.UI.XRLabel lblAktenzeichen; + private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; + private DevExpress.XtraReports.UI.XRLabel xrLabel27; + private DevExpress.XtraReports.UI.XRLabel xrLabel26; + private DevExpress.XtraReports.UI.XRLabel xrLabel25; + private DevExpress.XtraReports.UI.XRLabel xrLabel2; + private DevExpress.XtraReports.UI.XRLabel xrLabel3; + private DevExpress.XtraReports.UI.XRLabel xrLabel4; + private DevExpress.XtraReports.UI.XRLabel xrLabel5; + private DevExpress.XtraReports.UI.XRLabel xrLabel6; + private DevExpress.XtraReports.UI.XRLine xrLine2; + private DevExpress.XtraReports.UI.XRLabel xrLabel10; + } +} diff --git a/ReportImp/AutismusLeben/InvoiceCustomerReport.cs b/ReportImp/AutismusLeben/InvoiceCustomerReport.cs new file mode 100644 index 000000000..594d7dd83 --- /dev/null +++ b/ReportImp/AutismusLeben/InvoiceCustomerReport.cs @@ -0,0 +1,63 @@ +using System; +using System.Text; +using BeWo.Report; +using BeWo.Report.ReportObjects; + +namespace AutismusLeben +{ + public partial class InvoiceCustomerReport : DevExpress.XtraReports.UI.XtraReport, IBeWoReport + { + public InvoiceCustomerReport() + { + InitializeComponent(); + } + + public void SetReportDataSource(InvoiceCustomerRO pRO) + { + if (String.IsNullOrEmpty(pRO.Notice)) + { + lblNotice.Visible = false; + } + if (pRO.CustomerFirstName == null && pRO.CustomerLastName == null) + { + lblCustomerInformation.Visible = false; + lblAktenzeichen.Visible = false; + } + + //StringBuilder sb = new StringBuilder(); + //if (!String.IsNullOrEmpty(pRO.RecipientOrganisation) && !String.IsNullOrEmpty(pRO.RecipientOrganisation.Trim())) + //{ + // sb.AppendLine(pRO.RecipientOrganisation); + //} + //if (!String.IsNullOrEmpty(pRO.RecipientDivision) && !String.IsNullOrEmpty(pRO.RecipientDivision.Trim())) + //{ + // sb.AppendLine(pRO.RecipientDivision); + //} + //if ((!String.IsNullOrEmpty(pRO.RecipientFirstName) && !String.IsNullOrEmpty(pRO.RecipientFirstName.Trim())) + // || (!String.IsNullOrEmpty(pRO.RecipientLastName) && !String.IsNullOrEmpty(pRO.RecipientLastName.Trim()))) + //{ + // sb.AppendLine(String.Format("{0} {1}", pRO.RecipientFirstName, pRO.RecipientLastName).Trim()); + //} + //if (!String.IsNullOrEmpty(pRO.RecipientStreet) && !String.IsNullOrEmpty(pRO.RecipientStreet.Trim())) + //{ + // sb.AppendLine(pRO.RecipientStreet); + //} + //if (!String.IsNullOrEmpty(pRO.RecipientPostCode) && !String.IsNullOrEmpty(pRO.RecipientPostCode.Trim())) + //{ + // sb.Append(pRO.RecipientPostCode); + // sb.Append(" "); + //} + //if (!String.IsNullOrEmpty(pRO.RecipientTown) && !String.IsNullOrEmpty(pRO.RecipientTown.Trim())) + //{ + // sb.Append(pRO.RecipientTown); + //} + //lblAddress.Text = sb.ToString(); + + + + + + this.bindingSource1.DataSource = pRO; + } + } +} diff --git a/ReportImp/AutismusLeben/InvoiceCustomerReport.resx b/ReportImp/AutismusLeben/InvoiceCustomerReport.resx new file mode 100644 index 000000000..375605a44 --- /dev/null +++ b/ReportImp/AutismusLeben/InvoiceCustomerReport.resx @@ -0,0 +1,653 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + 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 + RK5CYII= + + + + + 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 + + + + 17, 17 + + \ No newline at end of file diff --git a/ReportImp/AutismusLeben/ServiceInvoiceReport.Designer.cs b/ReportImp/AutismusLeben/ServiceInvoiceReport.Designer.cs index b9c390bea..bc3765329 100644 --- a/ReportImp/AutismusLeben/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/AutismusLeben/ServiceInvoiceReport.Designer.cs @@ -29,14 +29,16 @@ namespace AutismusLeben private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServiceInvoiceReport)); DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServiceInvoiceReport)); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLine2 = new DevExpress.XtraReports.UI.XRLine(); this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); @@ -48,6 +50,26 @@ namespace AutismusLeben this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.RecipientPostCodeAndTown = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel_RecipientStreet = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel_RecipientDivision = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel29 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel30 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel31 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); @@ -81,31 +103,8 @@ namespace AutismusLeben this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); - this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel29 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel30 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel31 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); - this.RecipientPostCodeAndTown = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel_RecipientStreet = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel_RecipientDivision = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLine1 = new DevExpress.XtraReports.UI.XRLine(); - this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); @@ -129,6 +128,14 @@ namespace AutismusLeben this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // + // xrPictureBox2 + // + this.xrPictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox2.Image"))); + this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(450.7083F, 0F); + this.xrPictureBox2.Name = "xrPictureBox2"; + this.xrPictureBox2.SizeF = new System.Drawing.SizeF(232.2917F, 143.9583F); + this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // // ruleRateFactorNull // this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?"; @@ -143,7 +150,6 @@ namespace AutismusLeben // bottomMarginBand1 // this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLine1, this.xrLabel14, this.xrLine2, this.xrLabel5, @@ -158,14 +164,31 @@ namespace AutismusLeben this.bottomMarginBand1.HeightF = 108F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // + // xrLabel14 + // + this.xrLabel14.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel14.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold); + this.xrLabel14.ForeColor = System.Drawing.Color.Black; + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(18F, 37.51831F); + this.xrLabel14.Multiline = true; + this.xrLabel14.Name = "xrLabel14"; + this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel14.SizeF = new System.Drawing.SizeF(190.7083F, 17.70833F); + this.xrLabel14.StylePriority.UseBorders = false; + this.xrLabel14.StylePriority.UseFont = false; + this.xrLabel14.StylePriority.UseForeColor = false; + this.xrLabel14.StylePriority.UseTextAlignment = false; + this.xrLabel14.Text = "gemeinnützige GmbH"; + this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // // xrLine2 // this.xrLine2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(237)))), ((int)(((byte)(127)))), ((int)(((byte)(49))))); this.xrLine2.LineDirection = DevExpress.XtraReports.UI.LineDirection.Vertical; this.xrLine2.LineWidth = 2; - this.xrLine2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17.06246F); + this.xrLine2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F); this.xrLine2.Name = "xrLine2"; - this.xrLine2.SizeF = new System.Drawing.SizeF(7.541609F, 55.87502F); + this.xrLine2.SizeF = new System.Drawing.SizeF(7.541609F, 73.6459F); this.xrLine2.StylePriority.UseForeColor = false; // // xrLabel5 @@ -344,6 +367,222 @@ namespace AutismusLeben this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // + // RecipientPostCodeAndTown + // + this.RecipientPostCodeAndTown.CanShrink = true; + this.RecipientPostCodeAndTown.Font = new System.Drawing.Font("Arial", 10F); + this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0.1667023F, 85.00004F); + this.RecipientPostCodeAndTown.Name = "RecipientPostCodeAndTown"; + this.RecipientPostCodeAndTown.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.RecipientPostCodeAndTown.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.RecipientPostCodeAndTown.SizeF = new System.Drawing.SizeF(292F, 17F); + this.RecipientPostCodeAndTown.StylePriority.UseFont = false; + this.RecipientPostCodeAndTown.Text = "[RecipientPostCodeAndTown]"; + // + // xrLabel_RecipientStreet + // + this.xrLabel_RecipientStreet.CanShrink = true; + this.xrLabel_RecipientStreet.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0.1667023F, 68.00003F); + this.xrLabel_RecipientStreet.Name = "xrLabel_RecipientStreet"; + this.xrLabel_RecipientStreet.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel_RecipientStreet.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrLabel_RecipientStreet.SizeF = new System.Drawing.SizeF(292F, 17F); + this.xrLabel_RecipientStreet.StylePriority.UseFont = false; + this.xrLabel_RecipientStreet.Text = "[RecipientStreet]"; + // + // xrLabel_RecipientDivision + // + this.xrLabel_RecipientDivision.CanShrink = true; + this.xrLabel_RecipientDivision.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0.1667023F, 51.00002F); + this.xrLabel_RecipientDivision.Name = "xrLabel_RecipientDivision"; + this.xrLabel_RecipientDivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel_RecipientDivision.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrLabel_RecipientDivision.SizeF = new System.Drawing.SizeF(292F, 17F); + this.xrLabel_RecipientDivision.StylePriority.UseFont = false; + this.xrLabel_RecipientDivision.Text = "[RecipientDivision]"; + // + // xrLabel_RecipientContactPerson + // + this.xrLabel_RecipientContactPerson.CanShrink = true; + this.xrLabel_RecipientContactPerson.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientContactPerson")}); + this.xrLabel_RecipientContactPerson.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0.1667023F, 34.00002F); + this.xrLabel_RecipientContactPerson.Name = "xrLabel_RecipientContactPerson"; + this.xrLabel_RecipientContactPerson.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel_RecipientContactPerson.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrLabel_RecipientContactPerson.SizeF = new System.Drawing.SizeF(292F, 17F); + this.xrLabel_RecipientContactPerson.StylePriority.UseFont = false; + // + // xrLabel7 + // + this.xrLabel7.CanShrink = true; + this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0.1667023F, 17.00001F); + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrLabel7.SizeF = new System.Drawing.SizeF(292F, 17F); + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.Text = "[RecipientOrganisation]"; + // + // xrLabel6 + // + this.xrLabel6.Font = new System.Drawing.Font("Arial", 7F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(1.70299E-05F, 0F); + this.xrLabel6.Name = "xrLabel6"; + this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel6.SizeF = new System.Drawing.SizeF(369.0833F, 17F); + this.xrLabel6.StylePriority.UseFont = false; + this.xrLabel6.Text = "Autismus leben gemeinnützige GmbH, Augustastraße 78, 52070 Aachen"; + // + // xrLabel8 + // + this.xrLabel8.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(450.7083F, 17.00001F); + this.xrLabel8.Name = "xrLabel8"; + this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(84.04175F, 17F); + this.xrLabel8.StylePriority.UseFont = false; + this.xrLabel8.Text = "Rechnung Nr.:"; + // + // xrLabel13 + // + this.xrLabel13.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(450.7083F, 34.00005F); + this.xrLabel13.Name = "xrLabel13"; + this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel13.SizeF = new System.Drawing.SizeF(84.04175F, 17F); + this.xrLabel13.StylePriority.UseFont = false; + this.xrLabel13.Text = "Kunden Nr.:"; + // + // xrLabel10 + // + this.xrLabel10.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(450.7083F, 51.00005F); + this.xrLabel10.Name = "xrLabel10"; + this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel10.SizeF = new System.Drawing.SizeF(84.04175F, 16.99999F); + this.xrLabel10.StylePriority.UseFont = false; + this.xrLabel10.Text = "Bearbeiter:"; + // + // xrLabel11 + // + this.xrLabel11.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(450.7083F, 68.00003F); + this.xrLabel11.Name = "xrLabel11"; + this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(84.04175F, 17F); + this.xrLabel11.StylePriority.UseFont = false; + this.xrLabel11.Text = "Telefon:"; + // + // xrLabel16 + // + this.xrLabel16.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(450.7083F, 85.00004F); + this.xrLabel16.Name = "xrLabel16"; + this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel16.SizeF = new System.Drawing.SizeF(84.04175F, 17F); + this.xrLabel16.StylePriority.UseFont = false; + this.xrLabel16.Text = "E-Mail:"; + // + // xrLabel17 + // + this.xrLabel17.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(450.7083F, 102F); + this.xrLabel17.Name = "xrLabel17"; + this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel17.SizeF = new System.Drawing.SizeF(84.04175F, 17F); + this.xrLabel17.StylePriority.UseFont = false; + this.xrLabel17.Text = "Steuernr:"; + // + // xrLabel18 + // + this.xrLabel18.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(450.7083F, 119.0001F); + this.xrLabel18.Name = "xrLabel18"; + this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel18.SizeF = new System.Drawing.SizeF(84.04175F, 17.00001F); + this.xrLabel18.StylePriority.UseFont = false; + this.xrLabel18.Text = "Datum:"; + // + // xrLabel19 + // + this.xrLabel19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")}); + this.xrLabel19.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(534.75F, 17.00001F); + this.xrLabel19.Name = "xrLabel19"; + this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel19.SizeF = new System.Drawing.SizeF(148.2499F, 17F); + this.xrLabel19.StylePriority.UseFont = false; + // + // xrLabel20 + // + this.xrLabel20.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(534.75F, 34.00005F); + this.xrLabel20.Name = "xrLabel20"; + this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel20.SizeF = new System.Drawing.SizeF(148.2499F, 17F); + this.xrLabel20.StylePriority.UseFont = false; + this.xrLabel20.Text = "11601"; + // + // xrLabel12 + // + this.xrLabel12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")}); + this.xrLabel12.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(534.7501F, 51.00005F); + this.xrLabel12.Name = "xrLabel12"; + this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel12.SizeF = new System.Drawing.SizeF(148.25F, 17F); + this.xrLabel12.StylePriority.UseFont = false; + this.xrLabel12.Text = "Adriana Zoll"; + // + // xrLabel28 + // + this.xrLabel28.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(534.7501F, 68.00003F); + this.xrLabel28.Name = "xrLabel28"; + this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel28.SizeF = new System.Drawing.SizeF(148.25F, 17F); + this.xrLabel28.StylePriority.UseFont = false; + this.xrLabel28.Text = "0241 559272-210"; + // + // xrLabel29 + // + this.xrLabel29.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(534.7501F, 85.00004F); + this.xrLabel29.Name = "xrLabel29"; + this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel29.SizeF = new System.Drawing.SizeF(148.25F, 17F); + this.xrLabel29.StylePriority.UseFont = false; + this.xrLabel29.Text = "info@autismusleben.de"; + // + // xrLabel30 + // + this.xrLabel30.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(534.7501F, 102F); + this.xrLabel30.Name = "xrLabel30"; + this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel30.SizeF = new System.Drawing.SizeF(148.25F, 16.99999F); + this.xrLabel30.StylePriority.UseFont = false; + this.xrLabel30.Text = "201 5900 4337"; + // + // xrLabel31 + // + this.xrLabel31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); + this.xrLabel31.Font = new System.Drawing.Font("Arial", 9F); + this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(534.7501F, 119.0001F); + this.xrLabel31.Name = "xrLabel31"; + this.xrLabel31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel31.SizeF = new System.Drawing.SizeF(148.25F, 17F); + this.xrLabel31.StylePriority.UseFont = false; + this.xrLabel31.Text = "201 5900 4337"; + // // xrLabel21 // this.xrLabel21.BackColor = System.Drawing.Color.Transparent; @@ -363,7 +602,7 @@ namespace AutismusLeben // this.xrLabel4.BackColor = System.Drawing.Color.Transparent; this.xrLabel4.CanShrink = true; - this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 318.9285F); this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; @@ -793,233 +1032,6 @@ namespace AutismusLeben this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.xrTableCell11.Weight = 0.42299063272631143D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); - // - // xrPictureBox2 - // - this.xrPictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox2.Image"))); - this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(450.7083F, 0F); - this.xrPictureBox2.Name = "xrPictureBox2"; - this.xrPictureBox2.SizeF = new System.Drawing.SizeF(232.2917F, 143.9583F); - this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - // - // xrLabel8 - // - this.xrLabel8.Font = new System.Drawing.Font("Arial", 9F); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(450.7083F, 17.00001F); - this.xrLabel8.Name = "xrLabel8"; - this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(84.04175F, 17F); - this.xrLabel8.StylePriority.UseFont = false; - this.xrLabel8.Text = "Rechnung Nr.:"; - // - // xrLabel13 - // - this.xrLabel13.Font = new System.Drawing.Font("Arial", 9F); - this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(450.7083F, 34.00005F); - this.xrLabel13.Name = "xrLabel13"; - this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel13.SizeF = new System.Drawing.SizeF(84.04175F, 17F); - this.xrLabel13.StylePriority.UseFont = false; - this.xrLabel13.Text = "Kunden Nr.:"; - // - // xrLabel10 - // - this.xrLabel10.Font = new System.Drawing.Font("Arial", 9F); - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(450.7083F, 51.00005F); - this.xrLabel10.Name = "xrLabel10"; - this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel10.SizeF = new System.Drawing.SizeF(84.04175F, 16.99999F); - this.xrLabel10.StylePriority.UseFont = false; - this.xrLabel10.Text = "Bearbeiter:"; - // - // xrLabel11 - // - this.xrLabel11.Font = new System.Drawing.Font("Arial", 9F); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(450.7083F, 68.00003F); - this.xrLabel11.Name = "xrLabel11"; - this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel11.SizeF = new System.Drawing.SizeF(84.04175F, 17F); - this.xrLabel11.StylePriority.UseFont = false; - this.xrLabel11.Text = "Telefon:"; - // - // xrLabel16 - // - this.xrLabel16.Font = new System.Drawing.Font("Arial", 9F); - this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(450.7083F, 85.00004F); - this.xrLabel16.Name = "xrLabel16"; - this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel16.SizeF = new System.Drawing.SizeF(84.04175F, 17F); - this.xrLabel16.StylePriority.UseFont = false; - this.xrLabel16.Text = "E-Mail:"; - // - // xrLabel17 - // - this.xrLabel17.Font = new System.Drawing.Font("Arial", 9F); - this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(450.7083F, 102F); - this.xrLabel17.Name = "xrLabel17"; - this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel17.SizeF = new System.Drawing.SizeF(84.04175F, 17F); - this.xrLabel17.StylePriority.UseFont = false; - this.xrLabel17.Text = "Steuernr:"; - // - // xrLabel18 - // - this.xrLabel18.Font = new System.Drawing.Font("Arial", 9F); - this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(450.7083F, 119.0001F); - this.xrLabel18.Name = "xrLabel18"; - this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel18.SizeF = new System.Drawing.SizeF(84.04175F, 17.00001F); - this.xrLabel18.StylePriority.UseFont = false; - this.xrLabel18.Text = "Datum:"; - // - // xrLabel19 - // - this.xrLabel19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")}); - this.xrLabel19.Font = new System.Drawing.Font("Arial", 9F); - this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(534.75F, 17.00001F); - this.xrLabel19.Name = "xrLabel19"; - this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel19.SizeF = new System.Drawing.SizeF(148.2499F, 17F); - this.xrLabel19.StylePriority.UseFont = false; - // - // xrLabel20 - // - this.xrLabel20.Font = new System.Drawing.Font("Arial", 9F); - this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(534.75F, 34.00005F); - this.xrLabel20.Name = "xrLabel20"; - this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel20.SizeF = new System.Drawing.SizeF(148.2499F, 17F); - this.xrLabel20.StylePriority.UseFont = false; - this.xrLabel20.Text = "11601"; - // - // xrLabel12 - // - this.xrLabel12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "CreatorName")}); - this.xrLabel12.Font = new System.Drawing.Font("Arial", 9F); - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(534.7501F, 51.00005F); - this.xrLabel12.Name = "xrLabel12"; - this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel12.SizeF = new System.Drawing.SizeF(148.25F, 17F); - this.xrLabel12.StylePriority.UseFont = false; - this.xrLabel12.Text = "Adriana Zoll"; - // - // xrLabel28 - // - this.xrLabel28.Font = new System.Drawing.Font("Arial", 9F); - this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(534.7501F, 68.00003F); - this.xrLabel28.Name = "xrLabel28"; - this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel28.SizeF = new System.Drawing.SizeF(148.25F, 17F); - this.xrLabel28.StylePriority.UseFont = false; - this.xrLabel28.Text = "0241 559272-210"; - // - // xrLabel29 - // - this.xrLabel29.Font = new System.Drawing.Font("Arial", 9F); - this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(534.7501F, 85.00004F); - this.xrLabel29.Name = "xrLabel29"; - this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel29.SizeF = new System.Drawing.SizeF(148.25F, 17F); - this.xrLabel29.StylePriority.UseFont = false; - this.xrLabel29.Text = "info@autismusleben.de"; - // - // xrLabel30 - // - this.xrLabel30.Font = new System.Drawing.Font("Arial", 9F); - this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(534.7501F, 102F); - this.xrLabel30.Name = "xrLabel30"; - this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel30.SizeF = new System.Drawing.SizeF(148.25F, 16.99999F); - this.xrLabel30.StylePriority.UseFont = false; - this.xrLabel30.Text = "201 5900 4337"; - // - // xrLabel31 - // - this.xrLabel31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); - this.xrLabel31.Font = new System.Drawing.Font("Arial", 9F); - this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(534.7501F, 119.0001F); - this.xrLabel31.Name = "xrLabel31"; - this.xrLabel31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel31.SizeF = new System.Drawing.SizeF(148.25F, 17F); - this.xrLabel31.StylePriority.UseFont = false; - this.xrLabel31.Text = "201 5900 4337"; - // - // xrLabel6 - // - this.xrLabel6.Font = new System.Drawing.Font("Arial", 7F); - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(1.70299E-05F, 0F); - this.xrLabel6.Name = "xrLabel6"; - this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel6.SizeF = new System.Drawing.SizeF(369.0833F, 17F); - this.xrLabel6.StylePriority.UseFont = false; - this.xrLabel6.Text = "Autismus leben gemeinnützige GmbH, Augustastraße 78, 52070 Aachen"; - // - // RecipientPostCodeAndTown - // - this.RecipientPostCodeAndTown.CanShrink = true; - this.RecipientPostCodeAndTown.Font = new System.Drawing.Font("Arial", 10F); - this.RecipientPostCodeAndTown.LocationFloat = new DevExpress.Utils.PointFloat(0.1667023F, 85.00004F); - this.RecipientPostCodeAndTown.Name = "RecipientPostCodeAndTown"; - this.RecipientPostCodeAndTown.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.RecipientPostCodeAndTown.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.RecipientPostCodeAndTown.SizeF = new System.Drawing.SizeF(292F, 17F); - this.RecipientPostCodeAndTown.StylePriority.UseFont = false; - this.RecipientPostCodeAndTown.Text = "[RecipientPostCodeAndTown]"; - // - // xrLabel_RecipientStreet - // - this.xrLabel_RecipientStreet.CanShrink = true; - this.xrLabel_RecipientStreet.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel_RecipientStreet.LocationFloat = new DevExpress.Utils.PointFloat(0.1667023F, 68.00003F); - this.xrLabel_RecipientStreet.Name = "xrLabel_RecipientStreet"; - this.xrLabel_RecipientStreet.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel_RecipientStreet.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel_RecipientStreet.SizeF = new System.Drawing.SizeF(292F, 17F); - this.xrLabel_RecipientStreet.StylePriority.UseFont = false; - this.xrLabel_RecipientStreet.Text = "[RecipientStreet]"; - // - // xrLabel_RecipientDivision - // - this.xrLabel_RecipientDivision.CanShrink = true; - this.xrLabel_RecipientDivision.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel_RecipientDivision.LocationFloat = new DevExpress.Utils.PointFloat(0.1667023F, 51.00002F); - this.xrLabel_RecipientDivision.Name = "xrLabel_RecipientDivision"; - this.xrLabel_RecipientDivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel_RecipientDivision.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel_RecipientDivision.SizeF = new System.Drawing.SizeF(292F, 17F); - this.xrLabel_RecipientDivision.StylePriority.UseFont = false; - this.xrLabel_RecipientDivision.Text = "[RecipientDivision]"; - // - // xrLabel_RecipientContactPerson - // - this.xrLabel_RecipientContactPerson.CanShrink = true; - this.xrLabel_RecipientContactPerson.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel_RecipientContactPerson.LocationFloat = new DevExpress.Utils.PointFloat(0.1667023F, 34.00002F); - this.xrLabel_RecipientContactPerson.Name = "xrLabel_RecipientContactPerson"; - this.xrLabel_RecipientContactPerson.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel_RecipientContactPerson.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel_RecipientContactPerson.SizeF = new System.Drawing.SizeF(292F, 17F); - this.xrLabel_RecipientContactPerson.StylePriority.UseFont = false; - this.xrLabel_RecipientContactPerson.Text = "[RecipientContactPerson]"; - // - // xrLabel7 - // - this.xrLabel7.CanShrink = true; - this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0.1667023F, 17.00001F); - this.xrLabel7.Name = "xrLabel7"; - this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel7.SizeF = new System.Drawing.SizeF(292F, 17F); - this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.Text = "[RecipientOrganisation]"; - // // xrLabel9 // this.xrLabel9.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Italic); @@ -1030,32 +1042,9 @@ namespace AutismusLeben this.xrLabel9.StylePriority.UseFont = false; this.xrLabel9.Text = "Abschließende Bemerkungen:"; // - // xrLine1 + // bindingSource1 // - this.xrLine1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(237)))), ((int)(((byte)(127)))), ((int)(((byte)(49))))); - this.xrLine1.LineDirection = DevExpress.XtraReports.UI.LineDirection.Vertical; - this.xrLine1.LineWidth = 2; - this.xrLine1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 37.52003F); - this.xrLine1.Name = "xrLine1"; - this.xrLine1.SizeF = new System.Drawing.SizeF(7.541609F, 55.87502F); - this.xrLine1.StylePriority.UseForeColor = false; - // - // xrLabel14 - // - this.xrLabel14.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrLabel14.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold); - this.xrLabel14.ForeColor = System.Drawing.Color.Black; - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(18F, 37.51831F); - this.xrLabel14.Multiline = true; - this.xrLabel14.Name = "xrLabel14"; - this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel14.SizeF = new System.Drawing.SizeF(190.7083F, 17.70833F); - this.xrLabel14.StylePriority.UseBorders = false; - this.xrLabel14.StylePriority.UseFont = false; - this.xrLabel14.StylePriority.UseForeColor = false; - this.xrLabel14.StylePriority.UseTextAlignment = false; - this.xrLabel14.Text = "gemeinnützige GmbH"; - this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // // ServiceInvoiceReport // @@ -1158,7 +1147,6 @@ namespace AutismusLeben private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientContactPerson; private DevExpress.XtraReports.UI.XRLabel xrLabel7; private DevExpress.XtraReports.UI.XRLabel xrLabel9; - private DevExpress.XtraReports.UI.XRLine xrLine1; private DevExpress.XtraReports.UI.XRLabel xrLabel14; } } diff --git a/ReportImp/AutismusLeben/SettlementReport.Designer.cs b/ReportImp/AutismusLeben/SettlementReport.Designer.cs index d4527c9e3..5c534387e 100644 --- a/ReportImp/AutismusLeben/SettlementReport.Designer.cs +++ b/ReportImp/AutismusLeben/SettlementReport.Designer.cs @@ -1,4 +1,4 @@ -namespace AutismusLeben +namespace AutismusLeben.Alt { partial class Spitzabrechnung { @@ -95,6 +95,7 @@ namespace AutismusLeben this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -116,14 +117,13 @@ namespace AutismusLeben this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.table_Abschlagszahlungen)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -145,7 +145,7 @@ namespace AutismusLeben // xrPictureBox1 // this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(454.7083F, 5.29819E-06F); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(454.7088F, 0F); this.xrPictureBox1.Name = "xrPictureBox1"; this.xrPictureBox1.SizeF = new System.Drawing.SizeF(232.2917F, 143.9583F); this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; @@ -918,6 +918,10 @@ namespace AutismusLeben this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell10.Weight = 0.15038458100961152D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); + // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -1034,12 +1038,14 @@ namespace AutismusLeben // table_Abschlagszahlungen // this.table_Abschlagszahlungen.BorderColor = System.Drawing.Color.Black; + this.table_Abschlagszahlungen.Font = new System.Drawing.Font("Arial", 10F); this.table_Abschlagszahlungen.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50.66668F); this.table_Abschlagszahlungen.Name = "table_Abschlagszahlungen"; this.table_Abschlagszahlungen.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow4}); this.table_Abschlagszahlungen.SizeF = new System.Drawing.SizeF(687.0002F, 25.33334F); this.table_Abschlagszahlungen.StylePriority.UseBorderColor = false; + this.table_Abschlagszahlungen.StylePriority.UseFont = false; // // xrTableRow4 // @@ -1214,10 +1220,6 @@ namespace AutismusLeben this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell7.Weight = 0.15038493489183119D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); - // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1240,11 +1242,11 @@ namespace AutismusLeben this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.table_Abschlagszahlungen)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } diff --git a/ReportImp/AutismusLeben/SettlementReport.cs b/ReportImp/AutismusLeben/SettlementReport.cs index 2e654fd3a..eb574fb7b 100644 --- a/ReportImp/AutismusLeben/SettlementReport.cs +++ b/ReportImp/AutismusLeben/SettlementReport.cs @@ -11,7 +11,7 @@ using BS.Shared.Core; using BS.Shared.DataContracts; using DevExpress.XtraReports.UI; -namespace AutismusLeben +namespace AutismusLeben.Alt { public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport { @@ -85,54 +85,55 @@ namespace AutismusLeben var os = new OperationsServiceImp(); var span = new DateTimeSpan(pRO.AccountingStartDate, pRO.InvoiceDateTime.Value); - var abschlagszahlungen = os.GetAccountingTransactions(span, null, pRO.CostBearer2SupportConceptOid); - Dictionary gruppierteAbschlagszahlungen = GruppiereAbschlagszahlungen(pRO.InvoiceItems, abschlagszahlungen, pRO.AccountingStartDate, pRO.AccountingEndDate); + var abschlagszahlungen = os.GetAccountingTransactions(span, null, pRO.CostBearer2SupportConceptOid); + Dictionary gruppierteAbschlagszahlungen = GruppiereAbschlagszahlungen(pRO, abschlagszahlungen); var rowCounter = 0; - while (rowCounter < gruppierteAbschlagszahlungen.Count) + while (rowCounter < gruppierteAbschlagszahlungen.Count) { - if (rowCounter == 0) + if (rowCounter == 0) { - table_Abschlagszahlungen.Rows.RemoveAt(0); - var row = new XRTableRow(); - var baseCell0 = new XRTableCell() { Padding = 2, TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft, BorderColor = Color.Black, Borders = DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom, WidthF = 51.75f }; - var baseCell1 = new XRTableCell() { Padding = 2, TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft, BorderColor = Color.Black, Borders = DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom, WidthF = 539.5f }; - var baseCell2 = new XRTableCell() { Padding = 2, TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight, BorderColor = Color.Black, Borders = DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom, WidthF = 98.75f }; + table_Abschlagszahlungen.Rows.RemoveAt(0); + var row = new XRTableRow(); + row.HeightF = 25.33f; + var baseCell0 = new XRTableCell() { Padding = 2, TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft, BorderColor = Color.Black, Borders = DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom, WidthF = 51.75f, HeightF = 25.33f }; + var baseCell1 = new XRTableCell() { Padding = 2, TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft, BorderColor = Color.Black, Borders = DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom, WidthF = 537.5f, HeightF = 25.33f }; + var baseCell2 = new XRTableCell() { Padding = 2, TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight, BorderColor = Color.Black, Borders = DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom, WidthF = 97.75f, HeightF = 25.33f }; - baseCell0.Text = (rowCounter + 1).ToString(); - baseCell1.Text = gruppierteAbschlagszahlungen.ElementAt(0).Key; - baseCell2.Text = string.Format("{0:c}", gruppierteAbschlagszahlungen.ElementAt(0).Value); - row.Cells.Add(baseCell0); - row.Cells.Add(baseCell1); - row.Cells.Add(baseCell2); + baseCell0.Text = (rowCounter + 1).ToString(); + baseCell1.Text = gruppierteAbschlagszahlungen.ElementAt(0).Key; + baseCell2.Text = string.Format("{0:c}", gruppierteAbschlagszahlungen.ElementAt(0).Value); + row.Cells.Add(baseCell0); + row.Cells.Add(baseCell1); + row.Cells.Add(baseCell2); - table_Abschlagszahlungen.Rows.Add(row); - rowCounter++; - } - else + table_Abschlagszahlungen.Rows.Add(row); + rowCounter++; + } + else { - for(rowCounter = rowCounter; rowCounter < gruppierteAbschlagszahlungen.Count; rowCounter++) + for (rowCounter = rowCounter; rowCounter < gruppierteAbschlagszahlungen.Count; rowCounter++) { - var row = new XRTableRow(); + var row = new XRTableRow(); - var baseCell0 = new XRTableCell() { Padding = 2, TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft, BorderColor = Color.Black, Borders = DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom, WidthF = 51.75f }; - var baseCell1 = new XRTableCell() { Padding = 2, TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft, BorderColor = Color.Black, Borders = DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom, WidthF = 539.5f }; - var baseCell2 = new XRTableCell() { Padding = 2, TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight, BorderColor = Color.Black, Borders = DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom, WidthF = 98.75f }; + var baseCell0 = new XRTableCell() { Padding = 2, TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft, BorderColor = Color.Black, Borders = DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom, WidthF = 51.75f, HeightF = 25.33f }; + var baseCell1 = new XRTableCell() { Padding = 2, TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft, BorderColor = Color.Black, Borders = DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom, WidthF = 537.5f, HeightF = 25.33f }; + var baseCell2 = new XRTableCell() { Padding = 2, TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight, BorderColor = Color.Black, Borders = DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom, WidthF = 97.75f, HeightF = 25.33f }; - baseCell0.Text = (rowCounter + 1).ToString(); - baseCell1.Text = gruppierteAbschlagszahlungen.ElementAt(rowCounter).Key; - baseCell2.Text = string.Format("{0:c}", gruppierteAbschlagszahlungen.ElementAt(rowCounter).Value); + baseCell0.Text = (rowCounter + 1).ToString(); + baseCell1.Text = gruppierteAbschlagszahlungen.ElementAt(rowCounter).Key; + baseCell2.Text = string.Format("{0:c}", gruppierteAbschlagszahlungen.ElementAt(rowCounter).Value); - row.Cells.Add(baseCell0); - row.Cells.Add(baseCell1); - row.Cells.Add(baseCell2); + row.Cells.Add(baseCell0); + row.Cells.Add(baseCell1); + row.Cells.Add(baseCell2); - table_Abschlagszahlungen.Rows.Add(row); - } - } - } - var claimAsDecimal = pRO.Claim.Split(' '); + table_Abschlagszahlungen.Rows.Add(row); + } + } + } + var claimAsDecimal = pRO.Claim.Split(' '); if (Convert.ToDecimal(claimAsDecimal[0]) >= 0) tc_RueckzahlungOderRestbetrag.Text = "Restbetrag"; else @@ -143,68 +144,50 @@ namespace AutismusLeben this.bindingSource1.DataSource = pRO; } - private Dictionary GruppiereAbschlagszahlungen(IList invoiceItems, List abschlagszahlungen, DateTime accountingStartDate, DateTime accountingEndDate) + private Dictionary GruppiereAbschlagszahlungen(SettlementRO pRO, List abschlagszahlungen) { + var invoiceItems = pRO.InvoiceItems; + var accountingStartDate = pRO.AccountingStartDate; + var accountingEndDate = pRO.AccountingEndDate; + DateTime? letztesEnde = null; Dictionary gruppierteAbschlagszahlungen = new Dictionary(); - - for (int i = 0; i < invoiceItems.Count; i++) + if (pRO.HourlyRate3 != 0) { - var item = invoiceItems[i]; - var descriptionString = item.ItemDescription.Split(' '); - - // Wenn es das erste Item ist, also auch der erste Stundensatz, dann ist in der description das Ende ausgewiesen. - if (letztesEnde == null) - { - DateTime? ende = Convert.ToDateTime(descriptionString[5].Remove(descriptionString[5].Length - 1, 1)); // HIER PASSIERT BEI DENEN EIN FEHLER - var zahlungenBisErstemStundensatzWechsel = abschlagszahlungen.Where(a => a.ValidityDate <= ende.Value).ToList(); - decimal summe = 0.0m; - foreach (var zahlung in zahlungenBisErstemStundensatzWechsel) - summe += zahlung.Amount; - - string zeitraum = string.Format("Abschlagszahlung {0:MMM yyyy} - {1:MMM yyyy}", accountingStartDate, ende.Value); - gruppierteAbschlagszahlungen.Add(zeitraum, summe); - letztesEnde = ende; - } - // Bei allen nachfolgenden Items muss geprüft werden, ob es noch ein nächstes Item gibt, weil in der Description nur der Anfang drin steht. - // Das Ende ist der Start - 1 des nächsten Items - else - { - DateTime? start = new DateTime?(); - int count = 0; - foreach (var s in descriptionString) - count++; - - if (count > 5) - start = Convert.ToDateTime(descriptionString[5].Remove(descriptionString[5].Length - 1, 1)); - else - start = Convert.ToDateTime(descriptionString[4].Remove(descriptionString[4].Length - 1, 1)); - if (i < invoiceItems.Count - 1) - { - var nextDescriptionString = invoiceItems[i + 1].ItemDescription.Split(' '); - DateTime? ende = Convert.ToDateTime(nextDescriptionString[4].Remove(nextDescriptionString[4].Length - 1, 1)); - var zahlungenInZeitraum = abschlagszahlungen.Where(a => a.ValidityDate >= start.Value && a.ValidityDate <= ende.Value).ToList(); - decimal summe = 0.0m; - foreach (var zahlung in zahlungenInZeitraum) - summe += zahlung.Amount; - - string zeitraum = string.Format("Abschlagszahlung {0:MMM yyyy} - {1:MMM yyyy}", start.Value, ende.Value); - gruppierteAbschlagszahlungen.Add(zeitraum, summe); - letztesEnde = ende; - } - else - { - var zahlungenInZeitraum = abschlagszahlungen.Where(a => a.ValidityDate >= start.Value).ToList(); - decimal summe = 0.0m; - foreach (var zahlung in zahlungenInZeitraum) - summe += zahlung.Amount; - - string zeitraum = string.Format("Abschlagszahlung {0:MMM yyyy} - {1:MMM yyyy}", start.Value, accountingEndDate); - gruppierteAbschlagszahlungen.Add(zeitraum, summe); - } - } + var zahlungenBisErstemStundensatzWechsel = abschlagszahlungen.Where(a => a.ValidityDate <= pRO.HourlyRateEndDate3).ToList(); + decimal summe = 0.0m; + foreach (var zahlung in zahlungenBisErstemStundensatzWechsel) + summe += zahlung.Amount; + var zeitraum = string.Format("Abschlagszahlung bis {0:dd.MM.yyyy} ", pRO.HourlyRateEndDate3); + gruppierteAbschlagszahlungen.Add(zeitraum, summe); } - + if (pRO.HourlyRateOld != 0) + { + List zahlungen = new List(); + if (pRO.HourlyRate3 == 0) + zahlungen = abschlagszahlungen.Where(a => a.ValidityDate <= pRO.HourlyRateOldEndDate).ToList(); + else + zahlungen = abschlagszahlungen.Where(a => a.ValidityDate > pRO.HourlyRateEndDate3 && a.ValidityDate <= pRO.HourlyRateOldEndDate).ToList(); + decimal summe = 0.0m; + foreach (var zahlung in zahlungen) + summe += zahlung.Amount; + var zeitraum = pRO.HourlyRate3 == 0 ? string.Format("Abschlagszahlung bis {0:dd.MM.yyyy} ", pRO.HourlyRateOldEndDate) : string.Format("Abschlagszahlung {0:dd.MM.yyyy} - {1:dd.MM.yyyy}", pRO.HourlyRateEndDate3.Value.AddDays(1), pRO.HourlyRateOldEndDate); + gruppierteAbschlagszahlungen.Add(zeitraum, summe); + } + if (pRO.HourlyRateNew != 0) + { + List zahlungen = new List(); + if (pRO.HourlyRateOld == 0) + zahlungen = abschlagszahlungen; + else + zahlungen = abschlagszahlungen.Where(a => a.ValidityDate > pRO.HourlyRateOldEndDate).ToList(); + decimal summe = 0.0m; + foreach (var zahlung in zahlungen) + summe += zahlung.Amount; + var zeitraum = pRO.HourlyRateOld == 0 ? string.Format("Abschlagszahlung ab {0:dd.MM.yyyy} ", pRO.AccountingStartDate) : string.Format("Abschlagszahlung ab {0:dd.MM.yyyy}", pRO.HourlyRateOldEndDate.Value.AddDays(1)); + gruppierteAbschlagszahlungen.Add(zeitraum, summe); + } + return gruppierteAbschlagszahlungen; } diff --git a/ReportImp/ChristinaFrommen/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/ChristinaFrommen/CustomMitarbeiterstundenkontoBerechnung.cs index e757e7bda..17bed3af6 100644 --- a/ReportImp/ChristinaFrommen/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/ChristinaFrommen/CustomMitarbeiterstundenkontoBerechnung.cs @@ -17,10 +17,10 @@ namespace ChristinaFrommen public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed) { var dd = base.CreateDayDetail(date, ed); - dd.MaxHoursUntilBreak = 6; - dd.MaxHoursUntilBreak2 = 9; - dd.BreakMinutes = 30; - dd.BreakMinutes2 = 15; + dd.MaxHoursUntilBreak = null; + dd.MaxHoursUntilBreak2 = null; + dd.BreakMinutes = null; + dd.BreakMinutes2 = null; return dd; } From 682e4b922215fde3e95d1ca8353007dd4e570a90 Mon Sep 17 00:00:00 2001 From: Lyndon Jetten Date: Wed, 10 Aug 2022 14:13:29 +0200 Subject: [PATCH 3/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 } - ) + )*@ - + *@