From 6d6c20bd159161c37db984c8978400a62b38428c Mon Sep 17 00:00:00 2001 From: HirschleM Date: Tue, 3 Mar 2026 15:07:40 +0100 Subject: [PATCH 01/24] MH: CaritasverbandKelheim Seitenzahlen auf QB --- .../CustomReportCreator.cs | 10 +- .../LeistungsnachweisAnlage4.Designer.cs | 812 +++++++++--------- .../LeistungsnachweisAnlage4.cs | 4 + 3 files changed, 417 insertions(+), 409 deletions(-) diff --git a/ReportImp/CaritasverbandKelheim/CustomReportCreator.cs b/ReportImp/CaritasverbandKelheim/CustomReportCreator.cs index 51283320e..21245867d 100644 --- a/ReportImp/CaritasverbandKelheim/CustomReportCreator.cs +++ b/ReportImp/CaritasverbandKelheim/CustomReportCreator.cs @@ -128,15 +128,15 @@ namespace CaritasverbandKelheim public override XtraReport CreateServiceOverviewReportForCustomers(IList customerOids, int month, int year, long? orgaOid, long? empOid, long? serviceCategoryOid, int startDay, int endDay, bool nurFehlende) { var roList = new List(); - int seitenzahl = 1; + //int seitenzahl = 1; foreach (var coid in customerOids) { var ro = ServicesOverviewRO.Create(coid, month, year, true, orgaOid ?? 0, empOid ?? 0, startDay, endDay, serviceCategoryOid); if (ro != null) { - ro.FreeHoursBisVormonat = seitenzahl; - seitenzahl++; + //ro.FreeHoursBisVormonat = seitenzahl; + //seitenzahl++; roList.Add(ro); } } @@ -171,9 +171,9 @@ namespace CaritasverbandKelheim public override XtraReport CreateServiceOverviewSingleCustomerReport(long customerOid, int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay) { - int seitenzahl = 1; + //int seitenzahl = 1; var ro = ServicesOverviewRO.Create(customerOid, month, year, false, orgaOid, empOid, startDay, endDay, serviceCategoryOid); - ro.FreeHoursBisVormonat = seitenzahl; + //ro.FreeHoursBisVormonat = seitenzahl; return CreateServicesOverviewReportForRo(ro, serviceCategoryOid); } diff --git a/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage4.Designer.cs b/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage4.Designer.cs index 189b95843..e1681baba 100644 --- a/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage4.Designer.cs +++ b/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage4.Designer.cs @@ -69,28 +69,6 @@ namespace CaritasverbandKelheim this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); - this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); - this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel33 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel34 = new DevExpress.XtraReports.UI.XRLabel(); - this.lblApprovedASS = new DevExpress.XtraReports.UI.XRLabel(); - this.lblApprovedFLS = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel30 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel29 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel24 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule(); this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule(); this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule(); @@ -111,6 +89,27 @@ namespace CaritasverbandKelheim this.lblUnterschriftKlient = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); + this.PageHeader = new DevExpress.XtraReports.UI.PageHeaderBand(); + this.lblSeite = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel24 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel30 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblApprovedFLS = new DevExpress.XtraReports.UI.XRLabel(); + this.lblApprovedASS = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel34 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel33 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -645,364 +644,6 @@ namespace CaritasverbandKelheim this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; this.formattingRuleStartDate.Name = "formattingRuleStartDate"; // - // ReportHeader - // - this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel13, - this.xrLabel33, - this.xrLabel34, - this.lblApprovedASS, - this.lblApprovedFLS, - this.xrLabel28, - this.xrLabel30, - this.xrLabel16, - this.xrLabel14, - this.xrLabel7, - this.xrLabel8, - this.xrLabel5, - this.xrLabel6, - this.xrLabel4, - this.xrLabel3, - this.xrLabel29, - this.xrLabel26, - this.xrLabel27, - this.xrLabel25, - this.xrLabel24, - this.xrLabel2}); - this.ReportHeader.HeightF = 147.235F; - this.ReportHeader.Name = "ReportHeader"; - // - // xrLabel13 - // - this.xrLabel13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "FreeHoursBisVormonat")}); - this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel13.ForeColor = System.Drawing.Color.Black; - this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(1038.74F, 0F); - this.xrLabel13.Multiline = true; - this.xrLabel13.Name = "xrLabel13"; - this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel13.SizeF = new System.Drawing.SizeF(44.79175F, 25F); - this.xrLabel13.StylePriority.UseFont = false; - this.xrLabel13.StylePriority.UseForeColor = false; - this.xrLabel13.StylePriority.UseTextAlignment = false; - this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; - // - // xrLabel33 - // - this.xrLabel33.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel33.ForeColor = System.Drawing.Color.Black; - this.xrLabel33.LocationFloat = new DevExpress.Utils.PointFloat(401.7843F, 117.2349F); - this.xrLabel33.Multiline = true; - this.xrLabel33.Name = "xrLabel33"; - this.xrLabel33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel33.SizeF = new System.Drawing.SizeF(82.84718F, 19.99998F); - this.xrLabel33.StylePriority.UseFont = false; - this.xrLabel33.StylePriority.UseForeColor = false; - this.xrLabel33.StylePriority.UseTextAlignment = false; - this.xrLabel33.Text = "Stunden"; - this.xrLabel33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // xrLabel34 - // - this.xrLabel34.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel34.ForeColor = System.Drawing.Color.Black; - this.xrLabel34.LocationFloat = new DevExpress.Utils.PointFloat(401.7843F, 97.23489F); - this.xrLabel34.Multiline = true; - this.xrLabel34.Name = "xrLabel34"; - this.xrLabel34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel34.SizeF = new System.Drawing.SizeF(82.84717F, 19.99999F); - this.xrLabel34.StylePriority.UseFont = false; - this.xrLabel34.StylePriority.UseForeColor = false; - this.xrLabel34.StylePriority.UseTextAlignment = false; - this.xrLabel34.Text = "Stunden"; - this.xrLabel34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // lblApprovedASS - // - this.lblApprovedASS.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.lblApprovedASS.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblApprovedASS.ForeColor = System.Drawing.Color.Black; - this.lblApprovedASS.LocationFloat = new DevExpress.Utils.PointFloat(340.7174F, 117.2349F); - this.lblApprovedASS.Multiline = true; - this.lblApprovedASS.Name = "lblApprovedASS"; - this.lblApprovedASS.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblApprovedASS.SizeF = new System.Drawing.SizeF(61.06689F, 19.99999F); - this.lblApprovedASS.StylePriority.UseBorders = false; - this.lblApprovedASS.StylePriority.UseFont = false; - this.lblApprovedASS.StylePriority.UseForeColor = false; - this.lblApprovedASS.StylePriority.UseTextAlignment = false; - this.lblApprovedASS.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - // - // lblApprovedFLS - // - this.lblApprovedFLS.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.lblApprovedFLS.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblApprovedFLS.ForeColor = System.Drawing.Color.Black; - this.lblApprovedFLS.LocationFloat = new DevExpress.Utils.PointFloat(340.7174F, 97.23489F); - this.lblApprovedFLS.Multiline = true; - this.lblApprovedFLS.Name = "lblApprovedFLS"; - this.lblApprovedFLS.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblApprovedFLS.SizeF = new System.Drawing.SizeF(61.06689F, 19.99999F); - this.lblApprovedFLS.StylePriority.UseBorders = false; - this.lblApprovedFLS.StylePriority.UseFont = false; - this.lblApprovedFLS.StylePriority.UseForeColor = false; - this.lblApprovedFLS.StylePriority.UseTextAlignment = false; - this.lblApprovedFLS.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - // - // xrLabel28 - // - this.xrLabel28.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel28.ForeColor = System.Drawing.Color.Black; - this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(257.8702F, 97.23489F); - this.xrLabel28.Multiline = true; - this.xrLabel28.Name = "xrLabel28"; - this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel28.SizeF = new System.Drawing.SizeF(82.84718F, 19.99999F); - this.xrLabel28.StylePriority.UseFont = false; - this.xrLabel28.StylePriority.UseForeColor = false; - this.xrLabel28.StylePriority.UseTextAlignment = false; - this.xrLabel28.Text = "wöchentlich"; - this.xrLabel28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // xrLabel30 - // - this.xrLabel30.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel30.ForeColor = System.Drawing.Color.Black; - this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(257.8702F, 117.2349F); - this.xrLabel30.Multiline = true; - this.xrLabel30.Name = "xrLabel30"; - this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel30.SizeF = new System.Drawing.SizeF(82.84718F, 19.99998F); - this.xrLabel30.StylePriority.UseFont = false; - this.xrLabel30.StylePriority.UseForeColor = false; - this.xrLabel30.StylePriority.UseTextAlignment = false; - this.xrLabel30.Text = "wöchentlich"; - this.xrLabel30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // xrLabel16 - // - this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel16.ForeColor = System.Drawing.Color.Black; - this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(0F, 117.2349F); - this.xrLabel16.Multiline = true; - this.xrLabel16.Name = "xrLabel16"; - this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel16.SizeF = new System.Drawing.SizeF(257.8702F, 19.99999F); - this.xrLabel16.StylePriority.UseFont = false; - this.xrLabel16.StylePriority.UseForeColor = false; - this.xrLabel16.StylePriority.UseTextAlignment = false; - this.xrLabel16.Text = "Bewilligte Hilfskraftstunden"; - this.xrLabel16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // xrLabel14 - // - this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel14.ForeColor = System.Drawing.Color.Black; - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 97.23489F); - this.xrLabel14.Multiline = true; - this.xrLabel14.Name = "xrLabel14"; - this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel14.SizeF = new System.Drawing.SizeF(257.8702F, 20F); - this.xrLabel14.StylePriority.UseFont = false; - this.xrLabel14.StylePriority.UseForeColor = false; - this.xrLabel14.StylePriority.UseTextAlignment = false; - this.xrLabel14.Text = "Bewilligte Fachkraftstunden"; - this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // xrLabel7 - // - this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel7.ForeColor = System.Drawing.Color.Black; - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(507.3043F, 43.5606F); - this.xrLabel7.Multiline = true; - this.xrLabel7.Name = "xrLabel7"; - this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(48.75629F, 25F); - this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.StylePriority.UseForeColor = false; - this.xrLabel7.StylePriority.UseTextAlignment = false; - this.xrLabel7.Text = "geb."; - this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; - // - // xrLabel8 - // - this.xrLabel8.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel8.ForeColor = System.Drawing.Color.Black; - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(556.0607F, 43.5606F); - this.xrLabel8.Multiline = true; - this.xrLabel8.Name = "xrLabel8"; - this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(409.7538F, 25F); - this.xrLabel8.StylePriority.UseBorders = false; - this.xrLabel8.StylePriority.UseFont = false; - this.xrLabel8.StylePriority.UseForeColor = false; - this.xrLabel8.StylePriority.UseTextAlignment = false; - this.xrLabel8.Text = "[CustomerBirthday!dd.MM.yyyy]"; - this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; - // - // xrLabel5 - // - this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel5.ForeColor = System.Drawing.Color.Black; - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.56059F); - this.xrLabel5.Multiline = true; - this.xrLabel5.Name = "xrLabel5"; - this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(67.7F, 20F); - this.xrLabel5.StylePriority.UseFont = false; - this.xrLabel5.StylePriority.UseForeColor = false; - this.xrLabel5.StylePriority.UseTextAlignment = false; - this.xrLabel5.Text = "Anbieter:"; - this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; - // - // xrLabel6 - // - this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Mandator.Name")}); - this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel6.ForeColor = System.Drawing.Color.Black; - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(67.69999F, 68.56059F); - this.xrLabel6.Multiline = true; - this.xrLabel6.Name = "xrLabel6"; - this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel6.SizeF = new System.Drawing.SizeF(409.7494F, 20.00001F); - this.xrLabel6.StylePriority.UseBorders = false; - this.xrLabel6.StylePriority.UseFont = false; - this.xrLabel6.StylePriority.UseForeColor = false; - this.xrLabel6.StylePriority.UseTextAlignment = false; - this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; - // - // xrLabel4 - // - this.xrLabel4.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel4.ForeColor = System.Drawing.Color.Black; - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(67.69569F, 43.5606F); - 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(409.7538F, 25F); - this.xrLabel4.StylePriority.UseBorders = false; - this.xrLabel4.StylePriority.UseFont = false; - this.xrLabel4.StylePriority.UseForeColor = false; - this.xrLabel4.StylePriority.UseTextAlignment = false; - this.xrLabel4.Text = "[CustomerLastName], [CustomerFirstName]"; - this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; - // - // xrLabel3 - // - this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel3.ForeColor = System.Drawing.Color.Black; - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 43.5606F); - this.xrLabel3.Multiline = true; - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(67.69569F, 25F); - this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.StylePriority.UseForeColor = false; - this.xrLabel3.StylePriority.UseTextAlignment = false; - this.xrLabel3.Text = "Name:"; - this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; - // - // xrLabel29 - // - this.xrLabel29.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel29.ForeColor = System.Drawing.Color.Black; - this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(993.9479F, 0F); - this.xrLabel29.Multiline = true; - this.xrLabel29.Name = "xrLabel29"; - this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel29.SizeF = new System.Drawing.SizeF(44.79175F, 25F); - this.xrLabel29.StylePriority.UseFont = false; - this.xrLabel29.StylePriority.UseForeColor = false; - this.xrLabel29.StylePriority.UseTextAlignment = false; - this.xrLabel29.Text = "Blatt"; - this.xrLabel29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; - // - // xrLabel26 - // - this.xrLabel26.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel26.ForeColor = System.Drawing.Color.Black; - this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(906.3555F, 0F); - this.xrLabel26.Multiline = true; - this.xrLabel26.Name = "xrLabel26"; - this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel26.SizeF = new System.Drawing.SizeF(33.42816F, 25F); - this.xrLabel26.StylePriority.UseFont = false; - this.xrLabel26.StylePriority.UseForeColor = false; - this.xrLabel26.StylePriority.UseTextAlignment = false; - this.xrLabel26.Text = "Jahr"; - this.xrLabel26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; - // - // xrLabel27 - // - this.xrLabel27.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Year")}); - this.xrLabel27.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel27.ForeColor = System.Drawing.Color.Black; - this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(939.7838F, 0F); - this.xrLabel27.Multiline = true; - this.xrLabel27.Name = "xrLabel27"; - this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel27.SizeF = new System.Drawing.SizeF(42.68488F, 25F); - this.xrLabel27.StylePriority.UseBorders = false; - this.xrLabel27.StylePriority.UseFont = false; - this.xrLabel27.StylePriority.UseForeColor = false; - this.xrLabel27.StylePriority.UseTextAlignment = false; - this.xrLabel27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; - // - // xrLabel25 - // - this.xrLabel25.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Month")}); - this.xrLabel25.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel25.ForeColor = System.Drawing.Color.Black; - this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(824.2299F, 0F); - this.xrLabel25.Multiline = true; - this.xrLabel25.Name = "xrLabel25"; - this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel25.SizeF = new System.Drawing.SizeF(77.39087F, 25F); - this.xrLabel25.StylePriority.UseBorders = false; - this.xrLabel25.StylePriority.UseFont = false; - this.xrLabel25.StylePriority.UseForeColor = false; - this.xrLabel25.StylePriority.UseTextAlignment = false; - this.xrLabel25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; - // - // xrLabel24 - // - this.xrLabel24.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel24.ForeColor = System.Drawing.Color.Black; - this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(778.3964F, 0F); - this.xrLabel24.Multiline = true; - this.xrLabel24.Name = "xrLabel24"; - this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel24.SizeF = new System.Drawing.SizeF(45.83344F, 25F); - this.xrLabel24.StylePriority.UseFont = false; - this.xrLabel24.StylePriority.UseForeColor = false; - this.xrLabel24.StylePriority.UseTextAlignment = false; - this.xrLabel24.Text = "Monat"; - this.xrLabel24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; - // - // xrLabel2 - // - this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 13F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel2.ForeColor = System.Drawing.Color.Black; - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrLabel2.Multiline = true; - this.xrLabel2.Name = "xrLabel2"; - this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(758.0366F, 25F); - this.xrLabel2.StylePriority.UseFont = false; - this.xrLabel2.StylePriority.UseForeColor = false; - this.xrLabel2.StylePriority.UseTextAlignment = false; - this.xrLabel2.Text = "Leistungsnachweis für direkte Betreuungsleistungen im Ambulant Betreuten Wohnen"; - this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; - // // formattingRuleServiceDesc // this.formattingRuleServiceDesc.Condition = "[StartDate2] < [StartDate]"; @@ -1127,6 +768,9 @@ namespace CaritasverbandKelheim // // xrTableCell37 // + this.xrTableCell37.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell37.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.xrTableCell37.Name = "xrTableCell37"; @@ -1140,9 +784,13 @@ namespace CaritasverbandKelheim // // lblEinzelFK // + this.lblEinzelFK.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblEinzelFK.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.lblEinzelFK.Name = "lblEinzelFK"; + this.lblEinzelFK.StylePriority.UseBorders = false; this.lblEinzelFK.StylePriority.UseFont = false; this.lblEinzelFK.StylePriority.UsePadding = false; this.lblEinzelFK.StylePriority.UseTextAlignment = false; @@ -1151,10 +799,14 @@ namespace CaritasverbandKelheim // // lblEinzelHK // + this.lblEinzelHK.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblEinzelHK.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.lblEinzelHK.Multiline = true; this.lblEinzelHK.Name = "lblEinzelHK"; + this.lblEinzelHK.StylePriority.UseBorders = false; this.lblEinzelHK.StylePriority.UseFont = false; this.lblEinzelHK.StylePriority.UsePadding = false; this.lblEinzelHK.StylePriority.UseTextAlignment = false; @@ -1163,10 +815,14 @@ namespace CaritasverbandKelheim // // lblGruppeFK // + this.lblGruppeFK.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblGruppeFK.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.lblGruppeFK.Multiline = true; this.lblGruppeFK.Name = "lblGruppeFK"; + this.lblGruppeFK.StylePriority.UseBorders = false; this.lblGruppeFK.StylePriority.UseFont = false; this.lblGruppeFK.StylePriority.UsePadding = false; this.lblGruppeFK.StylePriority.UseTextAlignment = false; @@ -1175,10 +831,14 @@ namespace CaritasverbandKelheim // // lblGruppeHK // + this.lblGruppeHK.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblGruppeHK.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.lblGruppeHK.Multiline = true; this.lblGruppeHK.Name = "lblGruppeHK"; + this.lblGruppeHK.StylePriority.UseBorders = false; this.lblGruppeHK.StylePriority.UseFont = false; this.lblGruppeHK.StylePriority.UsePadding = false; this.lblGruppeHK.StylePriority.UseTextAlignment = false; @@ -1187,10 +847,14 @@ namespace CaritasverbandKelheim // // xrTableCell42 // + this.xrTableCell42.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell42.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.xrTableCell42.Multiline = true; this.xrTableCell42.Name = "xrTableCell42"; + this.xrTableCell42.StylePriority.UseBorders = false; this.xrTableCell42.StylePriority.UseFont = false; this.xrTableCell42.StylePriority.UsePadding = false; this.xrTableCell42.StylePriority.UseTextAlignment = false; @@ -1236,15 +900,356 @@ namespace CaritasverbandKelheim this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldKontaktArt.Name = "fieldKontaktArt"; // + // PageHeader + // + this.PageHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblSeite, + this.xrLabel2, + this.xrLabel24, + this.xrLabel25, + this.xrLabel27, + this.xrLabel26, + this.xrLabel3, + this.xrLabel4, + this.xrLabel6, + this.xrLabel5, + this.xrLabel8, + this.xrLabel7, + this.xrLabel14, + this.xrLabel16, + this.xrLabel30, + this.xrLabel28, + this.lblApprovedFLS, + this.lblApprovedASS, + this.xrLabel34, + this.xrLabel33}); + this.PageHeader.HeightF = 175.7766F; + this.PageHeader.Name = "PageHeader"; + // + // lblSeite + // + this.lblSeite.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.lblSeite.ForeColor = System.Drawing.Color.Black; + this.lblSeite.LocationFloat = new DevExpress.Utils.PointFloat(985.2498F, 0F); + this.lblSeite.Multiline = true; + this.lblSeite.Name = "lblSeite"; + this.lblSeite.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblSeite.SizeF = new System.Drawing.SizeF(103.7503F, 25F); + this.lblSeite.StylePriority.UseFont = false; + this.lblSeite.StylePriority.UseForeColor = false; + this.lblSeite.StylePriority.UseTextAlignment = false; + this.lblSeite.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; + this.lblSeite.PrintOnPage += new DevExpress.XtraReports.UI.PrintOnPageEventHandler(this.lblSeite_PrintOnPage); + // + // xrLabel2 + // + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 13F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel2.ForeColor = System.Drawing.Color.Black; + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel2.Multiline = true; + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(758.0366F, 25F); + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.StylePriority.UseForeColor = false; + this.xrLabel2.StylePriority.UseTextAlignment = false; + this.xrLabel2.Text = "Leistungsnachweis für direkte Betreuungsleistungen im Ambulant Betreuten Wohnen"; + this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; + // + // xrLabel24 + // + this.xrLabel24.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel24.ForeColor = System.Drawing.Color.Black; + this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(758.0366F, 0F); + this.xrLabel24.Multiline = true; + this.xrLabel24.Name = "xrLabel24"; + this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel24.SizeF = new System.Drawing.SizeF(45.83344F, 25F); + this.xrLabel24.StylePriority.UseFont = false; + this.xrLabel24.StylePriority.UseForeColor = false; + this.xrLabel24.StylePriority.UseTextAlignment = false; + this.xrLabel24.Text = "Monat"; + this.xrLabel24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; + // + // xrLabel25 + // + this.xrLabel25.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrLabel25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Month")}); + this.xrLabel25.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel25.ForeColor = System.Drawing.Color.Black; + this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(803.8701F, 0F); + this.xrLabel25.Multiline = true; + this.xrLabel25.Name = "xrLabel25"; + this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel25.SizeF = new System.Drawing.SizeF(77.39087F, 25F); + this.xrLabel25.StylePriority.UseBorders = false; + this.xrLabel25.StylePriority.UseFont = false; + this.xrLabel25.StylePriority.UseForeColor = false; + this.xrLabel25.StylePriority.UseTextAlignment = false; + this.xrLabel25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; + // + // xrLabel27 + // + this.xrLabel27.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrLabel27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Year")}); + this.xrLabel27.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel27.ForeColor = System.Drawing.Color.Black; + this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(919.424F, 0F); + this.xrLabel27.Multiline = true; + this.xrLabel27.Name = "xrLabel27"; + this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel27.SizeF = new System.Drawing.SizeF(42.68488F, 25F); + this.xrLabel27.StylePriority.UseBorders = false; + this.xrLabel27.StylePriority.UseFont = false; + this.xrLabel27.StylePriority.UseForeColor = false; + this.xrLabel27.StylePriority.UseTextAlignment = false; + this.xrLabel27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; + // + // xrLabel26 + // + this.xrLabel26.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel26.ForeColor = System.Drawing.Color.Black; + this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(885.9957F, 0F); + this.xrLabel26.Multiline = true; + this.xrLabel26.Name = "xrLabel26"; + this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel26.SizeF = new System.Drawing.SizeF(33.42816F, 25F); + this.xrLabel26.StylePriority.UseFont = false; + this.xrLabel26.StylePriority.UseForeColor = false; + this.xrLabel26.StylePriority.UseTextAlignment = false; + this.xrLabel26.Text = "Jahr"; + this.xrLabel26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; + // + // xrLabel3 + // + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel3.ForeColor = System.Drawing.Color.Black; + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 43.5606F); + this.xrLabel3.Multiline = true; + this.xrLabel3.Name = "xrLabel3"; + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(67.69569F, 25F); + this.xrLabel3.StylePriority.UseFont = false; + this.xrLabel3.StylePriority.UseForeColor = false; + this.xrLabel3.StylePriority.UseTextAlignment = false; + this.xrLabel3.Text = "Name:"; + this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; + // + // xrLabel4 + // + this.xrLabel4.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel4.ForeColor = System.Drawing.Color.Black; + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(67.69569F, 43.5606F); + 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(409.7538F, 25F); + this.xrLabel4.StylePriority.UseBorders = false; + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.StylePriority.UseForeColor = false; + this.xrLabel4.StylePriority.UseTextAlignment = false; + this.xrLabel4.Text = "[CustomerLastName], [CustomerFirstName]"; + this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; + // + // xrLabel6 + // + this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Mandator.Name")}); + this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel6.ForeColor = System.Drawing.Color.Black; + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(67.69999F, 68.56059F); + this.xrLabel6.Multiline = true; + this.xrLabel6.Name = "xrLabel6"; + this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel6.SizeF = new System.Drawing.SizeF(409.7494F, 20.00001F); + this.xrLabel6.StylePriority.UseBorders = false; + this.xrLabel6.StylePriority.UseFont = false; + this.xrLabel6.StylePriority.UseForeColor = false; + this.xrLabel6.StylePriority.UseTextAlignment = false; + this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; + // + // xrLabel5 + // + this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel5.ForeColor = System.Drawing.Color.Black; + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 68.56059F); + this.xrLabel5.Multiline = true; + this.xrLabel5.Name = "xrLabel5"; + this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(67.7F, 20F); + this.xrLabel5.StylePriority.UseFont = false; + this.xrLabel5.StylePriority.UseForeColor = false; + this.xrLabel5.StylePriority.UseTextAlignment = false; + this.xrLabel5.Text = "Anbieter:"; + this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; + // + // xrLabel8 + // + this.xrLabel8.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel8.ForeColor = System.Drawing.Color.Black; + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(556.0607F, 43.5606F); + this.xrLabel8.Multiline = true; + this.xrLabel8.Name = "xrLabel8"; + this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(409.7538F, 25F); + this.xrLabel8.StylePriority.UseBorders = false; + this.xrLabel8.StylePriority.UseFont = false; + this.xrLabel8.StylePriority.UseForeColor = false; + this.xrLabel8.StylePriority.UseTextAlignment = false; + this.xrLabel8.Text = "[CustomerBirthday!dd.MM.yyyy]"; + this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; + // + // xrLabel7 + // + this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel7.ForeColor = System.Drawing.Color.Black; + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(507.3043F, 43.5606F); + this.xrLabel7.Multiline = true; + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(48.75629F, 25F); + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.StylePriority.UseForeColor = false; + this.xrLabel7.StylePriority.UseTextAlignment = false; + this.xrLabel7.Text = "geb."; + this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; + // + // xrLabel14 + // + this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel14.ForeColor = System.Drawing.Color.Black; + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 97.23489F); + this.xrLabel14.Multiline = true; + this.xrLabel14.Name = "xrLabel14"; + this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel14.SizeF = new System.Drawing.SizeF(257.8702F, 20F); + this.xrLabel14.StylePriority.UseFont = false; + this.xrLabel14.StylePriority.UseForeColor = false; + this.xrLabel14.StylePriority.UseTextAlignment = false; + this.xrLabel14.Text = "Bewilligte Fachkraftstunden"; + this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // xrLabel16 + // + this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel16.ForeColor = System.Drawing.Color.Black; + this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(0F, 117.2349F); + this.xrLabel16.Multiline = true; + this.xrLabel16.Name = "xrLabel16"; + this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel16.SizeF = new System.Drawing.SizeF(257.8702F, 19.99999F); + this.xrLabel16.StylePriority.UseFont = false; + this.xrLabel16.StylePriority.UseForeColor = false; + this.xrLabel16.StylePriority.UseTextAlignment = false; + this.xrLabel16.Text = "Bewilligte Hilfskraftstunden"; + this.xrLabel16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // xrLabel30 + // + this.xrLabel30.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel30.ForeColor = System.Drawing.Color.Black; + this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(257.8702F, 117.2349F); + this.xrLabel30.Multiline = true; + this.xrLabel30.Name = "xrLabel30"; + this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel30.SizeF = new System.Drawing.SizeF(82.84718F, 19.99998F); + this.xrLabel30.StylePriority.UseFont = false; + this.xrLabel30.StylePriority.UseForeColor = false; + this.xrLabel30.StylePriority.UseTextAlignment = false; + this.xrLabel30.Text = "wöchentlich"; + this.xrLabel30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // xrLabel28 + // + this.xrLabel28.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel28.ForeColor = System.Drawing.Color.Black; + this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(257.8702F, 97.23489F); + this.xrLabel28.Multiline = true; + this.xrLabel28.Name = "xrLabel28"; + this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel28.SizeF = new System.Drawing.SizeF(82.84718F, 19.99999F); + this.xrLabel28.StylePriority.UseFont = false; + this.xrLabel28.StylePriority.UseForeColor = false; + this.xrLabel28.StylePriority.UseTextAlignment = false; + this.xrLabel28.Text = "wöchentlich"; + this.xrLabel28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // lblApprovedFLS + // + this.lblApprovedFLS.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.lblApprovedFLS.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.lblApprovedFLS.ForeColor = System.Drawing.Color.Black; + this.lblApprovedFLS.LocationFloat = new DevExpress.Utils.PointFloat(340.7174F, 97.23489F); + this.lblApprovedFLS.Multiline = true; + this.lblApprovedFLS.Name = "lblApprovedFLS"; + this.lblApprovedFLS.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblApprovedFLS.SizeF = new System.Drawing.SizeF(61.06689F, 19.99999F); + this.lblApprovedFLS.StylePriority.UseBorders = false; + this.lblApprovedFLS.StylePriority.UseFont = false; + this.lblApprovedFLS.StylePriority.UseForeColor = false; + this.lblApprovedFLS.StylePriority.UseTextAlignment = false; + this.lblApprovedFLS.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // lblApprovedASS + // + this.lblApprovedASS.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.lblApprovedASS.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.lblApprovedASS.ForeColor = System.Drawing.Color.Black; + this.lblApprovedASS.LocationFloat = new DevExpress.Utils.PointFloat(340.7174F, 117.2349F); + this.lblApprovedASS.Multiline = true; + this.lblApprovedASS.Name = "lblApprovedASS"; + this.lblApprovedASS.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblApprovedASS.SizeF = new System.Drawing.SizeF(61.06689F, 19.99999F); + this.lblApprovedASS.StylePriority.UseBorders = false; + this.lblApprovedASS.StylePriority.UseFont = false; + this.lblApprovedASS.StylePriority.UseForeColor = false; + this.lblApprovedASS.StylePriority.UseTextAlignment = false; + this.lblApprovedASS.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrLabel34 + // + this.xrLabel34.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel34.ForeColor = System.Drawing.Color.Black; + this.xrLabel34.LocationFloat = new DevExpress.Utils.PointFloat(401.7843F, 97.23489F); + this.xrLabel34.Multiline = true; + this.xrLabel34.Name = "xrLabel34"; + this.xrLabel34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel34.SizeF = new System.Drawing.SizeF(82.84717F, 19.99999F); + this.xrLabel34.StylePriority.UseFont = false; + this.xrLabel34.StylePriority.UseForeColor = false; + this.xrLabel34.StylePriority.UseTextAlignment = false; + this.xrLabel34.Text = "Stunden"; + this.xrLabel34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // xrLabel33 + // + this.xrLabel33.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel33.ForeColor = System.Drawing.Color.Black; + this.xrLabel33.LocationFloat = new DevExpress.Utils.PointFloat(401.7843F, 117.2349F); + this.xrLabel33.Multiline = true; + this.xrLabel33.Name = "xrLabel33"; + this.xrLabel33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel33.SizeF = new System.Drawing.SizeF(82.84718F, 19.99998F); + this.xrLabel33.StylePriority.UseFont = false; + this.xrLabel33.StylePriority.UseForeColor = false; + this.xrLabel33.StylePriority.UseTextAlignment = false; + this.xrLabel33.Text = "Stunden"; + this.xrLabel33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // // LeistungsnachweisAnlage4 // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { this.Detail, this.DetailReport, - this.ReportHeader, this.topMarginBand1, this.bottomMarginBand1, - this.GroupFooter1}); + this.GroupFooter1, + this.PageHeader}); this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { this.fieldKontaktArt}); this.DataSource = this.bindingSource1; @@ -1276,14 +1281,12 @@ namespace CaritasverbandKelheim private System.Windows.Forms.BindingSource bindingSource1; private DevExpress.XtraReports.UI.DetailReportBand DetailReport; private DevExpress.XtraReports.UI.DetailBand Detail1; - private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; private DevExpress.XtraReports.UI.FormattingRule formattingRuleStartDate; private DevExpress.XtraReports.UI.FormattingRule formattingRuleServiceDesc; private DevExpress.XtraReports.UI.FormattingRule formattingRuleCostBearer; private DevExpress.XtraReports.UI.FormattingRule formattingRuleEmployeeName; private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; - private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1; private DevExpress.XtraReports.UI.XRTable xrTableServiceRecords1; private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; @@ -1316,20 +1319,6 @@ namespace CaritasverbandKelheim private DevExpress.XtraReports.UI.XRLabel xrLabel15; private DevExpress.XtraReports.UI.XRLabel lblUnterschriftKlient; private DevExpress.XtraReports.UI.XRPictureBox picSignature; - private DevExpress.XtraReports.UI.XRLabel xrLabel3; - private DevExpress.XtraReports.UI.XRLabel xrLabel4; - private DevExpress.XtraReports.UI.XRLabel xrLabel5; - private DevExpress.XtraReports.UI.XRLabel xrLabel6; - private DevExpress.XtraReports.UI.XRLabel xrLabel7; - private DevExpress.XtraReports.UI.XRLabel xrLabel8; - private DevExpress.XtraReports.UI.XRLabel xrLabel16; - private DevExpress.XtraReports.UI.XRLabel xrLabel14; - private DevExpress.XtraReports.UI.XRLabel xrLabel28; - private DevExpress.XtraReports.UI.XRLabel xrLabel30; - private DevExpress.XtraReports.UI.XRLabel lblApprovedASS; - private DevExpress.XtraReports.UI.XRLabel lblApprovedFLS; - private DevExpress.XtraReports.UI.XRLabel xrLabel33; - private DevExpress.XtraReports.UI.XRLabel xrLabel34; private DevExpress.XtraReports.UI.XRTableCell xrTableCell32; private DevExpress.XtraReports.UI.XRTableCell xrTableCell33; private DevExpress.XtraReports.UI.XRTableCell xrTableCell34; @@ -1345,12 +1334,27 @@ namespace CaritasverbandKelheim private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.XRLabel xrLabel9; private DevExpress.XtraReports.UI.XRLabel xrLabel10; - private DevExpress.XtraReports.UI.XRLabel xrLabel29; - private DevExpress.XtraReports.UI.XRLabel xrLabel26; - private DevExpress.XtraReports.UI.XRLabel xrLabel27; - private DevExpress.XtraReports.UI.XRLabel xrLabel25; - private DevExpress.XtraReports.UI.XRLabel xrLabel24; private DevExpress.XtraReports.UI.XRTableCell lblGruppeFK; - private DevExpress.XtraReports.UI.XRLabel xrLabel13; + private DevExpress.XtraReports.UI.PageHeaderBand PageHeader; + private DevExpress.XtraReports.UI.XRLabel xrLabel2; + private DevExpress.XtraReports.UI.XRLabel xrLabel24; + private DevExpress.XtraReports.UI.XRLabel xrLabel25; + private DevExpress.XtraReports.UI.XRLabel xrLabel27; + private DevExpress.XtraReports.UI.XRLabel xrLabel26; + private DevExpress.XtraReports.UI.XRLabel xrLabel3; + private DevExpress.XtraReports.UI.XRLabel xrLabel4; + private DevExpress.XtraReports.UI.XRLabel xrLabel6; + private DevExpress.XtraReports.UI.XRLabel xrLabel5; + private DevExpress.XtraReports.UI.XRLabel xrLabel8; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; + private DevExpress.XtraReports.UI.XRLabel xrLabel14; + private DevExpress.XtraReports.UI.XRLabel xrLabel16; + private DevExpress.XtraReports.UI.XRLabel xrLabel30; + private DevExpress.XtraReports.UI.XRLabel xrLabel28; + private DevExpress.XtraReports.UI.XRLabel lblApprovedFLS; + private DevExpress.XtraReports.UI.XRLabel lblApprovedASS; + private DevExpress.XtraReports.UI.XRLabel xrLabel34; + private DevExpress.XtraReports.UI.XRLabel xrLabel33; + private DevExpress.XtraReports.UI.XRLabel lblSeite; } } diff --git a/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage4.cs b/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage4.cs index f0793f620..bc958e52a 100644 --- a/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage4.cs +++ b/ReportImp/CaritasverbandKelheim/LeistungsnachweisAnlage4.cs @@ -174,5 +174,9 @@ namespace CaritasverbandKelheim return Image.FromStream(memoryStream); } } + private void lblSeite_PrintOnPage(object sender, DevExpress.XtraReports.UI.PrintOnPageEventArgs e) + { + lblSeite.Text = String.Format("Seite {0} von {1}", e.PageIndex + 1, e.PageCount); + } } } From f22dfb3bece643dbc7829a7afd23e7353560d805 Mon Sep 17 00:00:00 2001 From: Rene Evertz Date: Wed, 4 Mar 2026 13:11:46 +0100 Subject: [PATCH 02/24] Rechte gerade ziehen (1/2) AiChatInZeiterfassung entfernt AiModuleChatView zusammengefasst --- BeWo/Core/Commands/CommandFactory.cs | 2 +- .../Detail/AI/AiConversationChatView.xaml | 2 - BeWo/View/Detail/CustomerView.xaml.cs | 2 +- .../Zeiterfassung/ServiceRecordEditView.xaml | 3 +- .../Zeiterfassung/ServiceRecordView2.xaml | 44 ++++++++++--------- .../Zeiterfassung/ServiceRecordView2.xaml.cs | 9 ---- .../Navigation/CustomerNavigationView.xaml.cs | 2 +- .../Navigation/EmployeeNavigationView.xaml.cs | 2 +- .../OrganisationNavigationView.xaml.cs | 2 +- .../Navigation/PersonNavigationView.xaml.cs | 2 +- .../SupportConceptNavigationView.xaml.cs | 2 +- .../ListViewModel/ServiceRecordListVM.cs | 16 ++++--- BeWo/ViewModel/UserGroupVM.cs | 7 +-- .../View/AI/AiConversationChatViewModel.cs | 6 +-- Data/Security/UserRightHelper.cs | 14 +++--- .../Enhanced/IAiEnhancedService.cs | 22 +++++----- Shared/BeWoEntityEnums.cs | 13 +++--- Shared/Core/EnumTranslations.cs | 13 +++--- Shared/Core/UserRightTypeHelper.cs | 26 +++++++++++ Shared/DataContracts/ClientPartials/UserDC.cs | 3 +- Shared/Shared.csproj | 1 + 21 files changed, 112 insertions(+), 81 deletions(-) create mode 100644 Shared/Core/UserRightTypeHelper.cs diff --git a/BeWo/Core/Commands/CommandFactory.cs b/BeWo/Core/Commands/CommandFactory.cs index 9852acdb8..46d22dffd 100644 --- a/BeWo/Core/Commands/CommandFactory.cs +++ b/BeWo/Core/Commands/CommandFactory.cs @@ -14,7 +14,7 @@ namespace BeWo.Core.Commands public static DelegateCommand GetAiViewCommand(Action openView, UserRightType? userRightType, Func additionalCheckup = null, bool? useCommandManager = null) { bool canExecute() => - (BeWoApp.AppSettings?.ModuleAiEnabled ?? BeWoApp.AppSettings?.ShowAI ?? false) && + (BeWoApp.AppSettings?.ShowAI ?? false) && (userRightType is null || BeWoApp.HasLoggedOnUserRight(userRightType.Value)) && (additionalCheckup is null || additionalCheckup()); diff --git a/BeWo/View/Detail/AI/AiConversationChatView.xaml b/BeWo/View/Detail/AI/AiConversationChatView.xaml index 31f9a14a5..920a55652 100644 --- a/BeWo/View/Detail/AI/AiConversationChatView.xaml +++ b/BeWo/View/Detail/AI/AiConversationChatView.xaml @@ -248,7 +248,6 @@ - @@ -303,7 +302,6 @@ - diff --git a/BeWo/View/Detail/CustomerView.xaml.cs b/BeWo/View/Detail/CustomerView.xaml.cs index f9704ae1d..1d7400633 100644 --- a/BeWo/View/Detail/CustomerView.xaml.cs +++ b/BeWo/View/Detail/CustomerView.xaml.cs @@ -102,7 +102,7 @@ namespace BeWo.View.Detail InitializeComponent(); DataContext = ViewModel; - OpenAiWindowCommand = CommandFactory.GetAiViewCommand(OpenAiWindow, UserRightType.AiModuleView, () => !ViewModel.IsNew); + OpenAiWindowCommand = CommandFactory.GetAiViewCommand(OpenAiWindow, UserRightType.AiModuleChatView, () => !ViewModel.IsNew); BehinderungsartenSelection.CommandBindings.Add(new CommandBinding(ApplicationCommands.Close, (s, e) => this.Dispatch(() => { PopupBehinderungsarten.IsOpen = false; }))); MerkzeichenSelection.CommandBindings.Add(new CommandBinding(ApplicationCommands.Close, (s, e) => this.Dispatch(() => { PopupMerkzeichen.IsOpen = false; }))); diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml b/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml index 85e2d2505..738d66cb0 100644 --- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml +++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordEditView.xaml @@ -1510,7 +1510,8 @@ Grid.ColumnSpan="2" HorizontalAlignment="Right" DataContext="" - Orientation="Horizontal"> + Orientation="Horizontal" + Visibility="{Binding IsAiDocuButtonVisible, Converter={StaticResource BoolVisibilityConverter}}"> diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml index 772f7559d..1d7ee3a44 100644 --- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml +++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml @@ -1693,8 +1693,7 @@ Grid.Row="1" Grid.ColumnSpan="4" HorizontalAlignment="Right" - Orientation="Horizontal" - Visibility="{Binding IsAiButtonVisible, Converter={StaticResource BoolVisibilityConverter}}"> + Orientation="Horizontal"> @@ -1702,26 +1701,31 @@ + + diff --git a/BeWo/View/Detail/AI/AiPromptbausteinComplexTreeView.xaml b/BeWo/View/Detail/AI/AiPromptbausteinComplexTreeView.xaml index bc466f8e2..a562eec23 100644 --- a/BeWo/View/Detail/AI/AiPromptbausteinComplexTreeView.xaml +++ b/BeWo/View/Detail/AI/AiPromptbausteinComplexTreeView.xaml @@ -52,8 +52,7 @@ Grid.Row="0" Grid.Column="2" HorizontalAlignment="Right" - Orientation="Horizontal"> - + Orientation="Horizontal" /> + x:Name="favorite" + Command="{Binding ChangeFavoritenStatePromptCommand}" + Header="Kopieren"> @@ -192,9 +191,9 @@ @@ -206,42 +205,42 @@ + Height="21" + Margin="0" + Padding="0" + VerticalAlignment="Center" + Background="Transparent" + BorderThickness="0" + Cursor="Arrow" + Focusable="False" + FontWeight="{Binding FontWeight, UpdateSourceTrigger=PropertyChanged}" + IsReadOnly="True" + Text="{Binding Path=Title, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" + ToolTipService.ShowDuration="100000"> - - (i) - + Grid.Column="1" + Margin="0" + Padding="0" + Visibility="{Binding IsInfoVisible, Converter={StaticResource BoolVisibilityConverter}}"> + + (i) + From 3bb1e551cf85cf1f8626c8f86dcd2b854e2aa267 Mon Sep 17 00:00:00 2001 From: Rene Evertz Date: Fri, 6 Mar 2026 11:18:49 +0100 Subject: [PATCH 19/24] Neue System DLL Version --- Host/Web.Deploy.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Host/Web.Deploy.config b/Host/Web.Deploy.config index 7bef24dfd..8dcfb2373 100644 --- a/Host/Web.Deploy.config +++ b/Host/Web.Deploy.config @@ -37,7 +37,7 @@ - + From 1ece17d18e8266a65ba3a8009f64672e27c63d66 Mon Sep 17 00:00:00 2001 From: Rene Evertz Date: Fri, 6 Mar 2026 11:51:53 +0100 Subject: [PATCH 20/24] Neue Log config --- Host/Web.Deploy.config | 32 ++++++++++++++++++++++++++------ Host/Web.config | 21 ++++++++++++++++++++- 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/Host/Web.Deploy.config b/Host/Web.Deploy.config index 8dcfb2373..6f573bcce 100644 --- a/Host/Web.Deploy.config +++ b/Host/Web.Deploy.config @@ -102,6 +102,12 @@ --> + + + + + + @@ -109,16 +115,30 @@ - - + + + + + + + + + + + + + + + + + + + + - - - - diff --git a/Host/Web.config b/Host/Web.config index 8d40e3b96..c324f6b3b 100644 --- a/Host/Web.config +++ b/Host/Web.config @@ -100,6 +100,7 @@ + @@ -118,12 +119,30 @@ - + + + + + + + + + + + + + + + + + + +