diff --git a/ReportImp/MuenchenerAidsHilfeEV/Invoicing/CustomInvoiceCreation.cs b/ReportImp/MuenchenerAidsHilfeEV/Invoicing/CustomInvoiceCreation.cs index 8b45e9f41..6a1f4b617 100644 --- a/ReportImp/MuenchenerAidsHilfeEV/Invoicing/CustomInvoiceCreation.cs +++ b/ReportImp/MuenchenerAidsHilfeEV/Invoicing/CustomInvoiceCreation.cs @@ -56,11 +56,12 @@ namespace MuenchenerAidsHilfeEV.Invoicing public override IList CreateInvoiceItems(List serviceRecordsInPeriod, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, Calculations calc) { + var startDate = scap.StartDate.HasValue && scap.StartDate.Value > invoicePeriod.StartDate ? scap.StartDate.Value : invoicePeriod.StartDate; + var endDate = scap.EndDate.HasValue && scap.EndDate.Value < invoicePeriod.EndDate ? scap.EndDate.Value : invoicePeriod.EndDate; - IList ergebnis = new List(); + IList ergebnis = new List(); var customer = scap.CostBearer2SupportConcept.SupportConcept.Customer; - // Alle Abwesenheiten raussuchen, die länger als 31 Tage gehen. Abwesenheiten werden normal mit abgerechnet bis zum 31. Tag. // Ab dann wird erst wieder abgerechnet, wenn der Klient wieder da ist, inkl. des letzten Abwesenheitstages. // Das gilt nur, wenn es für den Abwesenheitszeitraum keinen Pauschalbetrag in der Bewilligung gibt. Dieser wird nämlich ein paar @@ -74,9 +75,9 @@ namespace MuenchenerAidsHilfeEV.Invoicing } Dictionary tagessatz2unitCount = new Dictionary(); - var start = invoicePeriod.StartDate; + var start = startDate; - while (start < invoicePeriod.EndDate) + while (start <= endDate) { // Wenn eine Abwesenheit den aktuellen Tag enthält prüfen, ob er schon > 31 ist und wenn nein, ob es eine pauschale Bewilligung gibt var abs = laengerAls31.FirstOrDefault(l => l.AbsenceSpan.ContainsDate(start)); @@ -84,20 +85,26 @@ namespace MuenchenerAidsHilfeEV.Invoicing bool abwesend = false; if (abs != null) { + abwesend = true; + + // Abwesenheit künstlich um 1 tag verkürzen, da der letzte Abwesenheitstag wieder als anwesend gilt + abs.End = abs.End.Value.AddDays(-1); + var absStart = new DateTime(abs.Start.Value.Year, abs.Start.Value.Month, abs.Start.Value.Day); - int tage = 0; + int tage = 1; while (absStart < abs.End) { // Wenn der abzurechnende Tag nach dem 31. einer Abwesenheit liegt prüfen, ob er abgerechnet werden soll oder nicht - if (absStart.Date == start.Date && tage > 31) + if (absStart.Date == start.Date && tage > 31 || scap.ApprovedFixedAmount != null) { // Wenn ein Betrag > 0 zurückkommt existiert eine Bewilligung mit Tagessatz speziell für die Abwesenheit, sonst nicht abrechnen - if (GetTagespauschale(scap, start, true) == 0) + if (GetTagespauschale(scap, start, abwesend) == 0) abrechenbar = false; break; } - absStart.AddDays(1); + absStart = absStart.AddDays(1); + tage++; } } if (abrechenbar) @@ -110,7 +117,7 @@ namespace MuenchenerAidsHilfeEV.Invoicing tagessatz2unitCount[pauschale]++; } - start.AddDays(1); + start = start.AddDays(1); } foreach (var t2u in tagessatz2unitCount) @@ -125,9 +132,9 @@ namespace MuenchenerAidsHilfeEV.Invoicing ii.ApprovalUnit = BS.Shared.AccountingIntervalType.Daily; ii.ApprovedPerUnit = t2u.Key; ii.GrossAmountTotal = t2u.Value * t2u.Key; - ii.ItemDescription = "Tagespauschale"; - ii.ItemPeriodEnd = scap.EndDate; - ii.ItemPeriodStart = scap.StartDate; + ii.ItemDescription = scap.ServiceCategory != null ? scap.ServiceCategory.Name : ""; + ii.ItemPeriodEnd = endDate; + ii.ItemPeriodStart = startDate; ii.MaxApprovedAmount = t2u.Value * t2u.Key; ii.MaxApprovedUnitCount = t2u.Value; ii.RateFactor = null; diff --git a/ReportImp/MuenchenerAidsHilfeEV/ServiceInvoiceReport.Designer.cs b/ReportImp/MuenchenerAidsHilfeEV/ServiceInvoiceReport.Designer.cs index 47ba6860a..c31787f26 100644 --- a/ReportImp/MuenchenerAidsHilfeEV/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/MuenchenerAidsHilfeEV/ServiceInvoiceReport.Designer.cs @@ -30,6 +30,7 @@ namespace MuenchenerAidsHilfeEV { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServiceInvoiceReport)); + DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); @@ -53,6 +54,9 @@ namespace MuenchenerAidsHilfeEV this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblDatum = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -74,13 +78,6 @@ namespace MuenchenerAidsHilfeEV this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); - this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail3 = new DevExpress.XtraReports.UI.DetailBand(); this.xrTable6 = new DevExpress.XtraReports.UI.XRTable(); @@ -92,18 +89,22 @@ namespace MuenchenerAidsHilfeEV this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); - this.lblDatum = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // @@ -125,7 +126,8 @@ namespace MuenchenerAidsHilfeEV // // xrLabel6 // - this.xrLabel6.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Underline, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 104F); this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -135,7 +137,7 @@ namespace MuenchenerAidsHilfeEV // // xrPictureBox1 // - this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); + this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource")); this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(532.7916F, 0F); this.xrPictureBox1.Name = "xrPictureBox1"; this.xrPictureBox1.SizeF = new System.Drawing.SizeF(112.7084F, 96.45834F); @@ -161,12 +163,11 @@ namespace MuenchenerAidsHilfeEV this.xrRichText2, this.xrRichText1, this.xrLabel8}); - this.bottomMarginBand1.HeightF = 100F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // // xrRichText4 // - this.xrRichText4.Font = new System.Drawing.Font("Arial", 8F); + this.xrRichText4.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrRichText4.LocationFloat = new DevExpress.Utils.PointFloat(506.1947F, 5F); this.xrRichText4.Name = "xrRichText4"; this.xrRichText4.SerializableRtfString = resources.GetString("xrRichText4.SerializableRtfString"); @@ -175,7 +176,7 @@ namespace MuenchenerAidsHilfeEV // // xrRichText3 // - this.xrRichText3.Font = new System.Drawing.Font("Arial", 8F); + this.xrRichText3.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(346.2225F, 5F); this.xrRichText3.Name = "xrRichText3"; this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString"); @@ -184,7 +185,7 @@ namespace MuenchenerAidsHilfeEV // // xrRichText2 // - this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F); + this.xrRichText2.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(122.4721F, 5F); this.xrRichText2.Name = "xrRichText2"; this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); @@ -193,7 +194,7 @@ namespace MuenchenerAidsHilfeEV // // xrRichText1 // - this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F); + this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 5F); this.xrRichText1.Name = "xrRichText1"; this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); @@ -214,6 +215,7 @@ namespace MuenchenerAidsHilfeEV // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable5, this.lblEinrichtungsnummer, this.xrLabel7, this.xrLabel2, @@ -225,7 +227,7 @@ namespace MuenchenerAidsHilfeEV this.xrLabel5, this.lblAbrechnungszeitraum, this.xrTable2}); - this.Page1.HeightF = 424.9167F; + this.Page1.HeightF = 460.7917F; this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // @@ -233,7 +235,8 @@ namespace MuenchenerAidsHilfeEV // this.lblEinrichtungsnummer.BackColor = System.Drawing.Color.Transparent; this.lblEinrichtungsnummer.CanShrink = true; - this.lblEinrichtungsnummer.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblEinrichtungsnummer.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.lblEinrichtungsnummer.LocationFloat = new DevExpress.Utils.PointFloat(0F, 325F); this.lblEinrichtungsnummer.Multiline = true; this.lblEinrichtungsnummer.Name = "lblEinrichtungsnummer"; @@ -248,7 +251,8 @@ namespace MuenchenerAidsHilfeEV // this.xrLabel7.BackColor = System.Drawing.Color.Transparent; this.xrLabel7.CanShrink = true; - this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 305F); this.xrLabel7.Multiline = true; this.xrLabel7.Name = "xrLabel7"; @@ -263,7 +267,8 @@ namespace MuenchenerAidsHilfeEV // this.xrLabel2.BackColor = System.Drawing.Color.Transparent; this.xrLabel2.CanShrink = true; - this.xrLabel2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 245F); this.xrLabel2.Multiline = true; this.xrLabel2.Name = "xrLabel2"; @@ -347,6 +352,34 @@ namespace MuenchenerAidsHilfeEV this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; this.xrTableCell14.Weight = 0.56066716437300124D; // + // xrTableRow8 + // + this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3, + this.lblDatum}); + this.xrTableRow8.Name = "xrTableRow8"; + this.xrTableRow8.Weight = 0.13245033112582783D; + // + // xrTableCell3 + // + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell3.StylePriority.UsePadding = false; + this.xrTableCell3.StylePriority.UseTextAlignment = false; + this.xrTableCell3.Text = "Erstellungsdatum:"; + this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell3.Weight = 0.43933283562699876D; + // + // lblDatum + // + this.lblDatum.Name = "lblDatum"; + this.lblDatum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblDatum.StylePriority.UsePadding = false; + this.lblDatum.StylePriority.UseTextAlignment = false; + this.lblDatum.Text = "lblDatum"; + this.lblDatum.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.lblDatum.Weight = 0.56066716437300124D; + // // xrTableRow7 // this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { @@ -381,7 +414,8 @@ namespace MuenchenerAidsHilfeEV // xrLabel10 // this.xrLabel10.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(332.9584F, 110.2083F); this.xrLabel10.Name = "xrLabel10"; this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -403,7 +437,8 @@ namespace MuenchenerAidsHilfeEV // this.xrLabel4.BackColor = System.Drawing.Color.Transparent; this.xrLabel4.CanShrink = true; - this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 285F); this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; @@ -419,7 +454,8 @@ namespace MuenchenerAidsHilfeEV // this.xrLabel3.BackColor = System.Drawing.Color.Transparent; this.xrLabel3.CanShrink = true; - this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 265F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -559,14 +595,150 @@ namespace MuenchenerAidsHilfeEV // // Detail1 // - this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTable5}); - this.Detail1.HeightF = 25F; + this.Detail1.HeightF = 0F; this.Detail1.Name = "Detail1"; // + // DetailReport2 + // + this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail3, + this.GroupFooter1}); + this.DetailReport2.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems"; + this.DetailReport2.DataSource = this.bindingSource1; + this.DetailReport2.Level = 0; + this.DetailReport2.Name = "DetailReport2"; + this.DetailReport2.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand; + // + // Detail3 + // + this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable6}); + this.Detail3.HeightF = 25F; + this.Detail3.Name = "Detail3"; + // + // xrTable6 + // + this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable6.Name = "xrTable6"; + this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow25}); + this.xrTable6.SizeF = new System.Drawing.SizeF(677F, 25F); + this.xrTable6.StylePriority.UseFont = false; + // + // xrTableRow25 + // + this.xrTableRow25.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell40, + this.xrTableCell42, + this.xrTableCell44, + this.xrTableCell45, + this.xrTableCell47}); + this.xrTableRow25.Name = "xrTableRow25"; + this.xrTableRow25.Weight = 1D; + // + // xrTableCell40 + // + this.xrTableCell40.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell40.Name = "xrTableCell40"; + this.xrTableCell40.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell40.StylePriority.UseBorderColor = false; + this.xrTableCell40.StylePriority.UseBorders = false; + this.xrTableCell40.StylePriority.UsePadding = false; + this.xrTableCell40.StylePriority.UseTextAlignment = false; + this.xrTableCell40.Text = "[AccountingPeriodStart!dd.MM.yyyy] - [AccountingPeriodEnd!dd.MM.yyyy]"; + this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell40.Weight = 0.75332349160221157D; + // + // xrTableCell42 + // + this.xrTableCell42.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.ServiceDescription")}); + this.xrTableCell42.Name = "xrTableCell42"; + this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell42.StylePriority.UseBorderColor = false; + this.xrTableCell42.StylePriority.UseBorders = false; + this.xrTableCell42.StylePriority.UsePadding = false; + this.xrTableCell42.StylePriority.UseTextAlignment = false; + this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell42.Weight = 0.7221196454948301D; + // + // xrTableCell44 + // + this.xrTableCell44.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Hours", "{0:0.##}")}); + this.xrTableCell44.Name = "xrTableCell44"; + this.xrTableCell44.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell44.StylePriority.UseBorderColor = false; + this.xrTableCell44.StylePriority.UseBorders = false; + this.xrTableCell44.StylePriority.UsePadding = false; + this.xrTableCell44.StylePriority.UseTextAlignment = false; + this.xrTableCell44.Text = "xrTableCell44"; + this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell44.Weight = 0.4431314566991178D; + // + // xrTableCell45 + // + this.xrTableCell45.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.AmountPerUnit", "{0:0.00}")}); + this.xrTableCell45.Name = "xrTableCell45"; + this.xrTableCell45.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell45.StylePriority.UseBorderColor = false; + this.xrTableCell45.StylePriority.UseBorders = false; + this.xrTableCell45.StylePriority.UsePadding = false; + this.xrTableCell45.StylePriority.UseTextAlignment = false; + this.xrTableCell45.Text = "xrTableCell45"; + this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell45.Weight = 0.44313146796853364D; + // + // xrTableCell47 + // + this.xrTableCell47.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell47.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.GrossAmount")}); + this.xrTableCell47.Name = "xrTableCell47"; + this.xrTableCell47.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell47.StylePriority.UseBorderColor = false; + this.xrTableCell47.StylePriority.UseBorders = false; + this.xrTableCell47.StylePriority.UsePadding = false; + this.xrTableCell47.StylePriority.UseTextAlignment = false; + this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell47.Weight = 0.63829393823530678D; + // + // GroupFooter1 + // + this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel1, + this.xrLabel15}); + this.GroupFooter1.HeightF = 126.5834F; + this.GroupFooter1.Name = "GroupFooter1"; + // + // xrLabel1 + // + this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim", "Gesamtsumme: {0}")}); + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(420.9999F, 0F); + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(255.8333F, 25F); + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.StylePriority.UsePadding = false; + this.xrLabel1.StylePriority.UseTextAlignment = false; + this.xrLabel1.Text = "xrLabel1"; + this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + // // xrTable5 // - this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 435.7917F); this.xrTable5.Name = "xrTable5"; this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow23}); @@ -663,176 +835,10 @@ namespace MuenchenerAidsHilfeEV this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell34.Weight = 0.63829393823530678D; // - // DetailReport2 - // - this.DetailReport2.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { - this.Detail3, - this.GroupFooter1}); - this.DetailReport2.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems"; - this.DetailReport2.DataSource = this.bindingSource1; - this.DetailReport2.Level = 0; - this.DetailReport2.Name = "DetailReport2"; - this.DetailReport2.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand; - // - // Detail3 - // - this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTable6}); - this.Detail3.HeightF = 25F; - this.Detail3.Name = "Detail3"; - // - // xrTable6 - // - this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrTable6.Name = "xrTable6"; - this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow25}); - this.xrTable6.SizeF = new System.Drawing.SizeF(677F, 25F); - this.xrTable6.StylePriority.UseFont = false; - // - // xrTableRow25 - // - this.xrTableRow25.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell40, - this.xrTableCell42, - this.xrTableCell44, - this.xrTableCell45, - this.xrTableCell47}); - this.xrTableRow25.Name = "xrTableRow25"; - this.xrTableRow25.Weight = 1D; - // - // xrTableCell40 - // - this.xrTableCell40.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.AccountingPeriodStart", "{0:MMMM yyyy}")}); - this.xrTableCell40.Name = "xrTableCell40"; - this.xrTableCell40.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell40.StylePriority.UseBorderColor = false; - this.xrTableCell40.StylePriority.UseBorders = false; - this.xrTableCell40.StylePriority.UsePadding = false; - this.xrTableCell40.StylePriority.UseTextAlignment = false; - this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell40.Weight = 0.75332349160221157D; - // - // xrTableCell42 - // - this.xrTableCell42.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.ServiceDescription")}); - this.xrTableCell42.Name = "xrTableCell42"; - this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell42.StylePriority.UseBorderColor = false; - this.xrTableCell42.StylePriority.UseBorders = false; - this.xrTableCell42.StylePriority.UsePadding = false; - this.xrTableCell42.StylePriority.UseTextAlignment = false; - this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell42.Weight = 0.7221196454948301D; - // - // xrTableCell44 - // - this.xrTableCell44.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.Hours", "{0:0.##}")}); - this.xrTableCell44.Name = "xrTableCell44"; - this.xrTableCell44.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell44.StylePriority.UseBorderColor = false; - this.xrTableCell44.StylePriority.UseBorders = false; - this.xrTableCell44.StylePriority.UsePadding = false; - this.xrTableCell44.StylePriority.UseTextAlignment = false; - this.xrTableCell44.Text = "xrTableCell44"; - this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell44.Weight = 0.4431314566991178D; - // - // xrTableCell45 - // - this.xrTableCell45.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.AmountPerUnit", "{0:0.00}")}); - this.xrTableCell45.Name = "xrTableCell45"; - this.xrTableCell45.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell45.StylePriority.UseBorderColor = false; - this.xrTableCell45.StylePriority.UseBorders = false; - this.xrTableCell45.StylePriority.UsePadding = false; - this.xrTableCell45.StylePriority.UseTextAlignment = false; - this.xrTableCell45.Text = "xrTableCell45"; - this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell45.Weight = 0.44313146796853364D; - // - // xrTableCell47 - // - this.xrTableCell47.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell47.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.GrossAmount")}); - this.xrTableCell47.Name = "xrTableCell47"; - this.xrTableCell47.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell47.StylePriority.UseBorderColor = false; - this.xrTableCell47.StylePriority.UseBorders = false; - this.xrTableCell47.StylePriority.UsePadding = false; - this.xrTableCell47.StylePriority.UseTextAlignment = false; - this.xrTableCell47.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell47.Weight = 0.63829393823530678D; - // - // GroupFooter1 - // - this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel1, - this.xrLabel15}); - this.GroupFooter1.HeightF = 126.5834F; - this.GroupFooter1.Name = "GroupFooter1"; - // - // xrLabel1 - // - this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim", "Gesamtsumme: {0}")}); - this.xrLabel1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(420.9999F, 0F); - this.xrLabel1.Name = "xrLabel1"; - this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F); - this.xrLabel1.SizeF = new System.Drawing.SizeF(255.8333F, 25F); - this.xrLabel1.StylePriority.UseFont = false; - this.xrLabel1.StylePriority.UsePadding = false; - this.xrLabel1.StylePriority.UseTextAlignment = false; - this.xrLabel1.Text = "xrLabel1"; - this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // - // xrTableRow8 - // - this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell3, - this.lblDatum}); - this.xrTableRow8.Name = "xrTableRow8"; - this.xrTableRow8.Weight = 0.13245033112582783D; - // - // xrTableCell3 - // - this.xrTableCell3.Name = "xrTableCell3"; - this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell3.StylePriority.UsePadding = false; - this.xrTableCell3.StylePriority.UseTextAlignment = false; - this.xrTableCell3.Text = "Erstellungsdatum:"; - this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell3.Weight = 0.43933283562699876D; - // - // lblDatum - // - this.lblDatum.Name = "lblDatum"; - this.lblDatum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblDatum.StylePriority.UsePadding = false; - this.lblDatum.StylePriority.UseTextAlignment = false; - this.lblDatum.Text = "lblDatum"; - this.lblDatum.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.lblDatum.Weight = 0.56066716437300124D; - // // ServiceInvoiceReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -844,22 +850,25 @@ namespace MuenchenerAidsHilfeEV this.DetailReport}); this.DataSource = this.bindingSource1; this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; - this.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(75, 60, 91, 100); + this.Margins = new DevExpress.Drawing.DXMargins(75F, 60F, 91F, 100F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; - this.Version = "17.1"; + this.Version = "23.2"; + xrWatermark1.Id = "Watermark1"; + this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); @@ -883,13 +892,6 @@ namespace MuenchenerAidsHilfeEV private DevExpress.XtraReports.UI.XRLabel xrLabel15; private DevExpress.XtraReports.UI.DetailReportBand DetailReport; private DevExpress.XtraReports.UI.DetailBand Detail1; - private DevExpress.XtraReports.UI.XRTable xrTable5; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow23; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell32; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell37; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell33; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell36; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell34; private DevExpress.XtraReports.UI.DetailReportBand DetailReport2; private DevExpress.XtraReports.UI.DetailBand Detail3; private DevExpress.XtraReports.UI.XRTable xrTable6; @@ -932,5 +934,12 @@ namespace MuenchenerAidsHilfeEV private DevExpress.XtraReports.UI.XRTableRow xrTableRow8; private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; private DevExpress.XtraReports.UI.XRTableCell lblDatum; + private DevExpress.XtraReports.UI.XRTable xrTable5; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow23; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell32; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell37; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell33; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell36; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell34; } } diff --git a/ReportImp/MuenchenerAidsHilfeEV/ServiceInvoiceReport.resx b/ReportImp/MuenchenerAidsHilfeEV/ServiceInvoiceReport.resx index 5e5b6fbdb..c3b4a5a09 100644 --- a/ReportImp/MuenchenerAidsHilfeEV/ServiceInvoiceReport.resx +++ b/ReportImp/MuenchenerAidsHilfeEV/ServiceInvoiceReport.resx @@ -117,67 +117,8 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - /9j/4AAQSkZJRgABAQEAYABgAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwg - JC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIy - MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABaAH8DASIAAhEBAxEB/8QA - HwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIh - MUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVW - V1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXG - x8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQF - BgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAV - YnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOE - hYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq - 8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iiigAooooAKKKKACiiuU8d+O9O8DaP9pucTXswItbRWw0re - p9FHc/1oGlfRC+OvHem+BtH+03RE15KCLW0U4aVv6KO5/rXzLr/xA8U+JLl5b7WLlI2PFvbSGKJR6BVP - P1OTWXr2vaj4l1ibVNVuDNcyn6Ki9lUdlHpWbUN3OiMEi/Z63q+nzCay1W+t5Ac7orh1P869++D/AMTr - zxPNJoOuOsmoRRebBcgBTMgwCGA43DIOR1H05+cq734Mkj4q6Tg9UnB/79NSTCaTR718SPHcXgXw+LhI - 1m1G5Yx2kLHgkDlm/wBlePrkDvXy/rPirXvEF01xqmrXdwzHIQyFUX2VBwB9BXo37Qszt4y0uEsfLSw3 - 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 - R/2i7u0e1ha28hrjyTGCnmlOX29Nx7nrSK6n/9k= - + + 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W3vT4guNJnvktkJljjVyG2EEBjgdOM/lVTwFbw/2P8P5/Jj86We7mkk2jc7mJgWJ7sQBz1rSsoIhqdgREgx4rvG+6Oux+frQDKdz4s8TLYR6Ol3LcXw16bS3vLWCITyxRxeZlVciMOQcZPHBwM1Muq+NZz4f0ifUW0y7vb68tzcyQQyyPDHHuRmVSUEnBBAOMjkdqz/GUEK+APGs4iQTQ6200UgUbkk2xjeD2bHcc1o+E7a3j074cukESswuZCwQAl2ibc31Pc96AsrHT+NL+507SdOtodXu7a7ubhYQbKyWe4uMKSyop+VTxksQQADXLaT4q1e/s/Dy3cu+ZfEkunSyT2yLJJGiSEFlwQj8DO3HStv4uQxSeA55XiRpIZUeJ2UEo2cZU9jgkZHrXPeHbS2h07QY4reKNE8RuVVUACnyW5Ao6iS925XsL/Wtb1DwLr+o6tHPHqF/PJFYrAqLbkRSgBWHzEADBznk9q0fDXiHX7bW7eLxFeast7PBNIdPexhaC6ZFLYtZYz2HZic/rWTYafZQfGCQRWdvGI9SwmyJRt3QyFsccZPX1qp8J4Yv+Fp+IoPLTyrESLaR7RttwXwQg/hB9sUFNHT6/c33iPxR4Kksvt+g3MrX4DXdshmjAjXPyEleR0Jz1pNK8Tate3nhWG9mhlm/te+sLmYQKPOEKSAMBg7CdoJ2kflxXT62iN468KuVUsovNpI5GYx0rl9JhiGq6GREgI1/UWBCjglZMmgnoc7otvfXNv8ADeK2uLZIzd6gwWeAyDcrSEnGRztyB6E59q0I/FHju9vLrVNJtri7jTUZ7VLKQW8dqYkLKAHLCXzAV3HseeMVp+HYIlXwLtiQbLjUNuFHy58zOPSsK3srR/2i7u0e1ha28hrjyTGCnmlOX29Nx7nrSK6n/9k= ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGIAXABmADIAXABmAHMAMQA0AFwAYwBmADEAIABCAGEAbgBrAHYAZQByAGIAaQBuAGQAdQBuAGcAfQBcAGYAcwAyADIAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMgBcAGYAcwAxADQAXABjAGYAMQAgAEcATABTACAARwBlAG0AZQBpAG4AcwBjAGgAYQBmAHQAcwBiAGEAbgBrACAAZQBHAH0AXABmAHMAMgAyAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAaAB5AHAAaABwAGEAcgAwAHsAXABmADIAXABmAHMAMQA0AFwAYwBmADEAIABCAEwAWgA6ACAANAAzADAANgAwADkANgA3ACAAIAAgACAAIAAgAEsAVABPADoAIAA4ADIANAAzADMAMQA4ADMAMAAwAH0AXABmAHMAMgAyAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAaAB5AHAAaABwAGEAcgAwAHsAXABmADIAXABmAHMAMQA0AFwAYwBmADEAIABCAEkAQwA6ACAARwBFAE4ATwBEAEUATQAxAEcATABTAH0AXABmAHMAMgAyAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMQA0AFwAYwBmADEAIABJAEIAQQBOADoAIABEAEUANwAzACAANAAzADAANgAgADAAOQA2ADcAIAA4ADIANAAzACAAMwAxADgAMwAgADAAMAB9AFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQA= @@ -191,7 +132,4 @@ ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGIAXABmADIAXABmAHMAMQA0AFwAYwBmADEAIABBAG4AcwBjAGgAcgBpAGYAdAB9AFwAZgBzADIAMgBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGgAeQBwAGgAcABhAHIAMAB7AFwAZgAyAFwAZgBzADEANABcAGMAZgAxACAATQBcAHUAMgA1ADIAXAAnAGYAYwBuAGMAaABuAGUAcgAtAEEAaQBkAHMAaABpAGwAZgBlACAAZQAuAFYALgB9AFwAZgBzADIAMgBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAGgAeQBwAGgAcABhAHIAMAB7AFwAZgAyAFwAZgBzADEANABcAGMAZgAxACAATABpAG4AZAB3AHUAcgBtAHMAdAByAC4AIAA3ADEAfQBcAGYAcwAyADIAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABoAHkAcABoAHAAYQByADAAewBcAGYAMgBcAGYAcwAxADQAXABjAGYAMQAgADgAMAAzADMANwAgAE0AXAB1ADIANQAyAFwAJwBmAGMAbgBjAGgAZQBuAH0AXABmAHMAMgAyAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADIAXABmAHMAMQA0AFwAYwBmADEAIABEAGUAdQB0AHMAYwBoAGwAYQBuAGQAfQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A - - 17, 17 - \ No newline at end of file diff --git a/ReportImp/MuenchenerAidsHilfeEV/UeberUnterbelegungReport.cs b/ReportImp/MuenchenerAidsHilfeEV/UeberUnterbelegungReport.cs index 39eaa4292..edf39083d 100644 --- a/ReportImp/MuenchenerAidsHilfeEV/UeberUnterbelegungReport.cs +++ b/ReportImp/MuenchenerAidsHilfeEV/UeberUnterbelegungReport.cs @@ -31,8 +31,13 @@ namespace MuenchenerAidsHilfeEV foreach (var empDetail in pRO.EmployeeDetailList) { - // Stelle in % steht in "beschäftigt als" im Vertrag. - var contract = empDetail.Employee.GetValidContractForDate(pRO.ReportStartDate); + decimal betreuungsumfangInProzentGesamt = 0; + + // Nur aktive Hilfepläne sollen bedacht werden + empDetail.SupportConceptDetailList = empDetail.SupportConceptDetailList.Where(s => s.CostBearer2SupportConcept.SupportConcept.IsActive == BS.Shared.ActivationTypeId.Active).ToList(); + + // Stelle in % steht in "beschäftigt als" im Vertrag. + var contract = empDetail.Employee.GetValidContractForDate(pRO.ReportStartDate); if (contract != null && contract.EmploymentType != null && !contract.EmploymentType.Name.IsNullOrEmpty() && contract.EmploymentType.Name.Contains("%")) { empDetail.Employee.Text1 = contract.EmploymentType.Name.Split('%')[0]; // Stelle in % @@ -41,15 +46,20 @@ namespace MuenchenerAidsHilfeEV // Gesamtsumme der einzelnen Klientenbetreuungsumfänge zusammenzählen // Die einzelnen Umfänge stehen in der Leistungskategorie in den Bewilligungen - decimal betreuungsumfangInProzentGesamt = 0; foreach (var scDetail in empDetail.SupportConceptDetailList) { + foreach (var ap in scDetail.CostBearer2SupportConcept.ApprovalPeriodList) { if (ap.StartDate.HasValue && ap.EndDate.HasValue) { if (pRO.ReportEndDate >= ap.StartDate && pRO.ReportStartDate <= ap.EndDate) { + if (empDetail.FullName.Contains("Bode") && scDetail.CustomerFullName.Contains("Sommer")) + { + + } + // Benötigten Umfang pro Klient berechnen, also 100 / Nenner im Schlüssel (also bei 1:6 Schlüssel 100 / 6 = 16,67%) // Wenn es einen korrekt angelegten Betreuungsschlüssel gibt, gibt es einen :, welcher nicht das letzte Zeichen ist if (ap.ServiceCategory != null && ap.ServiceCategory.Name.Contains(":") && ap.ServiceCategory.Name[ap.ServiceCategory.Name.Length - 1] != ':') @@ -57,7 +67,8 @@ namespace MuenchenerAidsHilfeEV var schluessel = ap.ServiceCategory.Name; // Nenner des Schlüssels raussuchen, da der mit 100/Nenner den Betreuungsumfang ergibt var nenner = Convert.ToDecimal(ap.ServiceCategory.Name.Split(':')[1]); - + if (nenner == 2.92m) + nenner = 4; // Wenn es eine anteilige Betreuung in der Bewilligung gibt muss sich diese auch auf den Betreuungsumfang auswirken decimal betreuungsanteil = 1.0m; if (ap.SupportConceptApprovalPeriod2Employee != null && ap.SupportConceptApprovalPeriod2Employee.Count > 0) @@ -75,6 +86,11 @@ namespace MuenchenerAidsHilfeEV } } + if (empDetail.FullName.Contains("Bode")) + { + //if (nenner == 2.92m) + // nenner = 4; + } // Letztendlichen Umfang mit dem Nenner und dem eventuellen Anteil an der Betreuung betreuungsumfangInProzentGesamt += 100m / nenner; summeKlientInnen += 100m / nenner; @@ -89,32 +105,6 @@ namespace MuenchenerAidsHilfeEV } } empDetail.Employee.Text2 = string.Format("{0:0.00}", betreuungsumfangInProzentGesamt); - - // ALT Die einzelnen Umfänge stehen in der Betreuungsart im Klienten (CustomerCareTypes) - //foreach (var e2c in empDetail.Employee.Employee2CustomerList) - //{ - // var customerDC = MapperFactory.CustomerDC_Customer.MapToNewDC(e2c.Customer); - // var schluessel = customerDC.CustomerCareTypes; - // // Benötigten Umfang pro Klient berechnen, also 100 / Nenner im Schlüssel (also bei 1:6 Schlüssel 100 / 6 = 16,67%) - // foreach (var s in schluessel) - // { - // // Wenn es einen korrekt angelegten Betreuungsschlüssel gibt, gibt es einen :, welcher nicht das letzte Zeichen ist - // if (s.DisplayName.Contains(":") && s.DisplayName[s.DisplayName.Length - 1] != ':') - // { - // var nenner = Convert.ToDecimal(s.DisplayName.Split(':')[1]); - // betreuungsumfangInProzentGesamt += 100m / nenner; - // summeKlientInnen += 100m / nenner; - - // // für zweite Tabelle, die zeigt, welche Schlüssel es gibt und wie viele Klient*innen die jeweils haben, in Dict speichern - // if (!betreuungsschluesselZuAnzahl.ContainsKey(nenner)) - // betreuungsschluesselZuAnzahl.Add(nenner, 0); - // betreuungsschluesselZuAnzahl[nenner]++; - // } - // } - //} - //// Gesamtbetreuungsumfang in % setzen, um ihn in der Tabelle neben dem Mitarbeitendenbudget anzuzeigen - //empDetail.Employee.Text2 = string.Format("{0:0.00}", betreuungsumfangInProzentGesamt); - } tcSummeMitarbeitende.Text = string.Format("{0:0.00}", summeMitarbeitende / 100);