diff --git a/ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024.Designer.cs b/ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024.Designer.cs index ba0241b01..a87998b7a 100644 --- a/ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024.Designer.cs +++ b/ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024.Designer.cs @@ -30,9 +30,9 @@ namespace LebenshilfeWolfsburg.Reporting private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary(); - DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); @@ -44,6 +44,7 @@ namespace LebenshilfeWolfsburg.Reporting this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -57,6 +58,7 @@ namespace LebenshilfeWolfsburg.Reporting this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); this.columnWegepauschaleQuali = new DevExpress.XtraReports.UI.XRTableCell(); @@ -91,6 +93,7 @@ namespace LebenshilfeWolfsburg.Reporting this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); @@ -103,10 +106,9 @@ namespace LebenshilfeWolfsburg.Reporting this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); this.wennGruppeAnzPersonen = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); + this.Erlaeuterung = new DevExpress.XtraReports.UI.CalculatedField(); + this.Gruppenangebot = new DevExpress.XtraReports.UI.CalculatedField(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -200,7 +202,7 @@ namespace LebenshilfeWolfsburg.Reporting this.xrTableCell14.StylePriority.UseTextAlignment = false; this.xrTableCell14.Text = "xrTableCell14"; this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell14.Weight = 0.0818910743966614D; + this.xrTableCell14.Weight = 0.081322979871435414D; // // xrTableCell2 // @@ -211,12 +213,12 @@ namespace LebenshilfeWolfsburg.Reporting this.xrTableCell2.StylePriority.UseFont = false; this.xrTableCell2.StylePriority.UseTextAlignment = false; this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell2.Weight = 0.11870551698505645D; + this.xrTableCell2.Weight = 0.11927361151028244D; // // xrTableCell10 // this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice3")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Gruppenangebot")}); this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Calibri", 10F); this.xrTableCell10.Name = "xrTableCell10"; this.xrTableCell10.StylePriority.UseFont = false; @@ -236,6 +238,20 @@ namespace LebenshilfeWolfsburg.Reporting this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell12.Weight = 0.10843058021456664D; // + // xrTableCell16 + // + this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.GroupRoundedDuration")}); + this.xrTableCell16.Font = new DevExpress.Drawing.DXFont("Calibri", 10F); + this.xrTableCell16.Multiline = true; + this.xrTableCell16.Name = "xrTableCell16"; + this.xrTableCell16.StylePriority.UseFont = false; + this.xrTableCell16.StylePriority.UseTextAlignment = false; + this.xrTableCell16.Text = "xrTableCell16"; + this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell16.TextFormatString = "{0:#.##}"; + this.xrTableCell16.Weight = 0.1626457680127131D; + // // xrTableCell15 // this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -287,7 +303,7 @@ namespace LebenshilfeWolfsburg.Reporting // xrTableCell50 // this.xrTableCell50.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Erlaeuterung")}); this.xrTableCell50.Font = new DevExpress.Drawing.DXFont("Calibri", 10F); this.xrTableCell50.Name = "xrTableCell50"; this.xrTableCell50.StylePriority.UseBorders = false; @@ -433,6 +449,25 @@ namespace LebenshilfeWolfsburg.Reporting this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell6.Weight = 0.23987974563492123D; // + // xrTableCell9 + // + this.xrTableCell9.BackColor = System.Drawing.Color.Transparent; + this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell9.Multiline = true; + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F); + this.xrTableCell9.StylePriority.UseBackColor = false; + this.xrTableCell9.StylePriority.UseBorders = false; + this.xrTableCell9.StylePriority.UseFont = false; + this.xrTableCell9.StylePriority.UsePadding = false; + this.xrTableCell9.StylePriority.UseTextAlignment = false; + this.xrTableCell9.Text = "Summe: Dauer in Minuten direkt mit mehreren IP bei Gruppenangebot "; + this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell9.Weight = 0.35981960443848743D; + // // xrTableCell7 // this.xrTableCell7.BackColor = System.Drawing.Color.Transparent; @@ -955,6 +990,31 @@ namespace LebenshilfeWolfsburg.Reporting this.GroupFooter1.KeepTogether = true; this.GroupFooter1.Name = "GroupFooter1"; // + // xrLabel12 + // + this.xrLabel12.BackColor = System.Drawing.Color.Transparent; + this.xrLabel12.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel12.BorderWidth = 2F; + this.xrLabel12.CanGrow = false; + this.xrLabel12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.GroupRoundedDuration")}); + this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(364.9999F, 0F); + this.xrLabel12.Name = "xrLabel12"; + this.xrLabel12.SizeF = new System.Drawing.SizeF(121.0002F, 21F); + this.xrLabel12.StylePriority.UseBackColor = false; + this.xrLabel12.StylePriority.UseBorders = false; + this.xrLabel12.StylePriority.UseBorderWidth = false; + this.xrLabel12.StylePriority.UseFont = false; + this.xrLabel12.StylePriority.UsePadding = false; + this.xrLabel12.StylePriority.UseTextAlignment = false; + xrSummary1.FormatString = "{0:0.##}"; + xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrLabel12.Summary = xrSummary1; + this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // // xrLabel11 // this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -1150,68 +1210,23 @@ namespace LebenshilfeWolfsburg.Reporting this.wennGruppeAnzPersonen.Expression = "Iif([CustomerCount] > 1,[CustomerCount],\'\')"; this.wennGruppeAnzPersonen.Name = "wennGruppeAnzPersonen"; // - // xrTableCell9 + // Erlaeuterung // - this.xrTableCell9.BackColor = System.Drawing.Color.Transparent; - this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrTableCell9.Multiline = true; - this.xrTableCell9.Name = "xrTableCell9"; - this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F); - this.xrTableCell9.StylePriority.UseBackColor = false; - this.xrTableCell9.StylePriority.UseBorders = false; - this.xrTableCell9.StylePriority.UseFont = false; - this.xrTableCell9.StylePriority.UsePadding = false; - this.xrTableCell9.StylePriority.UseTextAlignment = false; - this.xrTableCell9.Text = "Summe: Dauer in Minuten direkt mit mehreren IP bei Gruppenangebot "; - this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell9.Weight = 0.35981960443848743D; + this.Erlaeuterung.DataMember = "Services"; + this.Erlaeuterung.Expression = "Iif([StartDate].[Year] >= 2026 && [StartDate].[Month] >= 2, [Notice3] , [Notice])" + + "\n"; + this.Erlaeuterung.Name = "Erlaeuterung"; // - // xrTableCell16 + // Gruppenangebot // - this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.GroupRoundedDuration")}); - this.xrTableCell16.Font = new DevExpress.Drawing.DXFont("Calibri", 10F); - this.xrTableCell16.Multiline = true; - this.xrTableCell16.Name = "xrTableCell16"; - this.xrTableCell16.StylePriority.UseFont = false; - this.xrTableCell16.StylePriority.UseTextAlignment = false; - this.xrTableCell16.Text = "xrTableCell16"; - this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell16.TextFormatString = "{0:#.##}"; - this.xrTableCell16.Weight = 0.1626457680127131D; + this.Gruppenangebot.DataMember = "Services"; + this.Gruppenangebot.Expression = "Iif([IsGroup] == true,\'1\',\'\')"; + this.Gruppenangebot.Name = "Gruppenangebot"; // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); // - // xrLabel12 - // - this.xrLabel12.BackColor = System.Drawing.Color.Transparent; - this.xrLabel12.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel12.BorderWidth = 2F; - this.xrLabel12.CanGrow = false; - this.xrLabel12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.GroupRoundedDuration")}); - this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(364.9999F, 0F); - this.xrLabel12.Name = "xrLabel12"; - this.xrLabel12.SizeF = new System.Drawing.SizeF(121.0002F, 21F); - this.xrLabel12.StylePriority.UseBackColor = false; - this.xrLabel12.StylePriority.UseBorders = false; - this.xrLabel12.StylePriority.UseBorderWidth = false; - this.xrLabel12.StylePriority.UseFont = false; - this.xrLabel12.StylePriority.UsePadding = false; - this.xrLabel12.StylePriority.UseTextAlignment = false; - xrSummary1.FormatString = "{0:0.##}"; - xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrLabel12.Summary = xrSummary1; - this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - // // Leistungsnachweis2024 // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1223,7 +1238,9 @@ namespace LebenshilfeWolfsburg.Reporting this.GroupFooter1}); this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { this.fieldKontaktArt, - this.wennGruppeAnzPersonen}); + this.wennGruppeAnzPersonen, + this.Erlaeuterung, + this.Gruppenangebot}); this.DataSource = this.bindingSource1; this.DisplayName = "Leistungsnachweis"; this.Font = new DevExpress.Drawing.DXFont("Calibri", 11F); @@ -1322,5 +1339,7 @@ namespace LebenshilfeWolfsburg.Reporting private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; private DevExpress.XtraReports.UI.XRLabel xrLabel12; + private DevExpress.XtraReports.UI.CalculatedField Erlaeuterung; + private DevExpress.XtraReports.UI.CalculatedField Gruppenangebot; } } \ No newline at end of file diff --git a/ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024.cs b/ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024.cs index 2dd2595f8..f826b8a97 100644 --- a/ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024.cs +++ b/ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024.cs @@ -46,11 +46,11 @@ namespace LebenshilfeWolfsburg.Reporting minuten += sd.Minutes; ServicesOverviewRO.CreateSignatureString(sd); - sd.Notice3 = ""; - if (sd.IsGroup) - { - sd.Notice3 = "1"; - } + //sd.Notice3 = ""; + //if (sd.IsGroup) + //{ + // sd.Notice3 = "1"; + //} // Felder für Wegepauschale setzen (Wenn FLS FaceToFace und keine Gruppe) sd.Notice4 = ""; diff --git a/ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024Ass.Designer.cs b/ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024Ass.Designer.cs index 22054e1d0..8ef31953c 100644 --- a/ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024Ass.Designer.cs +++ b/ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024Ass.Designer.cs @@ -64,7 +64,6 @@ namespace LebenshilfeWolfsburg.Reporting this.columnWegepauschaleQuali = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); @@ -107,6 +106,9 @@ namespace LebenshilfeWolfsburg.Reporting this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); this.wennGruppeAnzPersonen = new DevExpress.XtraReports.UI.CalculatedField(); + this.Erlaeuterung = new DevExpress.XtraReports.UI.CalculatedField(); + this.Gruppenangebot = new DevExpress.XtraReports.UI.CalculatedField(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -216,7 +218,7 @@ namespace LebenshilfeWolfsburg.Reporting // xrTableCell10 // this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice3")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Gruppenangebot")}); this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Calibri", 10F); this.xrTableCell10.Name = "xrTableCell10"; this.xrTableCell10.StylePriority.UseFont = false; @@ -301,7 +303,7 @@ namespace LebenshilfeWolfsburg.Reporting // xrTableCell50 // this.xrTableCell50.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Erlaeuterung")}); this.xrTableCell50.Font = new DevExpress.Drawing.DXFont("Calibri", 10F); this.xrTableCell50.Name = "xrTableCell50"; this.xrTableCell50.StylePriority.UseBorders = false; @@ -558,10 +560,6 @@ namespace LebenshilfeWolfsburg.Reporting this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell32.Weight = 1.0176190645501537D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; @@ -1212,6 +1210,23 @@ namespace LebenshilfeWolfsburg.Reporting this.wennGruppeAnzPersonen.Expression = "Iif([CustomerCount] > 1,[CustomerCount],\'\')"; this.wennGruppeAnzPersonen.Name = "wennGruppeAnzPersonen"; // + // Erlaeuterung + // + this.Erlaeuterung.DataMember = "Services"; + this.Erlaeuterung.Expression = "Iif([StartDate].[Year] >= 2026 & [StartDate].[Month] >= 2, [Notice3] , [Notice])\n" + + ""; + this.Erlaeuterung.Name = "Erlaeuterung"; + // + // Gruppenangebot + // + this.Gruppenangebot.DataMember = "Services"; + this.Gruppenangebot.Expression = "Iif([IsGroup] == true,\'1\',\'\')"; + this.Gruppenangebot.Name = "Gruppenangebot"; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // // Leistungsnachweis2024Ass // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1223,7 +1238,9 @@ namespace LebenshilfeWolfsburg.Reporting this.GroupFooter1}); this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { this.fieldKontaktArt, - this.wennGruppeAnzPersonen}); + this.wennGruppeAnzPersonen, + this.Erlaeuterung, + this.Gruppenangebot}); this.DataSource = this.bindingSource1; this.DisplayName = "Leistungsnachweis"; this.Font = new DevExpress.Drawing.DXFont("Calibri", 11F); @@ -1322,5 +1339,7 @@ namespace LebenshilfeWolfsburg.Reporting private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; private DevExpress.XtraReports.UI.XRLabel xrLabel12; + private DevExpress.XtraReports.UI.CalculatedField Erlaeuterung; + private DevExpress.XtraReports.UI.CalculatedField Gruppenangebot; } } \ No newline at end of file diff --git a/ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024Ass.cs b/ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024Ass.cs index d3ed9a68e..d63d1a3e9 100644 --- a/ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024Ass.cs +++ b/ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024Ass.cs @@ -46,11 +46,11 @@ namespace LebenshilfeWolfsburg.Reporting minuten += sd.Minutes; ServicesOverviewRO.CreateSignatureString(sd); - sd.Notice3 = ""; + //sd.Notice3 = ""; sd.Notice4 = ""; if (sd.IsGroup) { - sd.Notice3 = "1"; + //sd.Notice3 = "1"; sd.Notice4 = sd.EmployeeCount.ToString(); } // Felder für Ausfallstundnen setzen diff --git a/ReportImp/LebenshilfeWolfsburg/Reporting/ServicesOverviewReport.Designer.cs b/ReportImp/LebenshilfeWolfsburg/Reporting/ServicesOverviewReport.Designer.cs index 3dc7fa2a9..d510d87f3 100644 --- a/ReportImp/LebenshilfeWolfsburg/Reporting/ServicesOverviewReport.Designer.cs +++ b/ReportImp/LebenshilfeWolfsburg/Reporting/ServicesOverviewReport.Designer.cs @@ -31,6 +31,7 @@ namespace LebenshilfeWolfsburg.Reporting { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Stundenzettel)); + DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -49,7 +50,6 @@ namespace LebenshilfeWolfsburg.Reporting this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); @@ -91,11 +91,12 @@ namespace LebenshilfeWolfsburg.Reporting this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.fieldArtDerLeistung = new DevExpress.XtraReports.UI.CalculatedField(); this.Erlaeuterung = new DevExpress.XtraReports.UI.CalculatedField(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -312,10 +313,6 @@ namespace LebenshilfeWolfsburg.Reporting this.GroupHeader1.RepeatEveryPage = true; this.GroupHeader1.StylePriority.UseFont = false; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; @@ -804,10 +801,14 @@ namespace LebenshilfeWolfsburg.Reporting // Erlaeuterung // this.Erlaeuterung.DataMember = "Services"; - this.Erlaeuterung.Expression = "Iif([StartDate].[Year] >= 2026, [Notice3] , [Notice])"; + this.Erlaeuterung.Expression = "Iif([StartDate].[Year] >= 2026 & [StartDate].[Month] >= 2, [Notice3] , [Notice])"; this.Erlaeuterung.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.Erlaeuterung.Name = "Erlaeuterung"; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // // Stundenzettel // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -834,11 +835,13 @@ namespace LebenshilfeWolfsburg.Reporting this.PageWidth = 1169; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.Version = "23.2"; + xrWatermark1.Id = "Watermark1"; + this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); }