From 880696428756673ec6dfd89e363ea5ea9108f19d Mon Sep 17 00:00:00 2001 From: HirschleM Date: Tue, 21 Jul 2026 07:16:47 +0200 Subject: [PATCH] MH: HwHilfswerkInklusionUndTeilhabe Stundenkonto Bugfix und QB Hintergrunddienste --- ...CustomMitarbeiterstundenkontoBerechnung.cs | 24 +- .../HwHilfswerkInklusionUndTeilhabe.csproj | 10 + .../QuittierungsbelegJugendamt.Designer.cs | 467 +++++++++--------- .../QuittierungsbelegJugendamt.cs | 13 + 4 files changed, 281 insertions(+), 233 deletions(-) diff --git a/ReportImp/HwHilfswerkInklusionUndTeilhabe/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/HwHilfswerkInklusionUndTeilhabe/CustomMitarbeiterstundenkontoBerechnung.cs index ddd4ea5fa..4767cf3e5 100644 --- a/ReportImp/HwHilfswerkInklusionUndTeilhabe/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/HwHilfswerkInklusionUndTeilhabe/CustomMitarbeiterstundenkontoBerechnung.cs @@ -56,16 +56,16 @@ namespace HwHilfswerkInklusionUndTeilhabe return dd; } - public override bool AddServiceRecordToDuration(ServiceRecord item) + public override bool AddServiceRecordToDuration(StundenkontoServiceRecord item) { - if (HatEmployeeAmbulantContract(item.Employee.GetValidContractForDate(item.Start.Value))) + if (HatEmployeeAmbulantContract(item.Employee.GetValidContractForDate(item.Start))) { return true; } - if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null) + if (item.ServiceDescription != null && item.ServiceDescription.Category!= null) { - if (item.ServiceDescription.ServiceCategory.Name == "Arbeitszeit") + if (item.ServiceDescription.CategoryName.ToLower().Contains("arbeitszeit")) { return true; } @@ -74,21 +74,21 @@ namespace HwHilfswerkInklusionUndTeilhabe return false; } - protected override ServiceRecordSummary BerechneStunden(MitarbeiterstundenkontoRO.EmployeeDetail empDetail, IList groupFilteredRecords, DateTime berichtsAnfang, + protected override ServiceRecordSummary BerechneStunden(MitarbeiterstundenkontoRO.EmployeeDetail empDetail, IList groupFilteredRecords, DateTime berichtsAnfang, DateTime berichtsEnde) { decimal flsGesamt = 0; decimal arbeitszeit = 0; var sum = new ServiceRecordSummary(); - sum.RecordsImBerichtszeitraum = new List(); + sum.RecordsImBerichtszeitraum = new List(); //base.CorrectOverlappingTimes(groupFilteredRecords); foreach (var item in groupFilteredRecords) { if (!IsServiceRecordFehlzeit(item)) { - if (item.Start.Value >= berichtsAnfang && item.Start.Value < berichtsEnde) + if (item.Start >= berichtsAnfang && item.Start < berichtsEnde) { //if (AddServiceRecordToDuration(item)) //{ @@ -104,23 +104,23 @@ namespace HwHilfswerkInklusionUndTeilhabe } if (item.ServiceDescription != null && - item.ServiceDescription.ServiceCategory != null) + item.ServiceDescription.Category != null) { - if (item.Employee != null && HatEmployeeAmbulantContract(item.Employee.GetValidContractForDate(item.Start.Value))) + if (item.Employee != null && HatEmployeeAmbulantContract(item.Employee.GetValidContractForDate(item.Start))) { arbeitszeit += duration; - if (item.ServiceDescription.ServiceCategory.IsBillable) + if (item.ServiceDescription.Category.IsBillable) { flsGesamt += duration; } } else { - if (item.ServiceDescription.ServiceCategory.Name.ToLower().Contains("arbeitszeit")) + if (item.ServiceDescription.Category.Name.ToLower().Contains("arbeitszeit")) { arbeitszeit += duration; } - else if (item.ServiceDescription.ServiceCategory.IsBillable) + else if (item.ServiceDescription.Category.IsBillable) { flsGesamt += duration; } diff --git a/ReportImp/HwHilfswerkInklusionUndTeilhabe/HwHilfswerkInklusionUndTeilhabe.csproj b/ReportImp/HwHilfswerkInklusionUndTeilhabe/HwHilfswerkInklusionUndTeilhabe.csproj index a8c9cd6ed..645fb233c 100644 --- a/ReportImp/HwHilfswerkInklusionUndTeilhabe/HwHilfswerkInklusionUndTeilhabe.csproj +++ b/ReportImp/HwHilfswerkInklusionUndTeilhabe/HwHilfswerkInklusionUndTeilhabe.csproj @@ -58,6 +58,12 @@ + + Component + + + InvoiceCustomerReport.cs + @@ -106,6 +112,10 @@ + + InvoiceCustomerReport.cs + Designer + ResXFileCodeGenerator diff --git a/ReportImp/HwHilfswerkInklusionUndTeilhabe/QuittierungsbelegJugendamt.Designer.cs b/ReportImp/HwHilfswerkInklusionUndTeilhabe/QuittierungsbelegJugendamt.Designer.cs index 6e31cfcae..4c8370e57 100644 --- a/ReportImp/HwHilfswerkInklusionUndTeilhabe/QuittierungsbelegJugendamt.Designer.cs +++ b/ReportImp/HwHilfswerkInklusionUndTeilhabe/QuittierungsbelegJugendamt.Designer.cs @@ -30,8 +30,8 @@ namespace BeWo.Report.DefaultReports private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(QuittierungsbelegJugendamt)); DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(QuittierungsbelegJugendamt)); DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); @@ -43,6 +43,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell(); this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); @@ -54,6 +55,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule(); this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule(); @@ -61,39 +63,39 @@ namespace BeWo.Report.DefaultReports this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLine1 = new DevExpress.XtraReports.UI.XRLine(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLine2 = new DevExpress.XtraReports.UI.XRLine(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLine3 = new DevExpress.XtraReports.UI.XRLine(); + this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLine4 = new DevExpress.XtraReports.UI.XRLine(); + this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLine5 = new DevExpress.XtraReports.UI.XRLine(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); - this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); - this.lblReststunden = new DevExpress.XtraReports.UI.XRLabel(); - this.checkSozialassistenz = new DevExpress.XtraReports.UI.XRCheckBox(); - this.checkFLS = new DevExpress.XtraReports.UI.XRCheckBox(); this.checkAutismus = new DevExpress.XtraReports.UI.XRCheckBox(); - this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); + this.checkFLS = new DevExpress.XtraReports.UI.XRCheckBox(); + this.checkSozialassistenz = new DevExpress.XtraReports.UI.XRCheckBox(); + this.lblReststunden = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.MinutesAlsStunden = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrLine1 = new DevExpress.XtraReports.UI.XRLine(); - this.xrLine2 = new DevExpress.XtraReports.UI.XRLine(); - this.xrLine3 = new DevExpress.XtraReports.UI.XRLine(); - this.xrLine4 = new DevExpress.XtraReports.UI.XRLine(); - this.xrLine5 = new DevExpress.XtraReports.UI.XRLine(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.checkHintergrunddienst = new DevExpress.XtraReports.UI.XRCheckBox(); + this.lblHintergrunddienste = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -227,6 +229,19 @@ namespace BeWo.Report.DefaultReports this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell44.Weight = 0.22113961243859021D; // + // xrTableCell5 + // + this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice2")}); + this.xrTableCell5.Multiline = true; + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.StylePriority.UseBorders = false; + this.xrTableCell5.StylePriority.UseFont = false; + this.xrTableCell5.StylePriority.UsePadding = false; + this.xrTableCell5.StylePriority.UseTextAlignment = false; + this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell5.Weight = 0.22437535580364693D; + // // xrTableCell50 // this.xrTableCell50.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -402,6 +417,23 @@ namespace BeWo.Report.DefaultReports this.xrTableCell48.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell48.Weight = 0.4963833668101213D; // + // xrTableCell1 + // + this.xrTableCell1.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrTableCell1.Multiline = true; + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.StylePriority.UseBackColor = false; + this.xrTableCell1.StylePriority.UseBorders = false; + this.xrTableCell1.StylePriority.UseFont = false; + this.xrTableCell1.StylePriority.UseTextAlignment = false; + this.xrTableCell1.Text = "Unterschrift Klient*in"; + this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell1.Weight = 0.44692737430167606D; + // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; @@ -442,173 +474,12 @@ namespace BeWo.Report.DefaultReports // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblHintergrunddienste, this.xrTable1}); - this.GroupFooter1.HeightF = 63.54167F; + this.GroupFooter1.HeightF = 89.16664F; this.GroupFooter1.KeepTogether = true; this.GroupFooter1.Name = "GroupFooter1"; // - // fieldKontaktArt - // - this.fieldKontaktArt.DataMember = "Services"; - this.fieldKontaktArt.Expression = "Iif([IsGroup], \'GR\', \'E\')"; - this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; - this.fieldKontaktArt.Name = "fieldKontaktArt"; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // - // xrLabel2 - // - this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrLabel2.ForeColor = System.Drawing.Color.Black; - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 47.91667F); - 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(379.3611F, 25F); - this.xrLabel2.StylePriority.UseFont = false; - this.xrLabel2.StylePriority.UseForeColor = false; - this.xrLabel2.StylePriority.UseTextAlignment = false; - this.xrLabel2.Text = "Leistungsnachweis"; - this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // - // xrPictureBox3 - // - this.xrPictureBox3.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox3.ImageSource")); - this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(474.4724F, 0F); - this.xrPictureBox3.Name = "xrPictureBox3"; - this.xrPictureBox3.SizeF = new System.Drawing.SizeF(272.5276F, 72.91666F); - this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - // - // xrLabel3 - // - this.xrLabel3.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 92.66666F); - this.xrLabel3.Multiline = true; - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(546.0278F, 23F); - this.xrLabel3.StylePriority.UseBorders = false; - this.xrLabel3.StylePriority.UsePadding = false; - this.xrLabel3.StylePriority.UseTextAlignment = false; - this.xrLabel3.Text = "Vor- und Nachname Klient*in: [CustomerFirstName] [CustomerLastName]"; - this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; - // - // xrLabel4 - // - this.xrLabel4.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(546.0278F, 92.66666F); - 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(200.9722F, 23F); - this.xrLabel4.StylePriority.UseBorders = false; - this.xrLabel4.StylePriority.UseTextAlignment = false; - this.xrLabel4.Text = "Monat/Jahr: [Month] [Year]"; - this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; - // - // ReportHeader - // - this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.checkAutismus, - this.checkFLS, - this.checkSozialassistenz, - this.lblReststunden, - this.xrLabel5, - this.xrLabel4, - this.xrLabel3, - this.xrPictureBox3, - this.xrLabel2}); - this.ReportHeader.HeightF = 225.8333F; - this.ReportHeader.Name = "ReportHeader"; - // - // xrLabel5 - // - this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 115.6666F); - this.xrLabel5.Multiline = true; - this.xrLabel5.Name = "xrLabel5"; - this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(747.0001F, 23F); - this.xrLabel5.StylePriority.UseBorders = false; - this.xrLabel5.StylePriority.UsePadding = false; - this.xrLabel5.StylePriority.UseTextAlignment = false; - this.xrLabel5.Text = "Aktenzeichen: [ReferenceNumber]"; - this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; - // - // lblReststunden - // - this.lblReststunden.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.lblReststunden.LocationFloat = new DevExpress.Utils.PointFloat(0F, 138.6666F); - this.lblReststunden.Multiline = true; - this.lblReststunden.Name = "lblReststunden"; - this.lblReststunden.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); - this.lblReststunden.SizeF = new System.Drawing.SizeF(747.0001F, 23F); - this.lblReststunden.StylePriority.UseBorders = false; - this.lblReststunden.StylePriority.UsePadding = false; - this.lblReststunden.StylePriority.UseTextAlignment = false; - this.lblReststunden.Text = "Reststundenkontingent: "; - this.lblReststunden.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; - // - // checkSozialassistenz - // - this.checkSozialassistenz.GlyphOptions.Style = DevExpress.XtraPrinting.GlyphStyle.YesNoBox; - this.checkSozialassistenz.LocationFloat = new DevExpress.Utils.PointFloat(0F, 182.25F); - this.checkSozialassistenz.Name = "checkSozialassistenz"; - this.checkSozialassistenz.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F); - this.checkSozialassistenz.SizeF = new System.Drawing.SizeF(148.9583F, 23F); - this.checkSozialassistenz.Text = "Sozialassistenz"; - // - // checkFLS - // - this.checkFLS.GlyphOptions.Style = DevExpress.XtraPrinting.GlyphStyle.YesNoBox; - this.checkFLS.LocationFloat = new DevExpress.Utils.PointFloat(170F, 182.25F); - this.checkFLS.Name = "checkFLS"; - this.checkFLS.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.checkFLS.SizeF = new System.Drawing.SizeF(148.9583F, 23F); - this.checkFLS.Text = "Fachleistung"; - // - // checkAutismus - // - this.checkAutismus.GlyphOptions.Style = DevExpress.XtraPrinting.GlyphStyle.YesNoBox; - this.checkAutismus.LocationFloat = new DevExpress.Utils.PointFloat(330F, 182.25F); - this.checkAutismus.Name = "checkAutismus"; - this.checkAutismus.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.checkAutismus.SizeF = new System.Drawing.SizeF(148.9583F, 23F); - this.checkAutismus.Text = "Autismustherapie"; - // - // xrTableCell1 - // - this.xrTableCell1.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrTableCell1.Multiline = true; - this.xrTableCell1.Name = "xrTableCell1"; - this.xrTableCell1.StylePriority.UseBackColor = false; - this.xrTableCell1.StylePriority.UseBorders = false; - this.xrTableCell1.StylePriority.UseFont = false; - this.xrTableCell1.StylePriority.UseTextAlignment = false; - this.xrTableCell1.Text = "Unterschrift Klient*in"; - this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell1.Weight = 0.44692737430167606D; - // - // xrTableCell5 - // - this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice2")}); - this.xrTableCell5.Multiline = true; - this.xrTableCell5.Name = "xrTableCell5"; - this.xrTableCell5.StylePriority.UseBorders = false; - this.xrTableCell5.StylePriority.UseFont = false; - this.xrTableCell5.StylePriority.UsePadding = false; - this.xrTableCell5.StylePriority.UseTextAlignment = false; - this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell5.Weight = 0.22437535580364693D; - // // xrTable1 // this.xrTable1.BorderColor = System.Drawing.Color.Black; @@ -666,6 +537,13 @@ namespace BeWo.Report.DefaultReports this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell6.Weight = 0.10539240056428067D; // + // xrLine1 + // + this.xrLine1.LineDirection = DevExpress.XtraReports.UI.LineDirection.BackSlant; + this.xrLine1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLine1.Name = "xrLine1"; + this.xrLine1.SizeF = new System.Drawing.SizeF(69.66782F, 44.99998F); + // // xrTableCell7 // this.xrTableCell7.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -680,6 +558,13 @@ namespace BeWo.Report.DefaultReports this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell7.Weight = 0.12638061853691118D; // + // xrLine2 + // + this.xrLine2.LineDirection = DevExpress.XtraReports.UI.LineDirection.BackSlant; + this.xrLine2.LocationFloat = new DevExpress.Utils.PointFloat(1.525879E-05F, 0F); + this.xrLine2.Name = "xrLine2"; + this.xrLine2.SizeF = new System.Drawing.SizeF(83.54169F, 44.99998F); + // // xrTableCell8 // this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -708,6 +593,13 @@ namespace BeWo.Report.DefaultReports this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell15.Weight = 0.22113961243859021D; // + // xrLine3 + // + this.xrLine3.LineDirection = DevExpress.XtraReports.UI.LineDirection.BackSlant; + this.xrLine3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLine3.Name = "xrLine3"; + this.xrLine3.SizeF = new System.Drawing.SizeF(146.1805F, 44.99998F); + // // xrTableCell16 // this.xrTableCell16.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -721,6 +613,13 @@ namespace BeWo.Report.DefaultReports this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell16.Weight = 0.22437535580364693D; // + // xrLine4 + // + this.xrLine4.LineDirection = DevExpress.XtraReports.UI.LineDirection.BackSlant; + this.xrLine4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLine4.Name = "xrLine4"; + this.xrLine4.SizeF = new System.Drawing.SizeF(148.3194F, 44.99998F); + // // xrTableCell17 // this.xrTableCell17.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -733,40 +632,6 @@ namespace BeWo.Report.DefaultReports this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.xrTableCell17.Weight = 0.20202019042968572D; // - // MinutesAlsStunden - // - this.MinutesAlsStunden.DataMember = "Services"; - this.MinutesAlsStunden.Expression = "[Minutes]/60"; - this.MinutesAlsStunden.Name = "MinutesAlsStunden"; - // - // xrLine1 - // - this.xrLine1.LineDirection = DevExpress.XtraReports.UI.LineDirection.BackSlant; - this.xrLine1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrLine1.Name = "xrLine1"; - this.xrLine1.SizeF = new System.Drawing.SizeF(69.66782F, 44.99998F); - // - // xrLine2 - // - this.xrLine2.LineDirection = DevExpress.XtraReports.UI.LineDirection.BackSlant; - this.xrLine2.LocationFloat = new DevExpress.Utils.PointFloat(1.525879E-05F, 0F); - this.xrLine2.Name = "xrLine2"; - this.xrLine2.SizeF = new System.Drawing.SizeF(83.54169F, 44.99998F); - // - // xrLine3 - // - this.xrLine3.LineDirection = DevExpress.XtraReports.UI.LineDirection.BackSlant; - this.xrLine3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrLine3.Name = "xrLine3"; - this.xrLine3.SizeF = new System.Drawing.SizeF(146.1805F, 44.99998F); - // - // xrLine4 - // - this.xrLine4.LineDirection = DevExpress.XtraReports.UI.LineDirection.BackSlant; - this.xrLine4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrLine4.Name = "xrLine4"; - this.xrLine4.SizeF = new System.Drawing.SizeF(148.3194F, 44.99998F); - // // xrLine5 // this.xrLine5.LineDirection = DevExpress.XtraReports.UI.LineDirection.BackSlant; @@ -774,6 +639,164 @@ namespace BeWo.Report.DefaultReports this.xrLine5.Name = "xrLine5"; this.xrLine5.SizeF = new System.Drawing.SizeF(133.5419F, 44.99998F); // + // fieldKontaktArt + // + this.fieldKontaktArt.DataMember = "Services"; + this.fieldKontaktArt.Expression = "Iif([IsGroup], \'GR\', \'E\')"; + this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; + this.fieldKontaktArt.Name = "fieldKontaktArt"; + // + // xrLabel2 + // + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrLabel2.ForeColor = System.Drawing.Color.Black; + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 47.91667F); + 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(379.3611F, 25F); + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.StylePriority.UseForeColor = false; + this.xrLabel2.StylePriority.UseTextAlignment = false; + this.xrLabel2.Text = "Leistungsnachweis"; + this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrPictureBox3 + // + this.xrPictureBox3.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox3.ImageSource")); + this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(474.4724F, 0F); + this.xrPictureBox3.Name = "xrPictureBox3"; + this.xrPictureBox3.SizeF = new System.Drawing.SizeF(272.5276F, 72.91666F); + this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // + // xrLabel3 + // + this.xrLabel3.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 92.66666F); + this.xrLabel3.Multiline = true; + this.xrLabel3.Name = "xrLabel3"; + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(546.0278F, 23F); + this.xrLabel3.StylePriority.UseBorders = false; + this.xrLabel3.StylePriority.UsePadding = false; + this.xrLabel3.StylePriority.UseTextAlignment = false; + this.xrLabel3.Text = "Vor- und Nachname Klient*in: [CustomerFirstName] [CustomerLastName]"; + this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; + // + // xrLabel4 + // + this.xrLabel4.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(546.0278F, 92.66666F); + 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(200.9722F, 23F); + this.xrLabel4.StylePriority.UseBorders = false; + this.xrLabel4.StylePriority.UseTextAlignment = false; + this.xrLabel4.Text = "Monat/Jahr: [Month] [Year]"; + this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; + // + // ReportHeader + // + this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.checkHintergrunddienst, + this.checkAutismus, + this.checkFLS, + this.checkSozialassistenz, + this.lblReststunden, + this.xrLabel5, + this.xrLabel4, + this.xrLabel3, + this.xrPictureBox3, + this.xrLabel2}); + this.ReportHeader.HeightF = 225.8333F; + this.ReportHeader.Name = "ReportHeader"; + // + // checkAutismus + // + this.checkAutismus.GlyphOptions.Style = DevExpress.XtraPrinting.GlyphStyle.YesNoBox; + this.checkAutismus.LocationFloat = new DevExpress.Utils.PointFloat(330F, 182.25F); + this.checkAutismus.Name = "checkAutismus"; + this.checkAutismus.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.checkAutismus.SizeF = new System.Drawing.SizeF(148.9583F, 23F); + this.checkAutismus.Text = "Autismustherapie"; + // + // checkFLS + // + this.checkFLS.GlyphOptions.Style = DevExpress.XtraPrinting.GlyphStyle.YesNoBox; + this.checkFLS.LocationFloat = new DevExpress.Utils.PointFloat(170F, 182.25F); + this.checkFLS.Name = "checkFLS"; + this.checkFLS.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.checkFLS.SizeF = new System.Drawing.SizeF(148.9583F, 23F); + this.checkFLS.Text = "Fachleistung"; + // + // checkSozialassistenz + // + this.checkSozialassistenz.GlyphOptions.Style = DevExpress.XtraPrinting.GlyphStyle.YesNoBox; + this.checkSozialassistenz.LocationFloat = new DevExpress.Utils.PointFloat(0F, 182.25F); + this.checkSozialassistenz.Name = "checkSozialassistenz"; + this.checkSozialassistenz.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.checkSozialassistenz.SizeF = new System.Drawing.SizeF(148.9583F, 23F); + this.checkSozialassistenz.Text = "Sozialassistenz"; + // + // lblReststunden + // + this.lblReststunden.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.lblReststunden.LocationFloat = new DevExpress.Utils.PointFloat(0F, 138.6666F); + this.lblReststunden.Multiline = true; + this.lblReststunden.Name = "lblReststunden"; + this.lblReststunden.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.lblReststunden.SizeF = new System.Drawing.SizeF(747.0001F, 23F); + this.lblReststunden.StylePriority.UseBorders = false; + this.lblReststunden.StylePriority.UsePadding = false; + this.lblReststunden.StylePriority.UseTextAlignment = false; + this.lblReststunden.Text = "Reststundenkontingent: "; + this.lblReststunden.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; + // + // xrLabel5 + // + this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 115.6666F); + this.xrLabel5.Multiline = true; + this.xrLabel5.Name = "xrLabel5"; + this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(747.0001F, 23F); + this.xrLabel5.StylePriority.UseBorders = false; + this.xrLabel5.StylePriority.UsePadding = false; + this.xrLabel5.StylePriority.UseTextAlignment = false; + this.xrLabel5.Text = "Aktenzeichen: [ReferenceNumber]"; + this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; + // + // MinutesAlsStunden + // + this.MinutesAlsStunden.DataMember = "Services"; + this.MinutesAlsStunden.Expression = "[Minutes]/60"; + this.MinutesAlsStunden.Name = "MinutesAlsStunden"; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // + // checkHintergrunddienst + // + this.checkHintergrunddienst.GlyphOptions.Style = DevExpress.XtraPrinting.GlyphStyle.YesNoBox; + this.checkHintergrunddienst.LocationFloat = new DevExpress.Utils.PointFloat(501.875F, 182.25F); + this.checkHintergrunddienst.Name = "checkHintergrunddienst"; + this.checkHintergrunddienst.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.checkHintergrunddienst.SizeF = new System.Drawing.SizeF(143.7499F, 23F); + this.checkHintergrunddienst.Text = "Hintergrunddienst"; + // + // lblHintergrunddienste + // + this.lblHintergrunddienste.LocationFloat = new DevExpress.Utils.PointFloat(0F, 56.16665F); + this.lblHintergrunddienste.Multiline = true; + this.lblHintergrunddienste.Name = "lblHintergrunddienste"; + this.lblHintergrunddienste.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F); + this.lblHintergrunddienste.SizeF = new System.Drawing.SizeF(262.5F, 23F); + this.lblHintergrunddienste.Text = "Anzahl Hintergrunddienste: "; + this.lblHintergrunddienste.Visible = false; + // // QuittierungsbelegJugendamt // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -802,8 +825,8 @@ namespace BeWo.Report.DefaultReports this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -867,5 +890,7 @@ namespace BeWo.Report.DefaultReports private DevExpress.XtraReports.UI.XRLine xrLine3; private DevExpress.XtraReports.UI.XRLine xrLine4; private DevExpress.XtraReports.UI.XRLine xrLine5; + private DevExpress.XtraReports.UI.XRCheckBox checkHintergrunddienst; + private DevExpress.XtraReports.UI.XRLabel lblHintergrunddienste; } } diff --git a/ReportImp/HwHilfswerkInklusionUndTeilhabe/QuittierungsbelegJugendamt.cs b/ReportImp/HwHilfswerkInklusionUndTeilhabe/QuittierungsbelegJugendamt.cs index 98578bca1..a9638f165 100644 --- a/ReportImp/HwHilfswerkInklusionUndTeilhabe/QuittierungsbelegJugendamt.cs +++ b/ReportImp/HwHilfswerkInklusionUndTeilhabe/QuittierungsbelegJugendamt.cs @@ -21,6 +21,7 @@ namespace BeWo.Report.DefaultReports public void SetReportDataSource(ServicesOverviewRO pRO) { + int hintergrunddienste = 0; // Get calling method name //StackTrace stackTrace = new StackTrace(); @@ -33,6 +34,7 @@ namespace BeWo.Report.DefaultReports if (pRO.Services != null) { + // Checkboxen setzen if (pRO.Services.Any(s => s.ServiceCategory.ToLower().Contains("fachleistung") || s.ServiceCategory.ToLower().Contains("fls"))) checkFLS.Checked = true; @@ -40,11 +42,16 @@ namespace BeWo.Report.DefaultReports checkSozialassistenz.Checked = true; if (pRO.Services.Any(s => s.ServiceCategory.ToLower().Contains("autismustherapie"))) checkAutismus.Checked = true; + if (pRO.Services.Any(s => s.ServiceCategory.ToLower().Contains("hintergrunddienst") || s.ServiceDescription.ToLower().Contains("hintergrunddienst"))) + checkHintergrunddienst.Checked = true; List servicesBillable = new List(); foreach (var sd in pRO.Services) { + if (sd.ServiceDescription.ToLower().Contains("hintergrunddienst")) + hintergrunddienste++; + if (sd.IsBillable || sd.ServiceDescription.ToLower().Contains("fehlkontakt") || sd.ServiceCategory.ToLower().Contains("fehlkontakt")) { ServicesOverviewRO.CreateSignatureString(sd); @@ -91,6 +98,12 @@ namespace BeWo.Report.DefaultReports pRO.CalculateFLSSollIst2(); lblReststunden.Text += String.Format(" {0:0.00}", pRO.ApprovedFLSTotal - pRO.MinutenGeleistetBisVormonat / 60 - Convert.ToDecimal(pRO.TotalFLS)); + if (hintergrunddienste > 0) + { + lblHintergrunddienste.Text += string.Format("{0}", hintergrunddienste); + lblHintergrunddienste.Visible = true; + } + bindingSource1.DataSource = pRO; }