From a9537cacd20b5b00ba8a8a37bd40c3a7089dce2f Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Mon, 3 Jul 2023 11:33:01 +0200 Subject: [PATCH] =?UTF-8?q?MH:=20Bl=C3=B6meling=20Teckhaus=20Fehlkontakte?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Invoicing/SettlementInvoiceCreation.cs | 8 +- .../ServicesOverviewReport.Designer.cs | 161 ++++--- .../ServicesOverviewReport.cs | 4 + .../ServicesOverviewReportALS.Designer.cs | 35 +- .../ServicesOverviewReportALS.cs | 3 + .../SettlementReport2.Designer.cs | 412 ++++++++++++------ .../SettlementReport2.cs | 18 + 7 files changed, 413 insertions(+), 228 deletions(-) diff --git a/ReportImp/BloemelingUndTeckhaus/Invoicing/SettlementInvoiceCreation.cs b/ReportImp/BloemelingUndTeckhaus/Invoicing/SettlementInvoiceCreation.cs index cf6c0e9a6..6a383e3d4 100644 --- a/ReportImp/BloemelingUndTeckhaus/Invoicing/SettlementInvoiceCreation.cs +++ b/ReportImp/BloemelingUndTeckhaus/Invoicing/SettlementInvoiceCreation.cs @@ -16,10 +16,10 @@ namespace BloemelingUndTeckhaus.Invoicing public class BuTSettlementInvoiceCreation : SettlementInvoiceCreation { - public override bool CanCreateInvoiceTheOldWay(Settlement2DC si, CostBearer2SupportConcept c2s) - { - return true; - } + //public override bool CanCreateInvoiceTheOldWay(Settlement2DC si, CostBearer2SupportConcept c2s) + //{ + // return true; + //} public override bool IsServiceRecordBillable(ServiceRecord iRecord) { diff --git a/ReportImp/BloemelingUndTeckhaus/ServicesOverviewReport.Designer.cs b/ReportImp/BloemelingUndTeckhaus/ServicesOverviewReport.Designer.cs index ff3cc674c..a57edc9b4 100644 --- a/ReportImp/BloemelingUndTeckhaus/ServicesOverviewReport.Designer.cs +++ b/ReportImp/BloemelingUndTeckhaus/ServicesOverviewReport.Designer.cs @@ -56,7 +56,7 @@ namespace BeWo.BloemelingUndTeckhaus this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); this.ruleRowVisible = new DevExpress.XtraReports.UI.FormattingRule(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel(); @@ -109,8 +109,6 @@ namespace BeWo.BloemelingUndTeckhaus this.fieldMinutesAsHours = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldToday = new DevExpress.XtraReports.UI.CalculatedField(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.xrSubreport1 = new DevExpress.XtraReports.UI.XRSubreport(); this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText(); @@ -137,14 +135,18 @@ namespace BeWo.BloemelingUndTeckhaus this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); - this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrSubreport1 = new DevExpress.XtraReports.UI.XRSubreport(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -200,7 +202,7 @@ namespace BeWo.BloemelingUndTeckhaus this.xrTableCell3.StylePriority.UseTextAlignment = false; this.xrTableCell3.Text = "Datum"; this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell3.Weight = 0.2917665170442208D; + this.xrTableCell3.Weight = 0.377737048477923D; // // xrTableCell5 // @@ -209,7 +211,7 @@ namespace BeWo.BloemelingUndTeckhaus this.xrTableCell5.SnapLineMargin = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F); this.xrTableCell5.StylePriority.UseBorders = false; this.xrTableCell5.Text = "Uhrzeit"; - this.xrTableCell5.Weight = 0.58353304263294148D; + this.xrTableCell5.Weight = 0.48627753476803182D; // // xrTableCell9 // @@ -223,7 +225,7 @@ namespace BeWo.BloemelingUndTeckhaus this.xrTableCell9.StylePriority.UseTextAlignment = false; this.xrTableCell9.Text = "Minuten"; this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell9.Weight = 0.29176652536273417D; + this.xrTableCell9.Weight = 0.30305150179394169D; // // xrTableCell12 // @@ -266,7 +268,7 @@ namespace BeWo.BloemelingUndTeckhaus | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell7.Name = "xrTableCell7"; this.xrTableCell7.StylePriority.UseBorders = false; - this.xrTableCell7.Weight = 0.29176652629174737D; + this.xrTableCell7.Weight = 0.37773705772544958D; // // xrTableCell10 // @@ -274,7 +276,7 @@ namespace BeWo.BloemelingUndTeckhaus this.xrTableCell10.Name = "xrTableCell10"; this.xrTableCell10.StylePriority.UseBorders = false; this.xrTableCell10.Text = "von"; - this.xrTableCell10.Weight = 0.29176651841987827D; + this.xrTableCell10.Weight = 0.24313876448742344D; // // xrTableCell19 // @@ -282,14 +284,14 @@ namespace BeWo.BloemelingUndTeckhaus this.xrTableCell19.Name = "xrTableCell19"; this.xrTableCell19.StylePriority.UseBorders = false; this.xrTableCell19.Text = "bis"; - this.xrTableCell19.Weight = 0.29176652266194014D; + this.xrTableCell19.Weight = 0.24313888002958126D; // // xrTableCell11 // this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell11.Name = "xrTableCell11"; this.xrTableCell11.StylePriority.UseBorders = false; - this.xrTableCell11.Weight = 0.29176653621634663D; + this.xrTableCell11.Weight = 0.30305140134745817D; // // xrTableCell14 // @@ -359,7 +361,7 @@ namespace BeWo.BloemelingUndTeckhaus // xrTableCell13 // this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDate", "{0:dd.MM.yyyy}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDateString", "{0:dd.MM.yyyy}")}); this.xrTableCell13.Name = "xrTableCell13"; this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); this.xrTableCell13.StylePriority.UseFont = false; @@ -367,7 +369,7 @@ namespace BeWo.BloemelingUndTeckhaus this.xrTableCell13.StylePriority.UseTextAlignment = false; this.xrTableCell13.Text = "xrTableCell13"; this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell13.Weight = 0.15106751220969483D; + this.xrTableCell13.Weight = 0.19558034365503882D; // // xrTableCell20 // @@ -379,7 +381,7 @@ namespace BeWo.BloemelingUndTeckhaus this.xrTableCell20.StylePriority.UseTextAlignment = false; this.xrTableCell20.Text = "xrTableCell20"; this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell20.Weight = 0.15106751833204637D; + this.xrTableCell20.Weight = 0.12588959045400361D; // // xrTableCell6 // @@ -391,7 +393,7 @@ namespace BeWo.BloemelingUndTeckhaus this.xrTableCell6.StylePriority.UseTextAlignment = false; this.xrTableCell6.Text = "xrTableCell6"; this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell6.Weight = 0.15106751685625097D; + this.xrTableCell6.Weight = 0.12588960818743541D; // // xrTableCell16 // @@ -405,7 +407,7 @@ namespace BeWo.BloemelingUndTeckhaus this.xrTableCell16.StylePriority.UseTextAlignment = false; this.xrTableCell16.Text = "xrTableCell16"; this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell16.Weight = 0.1510675182013051D; + this.xrTableCell16.Weight = 0.15691052330281943D; // // xrTableCell17 // @@ -441,9 +443,14 @@ namespace BeWo.BloemelingUndTeckhaus this.ruleRowVisible.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; this.ruleRowVisible.Name = "ruleRowVisible"; // - // bindingSource1 + // GroupHeader1 // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTableServiceRecords1}); + this.GroupHeader1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.GroupHeader1.HeightF = 36.00006F; + this.GroupHeader1.Name = "GroupHeader1"; + this.GroupHeader1.StylePriority.UseFont = false; // // formattingRuleStartDate // @@ -817,14 +824,14 @@ namespace BeWo.BloemelingUndTeckhaus this.xrTableCell21.StylePriority.UseTextAlignment = false; this.xrTableCell21.Text = "Gesamt/Min."; this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell21.Weight = 0.1510675122096948D; + this.xrTableCell21.Weight = 0.19558034365503879D; // // xrTableCell23 // this.xrTableCell23.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell23.Name = "xrTableCell23"; this.xrTableCell23.StylePriority.UseBorders = false; - this.xrTableCell23.Weight = 0.15106751833204635D; + this.xrTableCell23.Weight = 0.12588959045400358D; // // xrTableCell24 // @@ -833,7 +840,7 @@ namespace BeWo.BloemelingUndTeckhaus this.xrTableCell24.StylePriority.UseBorders = false; this.xrTableCell24.StylePriority.UseTextAlignment = false; this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell24.Weight = 0.151067516856251D; + this.xrTableCell24.Weight = 0.12588960818743544D; // // cellMinuten // @@ -846,7 +853,7 @@ namespace BeWo.BloemelingUndTeckhaus this.cellMinuten.StylePriority.UseTextAlignment = false; this.cellMinuten.Text = "cellMinuten"; this.cellMinuten.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.cellMinuten.Weight = 0.15106751820130504D; + this.cellMinuten.Weight = 0.15691052330281938D; // // cellStunden // @@ -865,7 +872,7 @@ namespace BeWo.BloemelingUndTeckhaus // lblUnterschriftKlient // this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(307.575F, 266.1251F); + this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(307.575F, 299.4584F); this.lblUnterschriftKlient.Name = "lblUnterschriftKlient"; this.lblUnterschriftKlient.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.lblUnterschriftKlient.SizeF = new System.Drawing.SizeF(232.4248F, 17.99997F); @@ -876,11 +883,11 @@ namespace BeWo.BloemelingUndTeckhaus // xrLabel8 // this.xrLabel8.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(34.58328F, 55.41668F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(34.58328F, 75.41669F); this.xrLabel8.Multiline = true; this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(325.4167F, 20F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(320.7754F, 20F); this.xrLabel8.StylePriority.UseFont = false; this.xrLabel8.Text = "Summe der abzurechnenden FLS (Summe x 1,2):"; // @@ -889,11 +896,11 @@ namespace BeWo.BloemelingUndTeckhaus this.lblSummeMinutenFaktor.Borders = DevExpress.XtraPrinting.BorderSide.None; this.lblSummeMinutenFaktor.BorderWidth = 2F; this.lblSummeMinutenFaktor.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold); - this.lblSummeMinutenFaktor.LocationFloat = new DevExpress.Utils.PointFloat(360.583F, 55.41833F); + this.lblSummeMinutenFaktor.LocationFloat = new DevExpress.Utils.PointFloat(355.3587F, 75.41834F); this.lblSummeMinutenFaktor.Multiline = true; this.lblSummeMinutenFaktor.Name = "lblSummeMinutenFaktor"; this.lblSummeMinutenFaktor.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); - this.lblSummeMinutenFaktor.SizeF = new System.Drawing.SizeF(120.0002F, 19.99833F); + this.lblSummeMinutenFaktor.SizeF = new System.Drawing.SizeF(124.6413F, 19.99833F); this.lblSummeMinutenFaktor.StylePriority.UseBorders = false; this.lblSummeMinutenFaktor.StylePriority.UseBorderWidth = false; this.lblSummeMinutenFaktor.StylePriority.UseFont = false; @@ -904,7 +911,7 @@ namespace BeWo.BloemelingUndTeckhaus // lblUnterschriftMitarbeiter // this.lblUnterschriftMitarbeiter.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(0F, 266.1251F); + this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(0F, 299.4584F); this.lblUnterschriftMitarbeiter.Name = "lblUnterschriftMitarbeiter"; this.lblUnterschriftMitarbeiter.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.lblUnterschriftMitarbeiter.SizeF = new System.Drawing.SizeF(203.3905F, 17.99997F); @@ -919,7 +926,7 @@ namespace BeWo.BloemelingUndTeckhaus this.xrLabel3.Multiline = true; this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(325.4167F, 20F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(320.7754F, 20F); this.xrLabel3.StylePriority.UseFont = false; this.xrLabel3.Text = "Summe geleistete unmittelbare FLS:"; // @@ -928,10 +935,10 @@ namespace BeWo.BloemelingUndTeckhaus this.lblSummeMinuten.Borders = DevExpress.XtraPrinting.BorderSide.None; this.lblSummeMinuten.BorderWidth = 2F; this.lblSummeMinuten.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold); - this.lblSummeMinuten.LocationFloat = new DevExpress.Utils.PointFloat(360.583F, 35.41667F); + this.lblSummeMinuten.LocationFloat = new DevExpress.Utils.PointFloat(355.3587F, 35.41667F); this.lblSummeMinuten.Name = "lblSummeMinuten"; this.lblSummeMinuten.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); - this.lblSummeMinuten.SizeF = new System.Drawing.SizeF(120.0002F, 20F); + this.lblSummeMinuten.SizeF = new System.Drawing.SizeF(124.6414F, 20F); this.lblSummeMinuten.StylePriority.UseBorders = false; this.lblSummeMinuten.StylePriority.UseBorderWidth = false; this.lblSummeMinuten.StylePriority.UseFont = false; @@ -990,6 +997,8 @@ namespace BeWo.BloemelingUndTeckhaus // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel4, + this.xrLabel2, this.xrLabel15, this.xrRichText1, this.xrRichText2, @@ -1004,31 +1013,15 @@ namespace BeWo.BloemelingUndTeckhaus this.lblUnterschriftKlient, this.lblSummeMinuten}); this.GroupFooter1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.GroupFooter1.HeightF = 294.1251F; + this.GroupFooter1.HeightF = 327.4584F; this.GroupFooter1.KeepTogether = true; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // - // GroupFooter2 - // - this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrSubreport1}); - this.GroupFooter2.HeightF = 23.95833F; - this.GroupFooter2.Level = 1; - this.GroupFooter2.Name = "GroupFooter2"; - this.GroupFooter2.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBand; - // - // xrSubreport1 - // - this.xrSubreport1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrSubreport1.Name = "xrSubreport1"; - this.xrSubreport1.ReportSource = new BeWo.BloemelingUndTeckhaus.StundenzettelAssistenz(); - this.xrSubreport1.SizeF = new System.Drawing.SizeF(668.112F, 23.95833F); - // // xrLabel15 // this.xrLabel15.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Underline); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(1.185354F, 94.42361F); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(1.185354F, 127.7569F); this.xrLabel15.Multiline = true; this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -1044,7 +1037,7 @@ namespace BeWo.BloemelingUndTeckhaus // xrRichText1 // this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F); - this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(464.1947F, 94.42361F); + this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(464.1947F, 127.7569F); this.xrRichText1.Name = "xrRichText1"; this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); this.xrRichText1.SizeF = new System.Drawing.SizeF(210.8054F, 50F); @@ -1053,7 +1046,7 @@ namespace BeWo.BloemelingUndTeckhaus // xrRichText2 // this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F); - this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(464.1947F, 144.4236F); + this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(464.1947F, 177.7569F); this.xrRichText2.Name = "xrRichText2"; this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); this.xrRichText2.SizeF = new System.Drawing.SizeF(210.8053F, 68.05556F); @@ -1065,7 +1058,7 @@ namespace BeWo.BloemelingUndTeckhaus | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblHatGruppen.Font = new System.Drawing.Font("Arial", 10F); - this.lblHatGruppen.LocationFloat = new DevExpress.Utils.PointFloat(424.8611F, 94.42361F); + this.lblHatGruppen.LocationFloat = new DevExpress.Utils.PointFloat(424.8611F, 127.7569F); this.lblHatGruppen.Name = "lblHatGruppen"; this.lblHatGruppen.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.lblHatGruppen.SizeF = new System.Drawing.SizeF(25F, 25F); @@ -1082,7 +1075,7 @@ namespace BeWo.BloemelingUndTeckhaus | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblHatAbwesenheiten.Font = new System.Drawing.Font("Arial", 10F); - this.lblHatAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(424.8611F, 144.4236F); + this.lblHatAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(424.8611F, 177.7569F); this.lblHatAbwesenheiten.Name = "lblHatAbwesenheiten"; this.lblHatAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.lblHatAbwesenheiten.SizeF = new System.Drawing.SizeF(25F, 25F); @@ -1100,7 +1093,7 @@ namespace BeWo.BloemelingUndTeckhaus | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableAbwesenheiten.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(171.1853F, 94.42361F); + this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(171.1853F, 127.7569F); 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[] { @@ -1305,14 +1298,54 @@ namespace BeWo.BloemelingUndTeckhaus this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell35.Weight = 0.075757568269402914D; // - // GroupHeader1 + // GroupFooter2 // - this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTableServiceRecords1}); - this.GroupHeader1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); - this.GroupHeader1.HeightF = 36.00006F; - this.GroupHeader1.Name = "GroupHeader1"; - this.GroupHeader1.StylePriority.UseFont = false; + this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrSubreport1}); + this.GroupFooter2.HeightF = 23.95833F; + this.GroupFooter2.Level = 1; + this.GroupFooter2.Name = "GroupFooter2"; + this.GroupFooter2.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBand; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // + // xrLabel2 + // + this.xrLabel2.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(34.58328F, 55.41668F); + this.xrLabel2.Multiline = true; + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(320.7754F, 20F); + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.Text = "Davon Fehlkontakte: "; + // + // xrLabel4 + // + this.xrLabel4.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel4.BorderWidth = 2F; + this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMFehlkontakte", "{0:0.##}")}); + this.xrLabel4.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(355.3587F, 55.41668F); + this.xrLabel4.Name = "xrLabel4"; + this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(124.6414F, 20F); + this.xrLabel4.StylePriority.UseBorders = false; + this.xrLabel4.StylePriority.UseBorderWidth = false; + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.StylePriority.UsePadding = false; + this.xrLabel4.StylePriority.UseTextAlignment = false; + this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + // + // xrSubreport1 + // + this.xrSubreport1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrSubreport1.Name = "xrSubreport1"; + this.xrSubreport1.ReportSource = new BeWo.BloemelingUndTeckhaus.StundenzettelAssistenz(); + this.xrSubreport1.SizeF = new System.Drawing.SizeF(668.112F, 23.95833F); // // Stundenzettel // @@ -1348,11 +1381,11 @@ namespace BeWo.BloemelingUndTeckhaus this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1467,5 +1500,7 @@ namespace BeWo.BloemelingUndTeckhaus private DevExpress.XtraReports.UI.XRTableCell xrTableCell34; private DevExpress.XtraReports.UI.XRTableCell xrTableCell35; private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1; + private DevExpress.XtraReports.UI.XRLabel xrLabel2; + private DevExpress.XtraReports.UI.XRLabel xrLabel4; } } diff --git a/ReportImp/BloemelingUndTeckhaus/ServicesOverviewReport.cs b/ReportImp/BloemelingUndTeckhaus/ServicesOverviewReport.cs index b1085696e..a791cce25 100644 --- a/ReportImp/BloemelingUndTeckhaus/ServicesOverviewReport.cs +++ b/ReportImp/BloemelingUndTeckhaus/ServicesOverviewReport.cs @@ -31,6 +31,9 @@ namespace BeWo.BloemelingUndTeckhaus { if (s.IsBillable) { + if (s.ServiceDescription.ToLower().Contains("fehlkontakt")) + s.StartDateString += " (Fehlkontakt)"; + if (s.IsGroup) { //sd.Notice5 = String.Format("{0} Teilnehmer", sd.CustomerCount); @@ -92,6 +95,7 @@ namespace BeWo.BloemelingUndTeckhaus lblBewilligteStunden.Text = string.Format("{0:0.##}", approved); + pRO.TotalFLMFehlkontakte /= 60; bindingSource1.DataSource = pRO; } diff --git a/ReportImp/BloemelingUndTeckhaus/ServicesOverviewReportALS.Designer.cs b/ReportImp/BloemelingUndTeckhaus/ServicesOverviewReportALS.Designer.cs index 8cd5ea232..4efb9187a 100644 --- a/ReportImp/BloemelingUndTeckhaus/ServicesOverviewReportALS.Designer.cs +++ b/ReportImp/BloemelingUndTeckhaus/ServicesOverviewReportALS.Designer.cs @@ -52,7 +52,6 @@ namespace BeWo.BloemelingUndTeckhaus this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.ruleRowVisible = new DevExpress.XtraReports.UI.FormattingRule(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel(); @@ -103,10 +102,11 @@ namespace BeWo.BloemelingUndTeckhaus this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldMinutesAsHours = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldToday = new DevExpress.XtraReports.UI.CalculatedField(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -304,7 +304,7 @@ namespace BeWo.BloemelingUndTeckhaus // xrTableCell13 // this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDate", "{0:dd.MM.yyyy}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDateString", "{0:dd.MM.yyyy}")}); this.xrTableCell13.Name = "xrTableCell13"; this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); this.xrTableCell13.StylePriority.UseFont = false; @@ -372,23 +372,13 @@ namespace BeWo.BloemelingUndTeckhaus this.ruleRowVisible.Condition = "Not Contains([ServiceCategory], \'Assistenz\') And Not Contains([ServiceDescription" + "], \'Assistenz\')"; this.ruleRowVisible.DataMember = "Services"; - // - // - // this.ruleRowVisible.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; this.ruleRowVisible.Name = "ruleRowVisible"; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; this.formattingRuleStartDate.DataMember = "ServicesDouble"; - // - // - // this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; this.formattingRuleStartDate.Name = "formattingRuleStartDate"; // @@ -689,9 +679,6 @@ namespace BeWo.BloemelingUndTeckhaus // this.formattingRuleServiceDesc.Condition = "[StartDate2] < [StartDate]"; this.formattingRuleServiceDesc.DataMember = "ServicesDouble"; - // - // - // this.formattingRuleServiceDesc.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; this.formattingRuleServiceDesc.Name = "formattingRuleServiceDesc"; // @@ -699,9 +686,6 @@ namespace BeWo.BloemelingUndTeckhaus // this.formattingRuleCostBearer.Condition = "[StartDate2] < [StartDate]"; this.formattingRuleCostBearer.DataMember = "ServicesDouble"; - // - // - // this.formattingRuleCostBearer.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; this.formattingRuleCostBearer.Name = "formattingRuleCostBearer"; // @@ -709,9 +693,6 @@ namespace BeWo.BloemelingUndTeckhaus // this.formattingRuleEmployeeName.Condition = "[StartDate2] < [StartDate]"; this.formattingRuleEmployeeName.DataMember = "ServicesDouble"; - // - // - // this.formattingRuleEmployeeName.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; this.formattingRuleEmployeeName.Name = "formattingRuleEmployeeName"; // @@ -859,7 +840,7 @@ namespace BeWo.BloemelingUndTeckhaus // lblSummeMinuten // this.lblSummeMinuten.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.lblSummeMinuten.BorderWidth = 2; + this.lblSummeMinuten.BorderWidth = 2F; this.lblSummeMinuten.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold); this.lblSummeMinuten.LocationFloat = new DevExpress.Utils.PointFloat(359.9998F, 65.625F); this.lblSummeMinuten.Name = "lblSummeMinuten"; @@ -920,6 +901,10 @@ namespace BeWo.BloemelingUndTeckhaus // this.fieldToday.Name = "fieldToday"; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // // StundenzettelAssistenz // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -950,11 +935,11 @@ namespace BeWo.BloemelingUndTeckhaus this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; this.SnapGridSize = 9F; - this.Version = "13.1"; + this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } diff --git a/ReportImp/BloemelingUndTeckhaus/ServicesOverviewReportALS.cs b/ReportImp/BloemelingUndTeckhaus/ServicesOverviewReportALS.cs index 9a7645a98..67bd08e18 100644 --- a/ReportImp/BloemelingUndTeckhaus/ServicesOverviewReportALS.cs +++ b/ReportImp/BloemelingUndTeckhaus/ServicesOverviewReportALS.cs @@ -26,6 +26,9 @@ namespace BeWo.BloemelingUndTeckhaus foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services) { + if (s.ServiceDescription.ToLower().Contains("fehlkontakt")) + s.StartDateString += " (Fehlkontakt)"; + if (s.ServiceCategory.Contains("Assistenz")) { minTotal += s.Minutes; diff --git a/ReportImp/BloemelingUndTeckhaus/SettlementReport2.Designer.cs b/ReportImp/BloemelingUndTeckhaus/SettlementReport2.Designer.cs index 53d8bd390..2ce41cecb 100644 --- a/ReportImp/BloemelingUndTeckhaus/SettlementReport2.Designer.cs +++ b/ReportImp/BloemelingUndTeckhaus/SettlementReport2.Designer.cs @@ -31,6 +31,7 @@ namespace BeWo.BloemelingUndTeckhaus { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung)); + DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); @@ -51,23 +52,13 @@ namespace BeWo.BloemelingUndTeckhaus this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow20 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow21 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow22 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow24 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.lblNotice = new DevExpress.XtraReports.UI.XRLabel(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldApprovedFLSWithFactor = new DevExpress.XtraReports.UI.CalculatedField(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); @@ -75,7 +66,6 @@ namespace BeWo.BloemelingUndTeckhaus this.xrTableRow33 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell52 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell53 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow30 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -96,12 +86,35 @@ namespace BeWo.BloemelingUndTeckhaus this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + 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(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow20 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow21 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow22 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow24 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -145,11 +158,11 @@ namespace BeWo.BloemelingUndTeckhaus // xrTable1 // this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(3.000005F, 398.3332F); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 398.3332F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.rowErbrachteLeistung}); - this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 17F); + this.xrTable1.SizeF = new System.Drawing.SizeF(653F, 17F); this.xrTable1.StylePriority.UseBorderColor = false; // // rowErbrachteLeistung @@ -302,8 +315,8 @@ namespace BeWo.BloemelingUndTeckhaus // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel10, this.xrTable3, + this.xrLabel10, this.xrLabel12, this.xrLabel11, this.lblNotice}); @@ -315,104 +328,13 @@ namespace BeWo.BloemelingUndTeckhaus // // xrLabel10 // - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 117F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 137.8333F); this.xrLabel10.Name = "xrLabel10"; this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel10.SizeF = new System.Drawing.SizeF(175F, 17F); this.xrLabel10.StylePriority.UseFont = false; this.xrLabel10.Text = "Mit freundlichen Grüßen"; // - // xrTable3 - // - this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 33F); - this.xrTable3.Name = "xrTable3"; - this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow20, - this.xrTableRow21, - this.xrTableRow22, - this.xrTableRow23, - this.xrTableRow24}); - this.xrTable3.SizeF = new System.Drawing.SizeF(650F, 68F); - this.xrTable3.StylePriority.UseFont = false; - // - // xrTableRow20 - // - this.xrTableRow20.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell16}); - this.xrTableRow20.Name = "xrTableRow20"; - this.xrTableRow20.Weight = 0.38095238095238093D; - // - // xrTableCell16 - // - this.xrTableCell16.CanShrink = true; - this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")}); - this.xrTableCell16.Name = "xrTableCell16"; - this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell16.StylePriority.UsePadding = false; - this.xrTableCell16.Text = "xrTableCell1"; - this.xrTableCell16.Weight = 3D; - // - // xrTableRow21 - // - this.xrTableRow21.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell18}); - this.xrTableRow21.Name = "xrTableRow21"; - this.xrTableRow21.Weight = 0.23809523809523808D; - // - // xrTableCell18 - // - this.xrTableCell18.Name = "xrTableCell18"; - this.xrTableCell18.Weight = 3D; - // - // xrTableRow22 - // - this.xrTableRow22.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell29}); - this.xrTableRow22.Name = "xrTableRow22"; - this.xrTableRow22.Weight = 0.38095238095238088D; - // - // xrTableCell29 - // - this.xrTableCell29.CanShrink = true; - this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbsenceTimes")}); - this.xrTableCell29.Name = "xrTableCell29"; - this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell29.StylePriority.UsePadding = false; - this.xrTableCell29.Text = "xrTableCell4"; - this.xrTableCell29.Weight = 3D; - // - // xrTableRow23 - // - this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell30}); - this.xrTableRow23.Name = "xrTableRow23"; - this.xrTableRow23.Weight = 0.23809523809523803D; - // - // xrTableCell30 - // - this.xrTableCell30.Name = "xrTableCell30"; - this.xrTableCell30.Weight = 3D; - // - // xrTableRow24 - // - this.xrTableRow24.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell31}); - this.xrTableRow24.Name = "xrTableRow24"; - this.xrTableRow24.Weight = 0.38095238095238093D; - // - // xrTableCell31 - // - this.xrTableCell31.CanShrink = true; - this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "FinalSentence")}); - this.xrTableCell31.Name = "xrTableCell31"; - this.xrTableCell31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell31.StylePriority.UsePadding = false; - this.xrTableCell31.Text = "xrTableCell8"; - this.xrTableCell31.Weight = 3D; - // // xrLabel12 // this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192F); @@ -475,6 +397,16 @@ namespace BeWo.BloemelingUndTeckhaus this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // + // xrLabel7 + // + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(366.9998F, 192F); + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(283F, 23F); + this.xrLabel7.StylePriority.UseTextAlignment = false; + this.xrLabel7.Text = "GP-Nr.: 2000229078"; + this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + // // fieldApprovedFLSWithFactor // this.fieldApprovedFLSWithFactor.Expression = "[ApprovedFLSTotal] * [RateFactor]"; @@ -484,7 +416,8 @@ namespace BeWo.BloemelingUndTeckhaus // DetailReport // this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { - this.Detail1}); + this.Detail1, + this.Zwischensumme}); this.DetailReport.DataMember = "InvoiceItems"; this.DetailReport.DataSource = this.bindingSource1; this.DetailReport.Level = 0; @@ -548,10 +481,6 @@ namespace BeWo.BloemelingUndTeckhaus this.xrTableCell53.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell53.Weight = 0.21685899000901443D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); - // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -770,15 +699,214 @@ namespace BeWo.BloemelingUndTeckhaus this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell60.Weight = 0.21685899000901443D; // - // xrLabel7 + // Zwischensumme // - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(366.9998F, 192F); - this.xrLabel7.Name = "xrLabel7"; - this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(283F, 23F); - this.xrLabel7.StylePriority.UseTextAlignment = false; - this.xrLabel7.Text = "GP-Nr.: 2000229078"; - this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.Zwischensumme.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable6}); + this.Zwischensumme.HeightF = 34F; + this.Zwischensumme.Name = "Zwischensumme"; + // + // xrTable6 + // + 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.xrTableRow10}); + this.xrTable6.SizeF = new System.Drawing.SizeF(650F, 34F); + this.xrTable6.StylePriority.UseFont = false; + // + // xrTableRow12 + // + this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell9, + this.xrTableCell10}); + this.xrTableRow12.Name = "xrTableRow12"; + this.xrTableRow12.Weight = 0.40476190476190466D; + // + // xrTableCell9 + // + this.xrTableCell9.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell9.Font = new System.Drawing.Font("Arial", 11F); + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell9.StylePriority.UseBorderColor = false; + this.xrTableCell9.StylePriority.UseBorders = false; + this.xrTableCell9.StylePriority.UseFont = false; + this.xrTableCell9.StylePriority.UsePadding = false; + this.xrTableCell9.Text = "Zwischensumme [ItemDescription]:"; + this.xrTableCell9.Weight = 2.3494230299729568D; + // + // 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.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal")}); + this.xrTableCell10.Font = new System.Drawing.Font("Arial", 11F); + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell10.StylePriority.UseBorderColor = false; + this.xrTableCell10.StylePriority.UseBorders = false; + this.xrTableCell10.StylePriority.UseFont = false; + this.xrTableCell10.StylePriority.UsePadding = false; + this.xrTableCell10.StylePriority.UseTextAlignment = false; + xrSummary1.FormatString = "{0:c}"; + xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell10.Summary = xrSummary1; + this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell10.Weight = 0.65057697002704318D; + // + // xrTableRow10 + // + this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell7}); + this.xrTableRow10.Name = "xrTableRow10"; + this.xrTableRow10.Weight = 0.40476190476190466D; + // + // xrTableCell7 + // + this.xrTableCell7.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell7.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell7.StylePriority.UseBorderColor = false; + this.xrTableCell7.StylePriority.UseBorders = false; + this.xrTableCell7.StylePriority.UseFont = false; + this.xrTableCell7.StylePriority.UsePadding = false; + this.xrTableCell7.Weight = 3D; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); + // + // xrTable3 + // + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(3.000021F, 32.99999F); + this.xrTable3.Name = "xrTable3"; + this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow20, + this.xrTableRow7, + this.xrTableRow9, + this.xrTableRow21, + this.xrTableRow22, + this.xrTableRow23, + this.xrTableRow24}); + this.xrTable3.SizeF = new System.Drawing.SizeF(650F, 94F); + this.xrTable3.StylePriority.UseFont = false; + // + // xrTableRow20 + // + this.xrTableRow20.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell16}); + this.xrTableRow20.Name = "xrTableRow20"; + this.xrTableRow20.Weight = 0.38095238095238093D; + // + // xrTableCell16 + // + this.xrTableCell16.CanShrink = true; + this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")}); + this.xrTableCell16.Name = "xrTableCell16"; + this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell16.StylePriority.UsePadding = false; + this.xrTableCell16.Text = "xrTableCell1"; + this.xrTableCell16.Weight = 3D; + // + // xrTableRow7 + // + this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3}); + this.xrTableRow7.Name = "xrTableRow7"; + this.xrTableRow7.Weight = 0.23809523809523808D; + // + // xrTableCell3 + // + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell3.StylePriority.UsePadding = false; + this.xrTableCell3.Weight = 3D; + // + // xrTableRow9 + // + this.xrTableRow9.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell6}); + this.xrTableRow9.Name = "xrTableRow9"; + this.xrTableRow9.Weight = 0.38095238095238088D; + // + // xrTableCell6 + // + this.xrTableCell6.CanShrink = true; + this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")}); + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell6.StylePriority.UsePadding = false; + this.xrTableCell6.Weight = 3D; + // + // xrTableRow21 + // + this.xrTableRow21.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell18}); + this.xrTableRow21.Name = "xrTableRow21"; + this.xrTableRow21.Weight = 0.23809523809523808D; + // + // xrTableCell18 + // + this.xrTableCell18.Name = "xrTableCell18"; + this.xrTableCell18.Weight = 3D; + // + // xrTableRow22 + // + this.xrTableRow22.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell29}); + this.xrTableRow22.Name = "xrTableRow22"; + this.xrTableRow22.Weight = 0.38095238095238088D; + // + // xrTableCell29 + // + this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbsenceTimes")}); + this.xrTableCell29.Name = "xrTableCell29"; + this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell29.StylePriority.UsePadding = false; + this.xrTableCell29.Text = "xrTableCell4"; + this.xrTableCell29.Weight = 3D; + // + // xrTableRow23 + // + this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell30}); + this.xrTableRow23.Name = "xrTableRow23"; + this.xrTableRow23.Weight = 0.23809523809523803D; + // + // xrTableCell30 + // + this.xrTableCell30.CanShrink = true; + this.xrTableCell30.Name = "xrTableCell30"; + this.xrTableCell30.Weight = 3D; + // + // xrTableRow24 + // + this.xrTableRow24.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell31}); + this.xrTableRow24.Name = "xrTableRow24"; + this.xrTableRow24.Weight = 0.38095238095238088D; + // + // xrTableCell31 + // + this.xrTableCell31.CanShrink = true; + this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FinalSentence")}); + this.xrTableCell31.Name = "xrTableCell31"; + this.xrTableCell31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell31.StylePriority.UsePadding = false; + this.xrTableCell31.Text = "xrTableCell8"; + this.xrTableCell31.Weight = 3D; // // Spitzabrechnung // @@ -803,10 +931,11 @@ namespace BeWo.BloemelingUndTeckhaus this.PaperKind = System.Drawing.Printing.PaperKind.A4; this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -833,17 +962,6 @@ namespace BeWo.BloemelingUndTeckhaus private DevExpress.XtraReports.UI.XRTable xrTable1; private DevExpress.XtraReports.UI.XRTableRow rowErbrachteLeistung; private DevExpress.XtraReports.UI.XRTableCell xrTableCell22; - private DevExpress.XtraReports.UI.XRTable xrTable3; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow20; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow21; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow22; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow23; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow24; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; private DevExpress.XtraReports.UI.XRLabel xrLabel10; private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull; private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; @@ -879,5 +997,27 @@ namespace BeWo.BloemelingUndTeckhaus private DevExpress.XtraReports.UI.XRTableCell xrTableCell59; private DevExpress.XtraReports.UI.XRTableCell xrTableCell60; private DevExpress.XtraReports.UI.XRLabel xrLabel7; + 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 xrTableRow10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.XRTable xrTable3; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow20; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow7; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow9; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow21; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow22; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow23; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow24; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; } } diff --git a/ReportImp/BloemelingUndTeckhaus/SettlementReport2.cs b/ReportImp/BloemelingUndTeckhaus/SettlementReport2.cs index 538c88eb7..c21d1b8dd 100644 --- a/ReportImp/BloemelingUndTeckhaus/SettlementReport2.cs +++ b/ReportImp/BloemelingUndTeckhaus/SettlementReport2.cs @@ -5,6 +5,7 @@ using System.ComponentModel; using DevExpress.XtraReports.UI; using BeWo.Report.ReportObjects; using BeWo.Report; +using BS.Shared.Extensions; namespace BeWo.BloemelingUndTeckhaus { @@ -35,6 +36,23 @@ namespace BeWo.BloemelingUndTeckhaus { rateFactor = (100 + ii.RateFactor.Value) / 100; } + + if (!pRO.FehlkontakteString.IsNullOrEmpty() && ii.RateFactor == 0) + { + Zwischensumme.Visible = true; + //if (!ii.ItemDescription.IsNullOrEmpty()) + //{ + //ii.AbrechnungsText = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte"); + //} + ii.AbrechnungsText = ii.AbrechnungsText.Replace("FLS", "Std."); + ii.ItemDescription = "Fehlkontakte"; + } + else if (ii.ItemDescription.IsNullOrEmpty()) + { + ii.ItemDescription = "Fachleistungsstunden"; + } + + ii.DetailDescription = ii.ItemDescription + ii.DetailDescription; } pRO.RateFactor = (double)rateFactor;