diff --git a/BeWo.sln b/BeWo.sln index c0b604b3e..ea4d3d03e 100644 --- a/BeWo.sln +++ b/BeWo.sln @@ -557,6 +557,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wetterleuchten", "ReportImp EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FortisNova", "ReportImp\FortisNova\FortisNova.csproj", "{F38B83C7-A8EF-48EA-8B5B-9395174AA8AF}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ForumEV", "ReportImp\ForumEV\ForumEV.csproj", "{FB62ADF8-6CE8-44B5-9828-D9E31E7A5D2B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -4400,6 +4402,22 @@ Global {F38B83C7-A8EF-48EA-8B5B-9395174AA8AF}.Release|Mixed Platforms.Build.0 = Release|Any CPU {F38B83C7-A8EF-48EA-8B5B-9395174AA8AF}.Release|x86.ActiveCfg = Release|Any CPU {F38B83C7-A8EF-48EA-8B5B-9395174AA8AF}.Release|x86.Build.0 = Release|Any CPU + {FB62ADF8-6CE8-44B5-9828-D9E31E7A5D2B}.Debug|.NET.ActiveCfg = Debug|Any CPU + {FB62ADF8-6CE8-44B5-9828-D9E31E7A5D2B}.Debug|.NET.Build.0 = Debug|Any CPU + {FB62ADF8-6CE8-44B5-9828-D9E31E7A5D2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FB62ADF8-6CE8-44B5-9828-D9E31E7A5D2B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FB62ADF8-6CE8-44B5-9828-D9E31E7A5D2B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {FB62ADF8-6CE8-44B5-9828-D9E31E7A5D2B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {FB62ADF8-6CE8-44B5-9828-D9E31E7A5D2B}.Debug|x86.ActiveCfg = Debug|Any CPU + {FB62ADF8-6CE8-44B5-9828-D9E31E7A5D2B}.Debug|x86.Build.0 = Debug|Any CPU + {FB62ADF8-6CE8-44B5-9828-D9E31E7A5D2B}.Release|.NET.ActiveCfg = Release|Any CPU + {FB62ADF8-6CE8-44B5-9828-D9E31E7A5D2B}.Release|.NET.Build.0 = Release|Any CPU + {FB62ADF8-6CE8-44B5-9828-D9E31E7A5D2B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FB62ADF8-6CE8-44B5-9828-D9E31E7A5D2B}.Release|Any CPU.Build.0 = Release|Any CPU + {FB62ADF8-6CE8-44B5-9828-D9E31E7A5D2B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {FB62ADF8-6CE8-44B5-9828-D9E31E7A5D2B}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {FB62ADF8-6CE8-44B5-9828-D9E31E7A5D2B}.Release|x86.ActiveCfg = Release|Any CPU + {FB62ADF8-6CE8-44B5-9828-D9E31E7A5D2B}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -4674,6 +4692,7 @@ Global {8725A58B-AB80-4906-9B13-2D4144FF09EA} = {D8A691C5-146D-4613-86CC-438F02FE9106} {05241EF6-386F-4214-A0C8-DD08E5112BDE} = {D8A691C5-146D-4613-86CC-438F02FE9106} {F38B83C7-A8EF-48EA-8B5B-9395174AA8AF} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {FB62ADF8-6CE8-44B5-9828-D9E31E7A5D2B} = {D8A691C5-146D-4613-86CC-438F02FE9106} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9} diff --git a/Report/DefaultReports/CustomerDataReport.Designer.cs b/Report/DefaultReports/CustomerDataReport.Designer.cs index 1444c6274..fd96ef84b 100644 --- a/Report/DefaultReports/CustomerDataReport.Designer.cs +++ b/Report/DefaultReports/CustomerDataReport.Designer.cs @@ -74,7 +74,6 @@ namespace BeWo.Report.DefaultReports this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); this.xrTable6 = new DevExpress.XtraReports.UI.XRTable(); @@ -111,13 +110,29 @@ namespace BeWo.Report.DefaultReports this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.DetailReport5 = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail6 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel33 = new DevExpress.XtraReports.UI.XRLabel(); + this.DetailReport6 = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail7 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable9)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -249,10 +264,10 @@ namespace BeWo.Report.DefaultReports // xrLabel27 // this.xrLabel27.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(479.125F, 76.08337F); + this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(449.9582F, 76.08337F); this.xrLabel27.Name = "xrLabel27"; this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel27.SizeF = new System.Drawing.SizeF(197.875F, 24F); + this.xrLabel27.SizeF = new System.Drawing.SizeF(227.0418F, 24F); this.xrLabel27.StylePriority.UseFont = false; this.xrLabel27.Text = "[PostCode] [Town]"; // @@ -261,10 +276,10 @@ namespace BeWo.Report.DefaultReports this.xrLabel26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Street")}); this.xrLabel26.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(479.125F, 52.08333F); + this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(449.9582F, 52.08333F); this.xrLabel26.Name = "xrLabel26"; this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel26.SizeF = new System.Drawing.SizeF(197.875F, 24F); + this.xrLabel26.SizeF = new System.Drawing.SizeF(227.0418F, 24F); this.xrLabel26.StylePriority.UseFont = false; this.xrLabel26.Text = "Vorname:"; // @@ -273,10 +288,10 @@ namespace BeWo.Report.DefaultReports this.xrLabel29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Mobile")}); this.xrLabel29.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(479.125F, 124.0833F); + this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(449.9582F, 124.0833F); this.xrLabel29.Name = "xrLabel29"; this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel29.SizeF = new System.Drawing.SizeF(197F, 24F); + this.xrLabel29.SizeF = new System.Drawing.SizeF(226.1668F, 24.00002F); this.xrLabel29.StylePriority.UseFont = false; this.xrLabel29.Text = "Vorname:"; // @@ -285,10 +300,10 @@ namespace BeWo.Report.DefaultReports this.xrLabel32.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Mail")}); this.xrLabel32.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel32.LocationFloat = new DevExpress.Utils.PointFloat(479.125F, 196.0833F); + this.xrLabel32.LocationFloat = new DevExpress.Utils.PointFloat(449.9582F, 196.0833F); this.xrLabel32.Name = "xrLabel32"; this.xrLabel32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel32.SizeF = new System.Drawing.SizeF(196.9999F, 24F); + this.xrLabel32.SizeF = new System.Drawing.SizeF(226.1667F, 24F); this.xrLabel32.StylePriority.UseFont = false; this.xrLabel32.Text = "Vorname:"; // @@ -297,10 +312,10 @@ namespace BeWo.Report.DefaultReports this.xrLabel31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Fax")}); this.xrLabel31.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(479.125F, 172.0834F); + this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(449.9582F, 172.0834F); this.xrLabel31.Name = "xrLabel31"; this.xrLabel31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel31.SizeF = new System.Drawing.SizeF(197F, 24F); + this.xrLabel31.SizeF = new System.Drawing.SizeF(226.1668F, 24F); this.xrLabel31.StylePriority.UseFont = false; this.xrLabel31.Text = "Vorname:"; // @@ -309,10 +324,10 @@ namespace BeWo.Report.DefaultReports this.xrLabel30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Phone")}); this.xrLabel30.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(479.125F, 148.0834F); + this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(449.9582F, 148.0834F); this.xrLabel30.Name = "xrLabel30"; this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel30.SizeF = new System.Drawing.SizeF(197F, 24F); + this.xrLabel30.SizeF = new System.Drawing.SizeF(226.1668F, 24F); this.xrLabel30.StylePriority.UseFont = false; this.xrLabel30.Text = "Vorname:"; // @@ -322,7 +337,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(339.5449F, 76.08331F); this.xrLabel20.Name = "xrLabel20"; this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel20.SizeF = new System.Drawing.SizeF(139.58F, 24F); + this.xrLabel20.SizeF = new System.Drawing.SizeF(110.4133F, 24F); this.xrLabel20.StylePriority.UseFont = false; this.xrLabel20.Text = "PLZ/Ort:"; // @@ -332,7 +347,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(339.5449F, 52.08333F); this.xrLabel19.Name = "xrLabel19"; this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel19.SizeF = new System.Drawing.SizeF(139.58F, 24F); + this.xrLabel19.SizeF = new System.Drawing.SizeF(110.4133F, 24F); this.xrLabel19.StylePriority.UseFont = false; this.xrLabel19.Text = "Straße:"; // @@ -342,7 +357,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(339.5449F, 124.0833F); this.xrLabel22.Name = "xrLabel22"; this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel22.SizeF = new System.Drawing.SizeF(139.58F, 24F); + this.xrLabel22.SizeF = new System.Drawing.SizeF(110.4133F, 24.00002F); this.xrLabel22.StylePriority.UseFont = false; this.xrLabel22.Text = "Handy:"; // @@ -352,7 +367,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(339.5449F, 196.0834F); this.xrLabel25.Name = "xrLabel25"; this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel25.SizeF = new System.Drawing.SizeF(139.58F, 24F); + this.xrLabel25.SizeF = new System.Drawing.SizeF(110.4133F, 24F); this.xrLabel25.StylePriority.UseFont = false; this.xrLabel25.Text = "E-Mail:"; // @@ -362,7 +377,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(339.5449F, 172.0834F); this.xrLabel24.Name = "xrLabel24"; this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel24.SizeF = new System.Drawing.SizeF(139.58F, 24F); + this.xrLabel24.SizeF = new System.Drawing.SizeF(110.4133F, 24F); this.xrLabel24.StylePriority.UseFont = false; this.xrLabel24.Text = "Fax:"; // @@ -372,7 +387,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(339.5449F, 148.0834F); this.xrLabel23.Name = "xrLabel23"; this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel23.SizeF = new System.Drawing.SizeF(139.58F, 24F); + this.xrLabel23.SizeF = new System.Drawing.SizeF(110.4133F, 24F); this.xrLabel23.StylePriority.UseFont = false; this.xrLabel23.Text = "Telefon:"; // @@ -600,10 +615,6 @@ namespace BeWo.Report.DefaultReports this.xrTableCell40.Text = "Notiz"; this.xrTableCell40.Weight = 0.50934579439252337D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.CustomerDataRO); - // // DetailReport1 // this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -723,8 +734,7 @@ namespace BeWo.Report.DefaultReports // // xrTableCell44 // - this.xrTableCell44.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell44.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "RelatedEmployees.Employee")}); this.xrTableCell44.Name = "xrTableCell44"; @@ -1002,6 +1012,141 @@ namespace BeWo.Report.DefaultReports this.ReportHeader.HeightF = 280F; this.ReportHeader.Name = "ReportHeader"; // + // DetailReport5 + // + this.DetailReport5.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail6, + this.DetailReport6}); + this.DetailReport5.DataSource = this.bindingSource1; + this.DetailReport5.Level = 5; + this.DetailReport5.Name = "DetailReport5"; + // + // Detail6 + // + this.Detail6.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable1, + this.xrLabel33}); + this.Detail6.HeightF = 65.91667F; + this.Detail6.Name = "Detail6"; + // + // xrTable1 + // + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 47.91667F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow1}); + this.xrTable1.SizeF = new System.Drawing.SizeF(642F, 18F); + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell1, + this.xrTableCell3}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 1.0588235294117647D; + // + // xrTableCell1 + // + this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell1.StylePriority.UseBorders = false; + this.xrTableCell1.StylePriority.UseFont = false; + this.xrTableCell1.StylePriority.UsePadding = false; + this.xrTableCell1.Text = "ICD10-Code"; + this.xrTableCell1.Weight = 0.17912772585669781D; + // + // xrTableCell3 + // + this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell3.StylePriority.UseBorders = false; + this.xrTableCell3.StylePriority.UseFont = false; + this.xrTableCell3.StylePriority.UsePadding = false; + this.xrTableCell3.Text = "Beschreibung"; + this.xrTableCell3.Weight = 0.82087227414330211D; + // + // xrLabel33 + // + this.xrLabel33.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrLabel33.LocationFloat = new DevExpress.Utils.PointFloat(0F, 22.91667F); + this.xrLabel33.Multiline = true; + this.xrLabel33.Name = "xrLabel33"; + this.xrLabel33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel33.SizeF = new System.Drawing.SizeF(192F, 25F); + this.xrLabel33.StylePriority.UseFont = false; + this.xrLabel33.Text = "ICD10-Diagnosen"; + // + // DetailReport6 + // + this.DetailReport6.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail7}); + this.DetailReport6.DataMember = "ICD10Diagnosen"; + this.DetailReport6.DataSource = this.bindingSource1; + this.DetailReport6.Level = 0; + this.DetailReport6.Name = "DetailReport6"; + // + // Detail7 + // + this.Detail7.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable2}); + this.Detail7.HeightF = 18F; + this.Detail7.Name = "Detail7"; + // + // xrTable2 + // + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow2}); + this.xrTable2.SizeF = new System.Drawing.SizeF(642F, 18F); + this.xrTable2.StylePriority.UseFont = false; + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell2, + this.xrTableCell5}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Weight = 1.125D; + // + // xrTableCell2 + // + this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ICD10Diagnosen.ICD10Code")}); + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell2.StylePriority.UseBorders = false; + this.xrTableCell2.StylePriority.UseFont = false; + this.xrTableCell2.StylePriority.UsePadding = false; + this.xrTableCell2.Text = "Betreuer"; + this.xrTableCell2.Weight = 0.17912772585669781D; + // + // xrTableCell5 + // + this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ICD10Diagnosen.Beschreibung")}); + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell5.StylePriority.UseBorders = false; + this.xrTableCell5.StylePriority.UseFont = false; + this.xrTableCell5.StylePriority.UsePadding = false; + this.xrTableCell5.Text = "Notiz"; + this.xrTableCell5.Weight = 0.82087227414330211D; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.CustomerDataRO); + // // Klientenstammblatt // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1014,7 +1159,8 @@ namespace BeWo.Report.DefaultReports this.DetailReport4, this.topMarginBand1, this.bottomMarginBand1, - this.ReportHeader}); + this.ReportHeader, + this.DetailReport5}); this.DataSource = this.bindingSource1; this.Font = new System.Drawing.Font("Arial", 10F); this.Margins = new System.Drawing.Printing.Margins(75, 75, 75, 50); @@ -1024,11 +1170,13 @@ namespace BeWo.Report.DefaultReports this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable9)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1116,5 +1264,18 @@ namespace BeWo.Report.DefaultReports private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2; private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport5; + private DevExpress.XtraReports.UI.DetailBand Detail6; + private DevExpress.XtraReports.UI.XRLabel xrLabel33; + private DevExpress.XtraReports.UI.XRTable xrTable1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport6; + private DevExpress.XtraReports.UI.DetailBand Detail7; + private DevExpress.XtraReports.UI.XRTable xrTable2; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; } } diff --git a/ReportImp/ForumEV/Quittierungsbeleg.Designer.cs b/ReportImp/ForumEV/Quittierungsbeleg.Designer.cs index e5ebfed63..ad3fc92f0 100644 --- a/ReportImp/ForumEV/Quittierungsbeleg.Designer.cs +++ b/ReportImp/ForumEV/Quittierungsbeleg.Designer.cs @@ -62,9 +62,10 @@ namespace ForumEV this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel(); this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); @@ -120,14 +121,14 @@ namespace ForumEV this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblPage = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -538,10 +539,6 @@ namespace ForumEV this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell49.Weight = 0.44692737430167606D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; @@ -567,6 +564,42 @@ namespace ForumEV this.ReportHeader.HeightF = 214.6528F; this.ReportHeader.Name = "ReportHeader"; // + // xrLabel19 + // + this.xrLabel19.BackColor = System.Drawing.Color.Gainsboro; + this.xrLabel19.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel19.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(49.36113F, 150.8194F); + this.xrLabel19.Name = "xrLabel19"; + this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel19.SizeF = new System.Drawing.SizeF(120.6389F, 41.33336F); + this.xrLabel19.StylePriority.UseBackColor = false; + this.xrLabel19.StylePriority.UseBorders = false; + this.xrLabel19.StylePriority.UseFont = false; + this.xrLabel19.StylePriority.UsePadding = false; + this.xrLabel19.StylePriority.UseTextAlignment = false; + this.xrLabel19.Text = "Verantwortliche Mitarbeiter/in"; + this.xrLabel19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // xrLabel20 + // + this.xrLabel20.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel20.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(170F, 150.8194F); + this.xrLabel20.Name = "xrLabel20"; + this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel20.SizeF = new System.Drawing.SizeF(209.3611F, 41.33336F); + this.xrLabel20.StylePriority.UseBackColor = false; + this.xrLabel20.StylePriority.UseBorders = false; + this.xrLabel20.StylePriority.UseFont = false; + this.xrLabel20.StylePriority.UsePadding = false; + this.xrLabel20.StylePriority.UseTextAlignment = false; + this.xrLabel20.Text = "[MainAttendant]"; + this.xrLabel20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // // xrPictureBox3 // this.xrPictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox3.Image"))); @@ -757,7 +790,9 @@ namespace ForumEV // // bottomMarginBand1 // - this.bottomMarginBand1.HeightF = 30F; + this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblPage}); + this.bottomMarginBand1.HeightF = 56.87497F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // // GroupFooter1 @@ -781,9 +816,10 @@ namespace ForumEV this.xrLabel1, this.xrPictureBox1, this.xrLabel17}); - this.GroupFooter1.HeightF = 270F; + this.GroupFooter1.HeightF = 305.4167F; this.GroupFooter1.KeepTogether = true; this.GroupFooter1.Name = "GroupFooter1"; + this.GroupFooter1.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand; // // xrLabel18 // @@ -818,7 +854,7 @@ namespace ForumEV this.lblUnterschriftKlient.StylePriority.UseFont = false; this.lblUnterschriftKlient.StylePriority.UsePadding = false; this.lblUnterschriftKlient.StylePriority.UseTextAlignment = false; - this.lblUnterschriftKlient.Text = "Datum, Unterschrift Klient/in"; + this.lblUnterschriftKlient.Text = "Datum, Unterschrift ([CustomerName])"; this.lblUnterschriftKlient.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; // // lblUnterschriftMitarbeiter @@ -1239,41 +1275,24 @@ namespace ForumEV this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldKontaktArt.Name = "fieldKontaktArt"; // - // xrLabel19 + // lblPage // - this.xrLabel19.BackColor = System.Drawing.Color.Gainsboro; - this.xrLabel19.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel19.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(49.36113F, 150.8194F); - this.xrLabel19.Name = "xrLabel19"; - this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel19.SizeF = new System.Drawing.SizeF(120.6389F, 41.33336F); - this.xrLabel19.StylePriority.UseBackColor = false; - this.xrLabel19.StylePriority.UseBorders = false; - this.xrLabel19.StylePriority.UseFont = false; - this.xrLabel19.StylePriority.UsePadding = false; - this.xrLabel19.StylePriority.UseTextAlignment = false; - this.xrLabel19.Text = "Verantwortliche Mitarbeiter/in"; - this.xrLabel19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.lblPage.Font = new System.Drawing.Font("Arial", 10F); + this.lblPage.LocationFloat = new DevExpress.Utils.PointFloat(417.8055F, 0F); + this.lblPage.Name = "lblPage"; + this.lblPage.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.lblPage.SizeF = new System.Drawing.SizeF(321.6388F, 24.04162F); + this.lblPage.StylePriority.UseBackColor = false; + this.lblPage.StylePriority.UseBorders = false; + this.lblPage.StylePriority.UseFont = false; + this.lblPage.StylePriority.UsePadding = false; + this.lblPage.StylePriority.UseTextAlignment = false; + this.lblPage.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.lblPage.PrintOnPage += new DevExpress.XtraReports.UI.PrintOnPageEventHandler(this.lblPage_PrintOnPage); // - // xrLabel20 + // bindingSource1 // - this.xrLabel20.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel20.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(170F, 150.8194F); - this.xrLabel20.Name = "xrLabel20"; - this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel20.SizeF = new System.Drawing.SizeF(209.3611F, 41.33336F); - this.xrLabel20.StylePriority.UseBackColor = false; - this.xrLabel20.StylePriority.UseBorders = false; - this.xrLabel20.StylePriority.UseFont = false; - this.xrLabel20.StylePriority.UsePadding = false; - this.xrLabel20.StylePriority.UseTextAlignment = false; - this.xrLabel20.Text = "[MainAttendant]"; - this.xrLabel20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); // // Quittierungsbeleg // @@ -1293,17 +1312,17 @@ namespace ForumEV this.formattingRuleServiceDesc, this.formattingRuleCostBearer, this.formattingRuleEmployeeName}); - this.Margins = new System.Drawing.Printing.Margins(50, 30, 70, 30); + this.Margins = new System.Drawing.Printing.Margins(50, 30, 70, 57); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1401,5 +1420,6 @@ namespace ForumEV private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3; private DevExpress.XtraReports.UI.XRLabel xrLabel19; private DevExpress.XtraReports.UI.XRLabel xrLabel20; + private DevExpress.XtraReports.UI.XRLabel lblPage; } } diff --git a/ReportImp/ForumEV/Quittierungsbeleg.cs b/ReportImp/ForumEV/Quittierungsbeleg.cs index 51e6a4649..65dcf1c7a 100644 --- a/ReportImp/ForumEV/Quittierungsbeleg.cs +++ b/ReportImp/ForumEV/Quittierungsbeleg.cs @@ -19,7 +19,7 @@ namespace ForumEV public void SetReportDataSource(ServicesOverviewRO pRO) { - + // Get calling method name //StackTrace stackTrace = new StackTrace(); //Debug.WriteLine(stackTrace.GetFrame(1).GetMethod().Name); @@ -184,5 +184,10 @@ namespace ForumEV return Image.FromStream(memoryStream); } } + + private void lblPage_PrintOnPage(object sender, PrintOnPageEventArgs e) + { + lblPage.Text = String.Format("Seite {0} von {1}", e.PageIndex + 1, e.PageCount); + } } } diff --git a/ReportImp/IlkaLinkAmbulanteHilfen/UnterschriftSprang.jpg b/ReportImp/IlkaLinkAmbulanteHilfen/UnterschriftSprang.jpg new file mode 100644 index 000000000..98d2f5f02 Binary files /dev/null and b/ReportImp/IlkaLinkAmbulanteHilfen/UnterschriftSprang.jpg differ diff --git a/ReportImp/IlkaLinkAmbulanteHilfen/UnterschriftSprang.png b/ReportImp/IlkaLinkAmbulanteHilfen/UnterschriftSprang.png new file mode 100644 index 000000000..a147db056 Binary files /dev/null and b/ReportImp/IlkaLinkAmbulanteHilfen/UnterschriftSprang.png differ