From 49da8a92d1c5268b26a4bee51c1e60400a2fb1f6 Mon Sep 17 00:00:00 2001 From: Kojo Date: Wed, 6 Sep 2023 15:54:29 +0200 Subject: [PATCH 1/3] BeWoColonia5Reports (BeWo Dreilich und Pastor): Abwesenheitstabelle QB --- .../ServicesOverviewReport.Designer.cs | 466 ++++++++++++++---- .../ServicesOverviewReport.cs | 43 ++ 2 files changed, 415 insertions(+), 94 deletions(-) diff --git a/ReportImp/BeWoColonia5Reports/ServicesOverviewReport.Designer.cs b/ReportImp/BeWoColonia5Reports/ServicesOverviewReport.Designer.cs index 69ecca49f..16b332d01 100644 --- a/ReportImp/BeWoColonia5Reports/ServicesOverviewReport.Designer.cs +++ b/ReportImp/BeWoColonia5Reports/ServicesOverviewReport.Designer.cs @@ -35,6 +35,7 @@ namespace BeWoDreilichPastorDreilich this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); this.cellMinutenFLSHeader = new DevExpress.XtraReports.UI.XRTableCell(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); @@ -42,7 +43,9 @@ namespace BeWoDreilichPastorDreilich this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = 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.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel(); @@ -70,6 +73,10 @@ namespace BeWoDreilichPastorDreilich this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); + this.xrLabel30 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblFehlkontakt = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel4 = 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(); @@ -84,16 +91,32 @@ namespace BeWoDreilichPastorDreilich this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldGroupHours = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel30 = new DevExpress.XtraReports.UI.XRLabel(); - this.lblFehlkontakt = new DevExpress.XtraReports.UI.XRLabel(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrLabel31 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTableAbwesenheiten = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -101,7 +124,7 @@ namespace BeWoDreilichPastorDreilich this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTableServiceRecords1}); this.Detail.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Bold); - this.Detail.HeightF = 32F; + this.Detail.HeightF = 28F; this.Detail.Name = "Detail"; this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.Detail.StylePriority.UseFont = false; @@ -110,13 +133,15 @@ namespace BeWoDreilichPastorDreilich // xrTableServiceRecords1 // this.xrTableServiceRecords1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(221)))), ((int)(((byte)(221)))), ((int)(((byte)(221))))); - this.xrTableServiceRecords1.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + 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(626.9999F, 32F); + this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(626.9999F, 28F); this.xrTableServiceRecords1.StylePriority.UseBackColor = false; this.xrTableServiceRecords1.StylePriority.UseBorders = false; this.xrTableServiceRecords1.StylePriority.UseFont = false; @@ -133,7 +158,7 @@ namespace BeWoDreilichPastorDreilich this.xrTableRow2.Name = "xrTableRow2"; this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTableRow2.StylePriority.UseTextAlignment = false; - this.xrTableRow2.Weight = 1D; + this.xrTableRow2.Weight = 0.875D; // // xrTableCell3 // @@ -154,6 +179,14 @@ namespace BeWoDreilichPastorDreilich this.xrTableCell4.Text = "Uhrzeit"; this.xrTableCell4.Weight = 0.45659584837553346D; // + // 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 = "Art"; + this.xrTableCell1.Weight = 0.45659584837553346D; + // // cellMinutenFLSHeader // this.cellMinutenFLSHeader.Multiline = true; @@ -179,8 +212,8 @@ namespace BeWoDreilichPastorDreilich // this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable3}); - this.Detail1.Font = new System.Drawing.Font("Arial", 12F); - this.Detail1.HeightF = 25F; + this.Detail1.Font = new System.Drawing.Font("Times New Roman", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Detail1.HeightF = 24F; this.Detail1.Name = "Detail1"; this.Detail1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.Detail1.StylePriority.UseFont = false; @@ -196,7 +229,7 @@ namespace BeWoDreilichPastorDreilich this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow6}); - this.xrTable3.SizeF = new System.Drawing.SizeF(626.9999F, 25F); + this.xrTable3.SizeF = new System.Drawing.SizeF(626.9999F, 24F); this.xrTable3.StylePriority.UseFont = false; this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // @@ -210,7 +243,7 @@ namespace BeWoDreilichPastorDreilich this.xrTableRow6.Name = "xrTableRow6"; this.xrTableRow6.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTableRow6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableRow6.Weight = 1.25D; + this.xrTableRow6.Weight = 1.2D; // // xrTableCell13 // @@ -238,6 +271,18 @@ namespace BeWoDreilichPastorDreilich this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell14.Weight = 0.23641101510270648D; // + // xrTableCell2 + // + this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")}); + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.xrTableCell2.StylePriority.UsePadding = false; + this.xrTableCell2.StylePriority.UseTextAlignment = false; + this.xrTableCell2.Text = "xrTableCell2"; + this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell2.Weight = 0.23641101510270648D; + // // xrTableCell15 // this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -251,6 +296,10 @@ namespace BeWoDreilichPastorDreilich this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell15.Weight = 0.283693213636449D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; @@ -576,6 +625,8 @@ namespace BeWoDreilichPastorDreilich // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel31, + this.xrTableAbwesenheiten, this.xrLabel30, this.lblFehlkontakt, this.xrLabel11, @@ -591,14 +642,75 @@ namespace BeWoDreilichPastorDreilich this.cellGesamt, this.xrLabel3}); this.ReportFooter.Font = new System.Drawing.Font("Times New Roman", 11F); - this.ReportFooter.HeightF = 284.4999F; + this.ReportFooter.HeightF = 398.0415F; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // + // xrLabel30 + // + this.xrLabel30.Font = new System.Drawing.Font("Times New Roman", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel30.Name = "xrLabel30"; + this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel30.SizeF = new System.Drawing.SizeF(245F, 25F); + this.xrLabel30.StylePriority.UseBackColor = false; + this.xrLabel30.StylePriority.UseBorders = false; + this.xrLabel30.StylePriority.UseFont = false; + this.xrLabel30.StylePriority.UsePadding = false; + this.xrLabel30.StylePriority.UseTextAlignment = false; + this.xrLabel30.Text = "E = ear to ear, face to face"; + this.xrLabel30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // lblFehlkontakt + // + this.lblFehlkontakt.Font = new System.Drawing.Font("Times New Roman", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblFehlkontakt.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25.00001F); + this.lblFehlkontakt.Name = "lblFehlkontakt"; + this.lblFehlkontakt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.lblFehlkontakt.SizeF = new System.Drawing.SizeF(245F, 20F); + this.lblFehlkontakt.StylePriority.UseBackColor = false; + this.lblFehlkontakt.StylePriority.UseBorders = false; + this.lblFehlkontakt.StylePriority.UseFont = false; + this.lblFehlkontakt.StylePriority.UsePadding = false; + this.lblFehlkontakt.StylePriority.UseTextAlignment = false; + this.lblFehlkontakt.Text = "F = Fehlkontakt"; + this.lblFehlkontakt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // xrLabel11 + // + this.xrLabel11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel11.BorderWidth = 2F; + this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMFehlkontakte")}); + this.xrLabel11.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Bold); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(447.8571F, 50F); + this.xrLabel11.Name = "xrLabel11"; + this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(179.1428F, 25F); + this.xrLabel11.StylePriority.UseBorders = false; + this.xrLabel11.StylePriority.UseBorderWidth = false; + this.xrLabel11.StylePriority.UseFont = false; + this.xrLabel11.StylePriority.UsePadding = false; + this.xrLabel11.StylePriority.UseTextAlignment = false; + this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrLabel4 + // + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(300F, 50F); + 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(147.8571F, 25F); + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.StylePriority.UseTextAlignment = false; + this.xrLabel4.Text = "Summe Fehlkontakte\r\n"; + this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // // xrLabel19 // this.xrLabel19.Font = new System.Drawing.Font("Times New Roman", 11F); - this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0F, 262.9166F); + this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0F, 376.4582F); this.xrLabel19.Multiline = true; this.xrLabel19.Name = "xrLabel19"; this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -612,7 +724,7 @@ namespace BeWoDreilichPastorDreilich // xrLabel17 // this.xrLabel17.Font = new System.Drawing.Font("Times New Roman", 11F); - this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 128.75F); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 242.2916F); this.xrLabel17.Multiline = true; this.xrLabel17.Name = "xrLabel17"; this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -626,7 +738,7 @@ namespace BeWoDreilichPastorDreilich // xrLabel16 // this.xrLabel16.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Bold); - this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(0F, 108.75F); + this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(0F, 222.2917F); this.xrLabel16.Multiline = true; this.xrLabel16.Name = "xrLabel16"; this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -639,7 +751,7 @@ namespace BeWoDreilichPastorDreilich // xrLabel5 // this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(300F, 188.75F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(300F, 302.2917F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel5.SizeF = new System.Drawing.SizeF(327F, 17.99997F); @@ -679,7 +791,7 @@ namespace BeWoDreilichPastorDreilich // xrLabel7 // this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(300F, 148.75F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(300F, 262.2917F); this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel7.SizeF = new System.Drawing.SizeF(327F, 17.99997F); @@ -690,7 +802,7 @@ namespace BeWoDreilichPastorDreilich // xrLabel6 // this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(300F, 108.75F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(300F, 222.2917F); this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel6.SizeF = new System.Drawing.SizeF(327F, 17.99997F); @@ -753,90 +865,233 @@ namespace BeWoDreilichPastorDreilich this.fieldGroupHours.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldGroupHours.Name = "fieldGroupHours"; // - // xrTableCell1 + // xrLabel31 // - this.xrTableCell1.Name = "xrTableCell1"; - this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); - this.xrTableCell1.StylePriority.UsePadding = false; - this.xrTableCell1.Text = "Art"; - this.xrTableCell1.Weight = 0.45659584837553346D; + this.xrLabel31.Font = new System.Drawing.Font("Times New Roman", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(128.5713F, 94.4791F); + this.xrLabel31.Multiline = true; + this.xrLabel31.Name = "xrLabel31"; + this.xrLabel31.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel31.SizeF = new System.Drawing.SizeF(170F, 43.61115F); + this.xrLabel31.StylePriority.UseBackColor = false; + this.xrLabel31.StylePriority.UseBorders = false; + this.xrLabel31.StylePriority.UseFont = false; + this.xrLabel31.StylePriority.UsePadding = false; + this.xrLabel31.StylePriority.UseTextAlignment = false; + this.xrLabel31.Text = "Krankenhausaufenthalte/\r\nstat. Rehamaßnahmen:"; + this.xrLabel31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // - // xrTableCell2 + // xrTableAbwesenheiten // - this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")}); - this.xrTableCell2.Name = "xrTableCell2"; - this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); - this.xrTableCell2.StylePriority.UsePadding = false; - this.xrTableCell2.StylePriority.UseTextAlignment = false; - this.xrTableCell2.Text = "xrTableCell2"; - this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell2.Weight = 0.23641101510270648D; - // - // xrLabel11 - // - this.xrLabel11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableAbwesenheiten.BorderColor = System.Drawing.Color.Black; + this.xrTableAbwesenheiten.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel11.BorderWidth = 2F; - this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMFehlkontakte")}); - this.xrLabel11.Font = new System.Drawing.Font("Times New Roman", 11F, System.Drawing.FontStyle.Bold); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(447.8571F, 50F); - this.xrLabel11.Name = "xrLabel11"; - this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); - this.xrLabel11.SizeF = new System.Drawing.SizeF(179.1428F, 25F); - this.xrLabel11.StylePriority.UseBorders = false; - this.xrLabel11.StylePriority.UseBorderWidth = false; - this.xrLabel11.StylePriority.UseFont = false; - this.xrLabel11.StylePriority.UsePadding = false; - this.xrLabel11.StylePriority.UseTextAlignment = false; - this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableAbwesenheiten.Font = new System.Drawing.Font("Times New Roman", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(300F, 94.4791F); + this.xrTableAbwesenheiten.Name = "xrTableAbwesenheiten"; + this.xrTableAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.xrTableAbwesenheiten.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow3, + this.xrTableRow4, + this.xrTableRow5, + this.xrTableRow7, + this.xrTableRow8}); + this.xrTableAbwesenheiten.SizeF = new System.Drawing.SizeF(327.0001F, 99.99999F); + this.xrTableAbwesenheiten.StylePriority.UseBorders = false; + this.xrTableAbwesenheiten.StylePriority.UseFont = false; + this.xrTableAbwesenheiten.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // - // xrLabel4 + // xrTableRow3 // - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(300F, 50F); - 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(147.8571F, 25F); - this.xrLabel4.StylePriority.UseFont = false; - this.xrLabel4.StylePriority.UseTextAlignment = false; - this.xrLabel4.Text = "Summe Fehlkontakte\r\n"; - this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell16, + this.xrTableCell17, + this.xrTableCell18}); + this.xrTableRow3.Name = "xrTableRow3"; + this.xrTableRow3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.xrTableRow3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableRow3.Weight = 1D; // - // xrLabel30 + // xrTableCell16 // - this.xrLabel30.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrLabel30.Name = "xrLabel30"; - this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel30.SizeF = new System.Drawing.SizeF(245F, 20F); - this.xrLabel30.StylePriority.UseBackColor = false; - this.xrLabel30.StylePriority.UseBorders = false; - this.xrLabel30.StylePriority.UseFont = false; - this.xrLabel30.StylePriority.UsePadding = false; - this.xrLabel30.StylePriority.UseTextAlignment = false; - this.xrLabel30.Text = "E = ear to ear, face to face"; - this.xrLabel30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell16.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell16.Name = "xrTableCell16"; + this.xrTableCell16.StylePriority.UseBorders = false; + this.xrTableCell16.StylePriority.UseFont = false; + this.xrTableCell16.StylePriority.UsePadding = false; + this.xrTableCell16.StylePriority.UseTextAlignment = false; + this.xrTableCell16.Text = "von"; + this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell16.Weight = 0.1073232364991462D; // - // lblFehlkontakt + // xrTableCell17 // - this.lblFehlkontakt.Font = new System.Drawing.Font("Arial", 10F); - this.lblFehlkontakt.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.00001F); - this.lblFehlkontakt.Name = "lblFehlkontakt"; - this.lblFehlkontakt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.lblFehlkontakt.SizeF = new System.Drawing.SizeF(245F, 20F); - this.lblFehlkontakt.StylePriority.UseBackColor = false; - this.lblFehlkontakt.StylePriority.UseBorders = false; - this.lblFehlkontakt.StylePriority.UseFont = false; - this.lblFehlkontakt.StylePriority.UsePadding = false; - this.lblFehlkontakt.StylePriority.UseTextAlignment = false; - this.lblFehlkontakt.Text = "F = Fehlkontakt"; - this.lblFehlkontakt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell17.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell17.Name = "xrTableCell17"; + this.xrTableCell17.StylePriority.UseBorders = false; + this.xrTableCell17.StylePriority.UseFont = false; + this.xrTableCell17.StylePriority.UsePadding = false; + this.xrTableCell17.StylePriority.UseTextAlignment = false; + this.xrTableCell17.Text = "bis"; + this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell17.Weight = 0.10732323432577288D; // - // bindingSource1 + // xrTableCell18 // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + this.xrTableCell18.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell18.Name = "xrTableCell18"; + this.xrTableCell18.StylePriority.UseBorders = false; + this.xrTableCell18.StylePriority.UseFont = false; + this.xrTableCell18.StylePriority.UsePadding = false; + this.xrTableCell18.StylePriority.UseTextAlignment = false; + this.xrTableCell18.Text = "Tage"; + this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell18.Weight = 0.075757568269402914D; + // + // xrTableRow4 + // + this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell19, + this.xrTableCell20, + this.xrTableCell21}); + this.xrTableRow4.Name = "xrTableRow4"; + this.xrTableRow4.Weight = 1D; + // + // xrTableCell19 + // + this.xrTableCell19.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell19.Name = "xrTableCell19"; + this.xrTableCell19.StylePriority.UseFont = false; + this.xrTableCell19.StylePriority.UseTextAlignment = false; + this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell19.Weight = 0.1073232364991462D; + // + // xrTableCell20 + // + this.xrTableCell20.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell20.Name = "xrTableCell20"; + this.xrTableCell20.StylePriority.UseFont = false; + this.xrTableCell20.StylePriority.UseTextAlignment = false; + this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell20.Weight = 0.10732323432577288D; + // + // xrTableCell21 + // + this.xrTableCell21.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell21.Name = "xrTableCell21"; + this.xrTableCell21.StylePriority.UseFont = false; + this.xrTableCell21.StylePriority.UseTextAlignment = false; + this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell21.Weight = 0.075757568269402914D; + // + // xrTableRow5 + // + this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell22, + this.xrTableCell23, + this.xrTableCell24}); + this.xrTableRow5.Name = "xrTableRow5"; + this.xrTableRow5.Weight = 1D; + // + // xrTableCell22 + // + this.xrTableCell22.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell22.Name = "xrTableCell22"; + this.xrTableCell22.StylePriority.UseFont = false; + this.xrTableCell22.StylePriority.UseTextAlignment = false; + this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell22.Weight = 0.1073232364991462D; + // + // xrTableCell23 + // + this.xrTableCell23.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell23.Name = "xrTableCell23"; + this.xrTableCell23.StylePriority.UseFont = false; + this.xrTableCell23.StylePriority.UseTextAlignment = false; + this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell23.Weight = 0.10732323432577288D; + // + // xrTableCell24 + // + this.xrTableCell24.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell24.Name = "xrTableCell24"; + this.xrTableCell24.StylePriority.UseFont = false; + this.xrTableCell24.StylePriority.UseTextAlignment = false; + this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell24.Weight = 0.075757568269402914D; + // + // xrTableRow7 + // + this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell25, + this.xrTableCell26, + this.xrTableCell27}); + this.xrTableRow7.Name = "xrTableRow7"; + this.xrTableRow7.Weight = 1D; + // + // xrTableCell25 + // + this.xrTableCell25.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell25.Name = "xrTableCell25"; + this.xrTableCell25.StylePriority.UseFont = false; + this.xrTableCell25.StylePriority.UseTextAlignment = false; + this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell25.Weight = 0.1073232364991462D; + // + // xrTableCell26 + // + this.xrTableCell26.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell26.Name = "xrTableCell26"; + this.xrTableCell26.StylePriority.UseFont = false; + this.xrTableCell26.StylePriority.UseTextAlignment = false; + this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell26.Weight = 0.10732323432577288D; + // + // xrTableCell27 + // + this.xrTableCell27.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell27.Name = "xrTableCell27"; + this.xrTableCell27.StylePriority.UseFont = false; + this.xrTableCell27.StylePriority.UseTextAlignment = false; + this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell27.Weight = 0.075757568269402914D; + // + // xrTableRow8 + // + this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell29, + this.xrTableCell30, + this.xrTableCell31}); + this.xrTableRow8.Name = "xrTableRow8"; + this.xrTableRow8.Weight = 1D; + // + // xrTableCell29 + // + this.xrTableCell29.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell29.Name = "xrTableCell29"; + this.xrTableCell29.StylePriority.UseFont = false; + this.xrTableCell29.StylePriority.UseTextAlignment = false; + this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell29.Weight = 0.1073232364991462D; + // + // xrTableCell30 + // + this.xrTableCell30.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell30.Name = "xrTableCell30"; + this.xrTableCell30.StylePriority.UseFont = false; + this.xrTableCell30.StylePriority.UseTextAlignment = false; + this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell30.Weight = 0.10732323432577288D; + // + // xrTableCell31 + // + this.xrTableCell31.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell31.Name = "xrTableCell31"; + this.xrTableCell31.StylePriority.UseFont = false; + this.xrTableCell31.StylePriority.UseTextAlignment = false; + this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell31.Weight = 0.075757568269402914D; // // Stundenzettel // @@ -867,6 +1122,7 @@ namespace BeWoDreilichPastorDreilich ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -934,5 +1190,27 @@ namespace BeWoDreilichPastorDreilich private DevExpress.XtraReports.UI.XRLabel xrLabel4; private DevExpress.XtraReports.UI.XRLabel xrLabel30; private DevExpress.XtraReports.UI.XRLabel lblFehlkontakt; + private DevExpress.XtraReports.UI.XRLabel xrLabel31; + private DevExpress.XtraReports.UI.XRTable xrTableAbwesenheiten; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell22; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell24; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow7; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell25; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell26; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell27; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow8; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; } } diff --git a/ReportImp/BeWoColonia5Reports/ServicesOverviewReport.cs b/ReportImp/BeWoColonia5Reports/ServicesOverviewReport.cs index 1561fa2c9..9feacc9fd 100644 --- a/ReportImp/BeWoColonia5Reports/ServicesOverviewReport.cs +++ b/ReportImp/BeWoColonia5Reports/ServicesOverviewReport.cs @@ -62,6 +62,49 @@ namespace BeWoDreilichPastorDreilich } this.bindingSource1.DataSource = pRO; + + ErstelleAbwesenheitenTabelle(pRO); + } + + + private void ErstelleAbwesenheitenTabelle(ServicesOverviewRO pRO) + { + if (pRO.Abwesenheiten != null) + { + int newRows = 0; + int index = 1; + foreach (var at in pRO.Abwesenheiten) + { + DevExpress.XtraReports.UI.XRTableRow row = null; + if (index < xrTableAbwesenheiten.Rows.Count) + { + row = xrTableAbwesenheiten.Rows[index]; + } + else + { + row = xrTableAbwesenheiten.InsertRowBelow(xrTableAbwesenheiten.Rows[xrTableAbwesenheiten.Rows.Count - 1]); + newRows++; + } + + row.Cells[0].Text = String.Format("{0:dd.MM.yyyy}", at.Start); + int? days = null; + + if (at.End.HasValue) + { + row.Cells[1].Text = String.Format("{0:dd.MM.yyyy}", at.End); + days = (int)at.End.Value.Subtract(at.Start.Value).TotalDays + 1; + } + else + { + row.Cells[1].Text = "unbekannt"; + } + + row.Cells[2].Text = String.Format("{0:0}", days); + + index++; + } + } } } + } From 9e805060f88fb5f69804d9002bac683c90d08d93 Mon Sep 17 00:00:00 2001 From: Kojo Date: Wed, 6 Sep 2023 17:52:35 +0200 Subject: [PATCH 2/3] AidshilfeEssen: Zwischensummen auf Spitzabrechnung korrigiert --- .../SettlementReport2.Designer.cs | 64 +++++++++---------- ReportImp/AidshilfeEssen/SettlementReport2.cs | 33 ++-------- 2 files changed, 38 insertions(+), 59 deletions(-) diff --git a/ReportImp/AidshilfeEssen/SettlementReport2.Designer.cs b/ReportImp/AidshilfeEssen/SettlementReport2.Designer.cs index 1164cbf3f..7170039b2 100644 --- a/ReportImp/AidshilfeEssen/SettlementReport2.Designer.cs +++ b/ReportImp/AidshilfeEssen/SettlementReport2.Designer.cs @@ -118,7 +118,7 @@ namespace AidshilfeEssen this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); - this.Zwischensumme = new DevExpress.XtraReports.UI.ReportFooterBand(); + this.Zwischensumme = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable6 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -221,7 +221,7 @@ namespace AidshilfeEssen this.xrLabel18, this.xrLabel10}); this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F); - this.ReportFooter.HeightF = 345.4584F; + this.ReportFooter.HeightF = 304.0002F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; @@ -232,7 +232,7 @@ namespace AidshilfeEssen this.xrLabel34.Borders = DevExpress.XtraPrinting.BorderSide.Top; this.xrLabel34.CanShrink = true; this.xrLabel34.Font = new System.Drawing.Font("Arial", 11F); - this.xrLabel34.LocationFloat = new DevExpress.Utils.PointFloat(426.2916F, 325.4584F); + this.xrLabel34.LocationFloat = new DevExpress.Utils.PointFloat(426.2919F, 284.0002F); this.xrLabel34.Name = "xrLabel34"; this.xrLabel34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel34.SizeF = new System.Drawing.SizeF(317.7083F, 20F); @@ -249,7 +249,7 @@ namespace AidshilfeEssen this.xrLabel33.BackColor = System.Drawing.Color.Transparent; this.xrLabel33.CanShrink = true; this.xrLabel33.Font = new System.Drawing.Font("Arial", 11F); - this.xrLabel33.LocationFloat = new DevExpress.Utils.PointFloat(0F, 305.4584F); + this.xrLabel33.LocationFloat = new DevExpress.Utils.PointFloat(0.0003814697F, 264.0002F); this.xrLabel33.Name = "xrLabel33"; this.xrLabel33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel33.SizeF = new System.Drawing.SizeF(200.0002F, 19.99991F); @@ -266,7 +266,7 @@ namespace AidshilfeEssen this.xrLabel12.Borders = DevExpress.XtraPrinting.BorderSide.Top; this.xrLabel12.CanShrink = true; this.xrLabel12.Font = new System.Drawing.Font("Arial", 11F); - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 325.4584F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0.0003814697F, 284.0002F); this.xrLabel12.Name = "xrLabel12"; this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel12.SizeF = new System.Drawing.SizeF(200F, 19.99988F); @@ -284,7 +284,7 @@ namespace AidshilfeEssen this.xrLabel32.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Claim", "{0:c}")}); this.xrLabel32.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); - this.xrLabel32.LocationFloat = new DevExpress.Utils.PointFloat(597.9172F, 198.25F); + this.xrLabel32.LocationFloat = new DevExpress.Utils.PointFloat(597.9172F, 180.5417F); this.xrLabel32.Name = "xrLabel32"; this.xrLabel32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel32.SizeF = new System.Drawing.SizeF(147.0831F, 20.00001F); @@ -299,7 +299,7 @@ namespace AidshilfeEssen this.xrLabel31.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel31.CanShrink = true; this.xrLabel31.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); - this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(0F, 198.2501F); + this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(0F, 180.5417F); this.xrLabel31.Name = "xrLabel31"; this.xrLabel31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel31.SizeF = new System.Drawing.SizeF(597.9169F, 19.99998F); @@ -315,7 +315,7 @@ namespace AidshilfeEssen this.xrLabel29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountAdvancedPayments", "{0:c}")}); this.xrLabel29.Font = new System.Drawing.Font("Arial", 11F); - this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(597.9172F, 178.25F); + this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(597.9172F, 160.5417F); this.xrLabel29.Name = "xrLabel29"; this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel29.SizeF = new System.Drawing.SizeF(147.0831F, 20.00001F); @@ -329,7 +329,7 @@ namespace AidshilfeEssen this.xrLabel30.BackColor = System.Drawing.Color.Transparent; this.xrLabel30.CanShrink = true; this.xrLabel30.Font = new System.Drawing.Font("Arial", 11F); - this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(0.0002463659F, 178.25F); + this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 160.5417F); this.xrLabel30.Name = "xrLabel30"; this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel30.SizeF = new System.Drawing.SizeF(597.9167F, 20F); @@ -341,7 +341,7 @@ namespace AidshilfeEssen // lblBetragFuerKostentraeger // this.lblBetragFuerKostentraeger.Font = new System.Drawing.Font("Arial", 11F); - this.lblBetragFuerKostentraeger.LocationFloat = new DevExpress.Utils.PointFloat(597.9172F, 158.25F); + this.lblBetragFuerKostentraeger.LocationFloat = new DevExpress.Utils.PointFloat(597.9172F, 140.5417F); this.lblBetragFuerKostentraeger.Name = "lblBetragFuerKostentraeger"; this.lblBetragFuerKostentraeger.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.lblBetragFuerKostentraeger.SizeF = new System.Drawing.SizeF(147.0831F, 20.00001F); @@ -354,7 +354,7 @@ namespace AidshilfeEssen this.xrLabel24.BackColor = System.Drawing.Color.Transparent; this.xrLabel24.CanShrink = true; this.xrLabel24.Font = new System.Drawing.Font("Arial", 11F); - this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(0F, 158.25F); + this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(0F, 140.5417F); this.xrLabel24.Name = "xrLabel24"; this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel24.SizeF = new System.Drawing.SizeF(597.9167F, 20F); @@ -370,7 +370,7 @@ namespace AidshilfeEssen this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecipientOrganisation")}); this.xrLabel11.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 138.25F); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 120.5416F); this.xrLabel11.Name = "xrLabel11"; this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel11.SizeF = new System.Drawing.SizeF(745.0002F, 20F); @@ -1089,7 +1089,7 @@ namespace AidshilfeEssen this.xrLabel16, this.xrLine7}); this.GroupFooter1.Font = new System.Drawing.Font("Verdana", 10F); - this.GroupFooter1.HeightF = 75.30354F; + this.GroupFooter1.HeightF = 62.80355F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // @@ -1276,20 +1276,18 @@ namespace AidshilfeEssen // this.Zwischensumme.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable6}); - this.Zwischensumme.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Zwischensumme.HeightF = 34F; + this.Zwischensumme.HeightF = 26F; this.Zwischensumme.Name = "Zwischensumme"; - this.Zwischensumme.StylePriority.UseFont = false; this.Zwischensumme.Visible = false; // // xrTable6 // - this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0.000333786F, 0F); + this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable6.Name = "xrTable6"; this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow12, this.xrTableRow3}); - this.xrTable6.SizeF = new System.Drawing.SizeF(743.9996F, 34F); + this.xrTable6.SizeF = new System.Drawing.SizeF(743.9996F, 26F); this.xrTable6.StylePriority.UseFont = false; // // xrTableRow12 @@ -1303,7 +1301,7 @@ namespace AidshilfeEssen // xrTableCell9 // this.xrTableCell9.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell9.Borders = DevExpress.XtraPrinting.BorderSide.None; this.xrTableCell9.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrTableCell9.Name = "xrTableCell9"; this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -1317,14 +1315,15 @@ namespace AidshilfeEssen // xrTableCell10 // this.xrTableCell10.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell10.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Double; + this.xrTableCell10.Borders = DevExpress.XtraPrinting.BorderSide.Top; this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal")}); this.xrTableCell10.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrTableCell10.Name = "xrTableCell10"; this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell10.StylePriority.UseBorderColor = false; + this.xrTableCell10.StylePriority.UseBorderDashStyle = false; this.xrTableCell10.StylePriority.UseBorders = false; this.xrTableCell10.StylePriority.UseFont = false; this.xrTableCell10.StylePriority.UsePadding = false; @@ -1332,7 +1331,7 @@ namespace AidshilfeEssen xrSummary1.FormatString = "{0:c}"; xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; this.xrTableCell10.Summary = xrSummary1; - this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell10.Weight = 0.73199773522987122D; // // xrTableRow3 @@ -1340,13 +1339,12 @@ namespace AidshilfeEssen this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell11}); this.xrTableRow3.Name = "xrTableRow3"; - this.xrTableRow3.Weight = 0.40476190476190466D; + this.xrTableRow3.Weight = 0.21428571428571425D; // // xrTableCell11 // this.xrTableCell11.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell11.Borders = DevExpress.XtraPrinting.BorderSide.None; this.xrTableCell11.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrTableCell11.Name = "xrTableCell11"; this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -1478,13 +1476,13 @@ namespace AidshilfeEssen private DevExpress.XtraReports.UI.XRLabel xrLabel12; private DevExpress.XtraReports.UI.XRLabel xrLabel33; private DevExpress.XtraReports.UI.XRLabel xrLabel34; - private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2; - private DevExpress.XtraReports.UI.ReportFooterBand Zwischensumme; - private DevExpress.XtraReports.UI.XRTable xrTable6; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow12; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; + private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2; + private DevExpress.XtraReports.UI.GroupFooterBand Zwischensumme; + private DevExpress.XtraReports.UI.XRTable xrTable6; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow12; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; } } diff --git a/ReportImp/AidshilfeEssen/SettlementReport2.cs b/ReportImp/AidshilfeEssen/SettlementReport2.cs index b7185e5eb..3ee1b80a1 100644 --- a/ReportImp/AidshilfeEssen/SettlementReport2.cs +++ b/ReportImp/AidshilfeEssen/SettlementReport2.cs @@ -20,42 +20,23 @@ namespace AidshilfeEssen public void SetReportDataSource(Settlement2RO pRO) { - bool isDefaultSpitzabrechnung = false; - - //if (String.IsNullOrEmpty(pRO.Notice)) - //{ - // lblNotice.Visible = false; - //} - - if (pRO.InvoiceItems != null && pRO.InvoiceItems.Count == 1) - { - var ii = pRO.InvoiceItems[0]; - if ((ii.ItemDescription == "Spitzabrechung" || ii.ItemDescription == "Spitzabrechnung") && ii.GrossAmountTotal == null && ii.RateFactor == null) - { - isDefaultSpitzabrechnung = true; - } - } - decimal rateFactor = 1; foreach (var ii in pRO.InvoiceItems) { + if (ii.RateFactor == 0) + { + Zwischensumme.Visible = true; + ii.ItemDescription = "Fehlkontakte"; + } + if (ii.RateFactor.HasValue) { rateFactor = (100 + ii.RateFactor.Value) / 100; ii.RateFactor = rateFactor; } - - if (ii.RateFactor == 0) - { - Zwischensumme.Visible = true; - if (!ii.ItemDescription.IsNullOrEmpty()) - { - //ii.DetailDescription = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte"); - } - ii.ItemDescription = "Fehlkontakte"; - } } + pRO.RateFactor = (double)rateFactor; var tage = (pRO.AccountingEndDate - pRO.AccountingStartDate).TotalDays; From e90adc717cac0b746963efba0ed54fb394606bbc Mon Sep 17 00:00:00 2001 From: Kojo Date: Wed, 6 Sep 2023 18:06:02 +0200 Subject: [PATCH 3/3] =?UTF-8?q?BeWoColonia5Reports=20(BeWo=20Dreilich=20un?= =?UTF-8?q?d=20Pastor):=20neuer=20Verweis=20(f=C3=BCr=20Abwesenheitstabell?= =?UTF-8?q?e=20QB)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ReportImp/BeWoColonia5Reports/BeWoColonia5Reports.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ReportImp/BeWoColonia5Reports/BeWoColonia5Reports.csproj b/ReportImp/BeWoColonia5Reports/BeWoColonia5Reports.csproj index bb65755e9..214cfff6f 100644 --- a/ReportImp/BeWoColonia5Reports/BeWoColonia5Reports.csproj +++ b/ReportImp/BeWoColonia5Reports/BeWoColonia5Reports.csproj @@ -71,6 +71,10 @@ + + {B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE} + Data + {40D8B312-EA64-49E3-A31A-5E57ED4D5654} Report