diff --git a/ReportImp/DiakonieKKDuesseldorfMettmann/Quittierungsbeleg.Designer.cs b/ReportImp/DiakonieKKDuesseldorfMettmann/Quittierungsbeleg.Designer.cs index c325ae922..50eac894d 100644 --- a/ReportImp/DiakonieKKDuesseldorfMettmann/Quittierungsbeleg.Designer.cs +++ b/ReportImp/DiakonieKKDuesseldorfMettmann/Quittierungsbeleg.Designer.cs @@ -63,6 +63,7 @@ namespace DiakonieKKDuesseldorfMettmann this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); @@ -80,6 +81,7 @@ namespace DiakonieKKDuesseldorfMettmann this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel(); this.lblFlsOFehlkontakte = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel(); @@ -118,19 +120,17 @@ namespace DiakonieKKDuesseldorfMettmann this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -556,6 +556,10 @@ namespace DiakonieKKDuesseldorfMettmann this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell49.Weight = 0.44692737430167606D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; @@ -795,11 +799,27 @@ namespace DiakonieKKDuesseldorfMettmann this.GroupFooter1.KeepTogether = true; this.GroupFooter1.Name = "GroupFooter1"; // + // xrLabel22 + // + this.xrLabel22.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel22.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(253F, 19.99999F); + this.xrLabel22.Name = "xrLabel22"; + this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel22.SizeF = new System.Drawing.SizeF(74.99989F, 20F); + this.xrLabel22.StylePriority.UseBackColor = false; + this.xrLabel22.StylePriority.UseBorders = false; + this.xrLabel22.StylePriority.UseFont = false; + this.xrLabel22.StylePriority.UsePadding = false; + this.xrLabel22.StylePriority.UseTextAlignment = false; + this.xrLabel22.Text = "entspricht "; + this.xrLabel22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + // // lblFlsOFehlkontakte // this.lblFlsOFehlkontakte.BackColor = System.Drawing.Color.Transparent; this.lblFlsOFehlkontakte.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); - this.lblFlsOFehlkontakte.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.lblFlsOFehlkontakte.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.lblFlsOFehlkontakte.LocationFloat = new DevExpress.Utils.PointFloat(328.9998F, 19.99999F); this.lblFlsOFehlkontakte.Name = "lblFlsOFehlkontakte"; this.lblFlsOFehlkontakte.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -1247,10 +1267,10 @@ namespace DiakonieKKDuesseldorfMettmann // this.xrLabel11.BackColor = System.Drawing.Color.Transparent; this.xrLabel11.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 7F); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(489.1906F, 19.99999F); + this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 6F); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(515.4407F, 19.99997F); this.xrLabel11.Name = "xrLabel11"; - this.xrLabel11.SizeF = new System.Drawing.SizeF(245.8094F, 20F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(219.5593F, 20F); this.xrLabel11.StylePriority.UseBackColor = false; this.xrLabel11.StylePriority.UseBorders = false; this.xrLabel11.StylePriority.UseFont = false; @@ -1276,6 +1296,22 @@ namespace DiakonieKKDuesseldorfMettmann this.xrLabel10.Text = "Fachleistungen in Minuten"; this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // + // xrLabel9 + // + this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.Right; + this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(415.0001F, 20.00002F); + this.xrLabel9.Name = "xrLabel9"; + this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel9.SizeF = new System.Drawing.SizeF(100.4407F, 20F); + this.xrLabel9.StylePriority.UseBackColor = false; + this.xrLabel9.StylePriority.UseBorders = false; + this.xrLabel9.StylePriority.UseFont = false; + this.xrLabel9.StylePriority.UsePadding = false; + this.xrLabel9.StylePriority.UseTextAlignment = false; + this.xrLabel9.Text = "Std. (min/60)"; + this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // // xrLabel1 // this.xrLabel1.BackColor = System.Drawing.Color.Gainsboro; @@ -1325,42 +1361,6 @@ namespace DiakonieKKDuesseldorfMettmann this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldKontaktArt.Name = "fieldKontaktArt"; // - // xrLabel22 - // - this.xrLabel22.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrLabel22.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(253F, 19.99999F); - this.xrLabel22.Name = "xrLabel22"; - this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel22.SizeF = new System.Drawing.SizeF(74.99989F, 20F); - this.xrLabel22.StylePriority.UseBackColor = false; - this.xrLabel22.StylePriority.UseBorders = false; - this.xrLabel22.StylePriority.UseFont = false; - this.xrLabel22.StylePriority.UsePadding = false; - this.xrLabel22.StylePriority.UseTextAlignment = false; - this.xrLabel22.Text = "entspricht "; - this.xrLabel22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - // - // xrLabel9 - // - this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.Right; - this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(414.9999F, 20F); - this.xrLabel9.Name = "xrLabel9"; - this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel9.SizeF = new System.Drawing.SizeF(50.13882F, 20F); - this.xrLabel9.StylePriority.UseBackColor = false; - this.xrLabel9.StylePriority.UseBorders = false; - this.xrLabel9.StylePriority.UseFont = false; - this.xrLabel9.StylePriority.UsePadding = false; - this.xrLabel9.StylePriority.UseTextAlignment = false; - this.xrLabel9.Text = "h:min"; - this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // // Quittierungsbeleg // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1388,10 +1388,10 @@ namespace DiakonieKKDuesseldorfMettmann this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } diff --git a/ReportImp/DiakonieKKDuesseldorfMettmann/Quittierungsbeleg.cs b/ReportImp/DiakonieKKDuesseldorfMettmann/Quittierungsbeleg.cs index 569e818bd..840818a46 100644 --- a/ReportImp/DiakonieKKDuesseldorfMettmann/Quittierungsbeleg.cs +++ b/ReportImp/DiakonieKKDuesseldorfMettmann/Quittierungsbeleg.cs @@ -48,9 +48,8 @@ namespace DiakonieKKDuesseldorfMettmann pRO.Services = servicesBillable; } - int h = (int) pRO.TotalFLMoFehlkontakte / 60; - double min = pRO.TotalFLMoFehlkontakte % 60; - lblFlsOFehlkontakte.Text = h + ":" + min.ToString("00"); + decimal hoursOFehlkontakte = (decimal) Math.Round(pRO.TotalFLMoFehlkontakte / 60, 2, MidpointRounding.AwayFromZero); + lblFlsOFehlkontakte.Text = hoursOFehlkontakte.ToString(); if (String.IsNullOrWhiteSpace(pRO.AbsenceTimes)) {