diff --git a/ReportImp/BeWoAuxilio/SupportConceptReport.Designer.cs b/ReportImp/BeWoAuxilio/SupportConceptReport.Designer.cs index f9e799ab2..07ba05e44 100644 --- a/ReportImp/BeWoAuxilio/SupportConceptReport.Designer.cs +++ b/ReportImp/BeWoAuxilio/SupportConceptReport.Designer.cs @@ -55,6 +55,7 @@ namespace BeWoAuxilio this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell56 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -79,6 +80,7 @@ namespace BeWoAuxilio this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell55 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -106,15 +108,13 @@ namespace BeWoAuxilio this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell52 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell53 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell54 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell55 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell56 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -328,6 +328,18 @@ namespace BeWoAuxilio this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell27.Weight = 0.091349423732524554D; // + // xrTableCell56 + // + this.xrTableCell56.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.Custom1")}); + this.xrTableCell56.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell56.Multiline = true; + this.xrTableCell56.Name = "xrTableCell56"; + this.xrTableCell56.StylePriority.UseFont = false; + this.xrTableCell56.StylePriority.UseTextAlignment = false; + this.xrTableCell56.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell56.Weight = 0.11142541478797531D; + // // xrTableCell28 // this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -336,7 +348,7 @@ namespace BeWoAuxilio this.xrTableCell28.StylePriority.UseTextAlignment = false; this.xrTableCell28.Text = "xrTableCell28"; this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell28.Weight = 0.13840819943097546D; + this.xrTableCell28.Weight = 0.133710500154541D; // // xrTableCell29 // @@ -346,7 +358,7 @@ namespace BeWoAuxilio this.xrTableCell29.StylePriority.UseTextAlignment = false; this.xrTableCell29.Text = "xrTableCell29"; this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell29.Weight = 0.16055317664962485D; + this.xrTableCell29.Weight = 0.14517488487060853D; // // xrTableCell30 // @@ -534,23 +546,30 @@ namespace BeWoAuxilio this.xrTableCell10.Text = "Heute"; this.xrTableCell10.Weight = 0.089269612164975D; // + // xrTableCell55 + // + this.xrTableCell55.Multiline = true; + this.xrTableCell55.Name = "xrTableCell55"; + this.xrTableCell55.Text = "Assis-tenz / FK"; + this.xrTableCell55.Weight = 0.10888857101193653D; + // // xrTableCell11 // this.xrTableCell11.Name = "xrTableCell11"; this.xrTableCell11.Text = "Wochen gesamt"; - this.xrTableCell11.Weight = 0.1352569855617011D; + this.xrTableCell11.Weight = 0.13066628119830248D; // // xrTableCell12 // this.xrTableCell12.Name = "xrTableCell12"; this.xrTableCell12.Text = "Wochen bisher"; - this.xrTableCell12.Weight = 0.15689777328673804D; + this.xrTableCell12.Weight = 0.13066628360729798D; // // xrTableCell13 // this.xrTableCell13.Name = "xrTableCell13"; this.xrTableCell13.Text = "FLS/Woche Soll"; - this.xrTableCell13.Weight = 0.14878269161877905D; + this.xrTableCell13.Weight = 0.1599859268146562D; // // xrTableCell14 // @@ -791,6 +810,16 @@ namespace BeWoAuxilio this.xrTableCell48.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell48.Weight = 0.08870972754682778D; // + // xrTableCell57 + // + this.xrTableCell57.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell57.Multiline = true; + this.xrTableCell57.Name = "xrTableCell57"; + this.xrTableCell57.StylePriority.UseBorders = false; + this.xrTableCell57.StylePriority.UseTextAlignment = false; + this.xrTableCell57.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell57.Weight = 0.13440865878766972D; + // // xrTableCell49 // this.xrTableCell49.Borders = DevExpress.XtraPrinting.BorderSide.Right; @@ -853,35 +882,6 @@ namespace BeWoAuxilio this.xrTableCell54.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell54.Weight = 0.13525699097924734D; // - // xrTableCell55 - // - this.xrTableCell55.Multiline = true; - this.xrTableCell55.Name = "xrTableCell55"; - this.xrTableCell55.Text = "FK / Assis-tenz"; - this.xrTableCell55.Weight = 0.089269612164975D; - // - // xrTableCell56 - // - this.xrTableCell56.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptDetailList.Custom1")}); - this.xrTableCell56.Font = new DevExpress.Drawing.DXFont("Arial", 7F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrTableCell56.Multiline = true; - this.xrTableCell56.Name = "xrTableCell56"; - this.xrTableCell56.StylePriority.UseFont = false; - this.xrTableCell56.StylePriority.UseTextAlignment = false; - this.xrTableCell56.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell56.Weight = 0.091349423732524554D; - // - // xrTableCell57 - // - this.xrTableCell57.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell57.Multiline = true; - this.xrTableCell57.Name = "xrTableCell57"; - this.xrTableCell57.StylePriority.UseBorders = false; - this.xrTableCell57.StylePriority.UseTextAlignment = false; - this.xrTableCell57.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell57.Weight = 0.13440865878766972D; - // // Hilfeplanuebersicht // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { diff --git a/ReportImp/BeWoAuxilio/SupportConceptReport.cs b/ReportImp/BeWoAuxilio/SupportConceptReport.cs index 9f3e51e36..d3bb75c9f 100644 --- a/ReportImp/BeWoAuxilio/SupportConceptReport.cs +++ b/ReportImp/BeWoAuxilio/SupportConceptReport.cs @@ -36,12 +36,12 @@ namespace BeWoAuxilio zeitNFk += sr.RoundedDuration; } } - if (zeitNFk > 0) + if (zeitFk > 0) { - quote = zeitFk / zeitNFk; - sc.Custom1 = String.Format("{0:0.00} %", (100 + quote) / 100); + quote = zeitNFk / zeitFk; + sc.Custom1 = String.Format("{0:0.0}%", (100 * quote)); } - else if (zeitFk > 0 ) + else if (zeitNFk > 0 ) { sc.Custom1 = "100 %"; }