From 8bd8032fc3570208a803bc1d42e50586cd129253 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Wed, 24 Nov 2021 15:25:25 +0100 Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20VARO=20Rechnung=20und=20Quitt?= =?UTF-8?q?ierungsbeleg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RatPlusTat/Quittierungsbeleg.Designer.cs | 50 +++---- .../QuittierungsbelegPflegekasse.Designer.cs | 25 +++- .../RatPlusTat/RatPlusTatReportCreator.cs | 2 +- .../Invoicing/CustomInvoiceCreation.cs | 49 +++++-- .../Quittierungsbeleg.Designer.cs | 135 +++++++++++------- .../VaroSozialagentur/Quittierungsbeleg.cs | 54 ++++++- .../ServiceInvoiceReport.Designer.cs | 5 +- .../VaroSozialagentur/ServiceInvoiceReport.cs | 12 +- .../VaroSozialagentur.csproj | 3 - 9 files changed, 219 insertions(+), 116 deletions(-) diff --git a/ReportImp/RatPlusTat/Quittierungsbeleg.Designer.cs b/ReportImp/RatPlusTat/Quittierungsbeleg.Designer.cs index e6834b69c..3443707e4 100644 --- a/ReportImp/RatPlusTat/Quittierungsbeleg.Designer.cs +++ b/ReportImp/RatPlusTat/Quittierungsbeleg.Designer.cs @@ -77,6 +77,8 @@ namespace RatPlusTat this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule(); this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); @@ -118,8 +120,6 @@ namespace RatPlusTat this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox(); - this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -731,6 +731,29 @@ namespace RatPlusTat this.topMarginBand1.HeightF = 161.4583F; this.topMarginBand1.Name = "topMarginBand1"; // + // xrLabel19 + // + this.xrLabel19.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel19.ForeColor = System.Drawing.Color.Black; + this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(197.3055F, 73.95834F); + this.xrLabel19.Multiline = true; + this.xrLabel19.Name = "xrLabel19"; + this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel19.SizeF = new System.Drawing.SizeF(338.3334F, 25F); + this.xrLabel19.StylePriority.UseFont = false; + this.xrLabel19.StylePriority.UseForeColor = false; + this.xrLabel19.StylePriority.UseTextAlignment = false; + this.xrLabel19.Text = "Quittierungsbeleg "; + this.xrLabel19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + // + // xrPictureBox3 + // + this.xrPictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox3.Image"))); + this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(535.6389F, 38.54173F); + this.xrPictureBox3.Name = "xrPictureBox3"; + this.xrPictureBox3.SizeF = new System.Drawing.SizeF(177.0833F, 87.9166F); + this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // // bottomMarginBand1 // this.bottomMarginBand1.HeightF = 30F; @@ -1215,29 +1238,6 @@ namespace RatPlusTat this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldKontaktArt.Name = "fieldKontaktArt"; // - // xrPictureBox3 - // - this.xrPictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox3.Image"))); - this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(535.6389F, 38.54173F); - this.xrPictureBox3.Name = "xrPictureBox3"; - this.xrPictureBox3.SizeF = new System.Drawing.SizeF(177.0833F, 87.9166F); - this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - // - // xrLabel19 - // - this.xrLabel19.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel19.ForeColor = System.Drawing.Color.Black; - this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(197.3055F, 73.95834F); - this.xrLabel19.Multiline = true; - this.xrLabel19.Name = "xrLabel19"; - this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel19.SizeF = new System.Drawing.SizeF(338.3334F, 25F); - this.xrLabel19.StylePriority.UseFont = false; - this.xrLabel19.StylePriority.UseForeColor = false; - this.xrLabel19.StylePriority.UseTextAlignment = false; - this.xrLabel19.Text = "Quittierungsbeleg "; - this.xrLabel19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - // // Quittierungsbeleg // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { diff --git a/ReportImp/RatPlusTat/QuittierungsbelegPflegekasse.Designer.cs b/ReportImp/RatPlusTat/QuittierungsbelegPflegekasse.Designer.cs index 61ca28337..bd338908b 100644 --- a/ReportImp/RatPlusTat/QuittierungsbelegPflegekasse.Designer.cs +++ b/ReportImp/RatPlusTat/QuittierungsbelegPflegekasse.Designer.cs @@ -281,11 +281,13 @@ namespace RatPlusTat // // xrTableCell3 // + this.xrTableCell3.BackColor = System.Drawing.Color.Gainsboro; this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrTableCell3.Name = "xrTableCell3"; this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrTableCell3.StylePriority.UseBackColor = false; this.xrTableCell3.StylePriority.UseBorders = false; this.xrTableCell3.StylePriority.UseFont = false; this.xrTableCell3.StylePriority.UsePadding = false; @@ -296,12 +298,14 @@ namespace RatPlusTat // // xrTableCell4 // + this.xrTableCell4.BackColor = System.Drawing.Color.Gainsboro; this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrTableCell4.Multiline = true; this.xrTableCell4.Name = "xrTableCell4"; this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 4, 0, 0, 100F); + this.xrTableCell4.StylePriority.UseBackColor = false; this.xrTableCell4.StylePriority.UseBorders = false; this.xrTableCell4.StylePriority.UseFont = false; this.xrTableCell4.StylePriority.UsePadding = false; @@ -312,12 +316,14 @@ namespace RatPlusTat // // xrTableCell9 // + this.xrTableCell9.BackColor = System.Drawing.Color.Gainsboro; this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell9.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrTableCell9.Multiline = true; this.xrTableCell9.Name = "xrTableCell9"; this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrTableCell9.StylePriority.UseBackColor = false; this.xrTableCell9.StylePriority.UseBorders = false; this.xrTableCell9.StylePriority.UseFont = false; this.xrTableCell9.StylePriority.UsePadding = false; @@ -328,10 +334,12 @@ namespace RatPlusTat // // xrTableCell6 // + this.xrTableCell6.BackColor = System.Drawing.Color.Gainsboro; this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell6.Font = new System.Drawing.Font("Arial", 10F); this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.StylePriority.UseBackColor = false; this.xrTableCell6.StylePriority.UseBorders = false; this.xrTableCell6.StylePriority.UseFont = false; this.xrTableCell6.StylePriority.UseTextAlignment = false; @@ -341,14 +349,16 @@ namespace RatPlusTat // // xrTableCell28 // + this.xrTableCell28.BackColor = System.Drawing.Color.Gainsboro; this.xrTableCell28.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell28.Font = new System.Drawing.Font("Arial", 10F); this.xrTableCell28.Name = "xrTableCell28"; + this.xrTableCell28.StylePriority.UseBackColor = false; this.xrTableCell28.StylePriority.UseBorders = false; this.xrTableCell28.StylePriority.UseFont = false; this.xrTableCell28.StylePriority.UseTextAlignment = false; - this.xrTableCell28.Text = "Unterschrift"; + this.xrTableCell28.Text = "Mitarbeiter/in"; this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; this.xrTableCell28.Weight = 0.55827160530189857D; // @@ -366,19 +376,23 @@ namespace RatPlusTat // // xrTableCell1 // + this.xrTableCell1.BackColor = System.Drawing.Color.Gainsboro; this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.StylePriority.UseBackColor = false; this.xrTableCell1.StylePriority.UseBorders = false; this.xrTableCell1.Weight = 0.26536312849161997D; // // xrTableCell8 // + this.xrTableCell8.BackColor = System.Drawing.Color.Gainsboro; this.xrTableCell8.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell8.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.StylePriority.UseBackColor = false; this.xrTableCell8.StylePriority.UseBorders = false; this.xrTableCell8.StylePriority.UseFont = false; this.xrTableCell8.StylePriority.UseTextAlignment = false; @@ -388,11 +402,13 @@ namespace RatPlusTat // // xrTableCell5 // + this.xrTableCell5.BackColor = System.Drawing.Color.Gainsboro; this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell5.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.StylePriority.UseBackColor = false; this.xrTableCell5.StylePriority.UseBorders = false; this.xrTableCell5.StylePriority.UseFont = false; this.xrTableCell5.StylePriority.UseTextAlignment = false; @@ -402,7 +418,7 @@ namespace RatPlusTat // // xrTableCell7 // - this.xrTableCell7.BackColor = System.Drawing.Color.Yellow; + this.xrTableCell7.BackColor = System.Drawing.Color.Gainsboro; this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell7.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -417,10 +433,12 @@ namespace RatPlusTat // // xrTableCell11 // + this.xrTableCell11.BackColor = System.Drawing.Color.Gainsboro; this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell11.Font = new System.Drawing.Font("Arial", 10F); this.xrTableCell11.Name = "xrTableCell11"; + this.xrTableCell11.StylePriority.UseBackColor = false; this.xrTableCell11.StylePriority.UseBorders = false; this.xrTableCell11.StylePriority.UseFont = false; this.xrTableCell11.StylePriority.UseTextAlignment = false; @@ -430,14 +448,15 @@ namespace RatPlusTat // // xrTableCell43 // + this.xrTableCell43.BackColor = System.Drawing.Color.Gainsboro; this.xrTableCell43.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell43.Font = new System.Drawing.Font("Arial", 10F); this.xrTableCell43.Name = "xrTableCell43"; + this.xrTableCell43.StylePriority.UseBackColor = false; this.xrTableCell43.StylePriority.UseBorders = false; this.xrTableCell43.StylePriority.UseFont = false; this.xrTableCell43.StylePriority.UseTextAlignment = false; - this.xrTableCell43.Text = "Mitarbeiter/in"; this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell43.Weight = 0.55827160530189857D; // diff --git a/ReportImp/RatPlusTat/RatPlusTatReportCreator.cs b/ReportImp/RatPlusTat/RatPlusTatReportCreator.cs index 74b4f1255..a579bacb3 100644 --- a/ReportImp/RatPlusTat/RatPlusTatReportCreator.cs +++ b/ReportImp/RatPlusTat/RatPlusTatReportCreator.cs @@ -74,7 +74,7 @@ namespace RatPlusTat { foreach (ServicesOverviewRO.ServiceDetail s in ro.Services) { - if (ro.Costbearer.ToLower().Contains("lvr") && (s.ServiceCategory.ToLower().Contains("direkte") || s.ServiceCategory.ToLower().Contains("indirekte"))) + if (ro.Costbearer.ToLower().Contains("lvr") && !s.ServiceCategory.ToLower().Contains("assistenz")) { bewoRo.Services.Add(s); bewoRo.TotalFLMBillable += s.Minutes; diff --git a/ReportImp/VaroSozialagentur/Invoicing/CustomInvoiceCreation.cs b/ReportImp/VaroSozialagentur/Invoicing/CustomInvoiceCreation.cs index 0ecfeaff0..7042904e8 100644 --- a/ReportImp/VaroSozialagentur/Invoicing/CustomInvoiceCreation.cs +++ b/ReportImp/VaroSozialagentur/Invoicing/CustomInvoiceCreation.cs @@ -43,14 +43,35 @@ namespace VaroSozialagentur.Invoicing if (invoice.ServiceInvoicePeriodList != null && invoice.ServiceInvoicePeriodList.Count > 1) { - ServiceInvoicePeriod newPeriod = null; + //Fasse Fahrkosten über mehrere InvoicePeriods zusammen + ServiceInvoicePeriod newPeriod = invoice.ServiceInvoicePeriodList[0]; + List alleNichtFahrtkosten = new List(); + List alleFahrtkosten = new List(); + foreach (var ip in invoice.ServiceInvoicePeriodList) { - if (newPeriod == null) - newPeriod = ip; - else - newPeriod.InvoiceItemList.AddRange(ip.InvoiceItemList); + foreach (var item in ip.InvoiceItemList) + { + if (item.ItemDescription.Contains("Fahrtkosten")) + { + alleFahrtkosten.Add(item); + } + else + { + alleNichtFahrtkosten.Add(item); + } + } } + + newPeriod.InvoiceItemList.Clear(); + newPeriod.InvoiceItemList.AddRange(alleNichtFahrtkosten); + + if (alleFahrtkosten.Count > 0) + { + var summeFahrtkosten = CreateSummaryInvoiceItems(alleFahrtkosten, invoicePeriod, newPeriod.SupportConceptApprovalPeriod, null, false, false); + newPeriod.InvoiceItemList.AddRange(summeFahrtkosten); + } + invoice.ServiceInvoicePeriodList = new List(); invoice.ServiceInvoicePeriodList.Add(newPeriod); } @@ -90,14 +111,14 @@ namespace VaroSozialagentur.Invoicing BS.Shared.Services.Calculations calc) { var list = base.CreateInvoiceItems(serviceRecordsInPeriod, invoicePeriod, scap, calc); - var fitem = CreateFahrtkostenZoneItem(serviceRecordsInPeriod, invoicePeriod, scap); + var fitem = CreateFahrtkostenZoneItem(serviceRecordsInPeriod, invoicePeriod, scap); - if (fitem != null) - list.Add(fitem); - fitem = CreateFahrtkostenItem(serviceRecordsInPeriod, scap); + if (fitem != null) + list.Add(fitem); + fitem = CreateFahrtkostenItem(serviceRecordsInPeriod, scap); - if (fitem != null) - list.Add(fitem); + if (fitem != null) + list.Add(fitem); return list; } @@ -145,7 +166,6 @@ namespace VaroSozialagentur.Invoicing return null; } - // Die Fahrtkostenitems laufen hier gar nicht erst rein und ich verstehe nicht wieso :-( public override IList CreateSummaryInvoiceItems(IList itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, Calculations calc, bool summaryPerMonth, bool addRateFactorToUnitCount) { @@ -158,7 +178,7 @@ namespace VaroSozialagentur.Invoicing InvoiceItem item; var key = GetSummaryItemKey(null, iitem, summaryPerMonth); - if (rateToItem.ContainsKey(key) && iitem.ItemDescription.Contains("Fahrt")) + if (rateToItem.ContainsKey(key)) item = rateToItem[key]; else { @@ -197,11 +217,9 @@ namespace VaroSozialagentur.Invoicing item.UnitDescription = iitem.UnitDescription; item.SupportConceptApprovalPeriodOid = scap.Oid; - rateToItem[key] = item; } - if (!item.UnitCount.HasValue) { item.UnitCount = 0; @@ -272,6 +290,7 @@ namespace VaroSozialagentur.Invoicing foreach (var sr in serviceRecords) { + if (sr.DistanceInMeter.HasValue && sr.DistanceInMeter > 0) { //String ma = sr.Employee.LastName; diff --git a/ReportImp/VaroSozialagentur/Quittierungsbeleg.Designer.cs b/ReportImp/VaroSozialagentur/Quittierungsbeleg.Designer.cs index a4e96e85f..75767d62d 100644 --- a/ReportImp/VaroSozialagentur/Quittierungsbeleg.Designer.cs +++ b/ReportImp/VaroSozialagentur/Quittierungsbeleg.Designer.cs @@ -62,11 +62,11 @@ namespace VaroSozialagentur 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.lblLeistung = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblBewilligtFls = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); @@ -78,6 +78,7 @@ namespace VaroSozialagentur this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule(); this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); @@ -113,13 +114,14 @@ namespace VaroSozialagentur this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.lblBewilligtEinheit = 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 @@ -511,10 +513,6 @@ namespace VaroSozialagentur 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]"; @@ -525,8 +523,10 @@ namespace VaroSozialagentur // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblBewilligtEinheit, + this.lblLeistung, this.xrLabel14, - this.xrLabel16, + this.lblBewilligtFls, this.xrLabel7, this.xrLabel8, this.xrLabel6, @@ -534,41 +534,56 @@ namespace VaroSozialagentur this.xrLabel4, this.xrLabel3, this.xrLabel2}); - this.ReportHeader.HeightF = 130F; + this.ReportHeader.HeightF = 150.8194F; this.ReportHeader.Name = "ReportHeader"; + this.ReportHeader.StylePriority.UseTextAlignment = false; + this.ReportHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + // + // lblLeistung + // + this.lblLeistung.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Bold); + this.lblLeistung.ForeColor = System.Drawing.Color.Black; + this.lblLeistung.LocationFloat = new DevExpress.Utils.PointFloat(255F, 25F); + this.lblLeistung.Multiline = true; + this.lblLeistung.Name = "lblLeistung"; + this.lblLeistung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblLeistung.SizeF = new System.Drawing.SizeF(207.6945F, 25F); + this.lblLeistung.StylePriority.UseFont = false; + this.lblLeistung.StylePriority.UseForeColor = false; + this.lblLeistung.StylePriority.UseTextAlignment = false; + this.lblLeistung.Text = "Leistungskategorie"; + this.lblLeistung.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; // // xrLabel14 // this.xrLabel14.BackColor = System.Drawing.Color.Gainsboro; this.xrLabel14.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(414.9999F, 47.1111F); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(378.5416F, 65.8611F); this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel14.SizeF = new System.Drawing.SizeF(178.7501F, 30.50001F); + this.xrLabel14.SizeF = new System.Drawing.SizeF(157.9167F, 29.58333F); this.xrLabel14.StylePriority.UseBackColor = false; this.xrLabel14.StylePriority.UseBorders = false; this.xrLabel14.StylePriority.UseFont = false; this.xrLabel14.StylePriority.UsePadding = false; this.xrLabel14.StylePriority.UseTextAlignment = false; - this.xrLabel14.Text = "Bewilligte FLS wöchentlich"; + this.xrLabel14.Text = "Bewilligte FLS "; this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // - // xrLabel16 + // lblBewilligtFls // - this.xrLabel16.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrLabel16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerWeek", "{0:0.##}")}); - this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(593.75F, 47.1111F); - this.xrLabel16.Name = "xrLabel16"; - this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel16.SizeF = new System.Drawing.SizeF(100.2502F, 30.50001F); - this.xrLabel16.StylePriority.UseBackColor = false; - this.xrLabel16.StylePriority.UseBorders = false; - this.xrLabel16.StylePriority.UseFont = false; - this.xrLabel16.StylePriority.UsePadding = false; - this.xrLabel16.StylePriority.UseTextAlignment = false; - this.xrLabel16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.lblBewilligtFls.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.lblBewilligtFls.LocationFloat = new DevExpress.Utils.PointFloat(536.4583F, 65.8611F); + this.lblBewilligtFls.Name = "lblBewilligtFls"; + this.lblBewilligtFls.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.lblBewilligtFls.SizeF = new System.Drawing.SizeF(50.25031F, 29.58333F); + this.lblBewilligtFls.StylePriority.UseBackColor = false; + this.lblBewilligtFls.StylePriority.UseBorders = false; + this.lblBewilligtFls.StylePriority.UseFont = false; + this.lblBewilligtFls.StylePriority.UsePadding = false; + this.lblBewilligtFls.StylePriority.UseTextAlignment = false; + this.lblBewilligtFls.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; // // xrLabel7 // @@ -576,10 +591,10 @@ namespace VaroSozialagentur this.xrLabel7.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(415F, 77.6111F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(378.5416F, 95.44443F); this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(120.6389F, 30.50001F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(157.9167F, 29.57999F); this.xrLabel7.StylePriority.UseBackColor = false; this.xrLabel7.StylePriority.UseBorders = false; this.xrLabel7.StylePriority.UseFont = false; @@ -592,10 +607,10 @@ namespace VaroSozialagentur // this.xrLabel8.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(535.6389F, 77.6111F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(536.4583F, 95.44443F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(158.3612F, 30.50001F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(183.83F, 29.58F); this.xrLabel8.StylePriority.UseBackColor = false; this.xrLabel8.StylePriority.UseBorders = false; this.xrLabel8.StylePriority.UseFont = false; @@ -608,10 +623,10 @@ namespace VaroSozialagentur // this.xrLabel6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(170F, 77.6111F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(143.9583F, 95.44443F); this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel6.SizeF = new System.Drawing.SizeF(209.3611F, 30.50001F); + this.xrLabel6.SizeF = new System.Drawing.SizeF(209.3611F, 29.57999F); this.xrLabel6.StylePriority.UseBackColor = false; this.xrLabel6.StylePriority.UseBorders = false; this.xrLabel6.StylePriority.UseFont = false; @@ -623,10 +638,10 @@ namespace VaroSozialagentur // xrLabel5 // this.xrLabel5.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(170F, 47.1111F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(143.9583F, 65.8611F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(209.3611F, 30.50001F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(209.3611F, 29.58333F); this.xrLabel5.StylePriority.UseBackColor = false; this.xrLabel5.StylePriority.UseBorders = false; this.xrLabel5.StylePriority.UseFont = false; @@ -641,10 +656,10 @@ namespace VaroSozialagentur this.xrLabel4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(49.36111F, 77.6111F); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(23.31944F, 95.44443F); this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(120.6389F, 30.50001F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(120.6389F, 29.57999F); this.xrLabel4.StylePriority.UseBackColor = false; this.xrLabel4.StylePriority.UseBorders = false; this.xrLabel4.StylePriority.UseFont = false; @@ -658,10 +673,10 @@ namespace VaroSozialagentur this.xrLabel3.BackColor = System.Drawing.Color.Gainsboro; this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(49.3611F, 47.11109F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(23.31944F, 65.8611F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(120.6389F, 30.50001F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(120.6389F, 29.58333F); this.xrLabel3.StylePriority.UseBackColor = false; this.xrLabel3.StylePriority.UseBorders = false; this.xrLabel3.StylePriority.UseFont = false; @@ -674,15 +689,15 @@ namespace VaroSozialagentur // this.xrLabel2.Font = new System.Drawing.Font("Calibri", 14F, System.Drawing.FontStyle.Bold); this.xrLabel2.ForeColor = System.Drawing.Color.Black; - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(255F, 0F); this.xrLabel2.Multiline = true; this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(674.9998F, 25F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(207.6945F, 25F); this.xrLabel2.StylePriority.UseFont = false; this.xrLabel2.StylePriority.UseForeColor = false; this.xrLabel2.StylePriority.UseTextAlignment = false; - this.xrLabel2.Text = "Quittierungsbeleg [Mandator.Name]"; + this.xrLabel2.Text = "Quittierungsbeleg"; this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; // // formattingRuleServiceDesc @@ -713,6 +728,14 @@ namespace VaroSozialagentur this.topMarginBand1.HeightF = 175F; this.topMarginBand1.Name = "topMarginBand1"; // + // xrPictureBox1 + // + this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(602.8337F, 48.95833F); + this.xrPictureBox1.Name = "xrPictureBox1"; + this.xrPictureBox1.SizeF = new System.Drawing.SizeF(134.1663F, 126.0417F); + this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // // bottomMarginBand1 // this.bottomMarginBand1.HeightF = 30F; @@ -1099,13 +1122,23 @@ namespace VaroSozialagentur this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldKontaktArt.Name = "fieldKontaktArt"; // - // xrPictureBox1 + // lblBewilligtEinheit // - this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(602.8337F, 48.95833F); - this.xrPictureBox1.Name = "xrPictureBox1"; - this.xrPictureBox1.SizeF = new System.Drawing.SizeF(134.1663F, 126.0417F); - this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + this.lblBewilligtEinheit.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); + this.lblBewilligtEinheit.LocationFloat = new DevExpress.Utils.PointFloat(586.7086F, 65.8611F); + this.lblBewilligtEinheit.Name = "lblBewilligtEinheit"; + this.lblBewilligtEinheit.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.lblBewilligtEinheit.SizeF = new System.Drawing.SizeF(133.5797F, 29.58333F); + this.lblBewilligtEinheit.StylePriority.UseBackColor = false; + this.lblBewilligtEinheit.StylePriority.UseBorders = false; + this.lblBewilligtEinheit.StylePriority.UseFont = false; + this.lblBewilligtEinheit.StylePriority.UsePadding = false; + this.lblBewilligtEinheit.StylePriority.UseTextAlignment = false; + this.lblBewilligtEinheit.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); // // Quittierungsbeleg // @@ -1132,10 +1165,10 @@ namespace VaroSozialagentur this.Version = "17.1"; ((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(); } @@ -1221,9 +1254,11 @@ namespace VaroSozialagentur private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; private DevExpress.XtraReports.UI.XRLabel xrLabel14; - private DevExpress.XtraReports.UI.XRLabel xrLabel16; + private DevExpress.XtraReports.UI.XRLabel lblBewilligtFls; private DevExpress.XtraReports.UI.XRPictureBox picSignature; private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; + private DevExpress.XtraReports.UI.XRLabel lblLeistung; + private DevExpress.XtraReports.UI.XRLabel lblBewilligtEinheit; } } diff --git a/ReportImp/VaroSozialagentur/Quittierungsbeleg.cs b/ReportImp/VaroSozialagentur/Quittierungsbeleg.cs index 71a2a0e30..39a9a11b0 100644 --- a/ReportImp/VaroSozialagentur/Quittierungsbeleg.cs +++ b/ReportImp/VaroSozialagentur/Quittierungsbeleg.cs @@ -5,6 +5,8 @@ using System.IO; using System.Text.RegularExpressions; using BeWo.Report; using BeWo.Report.ReportObjects; +using BeWo.Service.DCEntityMapper; +using BS.Shared; using BS.Shared.Core; using DevExpress.XtraReports.UI; @@ -19,24 +21,25 @@ namespace VaroSozialagentur public void SetReportDataSource(ServicesOverviewRO pRO) { - // Get calling method name //StackTrace stackTrace = new StackTrace(); //Debug.WriteLine(stackTrace.GetFrame(1).GetMethod().Name); bool hatGruppen = false; + lblLeistung.Visible = false; - //if (pRO == null) - // return; double minuten = 0; + var countI = 0; + var countII = 0; + var countAll = pRO.Services.Count; - if (pRO.Services != null) + if (pRO.Services != null) { List servicesBillable = new List(); foreach (var sd in pRO.Services) { - if (sd.IsBillable && !sd.ServiceCategory.Contains("Fahrt")) // AB: ich bin mir nicht sicher ob die "Fahrt" hier noch maßgeblich ist... + if (sd.IsBillable && !sd.ServiceCategory.Contains("Fahrt")) { minuten += sd.Minutes; ServicesOverviewRO.CreateSignatureString(sd); @@ -51,11 +54,52 @@ namespace VaroSozialagentur } servicesBillable.Add(sd); } + if (sd.ServiceCategory.Contains("Leistungsumfang II")) + { + countII += 1; + lblLeistung.Text = "Leistungsumfang II"; + } + + else if (sd.ServiceCategory == ("Leistungsumfang I")) + { + countI += 1; + lblLeistung.Text = "Leistungsumfang I"; + } } pRO.Services = servicesBillable; } + if (countAll == countII || countAll == countI) + lblLeistung.Visible = true; + if (pRO.CostBearer2SupportConceptList != null && pRO.CostBearer2SupportConceptList.Count > 0) + { + var c2s = pRO.CostBearer2SupportConceptList[0]; + var dc = MapperFactory.SupportConceptCostBearerRelDC_CostBearer2SupportConcept.MapToNewDC(c2s); + bool showMonat = false; + decimal bewilligteFLS = 0; + + foreach (var scap in dc.ApprovalPeriodList) + { + if (scap.ApprovedBEPerInterval.HasValue && scap.ApprovedBEInterval.HasValue && scap.ApprovedBEInterval.Value == SupportConceptApprovalInterval.Monthly) + { + showMonat = true; + bewilligteFLS = scap.ApprovedBEPerInterval.Value; + } + } + + if (showMonat) + { + lblBewilligtFls.Text = String.Format("{0:0.00}", bewilligteFLS); + lblBewilligtEinheit.Text = "pro Monat"; + } + else + { + lblBewilligtFls.Text = String.Format("{0:0.00}", pRO.ApprovedFLSPerWeek); + lblBewilligtEinheit.Text = "pro Woche"; + } + + } pRO.TotalFLMBillable = minuten; if (String.IsNullOrWhiteSpace(pRO.AbsenceTimes)) diff --git a/ReportImp/VaroSozialagentur/ServiceInvoiceReport.Designer.cs b/ReportImp/VaroSozialagentur/ServiceInvoiceReport.Designer.cs index 82fe320af..ef1e144b9 100644 --- a/ReportImp/VaroSozialagentur/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/VaroSozialagentur/ServiceInvoiceReport.Designer.cs @@ -476,7 +476,6 @@ namespace VaroSozialagentur this.DetailReport2.DataSource = this.bindingSource1; this.DetailReport2.Level = 0; this.DetailReport2.Name = "DetailReport2"; - this.DetailReport2.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand; // // Detail3 // @@ -539,7 +538,7 @@ namespace VaroSozialagentur this.xrTableCell42.StylePriority.UsePadding = false; this.xrTableCell42.StylePriority.UseTextAlignment = false; this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell42.Weight = 0.88626285817953465D; + this.xrTableCell42.Weight = 0.96934959855254166D; // // xrTableCell43 // @@ -555,7 +554,7 @@ namespace VaroSozialagentur this.xrTableCell43.StylePriority.UseTextAlignment = false; this.xrTableCell43.Text = "xrTableCell43"; this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell43.Weight = 0.86336756286109606D; + this.xrTableCell43.Weight = 0.780280822488089D; // // xrTableCell44 // diff --git a/ReportImp/VaroSozialagentur/ServiceInvoiceReport.cs b/ReportImp/VaroSozialagentur/ServiceInvoiceReport.cs index 8ff105237..bcbb780e7 100644 --- a/ReportImp/VaroSozialagentur/ServiceInvoiceReport.cs +++ b/ReportImp/VaroSozialagentur/ServiceInvoiceReport.cs @@ -1,4 +1,5 @@ using System; +using System.Linq; using BeWo.Report; using BeWo.Report.ReportObjects; @@ -15,17 +16,6 @@ namespace VaroSozialagentur public void SetReportDataSource(ServiceInvoiceRO pRO) { - //DateTime start = pRO.AccountingPeriodStart; - //DateTime end = pRO.AccountingPeriodEnd; - //if (start.Month == end.Month && start.Year == end.Year) - //{ - // lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Monat {0:MMMM yyyy} folgende erbrachte Tätigkeiten:", start); - // } - // else - // { - // lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end); - // } - string[] start = pRO.AccountingPeriodStart.ToString().Split(' '); string[] ende = pRO.AccountingPeriodEnd.ToString().Split(' '); diff --git a/ReportImp/VaroSozialagentur/VaroSozialagentur.csproj b/ReportImp/VaroSozialagentur/VaroSozialagentur.csproj index 7cb64919b..3cc308870 100644 --- a/ReportImp/VaroSozialagentur/VaroSozialagentur.csproj +++ b/ReportImp/VaroSozialagentur/VaroSozialagentur.csproj @@ -103,8 +103,5 @@ Designer - - - \ No newline at end of file