From cc280c994921f098bd48802b2bffc54c9bac5446 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Mon, 4 Nov 2024 13:21:10 +0100 Subject: [PATCH] =?UTF-8?q?DiakonieKKKleve/ServicesOverviewReport=20-=20Su?= =?UTF-8?q?mme=20Fehlkontakte=20eingef=C3=BChrt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ServicesOverviewReport.Designer.cs | 305 ++++++++++-------- .../DiakonieKKKleve/ServicesOverviewReport.cs | 23 +- .../ServicesOverviewReport.resx | 3 - 3 files changed, 178 insertions(+), 153 deletions(-) diff --git a/ReportImp/DiakonieKKKleve/ServicesOverviewReport.Designer.cs b/ReportImp/DiakonieKKKleve/ServicesOverviewReport.Designer.cs index 50456b872..38fa625ca 100644 --- a/ReportImp/DiakonieKKKleve/ServicesOverviewReport.Designer.cs +++ b/ReportImp/DiakonieKKKleve/ServicesOverviewReport.Designer.cs @@ -46,6 +46,7 @@ namespace BeWo.DiakonieKKKleve this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); this.formattingRuleRowInvisible = new DevExpress.XtraReports.UI.FormattingRule(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); @@ -57,6 +58,11 @@ namespace BeWo.DiakonieKKKleve this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.lblSummeMinutenFaktor = new DevExpress.XtraReports.UI.XRLabel(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel(); @@ -82,18 +88,14 @@ namespace BeWo.DiakonieKKKleve this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.GroupFooter3 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.GroupFooter4 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.fieldGruppe = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.xrSubreport1 = new DevExpress.XtraReports.UI.XRSubreport(); + this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrSubreport2 = new DevExpress.XtraReports.UI.XRSubreport(); + this.GroupFooter4 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrSubreport3 = new DevExpress.XtraReports.UI.XRSubreport(); + this.fieldGruppe = new DevExpress.XtraReports.UI.CalculatedField(); + this.lblSummeMinutenFK = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); @@ -102,7 +104,7 @@ namespace BeWo.DiakonieKKKleve // // Detail // - this.Detail.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.Detail.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold); this.Detail.HeightF = 0F; this.Detail.Name = "Detail"; this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -208,7 +210,7 @@ namespace BeWo.DiakonieKKKleve // this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable3}); - this.Detail1.Font = new System.Drawing.Font("Arial", 10F); + this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.Detail1.HeightF = 20F; this.Detail1.Name = "Detail1"; this.Detail1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -220,7 +222,7 @@ namespace BeWo.DiakonieKKKleve this.xrTable3.BorderColor = System.Drawing.Color.Black; this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable3.Font = new System.Drawing.Font("Arial", 12F); + this.xrTable3.Font = new DevExpress.Drawing.DXFont("Arial", 12F); this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable3.Name = "xrTable3"; this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -279,6 +281,17 @@ namespace BeWo.DiakonieKKKleve this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell15.Weight = 0.13231305707472718D; // + // xrTableCell2 + // + this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")}); + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F); + this.xrTableCell2.StylePriority.UsePadding = false; + this.xrTableCell2.StylePriority.UseTextAlignment = false; + this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell2.Weight = 0.094854503260269424D; + // // xrTableCell5 // this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -300,6 +313,8 @@ namespace BeWo.DiakonieKKKleve // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblSummeMinutenFK, + this.xrLabel17, this.xrLabel3, this.lblSummeMinuten, this.xrLabel5, @@ -307,7 +322,7 @@ namespace BeWo.DiakonieKKKleve this.xrLabel7, this.xrLabel8, this.lblSummeMinutenFaktor}); - this.GroupFooter1.Font = new System.Drawing.Font("Arial", 12F); + this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Arial", 12F); this.GroupFooter1.HeightF = 216.7918F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; @@ -318,11 +333,11 @@ namespace BeWo.DiakonieKKKleve 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(387.0831F, 62F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(387.0831F, 49.49999F); this.xrLabel3.StylePriority.UseFont = false; this.xrLabel3.StylePriority.UseTextAlignment = false; - this.xrLabel3.Text = "1. Summer der unmittelbaren Betreuungsleistungen\r\n(face-to-face beziehungsweise e" + - "ar-to-ear)"; + this.xrLabel3.Text = "1. Summe der unmittelbaren Betreuungsleistungen\r\n(face-to-face beziehungsweise ea" + + "r-to-ear)"; this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // // lblSummeMinuten @@ -331,11 +346,11 @@ namespace BeWo.DiakonieKKKleve | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblSummeMinuten.BorderWidth = 2F; - this.lblSummeMinuten.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.lblSummeMinuten.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold); this.lblSummeMinuten.LocationFloat = new DevExpress.Utils.PointFloat(387.0831F, 0F); this.lblSummeMinuten.Name = "lblSummeMinuten"; this.lblSummeMinuten.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); - this.lblSummeMinuten.SizeF = new System.Drawing.SizeF(105.7916F, 62F); + this.lblSummeMinuten.SizeF = new System.Drawing.SizeF(105.7916F, 49.49999F); this.lblSummeMinuten.StylePriority.UseBorders = false; this.lblSummeMinuten.StylePriority.UseBorderWidth = false; this.lblSummeMinuten.StylePriority.UseFont = false; @@ -378,7 +393,7 @@ namespace BeWo.DiakonieKKKleve // // xrLabel8 // - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 62.00002F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 49.49999F); this.xrLabel8.Multiline = true; this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F); @@ -386,8 +401,8 @@ namespace BeWo.DiakonieKKKleve this.xrLabel8.StylePriority.UseFont = false; this.xrLabel8.StylePriority.UsePadding = false; this.xrLabel8.StylePriority.UseTextAlignment = false; - this.xrLabel8.Text = "2. Summer der mit dem Landschaftsverband Rheinland abzurechnenden Leistungen\r\n(=S" + - "umme 1 x 1,2)"; + this.xrLabel8.Text = "2. Summe der mit dem Landschaftsverband Rheinland abzurechnenden Leistungen\r\n(=Su" + + "mme 1 x 1,2)"; this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // // lblSummeMinutenFaktor @@ -395,8 +410,8 @@ namespace BeWo.DiakonieKKKleve this.lblSummeMinutenFaktor.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblSummeMinutenFaktor.BorderWidth = 2F; - this.lblSummeMinutenFaktor.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.lblSummeMinutenFaktor.LocationFloat = new DevExpress.Utils.PointFloat(387.0831F, 62.00002F); + this.lblSummeMinutenFaktor.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold); + this.lblSummeMinutenFaktor.LocationFloat = new DevExpress.Utils.PointFloat(387.0831F, 49.49999F); this.lblSummeMinutenFaktor.Name = "lblSummeMinutenFaktor"; this.lblSummeMinutenFaktor.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); this.lblSummeMinutenFaktor.SizeF = new System.Drawing.SizeF(105.7916F, 62F); @@ -416,12 +431,83 @@ namespace BeWo.DiakonieKKKleve this.xrTable1, this.xrLabel4, this.xrLabel9}); - this.GroupHeader1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold); this.GroupHeader1.HeightF = 40.00003F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.RepeatEveryPage = true; this.GroupHeader1.StylePriority.UseFont = false; // + // xrLabel11 + // + this.xrLabel11.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel11.CanGrow = false; + this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(491.8751F, 20.00001F); + this.xrLabel11.Multiline = true; + this.xrLabel11.Name = "xrLabel11"; + this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(75.12479F, 20.00001F); + this.xrLabel11.StylePriority.UseBorders = false; + this.xrLabel11.StylePriority.UseFont = false; + this.xrLabel11.StylePriority.UsePadding = false; + this.xrLabel11.StylePriority.UseTextAlignment = false; + this.xrLabel11.Text = "kontakt"; + this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrLabel10 + // + this.xrLabel10.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrLabel10.CanGrow = false; + this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(491.8751F, 0F); + this.xrLabel10.Multiline = true; + this.xrLabel10.Name = "xrLabel10"; + this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel10.SizeF = new System.Drawing.SizeF(75.12479F, 20.00001F); + this.xrLabel10.StylePriority.UseBorders = false; + this.xrLabel10.StylePriority.UseFont = false; + this.xrLabel10.StylePriority.UsePadding = false; + this.xrLabel10.StylePriority.UseTextAlignment = false; + this.xrLabel10.Text = "Fehl-"; + this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrLabel4 + // + this.xrLabel4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(387.0831F, 0F); + this.xrLabel4.Name = "xrLabel4"; + this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(104.792F, 40F); + this.xrLabel4.StylePriority.UseBorders = false; + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.StylePriority.UsePadding = false; + this.xrLabel4.StylePriority.UseTextAlignment = false; + this.xrLabel4.Text = "Minuten"; + this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrLabel9 + // + this.xrLabel9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(566.9999F, 0F); + this.xrLabel9.Multiline = true; + this.xrLabel9.Name = "xrLabel9"; + this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel9.SizeF = new System.Drawing.SizeF(120F, 40F); + this.xrLabel9.StylePriority.UseBorders = false; + this.xrLabel9.StylePriority.UseFont = false; + this.xrLabel9.StylePriority.UsePadding = false; + this.xrLabel9.StylePriority.UseTextAlignment = false; + this.xrLabel9.Text = "Gruppe"; + this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; @@ -446,14 +532,14 @@ namespace BeWo.DiakonieKKKleve this.xrLabel13, this.xrLabel12, this.xrLabel1}); - this.ReportHeader.Font = new System.Drawing.Font("Arial", 12F); + this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Arial", 12F); this.ReportHeader.HeightF = 320F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // // xrLabel20 // - this.xrLabel20.Font = new System.Drawing.Font("Arial", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline)))); + this.xrLabel20.Font = new DevExpress.Drawing.DXFont("Arial", 12F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline)))); this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(289.5833F, 282.6667F); this.xrLabel20.Name = "xrLabel20"; this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -463,7 +549,7 @@ namespace BeWo.DiakonieKKKleve // // xrLabel19 // - this.xrLabel19.Font = new System.Drawing.Font("Arial", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline)))); + this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Arial", 12F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline)))); this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0F, 282.6667F); this.xrLabel19.Name = "xrLabel19"; this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -473,7 +559,7 @@ namespace BeWo.DiakonieKKKleve // // xrLabel2 // - this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F); + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 12F); this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 38.08336F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -539,7 +625,7 @@ namespace BeWo.DiakonieKKKleve // // xrLabel18 // - this.xrLabel18.Font = new System.Drawing.Font("Arial", 12F); + this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Arial", 12F); this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(1.589457E-05F, 215.0833F); this.xrLabel18.Name = "xrLabel18"; this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -549,7 +635,7 @@ namespace BeWo.DiakonieKKKleve // // xrLabel15 // - this.xrLabel15.Font = new System.Drawing.Font("Arial", 12F); + this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 12F); this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 165.0833F); this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -559,7 +645,7 @@ namespace BeWo.DiakonieKKKleve // // xrLabel14 // - this.xrLabel14.Font = new System.Drawing.Font("Arial", 12F); + this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 12F); this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 140.0833F); this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -569,7 +655,7 @@ namespace BeWo.DiakonieKKKleve // // xrLabel13 // - this.xrLabel13.Font = new System.Drawing.Font("Arial", 12F); + this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 12F); this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 115.0833F); this.xrLabel13.Name = "xrLabel13"; this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -579,7 +665,7 @@ namespace BeWo.DiakonieKKKleve // // xrLabel12 // - this.xrLabel12.Font = new System.Drawing.Font("Arial", 12F); + this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 12F); this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 90.08334F); this.xrLabel12.Name = "xrLabel12"; this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -589,7 +675,7 @@ namespace BeWo.DiakonieKKKleve // // xrLabel1 // - this.xrLabel1.Font = new System.Drawing.Font("Arial", 14F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline)))); + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 14F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline)))); this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrLabel1.Multiline = true; this.xrLabel1.Name = "xrLabel1"; @@ -623,7 +709,7 @@ namespace BeWo.DiakonieKKKleve // // topMarginBand1 // - this.topMarginBand1.Font = new System.Drawing.Font("Times New Roman", 9.75F); + this.topMarginBand1.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F); this.topMarginBand1.HeightF = 50F; this.topMarginBand1.Name = "topMarginBand1"; this.topMarginBand1.StylePriority.UseFont = false; @@ -660,6 +746,13 @@ namespace BeWo.DiakonieKKKleve this.GroupFooter3.Name = "GroupFooter3"; this.GroupFooter3.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.DiakonieKKKleve.Assistenzstunden(); + this.xrSubreport1.SizeF = new System.Drawing.SizeF(686.9999F, 21.875F); + // // GroupFooter2 // this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -669,6 +762,13 @@ namespace BeWo.DiakonieKKKleve this.GroupFooter2.Name = "GroupFooter2"; this.GroupFooter2.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBand; // + // xrSubreport2 + // + this.xrSubreport2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrSubreport2.Name = "xrSubreport2"; + this.xrSubreport2.ReportSource = new BeWo.DiakonieKKKleve.VerhinderungspflegeReport(); + this.xrSubreport2.SizeF = new System.Drawing.SizeF(686.9999F, 21.875F); + // // GroupFooter4 // this.GroupFooter4.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -678,6 +778,13 @@ namespace BeWo.DiakonieKKKleve this.GroupFooter4.Name = "GroupFooter4"; this.GroupFooter4.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBand; // + // xrSubreport3 + // + this.xrSubreport3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrSubreport3.Name = "xrSubreport3"; + this.xrSubreport3.ReportSource = new BeWo.DiakonieKKKleve.Assistenzstunden(); + this.xrSubreport3.SizeF = new System.Drawing.SizeF(686.9999F, 21.875F); + // // fieldGruppe // this.fieldGruppe.DataMember = "Services"; @@ -685,108 +792,34 @@ namespace BeWo.DiakonieKKKleve this.fieldGruppe.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldGruppe.Name = "fieldGruppe"; // - // xrLabel4 + // lblSummeMinutenFK // - this.xrLabel4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) + this.lblSummeMinutenFK.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel4.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(387.0831F, 0F); - this.xrLabel4.Name = "xrLabel4"; - this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(104.792F, 40F); - this.xrLabel4.StylePriority.UseBorders = false; - this.xrLabel4.StylePriority.UseFont = false; - this.xrLabel4.StylePriority.UsePadding = false; - this.xrLabel4.StylePriority.UseTextAlignment = false; - this.xrLabel4.Text = "Minuten"; - this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.lblSummeMinutenFK.BorderWidth = 2F; + this.lblSummeMinutenFK.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold); + this.lblSummeMinutenFK.LocationFloat = new DevExpress.Utils.PointFloat(387.0831F, 111.5F); + this.lblSummeMinutenFK.Name = "lblSummeMinutenFK"; + this.lblSummeMinutenFK.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); + this.lblSummeMinutenFK.SizeF = new System.Drawing.SizeF(105.7916F, 24.99999F); + this.lblSummeMinutenFK.StylePriority.UseBorders = false; + this.lblSummeMinutenFK.StylePriority.UseBorderWidth = false; + this.lblSummeMinutenFK.StylePriority.UseFont = false; + this.lblSummeMinutenFK.StylePriority.UsePadding = false; + this.lblSummeMinutenFK.StylePriority.UseTextAlignment = false; + this.lblSummeMinutenFK.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; // - // xrLabel9 + // xrLabel17 // - this.xrLabel9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel9.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(566.9999F, 0F); - this.xrLabel9.Multiline = true; - this.xrLabel9.Name = "xrLabel9"; - this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel9.SizeF = new System.Drawing.SizeF(120F, 40F); - this.xrLabel9.StylePriority.UseBorders = false; - this.xrLabel9.StylePriority.UseFont = false; - this.xrLabel9.StylePriority.UsePadding = false; - this.xrLabel9.StylePriority.UseTextAlignment = false; - this.xrLabel9.Text = "Gruppe"; - this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - // - // xrTableCell2 - // - this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")}); - this.xrTableCell2.Name = "xrTableCell2"; - this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F); - this.xrTableCell2.StylePriority.UsePadding = false; - this.xrTableCell2.StylePriority.UseTextAlignment = false; - this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell2.Weight = 0.094854503260269424D; - // - // xrLabel10 - // - this.xrLabel10.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrLabel10.CanGrow = false; - this.xrLabel10.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(491.8751F, 0F); - this.xrLabel10.Multiline = true; - this.xrLabel10.Name = "xrLabel10"; - this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel10.SizeF = new System.Drawing.SizeF(75.12479F, 20.00001F); - this.xrLabel10.StylePriority.UseBorders = false; - this.xrLabel10.StylePriority.UseFont = false; - this.xrLabel10.StylePriority.UsePadding = false; - this.xrLabel10.StylePriority.UseTextAlignment = false; - this.xrLabel10.Text = "Fehl-"; - this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - // - // xrLabel11 - // - this.xrLabel11.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel11.CanGrow = false; - this.xrLabel11.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(491.8751F, 20.00001F); - this.xrLabel11.Multiline = true; - this.xrLabel11.Name = "xrLabel11"; - this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel11.SizeF = new System.Drawing.SizeF(75.12479F, 20.00001F); - this.xrLabel11.StylePriority.UseBorders = false; - this.xrLabel11.StylePriority.UseFont = false; - this.xrLabel11.StylePriority.UsePadding = false; - this.xrLabel11.StylePriority.UseTextAlignment = false; - this.xrLabel11.Text = "kontakt"; - this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // - // xrSubreport1 - // - this.xrSubreport1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrSubreport1.Name = "xrSubreport1"; - this.xrSubreport1.ReportSource = new BeWo.DiakonieKKKleve.Assistenzstunden(); - this.xrSubreport1.SizeF = new System.Drawing.SizeF(686.9999F, 21.875F); - // - // xrSubreport2 - // - this.xrSubreport2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrSubreport2.Name = "xrSubreport2"; - this.xrSubreport2.ReportSource = new BeWo.DiakonieKKKleve.VerhinderungspflegeReport(); - this.xrSubreport2.SizeF = new System.Drawing.SizeF(686.9999F, 21.875F); - // - // xrSubreport3 - // - this.xrSubreport3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrSubreport3.Name = "xrSubreport3"; - this.xrSubreport3.ReportSource = new BeWo.DiakonieKKKleve.Assistenzstunden(); - this.xrSubreport3.SizeF = new System.Drawing.SizeF(686.9999F, 21.875F); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 111.5F); + this.xrLabel17.Multiline = true; + this.xrLabel17.Name = "xrLabel17"; + this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel17.SizeF = new System.Drawing.SizeF(387.08F, 25F); + this.xrLabel17.StylePriority.UseFont = false; + this.xrLabel17.StylePriority.UseTextAlignment = false; + this.xrLabel17.Text = "3. Summe der Fehlkontakte\r\n"; + this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // // Stundenzettel // @@ -811,12 +844,12 @@ namespace BeWo.DiakonieKKKleve this.formattingRuleCostBearer, this.formattingRuleEmployeeName, this.formattingRuleRowInvisible}); - this.Margins = new System.Drawing.Printing.Margins(70, 70, 50, 30); + this.Margins = new DevExpress.Drawing.DXMargins(70F, 70F, 50F, 30F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.SnapGridSize = 9F; - this.Version = "17.1"; + this.Version = "23.2"; ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); @@ -891,5 +924,7 @@ namespace BeWo.DiakonieKKKleve private DevExpress.XtraReports.UI.XRLabel xrLabel10; private DevExpress.XtraReports.UI.XRLabel xrLabel4; private DevExpress.XtraReports.UI.XRLabel xrLabel9; + private DevExpress.XtraReports.UI.XRLabel lblSummeMinutenFK; + private DevExpress.XtraReports.UI.XRLabel xrLabel17; } } diff --git a/ReportImp/DiakonieKKKleve/ServicesOverviewReport.cs b/ReportImp/DiakonieKKKleve/ServicesOverviewReport.cs index 5650b92d0..12f422e58 100644 --- a/ReportImp/DiakonieKKKleve/ServicesOverviewReport.cs +++ b/ReportImp/DiakonieKKKleve/ServicesOverviewReport.cs @@ -66,10 +66,10 @@ namespace BeWo.DiakonieKKKleve if (showAssi) { var subReport = xrSubreport1.ReportSource as Assistenzstunden; - if (subReport != null) - subReport.SetReportDataSource(pRO); - + { + subReport.SetReportDataSource(pRO); + } } else { @@ -79,10 +79,10 @@ namespace BeWo.DiakonieKKKleve if (showPflege) { var subReport = xrSubreport2.ReportSource as VerhinderungspflegeReport; - if (subReport != null) + { subReport.SetReportDataSource(pRO); - + } } else { @@ -98,7 +98,6 @@ namespace BeWo.DiakonieKKKleve subReport.SetIstAlltagsbegleitung(true); subReport.SetReportDataSource(pRO); } - } else { @@ -106,9 +105,9 @@ namespace BeWo.DiakonieKKKleve //xrSubreport1.Visible = false; } bindingSource1.DataSource = pRO; - lblSummeMinuten.Text = string.Format("{0:0.##}", minTotal); - - lblSummeMinutenFaktor.Text = string.Format("{0:0.##}", (minTotal - minFk) * 1.2 + minFk); + lblSummeMinuten.Text = string.Format("{0:0.##}", minTotal - minFk); + lblSummeMinutenFaktor.Text = string.Format("{0:0.##}", (minTotal - minFk) * 1.2); + lblSummeMinutenFK.Text = string.Format("{0:0.##}", minFk); var approved = pRO.ApprovedFLSPerWeek; var stats = GetStatistics(pRO); @@ -116,9 +115,7 @@ namespace BeWo.DiakonieKKKleve { approved = stats.MinutesApprovedPerWeek / 60; } - lblBewilligteStunden.Text = string.Format("{0:0.##}", approved); - } private SupportConceptPeriodStatisticsDC GetStatistics(ServicesOverviewRO ro) @@ -126,12 +123,9 @@ namespace BeWo.DiakonieKKKleve if (ro.CostBearer2SupportConceptList != null && ro.CostBearer2SupportConceptList.Count > 0) { var service = new OperationsServiceImp(); - foreach (var cb2sc in ro.CostBearer2SupportConceptList) { long cb2scOid = cb2sc.Oid.Value; - - var stats = service.CreateSupportConceptStatistics(cb2scOid, ro.EndDate); if (stats.PeriodStatistics != null && stats.PeriodStatistics.Count > 0) @@ -146,7 +140,6 @@ namespace BeWo.DiakonieKKKleve } } } - } return null; } diff --git a/ReportImp/DiakonieKKKleve/ServicesOverviewReport.resx b/ReportImp/DiakonieKKKleve/ServicesOverviewReport.resx index f6606300d..c7e0d4bdf 100644 --- a/ReportImp/DiakonieKKKleve/ServicesOverviewReport.resx +++ b/ReportImp/DiakonieKKKleve/ServicesOverviewReport.resx @@ -117,7 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 21, 17 - \ No newline at end of file