diff --git a/ReportImp/DiakonischesWerkDinslakenBeWo/SettlementReport2.Designer.cs b/ReportImp/DiakonischesWerkDinslakenBeWo/SettlementReport2.Designer.cs index 7c472f7d8..5cbfeda1c 100644 --- a/ReportImp/DiakonischesWerkDinslakenBeWo/SettlementReport2.Designer.cs +++ b/ReportImp/DiakonischesWerkDinslakenBeWo/SettlementReport2.Designer.cs @@ -80,7 +80,10 @@ namespace DiakonischesWerkDinslakenBeWo this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.lblDifferenzrechnungText = new DevExpress.XtraReports.UI.XRLabel(); + this.lblDifferenzrechnung = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel30 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel42 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel40 = new DevExpress.XtraReports.UI.XRLabel(); @@ -102,12 +105,20 @@ namespace DiakonischesWerkDinslakenBeWo this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.AnspruchMinusEigenbeteiligung = new DevExpress.XtraReports.UI.CalculatedField(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.lblDifferenzrechnungText = new DevExpress.XtraReports.UI.XRLabel(); - this.lblDifferenzrechnung = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblHours = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblMittelbare = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblHoursGes = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -787,9 +798,14 @@ namespace DiakonischesWerkDinslakenBeWo this.GroupHeader2.HeightF = 0F; this.GroupHeader2.Name = "GroupHeader2"; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); + // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable1, this.lblDifferenzrechnungText, this.lblDifferenzrechnung, this.xrLabel30, @@ -813,16 +829,47 @@ namespace DiakonischesWerkDinslakenBeWo this.xrLabel4, this.xrLabel3}); this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.GroupFooter1.HeightF = 421.6569F; + this.GroupFooter1.HeightF = 474.7819F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // + // lblDifferenzrechnungText + // + this.lblDifferenzrechnungText.BackColor = System.Drawing.Color.Transparent; + this.lblDifferenzrechnungText.CanShrink = true; + this.lblDifferenzrechnungText.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.lblDifferenzrechnungText.LocationFloat = new DevExpress.Utils.PointFloat(0F, 167.6248F); + this.lblDifferenzrechnungText.Name = "lblDifferenzrechnungText"; + this.lblDifferenzrechnungText.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblDifferenzrechnungText.SizeF = new System.Drawing.SizeF(478.6667F, 18.83333F); + this.lblDifferenzrechnungText.StylePriority.UseBackColor = false; + this.lblDifferenzrechnungText.StylePriority.UseFont = false; + this.lblDifferenzrechnungText.StylePriority.UseTextAlignment = false; + this.lblDifferenzrechnungText.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.lblDifferenzrechnungText.WordWrap = false; + // + // lblDifferenzrechnung + // + this.lblDifferenzrechnung.BackColor = System.Drawing.Color.Transparent; + this.lblDifferenzrechnung.CanShrink = true; + this.lblDifferenzrechnung.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.lblDifferenzrechnung.LocationFloat = new DevExpress.Utils.PointFloat(478.6667F, 167.6249F); + this.lblDifferenzrechnung.Multiline = true; + this.lblDifferenzrechnung.Name = "lblDifferenzrechnung"; + this.lblDifferenzrechnung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblDifferenzrechnung.SizeF = new System.Drawing.SizeF(246.3331F, 18.83335F); + this.lblDifferenzrechnung.StylePriority.UseBackColor = false; + this.lblDifferenzrechnung.StylePriority.UseFont = false; + this.lblDifferenzrechnung.StylePriority.UseTextAlignment = false; + this.lblDifferenzrechnung.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.lblDifferenzrechnung.WordWrap = false; + // // xrLabel30 // this.xrLabel30.CanShrink = true; this.xrLabel30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")}); - this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(0F, 398.6569F); + this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(0F, 451.7819F); this.xrLabel30.Name = "xrLabel30"; this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel30.SizeF = new System.Drawing.SizeF(724.5001F, 23F); @@ -835,7 +882,7 @@ namespace DiakonischesWerkDinslakenBeWo | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel42.CanShrink = true; this.xrLabel42.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); - this.xrLabel42.LocationFloat = new DevExpress.Utils.PointFloat(0F, 363.3236F); + this.xrLabel42.LocationFloat = new DevExpress.Utils.PointFloat(0F, 416.4486F); this.xrLabel42.Multiline = true; this.xrLabel42.Name = "xrLabel42"; this.xrLabel42.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -852,7 +899,7 @@ namespace DiakonischesWerkDinslakenBeWo this.xrLabel40.Borders = DevExpress.XtraPrinting.BorderSide.Right; this.xrLabel40.CanShrink = true; this.xrLabel40.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); - this.xrLabel40.LocationFloat = new DevExpress.Utils.PointFloat(362.4996F, 331.2333F); + this.xrLabel40.LocationFloat = new DevExpress.Utils.PointFloat(362.4996F, 384.3583F); this.xrLabel40.Multiline = true; this.xrLabel40.Name = "xrLabel40"; this.xrLabel40.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -870,7 +917,7 @@ namespace DiakonischesWerkDinslakenBeWo this.xrLabel39.Borders = DevExpress.XtraPrinting.BorderSide.Left; this.xrLabel39.CanShrink = true; this.xrLabel39.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); - this.xrLabel39.LocationFloat = new DevExpress.Utils.PointFloat(0F, 331.2333F); + this.xrLabel39.LocationFloat = new DevExpress.Utils.PointFloat(0F, 384.3583F); this.xrLabel39.Multiline = true; this.xrLabel39.Name = "xrLabel39"; this.xrLabel39.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -889,7 +936,7 @@ namespace DiakonischesWerkDinslakenBeWo this.xrLabel38.CanShrink = true; this.xrLabel38.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Underline, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrLabel38.LocationFloat = new DevExpress.Utils.PointFloat(0F, 313.3236F); + this.xrLabel38.LocationFloat = new DevExpress.Utils.PointFloat(0F, 366.4486F); this.xrLabel38.Multiline = true; this.xrLabel38.Name = "xrLabel38"; this.xrLabel38.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -906,7 +953,7 @@ namespace DiakonischesWerkDinslakenBeWo this.xrLabel36.Borders = DevExpress.XtraPrinting.BorderSide.Left; this.xrLabel36.CanShrink = true; this.xrLabel36.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); - this.xrLabel36.LocationFloat = new DevExpress.Utils.PointFloat(0F, 247.4971F); + this.xrLabel36.LocationFloat = new DevExpress.Utils.PointFloat(0F, 300.6221F); this.xrLabel36.Multiline = true; this.xrLabel36.Name = "xrLabel36"; this.xrLabel36.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -923,7 +970,7 @@ namespace DiakonischesWerkDinslakenBeWo this.xrLabel37.Borders = DevExpress.XtraPrinting.BorderSide.Right; this.xrLabel37.CanShrink = true; this.xrLabel37.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); - this.xrLabel37.LocationFloat = new DevExpress.Utils.PointFloat(238.8749F, 247.4971F); + this.xrLabel37.LocationFloat = new DevExpress.Utils.PointFloat(238.8749F, 300.6221F); this.xrLabel37.Multiline = true; this.xrLabel37.Name = "xrLabel37"; this.xrLabel37.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -941,7 +988,7 @@ namespace DiakonischesWerkDinslakenBeWo this.xrLabel35.CanShrink = true; this.xrLabel35.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline))), DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrLabel35.LocationFloat = new DevExpress.Utils.PointFloat(238.8749F, 224.4971F); + this.xrLabel35.LocationFloat = new DevExpress.Utils.PointFloat(238.8749F, 277.6221F); this.xrLabel35.Name = "xrLabel35"; this.xrLabel35.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel35.SizeF = new System.Drawing.SizeF(486.1248F, 22.99998F); @@ -958,7 +1005,7 @@ namespace DiakonischesWerkDinslakenBeWo this.xrLabel34.CanShrink = true; this.xrLabel34.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline))), DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrLabel34.LocationFloat = new DevExpress.Utils.PointFloat(0F, 224.4972F); + this.xrLabel34.LocationFloat = new DevExpress.Utils.PointFloat(0F, 277.6222F); this.xrLabel34.Name = "xrLabel34"; this.xrLabel34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel34.SizeF = new System.Drawing.SizeF(238.875F, 23F); @@ -973,7 +1020,7 @@ namespace DiakonischesWerkDinslakenBeWo this.xrLabel33.BackColor = System.Drawing.Color.Transparent; this.xrLabel33.CanShrink = true; this.xrLabel33.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel33.LocationFloat = new DevExpress.Utils.PointFloat(0F, 205.6637F); + this.xrLabel33.LocationFloat = new DevExpress.Utils.PointFloat(0F, 258.7887F); this.xrLabel33.Name = "xrLabel33"; this.xrLabel33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel33.SizeF = new System.Drawing.SizeF(478.6667F, 18.83333F); @@ -989,7 +1036,7 @@ namespace DiakonischesWerkDinslakenBeWo this.xrLabel32.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Claim", "{0:c}")}); this.xrLabel32.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel32.LocationFloat = new DevExpress.Utils.PointFloat(478.6666F, 155.6637F); + this.xrLabel32.LocationFloat = new DevExpress.Utils.PointFloat(478.6666F, 208.7887F); this.xrLabel32.Multiline = true; this.xrLabel32.Name = "xrLabel32"; this.xrLabel32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -1005,7 +1052,7 @@ namespace DiakonischesWerkDinslakenBeWo this.lblRestforderungGutschrift.BackColor = System.Drawing.Color.Transparent; this.lblRestforderungGutschrift.CanShrink = true; this.lblRestforderungGutschrift.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.lblRestforderungGutschrift.LocationFloat = new DevExpress.Utils.PointFloat(0F, 155.6637F); + this.lblRestforderungGutschrift.LocationFloat = new DevExpress.Utils.PointFloat(0F, 208.7887F); this.lblRestforderungGutschrift.Name = "lblRestforderungGutschrift"; this.lblRestforderungGutschrift.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.lblRestforderungGutschrift.SizeF = new System.Drawing.SizeF(213.0417F, 18.83333F); @@ -1021,7 +1068,7 @@ namespace DiakonischesWerkDinslakenBeWo this.xrLabel29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountAdvancedPayments", "{0:c}")}); this.xrLabel29.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(478.6666F, 95.66656F); + this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(478.6666F, 148.7916F); this.xrLabel29.Multiline = true; this.xrLabel29.Name = "xrLabel29"; this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -1037,7 +1084,7 @@ namespace DiakonischesWerkDinslakenBeWo this.xrLabel28.BackColor = System.Drawing.Color.Transparent; this.xrLabel28.CanShrink = true; this.xrLabel28.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(0F, 95.66656F); + this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(0F, 148.7916F); this.xrLabel28.Name = "xrLabel28"; this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel28.SizeF = new System.Drawing.SizeF(478.6667F, 18.83333F); @@ -1056,7 +1103,7 @@ namespace DiakonischesWerkDinslakenBeWo new DevExpress.XtraReports.UI.XRBinding("Text", null, "AnspruchMinusEigenbeteiligung", "{0:c}")}); this.xrLabel27.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(478.6666F, 64.33325F); + this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(478.6666F, 117.4583F); this.xrLabel27.Multiline = true; this.xrLabel27.Name = "xrLabel27"; this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -1072,7 +1119,7 @@ namespace DiakonischesWerkDinslakenBeWo this.xrLabel24.BackColor = System.Drawing.Color.Transparent; this.xrLabel24.CanShrink = true; this.xrLabel24.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(0F, 64.33325F); + this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(0F, 117.4583F); this.xrLabel24.Name = "xrLabel24"; this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel24.SizeF = new System.Drawing.SizeF(478.6667F, 18.83333F); @@ -1088,7 +1135,7 @@ namespace DiakonischesWerkDinslakenBeWo this.xrLabel6.BackColor = System.Drawing.Color.Transparent; this.xrLabel6.CanShrink = true; this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(478.6667F, 28.83333F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(478.6667F, 81.95833F); this.xrLabel6.Multiline = true; this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -1105,7 +1152,7 @@ namespace DiakonischesWerkDinslakenBeWo this.xrLabel5.BackColor = System.Drawing.Color.Transparent; this.xrLabel5.CanShrink = true; this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 28.83326F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 81.95826F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel5.SizeF = new System.Drawing.SizeF(478.6667F, 18.83333F); @@ -1123,7 +1170,7 @@ namespace DiakonischesWerkDinslakenBeWo this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountBillableTotal", "{0:c}")}); this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(478.6667F, 9.999974F); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(478.6667F, 63.12497F); this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -1140,7 +1187,7 @@ namespace DiakonischesWerkDinslakenBeWo this.xrLabel3.BackColor = System.Drawing.Color.Transparent; this.xrLabel3.CanShrink = true; this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 63.12497F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel3.SizeF = new System.Drawing.SizeF(478.6667F, 18.83333F); @@ -1155,40 +1202,143 @@ namespace DiakonischesWerkDinslakenBeWo this.AnspruchMinusEigenbeteiligung.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.AnspruchMinusEigenbeteiligung.Name = "AnspruchMinusEigenbeteiligung"; // - // bindingSource1 + // xrTable1 // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); + this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow1, + this.xrTableRow2, + this.xrTableRow3}); + this.xrTable1.SizeF = new System.Drawing.SizeF(724.5001F, 51F); + this.xrTable1.StylePriority.UseBorderColor = false; // - // lblDifferenzrechnungText + // xrTableRow1 // - this.lblDifferenzrechnungText.BackColor = System.Drawing.Color.Transparent; - this.lblDifferenzrechnungText.CanShrink = true; - this.lblDifferenzrechnungText.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblDifferenzrechnungText.LocationFloat = new DevExpress.Utils.PointFloat(0F, 114.4998F); - this.lblDifferenzrechnungText.Name = "lblDifferenzrechnungText"; - this.lblDifferenzrechnungText.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblDifferenzrechnungText.SizeF = new System.Drawing.SizeF(478.6667F, 18.83333F); - this.lblDifferenzrechnungText.StylePriority.UseBackColor = false; - this.lblDifferenzrechnungText.StylePriority.UseFont = false; - this.lblDifferenzrechnungText.StylePriority.UseTextAlignment = false; - this.lblDifferenzrechnungText.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.lblDifferenzrechnungText.WordWrap = false; + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell1, + this.lblHours}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 0.085D; // - // lblDifferenzrechnung + // xrTableCell1 // - this.lblDifferenzrechnung.BackColor = System.Drawing.Color.Transparent; - this.lblDifferenzrechnung.CanShrink = true; - this.lblDifferenzrechnung.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblDifferenzrechnung.LocationFloat = new DevExpress.Utils.PointFloat(478.6667F, 114.4999F); - this.lblDifferenzrechnung.Multiline = true; - this.lblDifferenzrechnung.Name = "lblDifferenzrechnung"; - this.lblDifferenzrechnung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblDifferenzrechnung.SizeF = new System.Drawing.SizeF(246.3331F, 18.83335F); - this.lblDifferenzrechnung.StylePriority.UseBackColor = false; - this.lblDifferenzrechnung.StylePriority.UseFont = false; - this.lblDifferenzrechnung.StylePriority.UseTextAlignment = false; - this.lblDifferenzrechnung.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.lblDifferenzrechnung.WordWrap = false; + this.xrTableCell1.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell1.CanShrink = true; + this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell1.StylePriority.UseBorderColor = false; + this.xrTableCell1.StylePriority.UseBorders = false; + this.xrTableCell1.StylePriority.UseFont = false; + this.xrTableCell1.StylePriority.UsePadding = false; + this.xrTableCell1.Text = "Im Abrechnungszeitraum geleistete direkte FLS"; + this.xrTableCell1.Weight = 0.78314100999098546D; + // + // lblHours + // + this.lblHours.BorderColor = System.Drawing.SystemColors.ControlLight; + this.lblHours.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.lblHours.CanShrink = true; + this.lblHours.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.lblHours.Name = "lblHours"; + this.lblHours.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblHours.StylePriority.UseBorderColor = false; + this.lblHours.StylePriority.UseBorders = false; + this.lblHours.StylePriority.UseFont = false; + this.lblHours.StylePriority.UsePadding = false; + this.lblHours.StylePriority.UseTextAlignment = false; + this.lblHours.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.lblHours.Weight = 0.21616984089967392D; + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3, + this.lblMittelbare}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Weight = 0.085D; + // + // xrTableCell3 + // + this.xrTableCell3.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrTableCell3.Multiline = true; + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell3.StylePriority.UseBorderColor = false; + this.xrTableCell3.StylePriority.UseBorders = false; + this.xrTableCell3.StylePriority.UseFont = false; + this.xrTableCell3.StylePriority.UsePadding = false; + this.xrTableCell3.Text = "Im Abrechnungszeitraum zurechenbare mittelbare FLS"; + this.xrTableCell3.Weight = 0.78314100999098546D; + // + // lblMittelbare + // + this.lblMittelbare.BorderColor = System.Drawing.SystemColors.ControlLight; + this.lblMittelbare.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.lblMittelbare.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.lblMittelbare.Multiline = true; + this.lblMittelbare.Name = "lblMittelbare"; + this.lblMittelbare.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblMittelbare.StylePriority.UseBorderColor = false; + this.lblMittelbare.StylePriority.UseBorders = false; + this.lblMittelbare.StylePriority.UseFont = false; + this.lblMittelbare.StylePriority.UsePadding = false; + this.lblMittelbare.StylePriority.UseTextAlignment = false; + this.lblMittelbare.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.lblMittelbare.Weight = 0.21616984089967392D; + // + // xrTableRow3 + // + this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell5, + this.lblHoursGes}); + this.xrTableRow3.Name = "xrTableRow3"; + this.xrTableRow3.Weight = 0.085D; + // + // xrTableCell5 + // + this.xrTableCell5.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrTableCell5.Multiline = true; + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell5.StylePriority.UseBorderColor = false; + this.xrTableCell5.StylePriority.UseBorders = false; + this.xrTableCell5.StylePriority.UseFont = false; + this.xrTableCell5.StylePriority.UsePadding = false; + this.xrTableCell5.Text = "Summe FLS im Abrechnungszeitraum"; + this.xrTableCell5.Weight = 0.78314100999098546D; + // + // lblHoursGes + // + this.lblHoursGes.BorderColor = System.Drawing.SystemColors.ControlLight; + this.lblHoursGes.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.lblHoursGes.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.lblHoursGes.Multiline = true; + this.lblHoursGes.Name = "lblHoursGes"; + this.lblHoursGes.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblHoursGes.StylePriority.UseBorderColor = false; + this.lblHoursGes.StylePriority.UseBorders = false; + this.lblHoursGes.StylePriority.UseFont = false; + this.lblHoursGes.StylePriority.UsePadding = false; + this.lblHoursGes.StylePriority.UseTextAlignment = false; + this.lblHoursGes.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.lblHoursGes.Weight = 0.21616984089967392D; // // Spitzabrechnung // @@ -1217,6 +1367,7 @@ namespace DiakonischesWerkDinslakenBeWo ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1296,5 +1447,15 @@ namespace DiakonischesWerkDinslakenBeWo private DevExpress.XtraReports.UI.XRLabel xrLabel45; private DevExpress.XtraReports.UI.XRLabel lblDifferenzrechnungText; private DevExpress.XtraReports.UI.XRLabel lblDifferenzrechnung; + private DevExpress.XtraReports.UI.XRTable xrTable1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.XRTableCell lblHours; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.XRTableCell lblMittelbare; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRTableCell lblHoursGes; } } diff --git a/ReportImp/DiakonischesWerkDinslakenBeWo/SettlementReport2.cs b/ReportImp/DiakonischesWerkDinslakenBeWo/SettlementReport2.cs index a74aa9f82..ddcf5fd25 100644 --- a/ReportImp/DiakonischesWerkDinslakenBeWo/SettlementReport2.cs +++ b/ReportImp/DiakonischesWerkDinslakenBeWo/SettlementReport2.cs @@ -15,14 +15,20 @@ namespace DiakonischesWerkDinslakenBeWo { decimal rateFactor = 1; + decimal hours = 0; + decimal sumHours = 0; + decimal sumMittelbare = 0; + decimal sumHoursGesamt = 0; + foreach (var ii in pRO.InvoiceItems) { + hours = ii.UnitCount ?? 0; + sumHours += hours; if (ii.RateFactor.HasValue) { rateFactor = (100 + ii.RateFactor.Value) / 100; } - if (!pRO.FehlkontakteString.IsNullOrEmpty() && ii.RateFactor == 0) { Zwischensumme.Visible = true; @@ -32,8 +38,16 @@ namespace DiakonischesWerkDinslakenBeWo else if (ii.ItemDescription.IsNullOrEmpty()) { ii.ItemDescription = "Fachleistungsstunden"; + if (ii.RateFactor.HasValue) + { + sumMittelbare += (hours * ii.RateFactor.Value) / 100m; + } } } + sumHoursGesamt = sumHours + sumMittelbare; + lblHours.Text = sumHours.ToString("n2"); + lblMittelbare.Text = sumMittelbare.ToString("n2"); + lblHoursGes.Text = sumHoursGesamt.ToString("n2"); pRO.RateFactor = (double)rateFactor; if (pRO.AmountBillableTotal - (pRO.Claim + pRO.AmountAdvancedPayments) != 0) @@ -63,6 +77,5 @@ namespace DiakonischesWerkDinslakenBeWo this.bindingSource1.DataSource = pRO; } - } }