diff --git a/ReportImp/AbwWeeger/Quittierungsbeleg.cs b/ReportImp/AbwWeeger/Quittierungsbeleg.cs index 323cfe302..dd68b390c 100644 --- a/ReportImp/AbwWeeger/Quittierungsbeleg.cs +++ b/ReportImp/AbwWeeger/Quittierungsbeleg.cs @@ -42,7 +42,7 @@ namespace AbwWeeger if (sd.ServiceDescription.ToLower().Contains("fehlkontakt")) { sd.Notice5 = "FK"; - //sd.Minutes = sd.Minutes * 80 / 100; + sd.Minutes = sd.Minutes * 80 / 100; } else if (sd.IsGroup) diff --git a/ReportImp/DieDueneReports/ServicesOverviewReport.Designer.cs b/ReportImp/DieDueneReports/ServicesOverviewReport.Designer.cs index a6eb8f067..6c6dc1fad 100644 --- a/ReportImp/DieDueneReports/ServicesOverviewReport.Designer.cs +++ b/ReportImp/DieDueneReports/ServicesOverviewReport.Designer.cs @@ -41,6 +41,7 @@ namespace BeWo.DieDueneReports this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); @@ -49,10 +50,6 @@ namespace BeWo.DieDueneReports this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail3 = new DevExpress.XtraReports.UI.DetailBand(); - this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); @@ -77,6 +74,8 @@ namespace BeWo.DieDueneReports this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); + this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox(); this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTableAbwesenheiten = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -104,9 +103,8 @@ namespace BeWo.DieDueneReports this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText(); this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); - this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -225,6 +223,20 @@ namespace BeWo.DieDueneReports this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.xrTableCell12.Weight = 0.30726256983240235D; // + // xrTableCell14 + // + this.xrTableCell14.BackColor = System.Drawing.Color.WhiteSmoke; + this.xrTableCell14.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.xrTableCell14.StylePriority.UseBackColor = false; + this.xrTableCell14.StylePriority.UseFont = false; + this.xrTableCell14.StylePriority.UsePadding = false; + this.xrTableCell14.StylePriority.UseTextAlignment = false; + this.xrTableCell14.Text = "Unterschrift Klient/in"; + this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell14.Weight = 0.41899441340782123D; + // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; @@ -247,10 +259,12 @@ namespace BeWo.DieDueneReports | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel6, + this.xrLabel7, this.xrLabel5, this.xrLabel3, this.xrLabel4}); - this.Detail2.HeightF = 96.875F; + this.Detail2.HeightF = 157.2917F; this.Detail2.Name = "Detail2"; this.Detail2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.Detail2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; @@ -306,67 +320,11 @@ namespace BeWo.DieDueneReports // // Detail3 // - this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel10, - this.xrLabel7, - this.xrLabel6, - this.xrLabel8}); - this.Detail3.HeightF = 42F; + this.Detail3.HeightF = 0F; this.Detail3.Name = "Detail3"; this.Detail3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.Detail3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // - // xrLabel10 - // - this.xrLabel10.Font = new System.Drawing.Font("Arial", 9.75F); - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(392F, 17F); - this.xrLabel10.Name = "xrLabel10"; - this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel10.SizeF = new System.Drawing.SizeF(100F, 25F); - this.xrLabel10.StylePriority.UseFont = false; - this.xrLabel10.StylePriority.UseTextAlignment = false; - this.xrLabel10.Text = "FLM"; - this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // xrLabel7 - // - this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "AllEmployees.TotalFLM", "{0:0.##}")}); - this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(325F, 17F); - this.xrLabel7.Name = "xrLabel7"; - this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(58F, 25F); - this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.StylePriority.UseTextAlignment = false; - this.xrLabel7.Text = "xrLabel7"; - this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - // - // xrLabel6 - // - this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "AllEmployees.EmployeeName")}); - this.xrLabel6.Font = new System.Drawing.Font("Arial", 9.75F); - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17F); - this.xrLabel6.Name = "xrLabel6"; - this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel6.SizeF = new System.Drawing.SizeF(125F, 25F); - this.xrLabel6.StylePriority.UseFont = false; - this.xrLabel6.StylePriority.UseTextAlignment = false; - this.xrLabel6.Text = "xrLabel6"; - this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // xrLabel8 - // - this.xrLabel8.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel8.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(125F, 12F); - this.xrLabel8.Name = "xrLabel8"; - this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(200F, 25F); - this.xrLabel8.StylePriority.UseBorders = false; - this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -620,6 +578,31 @@ namespace BeWo.DieDueneReports this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.xrTableCell24.Weight = 0.138888890667002D; // + // xrTableCell16 + // + this.xrTableCell16.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.picSignature}); + this.xrTableCell16.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell16.Name = "xrTableCell16"; + this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell16.StylePriority.UseFont = false; + this.xrTableCell16.StylePriority.UsePadding = false; + this.xrTableCell16.StylePriority.UseTextAlignment = false; + this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell16.Weight = 0.18939393894452627D; + // + // picSignature + // + this.picSignature.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.picSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")}); + this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.picSignature.Name = "picSignature"; + this.picSignature.SizeF = new System.Drawing.SizeF(143.8145F, 20F); + this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + this.picSignature.StylePriority.UseBorders = false; + this.picSignature.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.picSignature_BeforePrint); + // // GroupFooter2 // this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -913,44 +896,29 @@ namespace BeWo.DieDueneReports this.xrLabel15.Text = "Krankenhausaufenthalte/\r\nstat. Rehamaßnahmen:"; this.xrLabel15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // - // xrTableCell14 + // xrLabel6 // - this.xrTableCell14.BackColor = System.Drawing.Color.WhiteSmoke; - this.xrTableCell14.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell14.Name = "xrTableCell14"; - this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); - this.xrTableCell14.StylePriority.UseBackColor = false; - this.xrTableCell14.StylePriority.UseFont = false; - this.xrTableCell14.StylePriority.UsePadding = false; - this.xrTableCell14.StylePriority.UseTextAlignment = false; - this.xrTableCell14.Text = "Unterschrift Klient/in"; - this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell14.Weight = 0.41899441340782123D; + this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(380.0001F, 122.2917F); + this.xrLabel6.Name = "xrLabel6"; + this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel6.SizeF = new System.Drawing.SizeF(299.9998F, 24.99999F); + this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // - // xrTableCell16 + // xrLabel7 // - this.xrTableCell16.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.picSignature}); - this.xrTableCell16.Font = new System.Drawing.Font("Arial", 10F); - this.xrTableCell16.Name = "xrTableCell16"; - this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell16.StylePriority.UseFont = false; - this.xrTableCell16.StylePriority.UsePadding = false; - this.xrTableCell16.StylePriority.UseTextAlignment = false; - this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell16.Weight = 0.18939393894452627D; - // - // picSignature - // - this.picSignature.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.picSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")}); - this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.picSignature.Name = "picSignature"; - this.picSignature.SizeF = new System.Drawing.SizeF(143.8145F, 20F); - this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - this.picSignature.StylePriority.UseBorders = false; - this.picSignature.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.picSignature_BeforePrint); + this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 122.2917F); + this.xrLabel7.Multiline = true; + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(380F, 23.99999F); + this.xrLabel7.StylePriority.UseBorders = false; + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.StylePriority.UseTextAlignment = false; + this.xrLabel7.Text = "Datum, Unterschrift des/der verantwortlichen Mitarbeiters/in:"; + this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // // Stundenzettel // @@ -992,7 +960,6 @@ namespace BeWo.DieDueneReports private DevExpress.XtraReports.UI.XRLabel xrLabel4; private DevExpress.XtraReports.UI.DetailReportBand DetailReport2; private DevExpress.XtraReports.UI.DetailBand Detail3; - private DevExpress.XtraReports.UI.XRLabel xrLabel8; private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.XRLabel xrLabel9; @@ -1005,9 +972,6 @@ namespace BeWo.DieDueneReports private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; - private DevExpress.XtraReports.UI.XRLabel xrLabel7; - private DevExpress.XtraReports.UI.XRLabel xrLabel6; - private DevExpress.XtraReports.UI.XRLabel xrLabel10; private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.FormattingRule formattingRuleStartDate; private DevExpress.XtraReports.UI.FormattingRule formattingRuleServiceDesc; @@ -1061,5 +1025,7 @@ namespace BeWo.DieDueneReports private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; private DevExpress.XtraReports.UI.XRPictureBox picSignature; + private DevExpress.XtraReports.UI.XRLabel xrLabel6; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; } }