From 4ae3a82f0951035f1972f73d34217b67af99f4a5 Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 1 Oct 2020 10:37:26 +0200 Subject: [PATCH] CB Reports --- Host/Host.csproj.user | 2 +- .../WahlEv/QuittierungsbelegBeWo.Designer.cs | 51 ++++--------------- ReportImp/WahlEv/QuittierungsbelegBeWo.cs | 2 +- ReportImp/WahlEv/QuittierungsbelegNeu.cs | 2 +- 4 files changed, 13 insertions(+), 44 deletions(-) diff --git a/Host/Host.csproj.user b/Host/Host.csproj.user index 2beba1959..4b21acef4 100644 --- a/Host/Host.csproj.user +++ b/Host/Host.csproj.user @@ -3,7 +3,7 @@ BeWo2.0 true - Release|Any CPU + Debug|Any CPU diff --git a/ReportImp/WahlEv/QuittierungsbelegBeWo.Designer.cs b/ReportImp/WahlEv/QuittierungsbelegBeWo.Designer.cs index dd8affe7e..739b82609 100644 --- a/ReportImp/WahlEv/QuittierungsbelegBeWo.Designer.cs +++ b/ReportImp/WahlEv/QuittierungsbelegBeWo.Designer.cs @@ -59,7 +59,6 @@ namespace WahlEv this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.lblDiff = new DevExpress.XtraReports.UI.XRLabel(); this.lblGeleistet = new DevExpress.XtraReports.UI.XRLabel(); - this.lblStdMonatBewilligt = new DevExpress.XtraReports.UI.XRLabel(); this.lblStdGesamtBewilligt = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel24 = new DevExpress.XtraReports.UI.XRLabel(); @@ -78,7 +77,6 @@ namespace WahlEv this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule(); this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule(); @@ -398,7 +396,6 @@ namespace WahlEv this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.lblDiff, this.lblGeleistet, - this.lblStdMonatBewilligt, this.lblStdGesamtBewilligt, this.xrLabel25, this.xrLabel24, @@ -417,7 +414,6 @@ namespace WahlEv this.xrLabel10, this.xrLabel12, this.xrLabel1, - this.xrLabel22, this.xrLabel11}); this.ReportHeader.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ReportHeader.HeightF = 456.3752F; @@ -430,7 +426,7 @@ namespace WahlEv | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblDiff.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblDiff.LocationFloat = new DevExpress.Utils.PointFloat(260.0001F, 410F); + this.lblDiff.LocationFloat = new DevExpress.Utils.PointFloat(260.0001F, 366.25F); this.lblDiff.Name = "lblDiff"; this.lblDiff.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F); this.lblDiff.SizeF = new System.Drawing.SizeF(60F, 34F); @@ -447,7 +443,7 @@ namespace WahlEv | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblGeleistet.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblGeleistet.LocationFloat = new DevExpress.Utils.PointFloat(260F, 306F); + this.lblGeleistet.LocationFloat = new DevExpress.Utils.PointFloat(260.0001F, 262.25F); this.lblGeleistet.Name = "lblGeleistet"; this.lblGeleistet.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F); this.lblGeleistet.SizeF = new System.Drawing.SizeF(60F, 34F); @@ -458,22 +454,6 @@ namespace WahlEv this.lblGeleistet.Text = "6,00"; this.lblGeleistet.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; // - // lblStdMonatBewilligt - // - this.lblStdMonatBewilligt.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.lblStdMonatBewilligt.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblStdMonatBewilligt.LocationFloat = new DevExpress.Utils.PointFloat(260.0001F, 238F); - this.lblStdMonatBewilligt.Name = "lblStdMonatBewilligt"; - this.lblStdMonatBewilligt.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F); - this.lblStdMonatBewilligt.SizeF = new System.Drawing.SizeF(60F, 22F); - this.lblStdMonatBewilligt.StylePriority.UseBorders = false; - this.lblStdMonatBewilligt.StylePriority.UseFont = false; - this.lblStdMonatBewilligt.StylePriority.UsePadding = false; - this.lblStdMonatBewilligt.StylePriority.UseTextAlignment = false; - this.lblStdMonatBewilligt.Text = "6,00"; - this.lblStdMonatBewilligt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - // // lblStdGesamtBewilligt // this.lblStdGesamtBewilligt.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) @@ -539,7 +519,7 @@ namespace WahlEv this.xrLabel20.Angle = 90F; this.xrLabel20.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(540F, 216F); + this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(539.9999F, 172.25F); this.xrLabel20.Name = "xrLabel20"; this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 3, 100F); this.xrLabel20.SizeF = new System.Drawing.SizeF(20F, 240F); @@ -554,7 +534,7 @@ namespace WahlEv // this.xrLabel19.Angle = 90F; this.xrLabel19.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); - this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(520F, 216F); + this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(520.0002F, 172.25F); this.xrLabel19.Name = "xrLabel19"; this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 3, 100F); this.xrLabel19.SizeF = new System.Drawing.SizeF(20F, 240F); @@ -569,7 +549,7 @@ namespace WahlEv // this.xrLabel18.Angle = 90F; this.xrLabel18.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); - this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(500F, 216F); + this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(500F, 172.25F); this.xrLabel18.Name = "xrLabel18"; this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 3, 100F); this.xrLabel18.SizeF = new System.Drawing.SizeF(20F, 240F); @@ -584,7 +564,7 @@ namespace WahlEv // this.xrLabel17.Angle = 90F; this.xrLabel17.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); - this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(460F, 216F); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(460.0001F, 172.25F); this.xrLabel17.Name = "xrLabel17"; this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 3, 100F); this.xrLabel17.SizeF = new System.Drawing.SizeF(20F, 240F); @@ -599,7 +579,7 @@ namespace WahlEv // this.xrLabel16.Angle = 90F; this.xrLabel16.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); - this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(480F, 216F); + this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(479.9998F, 172.25F); this.xrLabel16.Name = "xrLabel16"; this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 3, 100F); this.xrLabel16.SizeF = new System.Drawing.SizeF(20F, 240F); @@ -614,7 +594,7 @@ namespace WahlEv // this.xrLabel15.Angle = 90F; this.xrLabel15.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(440F, 216F); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(439.9999F, 172.25F); this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 3, 100F); this.xrLabel15.SizeF = new System.Drawing.SizeF(20F, 240F); @@ -627,7 +607,7 @@ namespace WahlEv // // xrLabel14 // - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 410F); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 366.25F); this.xrLabel14.Multiline = true; this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -637,7 +617,7 @@ namespace WahlEv // // xrLabel7 // - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 308F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 264.25F); this.xrLabel7.Multiline = true; this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -697,15 +677,6 @@ namespace WahlEv this.xrLabel1.Text = "Monatliche Betreuungszeiterfassung\r\nBetreutes Wohnen"; this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // - // xrLabel22 - // - this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(0F, 242F); - this.xrLabel22.Name = "xrLabel22"; - this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel22.SizeF = new System.Drawing.SizeF(260.0001F, 18F); - this.xrLabel22.StylePriority.UseFont = false; - this.xrLabel22.Text = "ergibt im Monat: (Wochenstunden x 4,33)"; - // // xrLabel11 // this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 220F); @@ -963,7 +934,6 @@ namespace WahlEv private DevExpress.XtraReports.UI.XRLabel xrLabel10; private DevExpress.XtraReports.UI.XRLabel xrLabel12; private DevExpress.XtraReports.UI.XRLabel xrLabel1; - private DevExpress.XtraReports.UI.XRLabel xrLabel22; private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.CalculatedField fieldBillableFLS; private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareFLS; @@ -987,7 +957,6 @@ namespace WahlEv private DevExpress.XtraReports.UI.XRLabel xrLabel17; private DevExpress.XtraReports.UI.XRLabel xrLabel16; private DevExpress.XtraReports.UI.XRLabel xrLabel15; - private DevExpress.XtraReports.UI.XRLabel lblStdMonatBewilligt; private DevExpress.XtraReports.UI.XRLabel lblStdGesamtBewilligt; private DevExpress.XtraReports.UI.XRLabel lblDiff; private DevExpress.XtraReports.UI.XRLabel lblGeleistet; diff --git a/ReportImp/WahlEv/QuittierungsbelegBeWo.cs b/ReportImp/WahlEv/QuittierungsbelegBeWo.cs index f4fd7c8c4..8ac23d2eb 100644 --- a/ReportImp/WahlEv/QuittierungsbelegBeWo.cs +++ b/ReportImp/WahlEv/QuittierungsbelegBeWo.cs @@ -57,7 +57,7 @@ namespace WahlEv decimal sollProMonat = Math.Round(pRO.ApprovedFLSPerWeek * 4.33m, 2, MidpointRounding.AwayFromZero); lblStdGesamtBewilligt.Text = String.Format("{0:0.00}", pRO.ApprovedFLSTotal); - lblStdMonatBewilligt.Text = String.Format("{0:0.00}", sollProMonat); + //lblStdMonatBewilligt.Text = String.Format("{0:0.00}", sollProMonat); decimal geleisteteStunden = Math.Round((decimal)geleistet / 60, 2, MidpointRounding.AwayFromZero); diff --git a/ReportImp/WahlEv/QuittierungsbelegNeu.cs b/ReportImp/WahlEv/QuittierungsbelegNeu.cs index 963d178ab..292a49ed9 100644 --- a/ReportImp/WahlEv/QuittierungsbelegNeu.cs +++ b/ReportImp/WahlEv/QuittierungsbelegNeu.cs @@ -57,7 +57,7 @@ namespace WahlEv decimal sollProMonat = Math.Round(pRO.ApprovedFLSPerWeek * 4.33m, 2, MidpointRounding.AwayFromZero); lblStdGesamtBewilligt.Text = String.Format("{0:0.00}", pRO.ApprovedFLSTotal); - lblStdMonatBewilligt.Text = String.Format("{0:0.00}", sollProMonat); + //lblStdMonatBewilligt.Text = String.Format("{0:0.00}", sollProMonat); decimal geleisteteStunden = Math.Round((decimal)geleistet / 60, 2, MidpointRounding.AwayFromZero);