diff --git a/ReportImp/ChristopherusHausMID/Rechnung.Designer.cs b/ReportImp/ChristopherusHausMID/Rechnung.Designer.cs index d5ce2a2fb..45e0ec39c 100644 --- a/ReportImp/ChristopherusHausMID/Rechnung.Designer.cs +++ b/ReportImp/ChristopherusHausMID/Rechnung.Designer.cs @@ -141,6 +141,9 @@ namespace ChristopherusHausMID this.xrTableCell56 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.fieldAbweichungIstSoll = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrCheckBox1 = new DevExpress.XtraReports.UI.XRCheckBox(); + this.xrCheckBox2 = new DevExpress.XtraReports.UI.XRCheckBox(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -1314,6 +1317,9 @@ namespace ChristopherusHausMID // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrCheckBox1, + this.xrCheckBox2, + this.xrLabel4, this.xrLabel9, this.xrLabel7, this.lblAbrechenbareStunden, @@ -1895,6 +1901,40 @@ namespace ChristopherusHausMID "cePeriods].[ApprovedHours]))/Sum([ServiceInvoicePeriods].[ApprovedHours]) * 100"; this.fieldAbweichungIstSoll.Name = "fieldAbweichungIstSoll"; // + // xrLabel4 + // + this.xrLabel4.BackColor = System.Drawing.Color.Transparent; + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(242.6284F, 21.66667F); + this.xrLabel4.Multiline = true; + this.xrLabel4.Name = "xrLabel4"; + this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(455.9977F, 52.29167F); + this.xrLabel4.StylePriority.UseBackColor = false; + this.xrLabel4.StylePriority.UseBorders = false; + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.StylePriority.UseTextAlignment = false; + this.xrLabel4.Text = "Die Betreuung wurde während der Pausenzeiten durch eine Schulbegleitung\r\nunseres " + + "Dienstes gewährleistet."; + this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrLabel4.TextTrimming = DevExpress.Drawing.DXStringTrimming.None; + this.xrLabel4.WordWrap = false; + // + // xrCheckBox1 + // + this.xrCheckBox1.LocationFloat = new DevExpress.Utils.PointFloat(242.6284F, 73.95834F); + this.xrCheckBox1.Name = "xrCheckBox1"; + this.xrCheckBox1.SizeF = new System.Drawing.SizeF(63.49995F, 21.875F); + this.xrCheckBox1.StylePriority.UseFont = false; + this.xrCheckBox1.Text = "Ja"; + // + // xrCheckBox2 + // + this.xrCheckBox2.LocationFloat = new DevExpress.Utils.PointFloat(306.1283F, 73.95834F); + this.xrCheckBox2.Name = "xrCheckBox2"; + this.xrCheckBox2.SizeF = new System.Drawing.SizeF(307.5598F, 21.875F); + this.xrCheckBox2.StylePriority.UseFont = false; + this.xrCheckBox2.Text = "Nein"; + // // Rechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -2047,5 +2087,8 @@ namespace ChristopherusHausMID private DevExpress.XtraReports.UI.XRTableCell xrTableCell42; private DevExpress.XtraReports.UI.XRLabel xrLabel9; private DevExpress.XtraReports.UI.XRLabel xrLabel7; + private DevExpress.XtraReports.UI.XRLabel xrLabel4; + private DevExpress.XtraReports.UI.XRCheckBox xrCheckBox1; + private DevExpress.XtraReports.UI.XRCheckBox xrCheckBox2; } } diff --git a/ReportImp/HphBersenbrueckFreizeitUndReisen/Helferentgelt.Designer.cs b/ReportImp/HphBersenbrueckFreizeitUndReisen/Helferentgelt.Designer.cs index ac3ab1f73..0d3ffb907 100644 --- a/ReportImp/HphBersenbrueckFreizeitUndReisen/Helferentgelt.Designer.cs +++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/Helferentgelt.Designer.cs @@ -93,7 +93,6 @@ namespace HphBersenbrueckFreizeitUndReisen this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.Title = new DevExpress.XtraReports.UI.XRControlStyle(); this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle(); this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle(); @@ -102,6 +101,15 @@ namespace HphBersenbrueckFreizeitUndReisen this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.fieldDifferenz = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell52 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell53 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -132,7 +140,7 @@ namespace HphBersenbrueckFreizeitUndReisen this.xrTableDetail.Name = "xrTableDetail"; this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRowDetail}); - this.xrTableDetail.SizeF = new System.Drawing.SizeF(1439F, 20F); + this.xrTableDetail.SizeF = new System.Drawing.SizeF(1719F, 20F); this.xrTableDetail.StylePriority.UseBorders = false; this.xrTableDetail.StylePriority.UsePadding = false; this.xrTableDetail.StylePriority.UseTextAlignment = false; @@ -152,6 +160,8 @@ namespace HphBersenbrueckFreizeitUndReisen this.xrTableCell86, this.xrTableCell45, this.xrTableCell41, + this.xrTableCell53, + this.xrTableCell49, this.xrTableCell85, this.xrTableCell87}); this.xrTableRowDetail.Name = "xrTableRowDetail"; @@ -269,7 +279,7 @@ namespace HphBersenbrueckFreizeitUndReisen // xrTableCell85 // this.xrTableCell85.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.KilometerLoa497", "{0:0}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.KilometerFreizeitangeboteLoa497", "{0:0}")}); this.xrTableCell85.Name = "xrTableCell85"; this.xrTableCell85.StylePriority.UseBackColor = false; this.xrTableCell85.Text = "xrTableCell85"; @@ -315,7 +325,7 @@ namespace HphBersenbrueckFreizeitUndReisen this.xrTableRow2, this.xrTableRow3, this.xrTableRow1}); - this.xrTable1.SizeF = new System.Drawing.SizeF(1439F, 100F); + this.xrTable1.SizeF = new System.Drawing.SizeF(1719F, 100F); this.xrTable1.StylePriority.UseBackColor = false; this.xrTable1.StylePriority.UseBorders = false; this.xrTable1.StylePriority.UsePadding = false; @@ -336,6 +346,8 @@ namespace HphBersenbrueckFreizeitUndReisen this.xrTableCell17, this.xrTableCell42, this.xrTableCell6, + this.xrTableCell50, + this.xrTableCell46, this.xrTableCell18, this.xrTableCell19}); this.xrTableRow2.Name = "xrTableRow2"; @@ -432,6 +444,8 @@ namespace HphBersenbrueckFreizeitUndReisen this.xrTableCell34, this.xrTableCell43, this.xrTableCell15, + this.xrTableCell51, + this.xrTableCell47, this.xrTableCell35, this.xrTableCell36}); this.xrTableRow3.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); @@ -517,14 +531,14 @@ namespace HphBersenbrueckFreizeitUndReisen // this.xrTableCell35.Multiline = true; this.xrTableCell35.Name = "xrTableCell35"; - this.xrTableCell35.Text = "Stamm-kostenstelle"; + this.xrTableCell35.Text = "Stamm-Kostenstelle"; this.xrTableCell35.Weight = 0.12680564675889139D; // // xrTableCell36 // this.xrTableCell36.Multiline = true; this.xrTableCell36.Name = "xrTableCell36"; - this.xrTableCell36.Text = "Stamm-kostenstelle"; + this.xrTableCell36.Text = "Stamm-Kostenstelle"; this.xrTableCell36.Weight = 0.12137111542174259D; // // xrTableRow1 @@ -541,6 +555,8 @@ namespace HphBersenbrueckFreizeitUndReisen this.xrTableCell8, this.xrTableCell44, this.xrTableCell31, + this.xrTableCell52, + this.xrTableCell48, this.xrTableCell9, this.xrTableCell10}); this.xrTableRow1.Name = "xrTableRow1"; @@ -640,7 +656,7 @@ namespace HphBersenbrueckFreizeitUndReisen // this.xrTableCell9.Name = "xrTableCell9"; this.xrTableCell9.StylePriority.UseBackColor = false; - this.xrTableCell9.Text = "Kilometer"; + this.xrTableCell9.Text = "Kilometer Freizeitangebote"; this.xrTableCell9.Weight = 0.12680564675889139D; // // xrTableCell10 @@ -650,10 +666,6 @@ namespace HphBersenbrueckFreizeitUndReisen this.xrTableCell10.Text = "Führungszeugnisse"; this.xrTableCell10.Weight = 0.12137111542174259D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(HphBersenbrueckFreizeitUndReisen.HelferentgeltRO); - // // Title // this.Title.BackColor = System.Drawing.Color.White; @@ -718,6 +730,72 @@ namespace HphBersenbrueckFreizeitUndReisen this.fieldDifferenz.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldDifferenz.Name = "fieldDifferenz"; // + // xrTableCell46 + // + this.xrTableCell46.Multiline = true; + this.xrTableCell46.Name = "xrTableCell46"; + this.xrTableCell46.Text = "LoA 497"; + this.xrTableCell46.Weight = 0.12680564675889139D; + // + // xrTableCell47 + // + this.xrTableCell47.Multiline = true; + this.xrTableCell47.Name = "xrTableCell47"; + this.xrTableCell47.Text = "Stamm-Kostenstelle"; + this.xrTableCell47.Weight = 0.12680564675889139D; + // + // xrTableCell48 + // + this.xrTableCell48.Multiline = true; + this.xrTableCell48.Name = "xrTableCell48"; + this.xrTableCell48.StylePriority.UseBackColor = false; + this.xrTableCell48.Text = "Kilometer Reisen"; + this.xrTableCell48.Weight = 0.12680564675889139D; + // + // xrTableCell49 + // + this.xrTableCell49.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.KilometerReisenLoa497")}); + this.xrTableCell49.Multiline = true; + this.xrTableCell49.Name = "xrTableCell49"; + this.xrTableCell49.StylePriority.UseBackColor = false; + this.xrTableCell49.TextFormatString = "{0:0}"; + this.xrTableCell49.Weight = 0.12680564675889139D; + // + // xrTableCell50 + // + this.xrTableCell50.Multiline = true; + this.xrTableCell50.Name = "xrTableCell50"; + this.xrTableCell50.Text = "LoA 497"; + this.xrTableCell50.Weight = 0.12680564675889139D; + // + // xrTableCell51 + // + this.xrTableCell51.Multiline = true; + this.xrTableCell51.Name = "xrTableCell51"; + this.xrTableCell51.Text = "Stamm-Kostenstelle"; + this.xrTableCell51.Weight = 0.12680564675889139D; + // + // xrTableCell52 + // + this.xrTableCell52.Multiline = true; + this.xrTableCell52.Name = "xrTableCell52"; + this.xrTableCell52.StylePriority.UseBackColor = false; + this.xrTableCell52.Text = "Kilometer Einzelbetreuung"; + this.xrTableCell52.Weight = 0.12680564675889139D; + // + // xrTableCell53 + // + this.xrTableCell53.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "DetailList.KilometerEinzelstundenLoa497")}); + this.xrTableCell53.Name = "xrTableCell53"; + this.xrTableCell53.TextFormatString = "{0:0}"; + this.xrTableCell53.Weight = 0.12680564675889139D; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(HphBersenbrueckFreizeitUndReisen.HelferentgeltRO); + // // Helferentgelt // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -732,7 +810,7 @@ namespace HphBersenbrueckFreizeitUndReisen this.Landscape = true; this.Margins = new DevExpress.Drawing.DXMargins(30F, 30F, 50F, 51F); this.PageHeight = 827; - this.PageWidth = 2000; + this.PageWidth = 1800; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.Custom; this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] { this.Title, @@ -822,5 +900,13 @@ namespace HphBersenbrueckFreizeitUndReisen private DevExpress.XtraReports.UI.XRTableCell xrTableCell39; private DevExpress.XtraReports.UI.XRTableCell xrTableCell44; private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell53; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell49; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell50; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell46; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell51; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell47; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell52; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell48; } } diff --git a/ReportImp/HphBersenbrueckFreizeitUndReisen/Helferentgelt.cs b/ReportImp/HphBersenbrueckFreizeitUndReisen/Helferentgelt.cs index 0b6bfd642..123b802e7 100644 --- a/ReportImp/HphBersenbrueckFreizeitUndReisen/Helferentgelt.cs +++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/Helferentgelt.cs @@ -343,6 +343,11 @@ namespace HphBersenbrueckFreizeitUndReisen ro.StundenLoA53_35700 = (ro.StundenLoA53_35700 ?? 0) + sr.RoundedDuration / 60; } } + + if (sr.DistanceInMeter.HasValue) + { + ro.KilometerEinzelstundenLoa497 = (ro.KilometerEinzelstundenLoa497 ?? 0) + sr.DistanceInMeter.Value; + } } //Kostenstelle 35950 else if ((desc.Contains("Freizeitangebote") || desc.Contains("Freizeittreff") || desc.Contains("Tagesfahrt") || desc.Contains("Freizeithelfer")) && (cat.Contains("Entlastungsbetrag") || cat.Contains("Verhinderungspflege") || cat.Contains("Selbstzahler") || cat.Contains("Helferentgelt"))) @@ -360,6 +365,10 @@ namespace HphBersenbrueckFreizeitUndReisen ro.StundenLoA44_35950 = (ro.StundenLoA44_35950 ?? 0) + sr.RoundedDuration / 60; } } + if (sr.DistanceInMeter.HasValue) + { + ro.KilometerFreizeitangeboteLoa497 = (ro.KilometerFreizeitangeboteLoa497 ?? 0) + sr.DistanceInMeter.Value; + } } //Kostenstelle 35900 else if (desc.ToLower().Contains("reise") && (cat.Contains("Entlastungsbetrag") || cat.Contains("Verhinderungspflege") || cat.Contains("Selbstzahler") || cat.Contains("Helferentgelt"))) @@ -374,6 +383,11 @@ namespace HphBersenbrueckFreizeitUndReisen { ro.StundenLoA44_35900 = (ro.StundenLoA44_35900 ?? 0) + sr.RoundedDuration / 60; } + + if (sr.DistanceInMeter.HasValue) + { + ro.KilometerReisenLoa497 = (ro.KilometerReisenLoa497 ?? 0) + sr.DistanceInMeter.Value; + } } else if ((desc.Contains("Prämie Basisschulung") || desc.Contains("Führungszeugnis")) && (cat.Contains("Führungszeugnis") || cat.Contains("Helferentgelt"))) { @@ -385,11 +399,13 @@ namespace HphBersenbrueckFreizeitUndReisen ro.FührungszeugnisseLoa494 = (ro.FührungszeugnisseLoa494 ?? 0) + preis; } //ro.FührungszeugnisseLoa494 = (ro.FührungszeugnisseLoa494 ?? 0) + sr.RoundedDuration / 60; + + if (sr.DistanceInMeter.HasValue) + { + //ro.KilometerReisenLoa497 = (ro.KilometerReisenLoa497 ?? 0) + sr.DistanceInMeter.Value; + } } - if (sr.DistanceInMeter.HasValue) - { - ro.KilometerLoa497 = (ro.KilometerLoa497 ?? 0) + sr.DistanceInMeter.Value; - } + } } diff --git a/ReportImp/HphBersenbrueckFreizeitUndReisen/HelferentgeltRO.cs b/ReportImp/HphBersenbrueckFreizeitUndReisen/HelferentgeltRO.cs index 1281b3cd1..5696f9773 100644 --- a/ReportImp/HphBersenbrueckFreizeitUndReisen/HelferentgeltRO.cs +++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/HelferentgeltRO.cs @@ -33,7 +33,11 @@ namespace HphBersenbrueckFreizeitUndReisen public decimal? StundenLoa51_35950 { get; set; } - public decimal? KilometerLoa497 { get; set; } + public decimal? KilometerEinzelstundenLoa497 { get; set; } + + public decimal? KilometerFreizeitangeboteLoa497 { get; set; } + + public decimal? KilometerReisenLoa497 { get; set; } public decimal? FührungszeugnisseLoa494 { get; set; } diff --git a/ReportImp/LebenshilfeFrankfurtOder/RechnungEinzelfallhilfe.cs b/ReportImp/LebenshilfeFrankfurtOder/RechnungEinzelfallhilfe.cs index df23694d9..b3b252ba6 100644 --- a/ReportImp/LebenshilfeFrankfurtOder/RechnungEinzelfallhilfe.cs +++ b/ReportImp/LebenshilfeFrankfurtOder/RechnungEinzelfallhilfe.cs @@ -94,14 +94,14 @@ namespace LebenshilfeFrankfurtOder { foreach (var ii in sip.ServiceInvoiceItems) { - if (!String.IsNullOrWhiteSpace(ii.ServiceDescription)) + if (!String.IsNullOrWhiteSpace(ii.ServiceDescription))// && !ii.ServiceDescription.ToLower().Contains("krank")) { titel = ii.ServiceDescription; - - ii.ServiceDescription = "lt. beiliegendem Leistungsnachweis"; } - } + ii.ServiceDescription = "lt. beiliegendem Leistungsnachweis"; + + } } }