From 1e0b2513f9e0010dc1e88ecb3c82deaf5f1ca48e Mon Sep 17 00:00:00 2001 From: Alexandra Date: Wed, 8 Feb 2023 19:02:51 +0100 Subject: [PATCH] BhsSolingen/CustomerDataReport, BHVBergischeHauspflege, AWOMuensterlandRecklinghausen --- .../AWOMuensterlandRecklinghausen.csproj | 4 +- .../BHVBergischeHauspflege.csproj | 3 +- .../CustomerDataReport.Designer.cs | 47 ++++++++++++++++--- ReportImp/BhsSolingen/CustomerDataReport.cs | 5 ++ 4 files changed, 48 insertions(+), 11 deletions(-) diff --git a/ReportImp/AWOMuensterlandRecklinghausen/AWOMuensterlandRecklinghausen.csproj b/ReportImp/AWOMuensterlandRecklinghausen/AWOMuensterlandRecklinghausen.csproj index 34ee5ba81..cc6a2c155 100644 --- a/ReportImp/AWOMuensterlandRecklinghausen/AWOMuensterlandRecklinghausen.csproj +++ b/ReportImp/AWOMuensterlandRecklinghausen/AWOMuensterlandRecklinghausen.csproj @@ -50,9 +50,7 @@ - - Component - + Quittierungsbeleg.cs diff --git a/ReportImp/BHVBergischeHauspflege/BHVBergischeHauspflege.csproj b/ReportImp/BHVBergischeHauspflege/BHVBergischeHauspflege.csproj index 9b41f6777..1ba1aead1 100644 --- a/ReportImp/BHVBergischeHauspflege/BHVBergischeHauspflege.csproj +++ b/ReportImp/BHVBergischeHauspflege/BHVBergischeHauspflege.csproj @@ -4,7 +4,7 @@ Debug AnyCPU - {375E3B1B-633A-477B-B0CF-C3A430B4A62D} + {F63DB13E-7930-4D8D-8C2F-B83B25502A9D} Library Properties BHVBergischeHauspflege @@ -116,7 +116,6 @@ Quittierungsbeleg.cs - Designer Teamstundenkonto.cs diff --git a/ReportImp/BhsSolingen/CustomerDataReport.Designer.cs b/ReportImp/BhsSolingen/CustomerDataReport.Designer.cs index b4e0eae3f..67f3572bc 100644 --- a/ReportImp/BhsSolingen/CustomerDataReport.Designer.cs +++ b/ReportImp/BhsSolingen/CustomerDataReport.Designer.cs @@ -74,6 +74,7 @@ namespace BhsSolingen 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(); @@ -123,16 +124,18 @@ namespace BhsSolingen 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); + this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); + this.xrLabel34 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblMedikation = new DevExpress.XtraReports.UI.XRLabel(); ((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 @@ -615,6 +618,10 @@ namespace BhsSolingen 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[] { @@ -1143,9 +1150,33 @@ namespace BhsSolingen this.xrTableCell5.Text = "Notiz"; this.xrTableCell5.Weight = 0.82087227414330211D; // - // bindingSource1 + // ReportFooter // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.CustomerDataRO); + this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel34, + this.lblMedikation}); + this.ReportFooter.HeightF = 48.45831F; + this.ReportFooter.Name = "ReportFooter"; + // + // xrLabel34 + // + this.xrLabel34.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrLabel34.LocationFloat = new DevExpress.Utils.PointFloat(0F, 24.45831F); + this.xrLabel34.Name = "xrLabel34"; + this.xrLabel34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel34.SizeF = new System.Drawing.SizeF(139.58F, 24F); + this.xrLabel34.StylePriority.UseFont = false; + this.xrLabel34.Text = "Medikation:"; + // + // lblMedikation + // + this.lblMedikation.Font = new System.Drawing.Font("Arial", 10F); + this.lblMedikation.LocationFloat = new DevExpress.Utils.PointFloat(139.58F, 24.45831F); + this.lblMedikation.Multiline = true; + this.lblMedikation.Name = "lblMedikation"; + this.lblMedikation.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblMedikation.SizeF = new System.Drawing.SizeF(537.42F, 24F); + this.lblMedikation.StylePriority.UseFont = false; // // Klientenstammblatt // @@ -1160,7 +1191,8 @@ namespace BhsSolingen this.topMarginBand1, this.bottomMarginBand1, this.ReportHeader, - this.DetailReport5}); + this.DetailReport5, + this.ReportFooter}); this.DataSource = this.bindingSource1; this.Font = new System.Drawing.Font("Arial", 10F); this.Margins = new System.Drawing.Printing.Margins(75, 75, 75, 50); @@ -1170,13 +1202,13 @@ namespace BhsSolingen 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(); } @@ -1277,5 +1309,8 @@ namespace BhsSolingen private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; + private DevExpress.XtraReports.UI.XRLabel xrLabel34; + private DevExpress.XtraReports.UI.XRLabel lblMedikation; } } diff --git a/ReportImp/BhsSolingen/CustomerDataReport.cs b/ReportImp/BhsSolingen/CustomerDataReport.cs index a45391bd7..14f19f815 100644 --- a/ReportImp/BhsSolingen/CustomerDataReport.cs +++ b/ReportImp/BhsSolingen/CustomerDataReport.cs @@ -5,6 +5,8 @@ using System.ComponentModel; using DevExpress.XtraReports.UI; using BeWo.Report.ReportObjects; using BeWo.Report; +using BeWo.Data.Access; +using BeWo.Data.Entities; namespace BhsSolingen { @@ -17,6 +19,9 @@ namespace BhsSolingen public void SetReportDataSource(CustomerDataRO pRO) { + var c = DAOFactory.GenericDAO.LoadByID(pRO.CustomerOid); + lblMedikation.Text = c.Medication; + this.bindingSource1.DataSource = pRO; } }