From 14ff40450035fc8417f5b23b80b2b9aa8b0ce4b6 Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Wed, 21 Feb 2024 16:39:46 +0100 Subject: [PATCH] MH: LH Stade --- .../Invoicing/CustomInvoiceCreation.cs | 13 ++- .../CustomSettlementInvoiceCreation.cs | 4 +- ...QuittierungsbelegNiedersachsen.Designer.cs | 89 +++++-------------- .../QuittierungsbelegNiedersachsen.cs | 2 +- 4 files changed, 28 insertions(+), 80 deletions(-) diff --git a/ReportImp/LebenshilfeStade/Invoicing/CustomInvoiceCreation.cs b/ReportImp/LebenshilfeStade/Invoicing/CustomInvoiceCreation.cs index 70f13d937..4d07fec47 100644 --- a/ReportImp/LebenshilfeStade/Invoicing/CustomInvoiceCreation.cs +++ b/ReportImp/LebenshilfeStade/Invoicing/CustomInvoiceCreation.cs @@ -23,11 +23,6 @@ namespace LebenshilfeStade.Invoicing { var invoiceItem = base.CreateInvoiceItem(iServiceRecord, scap, calc); - // Vermerken, ob MA (un)qualifiziert ist, um den richtigen Preis für die Pauschale zu bekommen (in "Preise" hinterlegt) - //var emp = DAOFactory.GenericDAO.GetByID(iServiceRecord.Employee.EmployeeOid); - //if (emp.IsQualified.HasValue) - // invoiceItem.Notice = emp.IsQualified.Value ? "Wegepauschale Qualifiziert" : "Wegepauschale kompensatorisch"; - var crp = scap.CostBearer2SupportConcept.CostBearer.CostRatePeriods; if (crp != null && crp.Count > 0) { @@ -63,9 +58,11 @@ namespace LebenshilfeStade.Invoicing item.UnitCount *= 60 / minsProFLS; var countQualifiziert = serviceRecordsInPeriod.Where(sr => sr.ServiceDescription.CategoryName.ToLower().Contains("qualifiziert") && sr.ServiceDescription.Name.ToLower().Contains("mit wegezeit")).ToList(); - toAdd.Add(CreateKontaktpauschalenItem(countQualifiziert.Count, item.ItemPeriodStart, item.ItemPeriodEnd, "Wegepauschale Qualifiziert")); + if (countQualifiziert.Count > 0) + toAdd.Add(CreateKontaktpauschalenItem(countQualifiziert.Count, item.ItemPeriodStart, item.ItemPeriodEnd, "Wegepauschale Qualifiziert")); var countKompensatorisch = serviceRecordsInPeriod.Where(sr => sr.ServiceDescription.CategoryName.ToLower().Contains("kompensatorisch") && sr.ServiceDescription.Name.ToLower().Contains("mit wegezeit")).ToList(); - toAdd.Add(CreateKontaktpauschalenItem(countKompensatorisch.Count, item.ItemPeriodStart, item.ItemPeriodEnd, "Wegepauschale kompensatorisch")); + if (countKompensatorisch.Count > 0) + toAdd.Add(CreateKontaktpauschalenItem(countKompensatorisch.Count, item.ItemPeriodStart, item.ItemPeriodEnd, "Wegepauschale kompensatorisch")); } if (toAdd.Count > 0) @@ -138,7 +135,7 @@ namespace LebenshilfeStade.Invoicing var ii = new InvoiceItem() { UnitCount = unitCount, - ItemDescription = "Kontaktpauschale", + ItemDescription = "Wegezeiten-Pauschale", UnitDescription = "Pauschale pro direktem Kontakt", AmountPerUnit = pauschale, AmountTotal = pauschale * unitCount, diff --git a/ReportImp/LebenshilfeStade/Invoicing/CustomSettlementInvoiceCreation.cs b/ReportImp/LebenshilfeStade/Invoicing/CustomSettlementInvoiceCreation.cs index 5e100d6bb..23478b759 100644 --- a/ReportImp/LebenshilfeStade/Invoicing/CustomSettlementInvoiceCreation.cs +++ b/ReportImp/LebenshilfeStade/Invoicing/CustomSettlementInvoiceCreation.cs @@ -117,7 +117,7 @@ namespace LebenshilfeStade.Invoicing invoiceItem = new InvoiceItemDC() { UnitCount = countQualifiziert.Count, - ItemDescription = "Kontaktpauschale", + ItemDescription = "Wegezeiten-Pauschale", UnitDescription = "Pauschale pro direktem Kontakt", AmountPerUnit = pauschale, AmountTotal = pauschale * countQualifiziert.Count, @@ -136,7 +136,7 @@ namespace LebenshilfeStade.Invoicing invoiceItem = new InvoiceItemDC() { UnitCount = countKompensatorisch.Count, - ItemDescription = "Kontaktpauschale", + ItemDescription = "Wegezeiten-Pauschale", UnitDescription = "Pauschale pro direktem Kontakt", AmountPerUnit = pauschale, AmountTotal = pauschale * countKompensatorisch.Count, diff --git a/ReportImp/LebenshilfeStade/QuittierungsbelegNiedersachsen.Designer.cs b/ReportImp/LebenshilfeStade/QuittierungsbelegNiedersachsen.Designer.cs index 30a016e22..0c138aee0 100644 --- a/ReportImp/LebenshilfeStade/QuittierungsbelegNiedersachsen.Designer.cs +++ b/ReportImp/LebenshilfeStade/QuittierungsbelegNiedersachsen.Designer.cs @@ -45,8 +45,6 @@ namespace LebenshilfeStade this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); - this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -60,7 +58,7 @@ namespace LebenshilfeStade this.tcWege = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell9 = 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.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); @@ -108,7 +106,6 @@ namespace LebenshilfeStade this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); this.wennGruppeAnzPersonen = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldTotalFLSBilllable = new DevExpress.XtraReports.UI.CalculatedField(); - 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(); @@ -153,7 +150,7 @@ namespace LebenshilfeStade this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow6}); - this.xrTable3.SizeF = new System.Drawing.SizeF(1107.571F, 20F); + this.xrTable3.SizeF = new System.Drawing.SizeF(1108F, 20F); this.xrTable3.StylePriority.UseFont = false; this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // @@ -169,8 +166,7 @@ namespace LebenshilfeStade this.xrTableCell33, this.xrTableCell34, this.xrTableCell35, - this.xrTableCell50, - this.xrTableCell16}); + this.xrTableCell50}); this.xrTableRow6.Name = "xrTableRow6"; this.xrTableRow6.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTableRow6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; @@ -298,29 +294,6 @@ namespace LebenshilfeStade this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell50.Weight = 0.11429767299237592D; // - // xrTableCell16 - // - this.xrTableCell16.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.picSignature}); - this.xrTableCell16.Multiline = true; - this.xrTableCell16.Name = "xrTableCell16"; - this.xrTableCell16.StylePriority.UseTextAlignment = false; - this.xrTableCell16.Text = "\r\n"; - this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell16.Weight = 0.19279768996400137D; - // - // picSignature - // - this.picSignature.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.picSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")}); - this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.picSignature.Name = "picSignature"; - this.picSignature.SizeF = new System.Drawing.SizeF(143.1249F, 20F); - this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - this.picSignature.StylePriority.UseBorders = false; - this.picSignature.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.picSignature_BeforePrint); - // // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -338,7 +311,7 @@ namespace LebenshilfeStade this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow2}); - this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(1107.571F, 136.1859F); + this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(1108F, 136.1859F); this.xrTableServiceRecords1.StylePriority.UseBackColor = false; this.xrTableServiceRecords1.StylePriority.UseBorders = false; this.xrTableServiceRecords1.StylePriority.UseFont = false; @@ -356,8 +329,7 @@ namespace LebenshilfeStade this.tcFLS, this.tcWege, this.xrTableCell11, - this.xrTableCell32, - this.xrTableCell9}); + this.xrTableCell32}); this.xrTableRow2.Name = "xrTableRow2"; this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTableRow2.StylePriority.UseTextAlignment = false; @@ -510,7 +482,7 @@ namespace LebenshilfeStade this.tcWege.StylePriority.UseFont = false; this.tcWege.StylePriority.UsePadding = false; this.tcWege.StylePriority.UseTextAlignment = false; - this.tcWege.Text = "Wege-pauschale (qualifizierte Assistenzkraft) Ja = 1"; + this.tcWege.Text = "Wegepauschale (qualifizierte Assistenzkraft) Ja = 1"; this.tcWege.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.tcWege.Weight = 0.26757486618312792D; // @@ -551,23 +523,9 @@ namespace LebenshilfeStade this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell32.Weight = 0.25285945124789461D; // - // xrTableCell9 + // bindingSource1 // - this.xrTableCell9.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell9.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold); - 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; - this.xrTableCell9.StylePriority.UseTextAlignment = false; - this.xrTableCell9.Text = "Unterschrift"; - this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell9.Weight = 0.42652458478096356D; + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); // // formattingRuleStartDate // @@ -748,7 +706,7 @@ namespace LebenshilfeStade | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel30.CanGrow = false; - this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(498.5673F, 133.3333F); + this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(498.5675F, 133.3332F); this.xrLabel30.Name = "xrLabel30"; this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.xrLabel30.SizeF = new System.Drawing.SizeF(116.0049F, 17.42422F); @@ -800,7 +758,7 @@ namespace LebenshilfeStade this.xrLabel27.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); this.xrLabel27.CanGrow = false; - this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(498.5673F, 115.909F); + this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(498.5675F, 115.909F); this.xrLabel27.Name = "xrLabel27"; this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.xrLabel27.SizeF = new System.Drawing.SizeF(116.0049F, 17.42421F); @@ -1181,10 +1139,10 @@ namespace LebenshilfeStade | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblSummeAusfallstunden.BorderWidth = 2F; this.lblSummeAusfallstunden.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold); - this.lblSummeAusfallstunden.LocationFloat = new DevExpress.Utils.PointFloat(798.3143F, 0F); + this.lblSummeAusfallstunden.LocationFloat = new DevExpress.Utils.PointFloat(925.1723F, 0F); this.lblSummeAusfallstunden.Name = "lblSummeAusfallstunden"; this.lblSummeAusfallstunden.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.lblSummeAusfallstunden.SizeF = new System.Drawing.SizeF(66.03705F, 20F); + this.lblSummeAusfallstunden.SizeF = new System.Drawing.SizeF(78.87616F, 20F); this.lblSummeAusfallstunden.StylePriority.UseBackColor = false; this.lblSummeAusfallstunden.StylePriority.UseBorders = false; this.lblSummeAusfallstunden.StylePriority.UseBorderWidth = false; @@ -1200,10 +1158,10 @@ namespace LebenshilfeStade | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblSummeWegepauschalen.BorderWidth = 2F; this.lblSummeWegepauschalen.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold); - this.lblSummeWegepauschalen.LocationFloat = new DevExpress.Utils.PointFloat(701.9389F, 0F); + this.lblSummeWegepauschalen.LocationFloat = new DevExpress.Utils.PointFloat(814.0193F, 0F); this.lblSummeWegepauschalen.Name = "lblSummeWegepauschalen"; this.lblSummeWegepauschalen.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.lblSummeWegepauschalen.SizeF = new System.Drawing.SizeF(96.37537F, 20F); + this.lblSummeWegepauschalen.SizeF = new System.Drawing.SizeF(111.153F, 20F); this.lblSummeWegepauschalen.StylePriority.UseBackColor = false; this.lblSummeWegepauschalen.StylePriority.UseBorders = false; this.lblSummeWegepauschalen.StylePriority.UseBorderWidth = false; @@ -1221,10 +1179,10 @@ namespace LebenshilfeStade this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "fieldTotalFLSBilllable", "{0:0.00}")}); this.xrLabel6.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold); - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(561.9389F, 0F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(652.0521F, 0F); this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel6.SizeF = new System.Drawing.SizeF(140F, 20F); + this.xrLabel6.SizeF = new System.Drawing.SizeF(161.9671F, 20F); this.xrLabel6.StylePriority.UseBackColor = false; this.xrLabel6.StylePriority.UseBorders = false; this.xrLabel6.StylePriority.UseBorderWidth = false; @@ -1240,10 +1198,10 @@ namespace LebenshilfeStade | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel2.BorderWidth = 2F; this.xrLabel2.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(444.6418F, 20.00001F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(515.9449F, 20.00001F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(117.2971F, 19.99998F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(136.1072F, 19.99998F); this.xrLabel2.StylePriority.UseBackColor = false; this.xrLabel2.StylePriority.UseBorders = false; this.xrLabel2.StylePriority.UseBorderWidth = false; @@ -1262,10 +1220,10 @@ namespace LebenshilfeStade this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMBillable", "{0:0.00}")}); this.xrLabel1.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(444.6418F, 0F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(515.9449F, 0F); this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel1.SizeF = new System.Drawing.SizeF(117.2971F, 20F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(136.1072F, 20F); this.xrLabel1.StylePriority.UseBackColor = false; this.xrLabel1.StylePriority.UseBorders = false; this.xrLabel1.StylePriority.UseBorderWidth = false; @@ -1292,10 +1250,6 @@ namespace LebenshilfeStade this.fieldTotalFLSBilllable.Expression = "[TotalFLMBillable] / 50"; this.fieldTotalFLSBilllable.Name = "fieldTotalFLSBilllable"; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // // QuittierungsbelegNiedersachsen // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1405,9 +1359,6 @@ namespace LebenshilfeStade private DevExpress.XtraReports.UI.XRLabel xrLabel10; private DevExpress.XtraReports.UI.XRLabel xrLabel13; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; - private DevExpress.XtraReports.UI.XRPictureBox picSignature; private DevExpress.XtraReports.UI.CalculatedField fieldTotalFLSBilllable; } } \ No newline at end of file diff --git a/ReportImp/LebenshilfeStade/QuittierungsbelegNiedersachsen.cs b/ReportImp/LebenshilfeStade/QuittierungsbelegNiedersachsen.cs index c99392f6b..41069f807 100644 --- a/ReportImp/LebenshilfeStade/QuittierungsbelegNiedersachsen.cs +++ b/ReportImp/LebenshilfeStade/QuittierungsbelegNiedersachsen.cs @@ -37,7 +37,7 @@ namespace LebenshilfeStade lblFLSWocheQuali.Text = "Kompensat. Assistenzkraft"; lblGesamtbudgetQuali.Text = "Kompensatorische Assistenz"; tcFLS.Text = "Anzahl direkte FLS kompensatorische Assistenzkraft. Eine FLS ist definiert als 50 Minuten mit der IP (gemäß Fußnote 2 zu Kap 2.3.1)"; - tcWege.Text = "Wege-pauschale (kompensatori-sche Assistenzkraft) Ja = 1"; + tcWege.Text = "Wegepauschale (kompensatorische Assistenzkraft) Ja = 1"; } var cr = pRO.CostBearer2SupportConceptList[0].CostBearer.CostRatePeriods.Where(p => p.CostRateType == CostRatePeriodType.MinutesPerServiceUnit).OrderBy(c => c.EndDate).ToList();